Changeset 1541 for branches/multiuser/feed.php

Timestamp:

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

Author:

mbonetti

Message:

Some more multi-user-hacking

Files:

• branches/multiuser/feed.php (modified) (2 diffs)

branches/multiuser/feed.php

@@ -61 +61 @@
 ) {
     $sqlid = sanitize($_REQUEST['channel'], RSS_SANITIZER_SIMPLE_SQL | RSS_SANITIZER_NO_SPACES);
-    $sql = "select id from " . getTable("channels") ." where title like '$sqlid'";
+    $sql = "select c.id from " 
+    . getTable("channels") 
+    ." c left join " .getTable('channels2user') ." c2u on (c.id=c2u.fkcid) "
+    ." where c.title like '$sqlid'";
     if (hidePrivate()) {
-        $sql .=" and not(mode & " . RSS_MODE_PRIVATE_STATE .") ";
+        $sql .=" and c2u.flgprivate=0 ";
     }
     // don't hide deprecated items becuase we want items of deprecated feeds to be accessible
@@ -76 +79 @@
 
         // is this a folder?
-        $sql = "select c.id, c.parent from ". getTable('channels')." c, "
+        $sql = "select c.id, c.parent from ". getTable('channels')." c left join "
+               . getTable('channels2user') .' c2u on (c.id=c2u.fkcid), '
                . getTable('folders') . " f "
                ." where c.parent=f.id and f.name like '$sqlid' and f.id > 0";
 
         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 ";
 
         $res = rss_query( $sql );