Changeset 1541 for branches/multiuser/cls

Timestamp:

08/21/06 19:48:40 (2 years ago)

Author:

mbonetti

Message:

Some more multi-user-hacking

Location:

branches/multiuser/cls

Files:

• channels.php (modified) (5 diffs)
• items.php (modified) (5 diffs)

branches/multiuser/cls/channels.php

@@ -170 +170 @@
         _pf(' ... totalCount');     
         $sql = 
-        "select count(*) from ".getTable("item2user") . "i , " . getTable('channels') . " c "
-            
-            ." where i.fkcid=c.id and i.flgdeleted=0 "
-            ." and not (c.mode & " .RSS_MODE_DELETED_STATE.")"
+            "select count(*) from ".getTable("item2user") . "i , " 
+            . getTable('channels2user') . " c2u "   
+            ." where i.fkcid=c2u.fkcid and i.flgdeleted=0 "
+            ." and c2u.fkuid=" . rss_user_id()
+            ." and i.fkuid=" . rss_user_id()
+            ." and c2u.flgdeleted=0"
             . (hidePrivate()? " and i.flgprivate=0":"");
             
@@ -184 +186 @@
         _pf(' ... feedsCount');             
         $res = rss_query("select count(*) from "
-            .getTable("channels")." where not(mode & ".RSS_MODE_DELETED_STATE.")"
-            . (hidePrivate()? " and not(mode & ".RSS_MODE_PRIVATE_STATE.")":"")
+            .getTable("channels2user")." where flgdeleted=0 "
+            ." and fkuid=" . rss_user_id()
+            . (hidePrivate()? " and flgprivate=0":"")
             );
             
@@ -220 +223 @@
             ." from "
             .getTable('item2user') ." i2u, "
-            .getTable('channels') . " c, "
+            .getTable('channels2user') . " c2u, "
             .getTable('folders') ." f "
             ." where i2u.flgunread =1 "
@@ -227 +230 @@
                 $sql .=" and i2u.flgprivate =0 ";
             }
-            $sql .= " and not(c.mode & " . RSS_MODE_DELETED_STATE .") ";
-            $sql .= " and i2u.fkcid=c.id and c.parent=f.id "
+            $sql .= " and c2u.fkuid=" . rss_user_id();
+            $sql .= " and c2u.flgdeleted=0 ";
+            $sql .= " and c2u.parent=f.id "
             ." group by f.id"; 
             _pf('query');
@@ -249 +253 @@
     function populate() {
         _pf('FeedList->populate() ...');
-        $sql = "select "." c.id, c.title, c.url, c.siteurl, f.name, c.parent, c.icon, c.descr, c.mode "." from ".getTable("channels")." c, "
-        .getTable("folders")." f "." where f.id = c.parent";
-
+        $sql = "select "
+        ." c.id, c.title, c.url, c.siteurl, f.name, c2u.parent, c2u.icon, c.descr, c2u.flgdeleted,c2u.flgprivate "
+        ." from "
+        .getTable("channels")." c, "
+        .getTable("channels2user")." c2u, "
+        .getTable("folders")." f "
+        
+        ." where "
+        ." f.id = c.parent "
+        ." and c2u.fkcid=c.id "
+        . " and c2u.fkuid=" . rss_user_id();
         if (hidePrivate()) {
-            $sql .= " and not(c.mode & ".RSS_MODE_PRIVATE_STATE.") ";
-        }
-
-        $sql .= " and not(c.mode & ".RSS_MODE_DELETED_STATE.") ";
+            $sql .= " and c2u.flgprivate=0 ";
+        }
+
+        $sql .= " and c2u.flgdeleted=0 ";
 
         if (getConfig('rss.config.absoluteordering')) {
-            $sql .= " order by f.position asc, c.position asc";
+            $sql .= " order by f.position asc, c2u.position asc";
         } else {
             $sql .= " order by f.name, c.title asc";

branches/multiuser/cls/items.php

@@ -262 +262 @@
         $this -> ORDER_BY_UNREAD_FIRST = " order by i2u.flgunread desc, ";
         if (getConfig('rss.config.absoluteordering')) {
-            $this -> ORDER_BY_UNREAD_FIRST .= " f.position asc, c.position asc";
+            $this -> ORDER_BY_UNREAD_FIRST .= " f.position asc, c2u.position asc";
         } else {
             $this -> ORDER_BY_UNREAD_FIRST .= " f.name asc, c.title asc";
@@ -284 +284 @@
       _pf('ItemList::populate()');
         $this -> _sqlActualWhat = " i.title,  c.title, c.id, "
-        ."i2u.flgunread, i2u.flgprivate, i2u.flgsticky, i2u.flgdeleted, i2u.flgflagged,"
-            ."i.url, i.enclosure, i.author, i.description, c.icon, "
+        ."i2u.flgunread, i2u.flgprivate, i2u.flgsticky, i2u.flgdeleted, "
+        ." i2u.flgflagged,"
+            ."i.url, i.enclosure, i.author, i.description, c2u.icon, "
             ." unix_timestamp(ifnull(i.pubdate,i.added)) as ts, "
             ." i.pubdate is not null as ispubdate, i.id "
@@ -298 +299 @@
             //." left join "
             //. getTable("rating") ." r on (i.id = r.iid), "
-            .getTable("channels")." c on (i.cid=c.id) left join "
-            .getTable("folders") ." f on (c.parent=f.id) ";
+            .getTable('channels2user') ." c2u on (i.cid=c2u.fkcid) left join "
+            .getTable("channels")." c on (c2u.fkcid=c.id) left join "
+            .getTable("folders") ." f on (c2u.parent=f.id) ";
 
 
@@ -308 +310 @@
         
         $this -> _sqlActualWhere .= " and "
-            . (false == $includeDeprecated ? " not(c.mode & ".RSS_MODE_DELETED_STATE.") and " : "")
+            . (false == $includeDeprecated ? " c2u.flgdeleted=0 and " : "")
             ." i2u.flgdeleted=0 and ";
             
@@ -337 +339 @@
             if (!getConfig('rss.config.feedgrouping')) {
                 if(getConfig("rss.config.datedesc.$skey")){
-                    $this -> _sqlActualOrder = " ts desc, f.position asc, c.position asc ";
+                    $this -> _sqlActualOrder = " ts desc, f.position asc, c2u.position asc ";
                 }else{
-                    $this -> _sqlActualOrder = " ts asc, f.position asc, c.position asc ";
+                    $this -> _sqlActualOrder = " ts asc, f.position asc, c2u.position asc ";
                 }
             } elseif (getConfig('rss.config.absoluteordering')) {
-                $this -> _sqlActualOrder = " f.position asc, c.position asc";
+                $this -> _sqlActualOrder = " f.position asc, c2u.position asc";
             } else {
                 $this -> _sqlActualOrder = " f.name asc, c.title asc";