Changeset 1655

Timestamp:

01/06/07 23:01:06 (3 years ago)

Author:

mbonetti

Message:

experimental fix for #302

Location:

trunk/gregarius

Files:

• cls/channels.php (modified) (3 diffs)
• schema.php (modified) (2 diffs)

trunk/gregarius/cls/channels.php

@@ -142 +142 @@
     }
     
-    function render() {     
-        $GLOBALS['rss']->currentFeedsFolder = $this;
-        eval($GLOBALS['rss'] ->getCachedTemplateFile("feedsfolder.php"));
+    function render() {
+        if ((!getConfig('rss.output.minimalchannellist')) || ($this->feeds)) { 
+            $GLOBALS['rss']->currentFeedsFolder = $this; 
+            require($GLOBALS['rss'] ->getTemplateFile("feedsfolder.php")); 
+        }
     }
 }
@@ -213 +215 @@
                // Lets collapse all folders
                $res = rss_query("select id from " . getTable('folders') . " where id != 0");
-               while (list ($this->collapsed_ids[]) = rss_fetch_row($res)) {
-               }
+               while (list ($this->collapsed_ids[]) = rss_fetch_row($res)) {}
                if (!headers_sent()) { // Sajax does not allow us to set cookies
                 setcookie(COLLAPSED_FOLDERS_COOKIE, 
@@ -287 +288 @@
                 $this->folders[$cparent] = new FeedFolder($fname, $cparent,$this);
             }
-            $this->folders[$cparent]->feeds[] = $f;
+            //$this->folders[$cparent]->feeds[] = $f;
+            if(($ucc != 0) || (!getConfig('rss.output.minimalchannellist'))) { 
+                $this->folders[$cparent]->feeds[] = $f; 
+            }
             $this->folders[$cparent]->isCollapsed = in_array($cparent, $this->collapsed_ids) && ($cparent > 0);
 

trunk/gregarius/schema.php

@@ -458 +458 @@
         "rss.output.frontpage.mixeditems"   => array('true','true','boolean','Show read items along with unread items on the front page?',NULL),
         "rss.output.frontpage.numreaditems" => array(-1,-1,'num','If there are no unread items then how many items to show on the frontpage. Set this to -1 if you want it to be the same as rss.output.numitemsonmainpage',NULL),
+        "rss.output.mimimalchannellist" => array('false','false','boolean','Exclude folders and channels without unread items in channel list?',NULL),
         "rss.output.theme"          =>      array('default','default','string','The theme to use. Download more themes from the <a href="http://themes.gregarius.net/">Gregarius Themes Repository</a>.',NULL),
         "rss.output.cachecontrol"   =>      array('false','false','boolean','If true, Gregarius will negotiate with the browser and check whether it should get a fresh document or not.',NULL),
@@ -478 +479 @@
         "rss.search.maxitems" => array(500, 500, 'num', 'Sets the maximum number of items returned on a search', NULL),
         "rss.config.restrictrefresh"    => array("false","false","boolean","Restrict refresh to command line only (eg php -f update.php). Useful for busy sites with multiple users.",NULL),
+        "rss.output.minimalchannellist" => array('false','false','boolean','Exclude folders and channels without unread items in channel list?',NULL), 
     );