Changeset 1759 for branches/multiuser/feed.php

Timestamp:

09/26/07 08:57:31 (14 months 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/feed.php (modified) (5 diffs)

branches/multiuser/feed.php

@@ -60 +60 @@
     && !is_numeric($_REQUEST['channel'])
 ) {
-    $sqlid = sanitize($_REQUEST['channel'], RSS_SANITIZER_SIMPLE_SQL | RSS_SANITIZER_NO_SPACES);
-    $sql = "select c.id from " 
-    . getTable("channels") 
-    ." c left join " .getTable('channels2user') ." c2u on (c.id=c2u.fkcid) "
-    ." where c.title like '$sqlid'";
+    $sqlid = preg_replace('#'.RSS_URI_SEPARATOR.'#','_',
+        sanitize($_REQUEST['channel'] , RSS_SANITIZER_SIMPLE_SQL )
+        );
+
+    $sql = "select c.id from " . getTable("channels") 
+      . " c left join " .getTable('channels2user') 
+      ." c2u on (c.id=c2u.fkcid) where title like '$sqlid'";
     if (hidePrivate()) {
         $sql .=" and c2u.flgprivate=0 ";
     }
     // don't hide deprecated items becuase we want items of deprecated feeds to be accessible
-    // $sql .= " and not(mode & " . RSS_MODE_DELETED_STATE . ") ";
+    // $sql .= " and c2u.flgdeleted=0 ";
 
     $res =  rss_query( $sql );
@@ -80 +82 @@
         // is this a folder?
         $sql = "select c.id, c.parent from ". getTable('channels')." c left join "
-            . getTable('channels2user') .m" c2u on (c.id=c2u.fkcid) "
-        . "inner join " . getTable('folders') . " f  on c.parent=f.id "
-        . "where f.name like '$sqlid' and f.id > 0";
+          . getTable('channels2user') . " c2u on (c.id=c2u.fkcid) "
+          ." inner join " . getTable('folders') . " f on f.id = c.parent "
+          ." where f.name like '$sqlid' and f.id > 0";
 
         if (hidePrivate()) {
@@ -308 +310 @@
 
         /** mark channel as read **/
-        $sql = "update " .getTable("item")
-               ." set unread = unread & ".SET_MODE_READ_STATE." where cid=$cid";
+        $sql = "update " .getTable("i2u")
+               ." set flgunread = 0 where i2u.fkcid=$cid";
         if (hidePrivate()) {
-            $sql .= " and not(unread & " . RSS_MODE_PRIVATE_STATE . ")";
+            $sql .= " and i2u.flgprivate =0";
         }
         if (count($IdsToMarkAsRead)) {
@@ -323 +325 @@
 
         $sql = "select count(*) from " .getTable("item2user") . " i2u "
-               ." where i2u.flgunread=1 "
-               ." and i2u.fkcid=$cid"
-               ." and i2u.flgdeleted=0 "
-               ;
+                ." where i2u.flgunread=1 "
+                ." and i2u.fkcid=$cid"
+                ." and i2u.flgdeleted=0 ";
         if (hidePrivate()) {
             $sql .=" and i2u.flgprivate =0";
@@ -1181 +1182 @@
     
             $sql = "select c.id, c.title from " . getTable("channels") ." c "
-            . "inner join " . getTable("folders") ." d on d.id = c.parent ";
+            . "inner join " . getTable("folders") ." d on d.id = c.parent "
             . " where not(c.mode & " .  RSS_MODE_DELETED_STATE .") ";