Changeset 1759 for branches/multiuser/index.php

Timestamp:

09/26/07 08:57:31 (3 years ago)

Author:

mdodoo

Message:

Lots of things are still not working, but I think this code is better than what was currently committed ([1639]
should have been reverted, and the person who committed should have had their SVN access pulled, for example).
Created this by grabbing the trunk code and then manually inserting the MU branch's changes in. This is probably
not usable in an actual installation (no support for creating new user accounts yet, for example), but patches are
welcome.

Not sure why I write so much here - I am not sure anyone other than my fellow devs actually read them...

Files:

• branches/multiuser/index.php (modified) (4 diffs)

branches/multiuser/index.php

@@ -92 +92 @@
 
 rss_plugin_hook('rss.plugins.frontpage.afterread', null);
-
 $GLOBALS['rss'] -> header = new Header("",LOCATION_HOME,array('cid'=>null,'fid'=>null));
 $GLOBALS['rss'] -> feedList = new FeedList(false);
@@ -132 +131 @@
     $sqlWhereHidden = "";
     
-    $unreadItems -> populate("i2u.flgunread=1 & " . RSS_MODE_UNREAD_STATE . $sqlWhereHidden, "", 0, $numItems,ITEM_SORT_HINT_UNREAD);
+    $unreadItems -> populate("i2u.flgunread=1 " . $sqlWhereHidden, "", 0, $numItems,ITEM_SORT_HINT_UNREAD);
     //var_dump($unreadItems);
     _pf('end populate unread items');
@@ -166 +165 @@
 
     if (getConfig('rss.config.feedgrouping')) {
-        if ($limit <= 0) {
+        if ($limit <= 0) {
             return;
         }
-    $sql = "select c2u.fkcid from " . getTable("channels2user") . " c2u " 
-            . "inner join " . getTable("folders") ." f on c2u.parent = f.id ";
+        $sql = "select c2u.fkcid from " . getTable("channels2user") . " c2u " 
+            . "inner join " . getTable("channels") . " c "
+            . "inner join " . getTable("folders") ." f on c.parent = f.id ";
           
          // $sql .= $sqlWhereHidden;
@@ -177 +177 @@
         
         if (getConfig('rss.config.absoluteordering')) {
-            $sql .= " order by f.position asc, c2u.position asc";
+            $sql .= " order by f.position asc, c.position asc";
         } else {
-            $sql .=" order by f.name asc, c2u.title asc";
+            $sql .=" order by f.name asc, c.title asc";
         }
         $res1=rss_query($sql);
         while ($readItems->itemCount < $limit && (list($cid) = rss_fetch_row($res1))) {
-            $sqlWhere  = " i2u.flgunread=0 and i.cid= $cid";
+            $sqlWhere  = " i2u.flgunread=0 and i.cid= $cid";
             $sqlWhere .= " and i.pubdate <= now() ";