Changeset 25 for branches/portal_by_daris

Timestamp:

02/10/09 13:00:01 (3 years ago)

Author:

daris

Message:

portal: rss fix

Location:

branches/portal_by_daris

Files:

• include/rewrite_rules.php (modified) (1 diff)
• manifest.xml (modified) (2 diffs)

branches/portal_by_daris/include/rewrite_rules.php

@@ -18 +18 @@
         '/^pages(\.html?|\/)?$/i'                       => 'index.php?pages',
         '/^page[\/_-]?([0-9]+).*(\.html?|\/)?$/i'       => 'index.php?page=$1',
-        '/^news[\/_-](rss|atom)(\.html?|\/)?$/i'        => 'extern.php?portal_feed=news&type=$1',
+        '/^news[\/_-](rss|atom)(\.html?|\/)?$/i'        => 'extern.php?news_feed&type=$1',
 );
 

branches/portal_by_daris/manifest.xml

@@ -189 +189 @@
 
                 <hook id="ex_qr_get_topics"><![CDATA[
-$valid_portal_feed = array('news');
-($hook = get_hook('xn_portal_by_daris_ex_qr_get_topics_add_valid_feed')) ? eval($hook) : null;
-
-if (isset($_GET['portal_feed']) && in_array($_GET['portal_feed'], $valid_portal_feed))
-{
-        $query['SELECT'] .= ', t.first_post_id, p.message';
-        $query['JOINS'][] = array('LEFT JOIN' => 'posts AS p', 'ON' => 't.first_post_id=p.id');
-        $query['WHERE'] .= ' AND t.forum_id IN('.$forum_config['o_portal_'.$_GET['portal_feed'].'_forums'].')';
-}
+if (isset($_GET['news_feed']))
+        $query['WHERE'] .= ' AND t.forum_id IN('.$forum_config['o_portal_news_forums'].')';
+
 ]]></hook>
 
                 <hook id="ex_modify_cur_topic_item"><![CDATA[
-$valid_portal_feed = array('news');
-($hook = get_hook('xn_portal_by_daris_ex_modify_cur_topic_item_add_valid_feed')) ? eval($hook) : null;
-
-if (isset($_GET['portal_feed']) && in_array($_GET['portal_feed'], $valid_portal_feed))
+
+if (isset($_GET['news_feed']))
 {
         require_once FORUM_ROOT.'include/parser.php';
@@ -214 +206 @@
 
         $desc = $lang_portal['News'].': <a href="'.forum_link($forum_url['topic'], array($cur_topic['id'], sef_friendly($cur_topic['subject'])));
-        
-        ($hook = get_hook('xn_portal_by_daris_ex_modify_cur_topic_item')) ? eval($hook) : null;
 
         $desc .= '">'.$cur_topic['subject'].'</a><br />'."\n".parse_message(strlen($cur_topic['message']) > 400 ? substr($cur_topic['message'], 0, 400).'...' : $cur_topic['message'], 1);