Changeset 1544 for trunk/gregarius/feed.php

Timestamp:

08/24/06 01:14:02 (4 years ago)

Author:

cfriesen

Message:

Feel free to scream if this breaks something...

Files:

• trunk/gregarius/feed.php (modified) (10 diffs)

trunk/gregarius/feed.php

@@ -76 +76 @@
 
         // is this a folder?
-        $sql = "select c.id, c.parent from ". getTable('channels')." c, "
-               . getTable('folders') . " f "
-               ." where c.parent=f.id and f.name like '$sqlid' and f.id > 0";
+        $sql = "select c.id, c.parent from ". getTable('channels')." c "
+               ." inner join " . getTable('folders') . " f on f.id = c.parent "
+               ." where f.name like '$sqlid' and f.id > 0";
 
         if (hidePrivate()) {
@@ -94 +94 @@
         } else {
             // maybe it's a virtual folder?
-            $sql = "select c.id, m.tid from ". getTable('channels')." c, "
-                   . getTable('metatag') . " m, " . getTable('tag') . " t "
-                   . "where c.id = m.fid and m.ttype = 'channel' and m.tid = t.id "
+            $sql = "select c.id, m.tid from ". getTable('channels')." c "
+                   ."inner join " . getTable('metatag') . " m on m.fid = c.id "
+                   ."inner join " . getTable('tag') . " t on t.id = m.tid "
+                   . "where m.ttype = 'channel' "
                    . "and t.tag like '$sqlid'";
 
@@ -194 +195 @@
     }
     elseif ($vfid) {
-        $sql = "select c.id, m.tid from ". getTable('channels')." c, "
-               . getTable('metatag') . " m, " . getTable('tag') . " t "
-               . "where c.id = m.fid and m.ttype = 'channel' and m.tid = t.id ";
+        $sql = "select c.id, m.tid from ". getTable('channels')." c "
+               ."inner join " . getTable('metatag') . " m on m.fid = c.id "
+               ."inner join " . getTable('tag') . " t on t.id = m.tid "
+               . "where m.ttype = 'channel'";
         // $vfid can be numeric (t.id) or alphabetic (t.tag)
         if(is_numeric($vfid)) {
@@ -343 +345 @@
             // 1: build a list of all feeds:
             $feeds = array();
-            $sql = "select c.id from "
-                   . getTable('channels') . " c, "
-                   . getTable('folders') . " f "
-                   . "where c.parent=f.id "
-                   ." and not (c.mode & " . RSS_MODE_DELETED_STATE .") "
-                   ;
+            $sql = "select c.id from " . getTable('channels') . " c "
+                   ."inner join " . getTable('folders') . " f on f.id = c.parent "
+                   . "where not (c.mode & " . RSS_MODE_DELETED_STATE .") ";
+
             if (hidePrivate()) {
                 $sql .= " and not (c.mode & " . RSS_MODE_PRIVATE_STATE . ") ";
@@ -449 +449 @@
             
             if( $found || !$first_fid ) {
-                $sql = "select count(*) from "
-                       .getTable('item') ." i, "
-                       .getTable('channels') ." c "
-                       ." where i.unread & " .RSS_MODE_UNREAD_STATE ." and i.cid = c.id and c.parent = $fid__";
+                $sql = "select count(*) from " . getTable('item') ." i "
+                       ."inner join " . getTable('channels') ." c on c.id = i.cid "
+                       ." where i.unread & " .RSS_MODE_UNREAD_STATE ." and c.parent = $fid__";
                 if (hidePrivate()) {
                     $sql .= " and not(i.unread & " . RSS_MODE_PRIVATE_STATE . ")";
@@ -513 +512 @@
         $next_vfid = $first_vfid = 0;
         $found = false;
-        $res = rss_query("select distinct tid from " .getTable('metatag') ." m," .getTable('tag') ."t where m.tid = t.id order by t.tag asc");
+        $res = rss_query("select distinct tid from " .getTable('metatag') ." m "
+             . "inner join " . getTable('tag') ."t on t.id = m.tid order by t.tag asc");
         while (list($tid__) = rss_fetch_row($res)) {
             if ($tid__ == $vfid) {
@@ -681 +681 @@
 } else {
     // "item mode"
-    $res = rss_query ("select c.title, c.icon, i.title from " . getTable("channels") ." c, "
-                      .getTable("item") ." i where c.id = $cid and i.cid=c.id and i.id=$iid"
+    $res = rss_query ("select c.title, c.icon, i.title from " . getTable("channels") ." c "
+                      ."inner join " . getTable("item") ." i on i.cid = c.id where c.id = $cid and i.id=$iid"
                       ." and not(i.unread & " . RSS_MODE_DELETED_STATE  .") "
                      );
@@ -1173 +1173 @@
             $sql = "select "
                    ." c.id, c.title "
-                   ." from "
-                   .getTable("channels") ." c, "
-                   . getTable("folders") ." d "
-                   ." where d.id = c.parent ";
-
-
+                   ." from " . getTable("channels") ." c "
+                   ." inner join " . getTable("folders") ." d "
+                   ."   on d.id = c.parent ";
+
+            $sql .= " where not(c.mode & " .  RSS_MODE_DELETED_STATE .") ";
             if (hidePrivate()) {
                 $sql .=" and not(c.mode & " . RSS_MODE_PRIVATE_STATE .") ";
             }
-            $sql .= " and not(c.mode & " .  RSS_MODE_DELETED_STATE .") ";
 
             if (getConfig('rss.config.absoluteordering')) {
@@ -1229 +1227 @@
         case 'cat':
             $res = rss_query(" select t.tag,t.id from  "
-                             .getTable('metatag') ." m, "
-                             .getTable('tag') . "t "
-                             ." where  m.ttype = 'channel' and m.tid = t.id  "
+                             .getTable('metatag') ." m "
+                             ."inner join " . getTable('tag') . "t on t.id = m.tid "
+                             ." where  m.ttype = 'channel' "
                              ." order by t.tag asc");
 
@@ -1278 +1276 @@
 
         case 'folder':
-            $sql = "select  f.id, f.name, count(*) from "
-                   . getTable('channels') . " c, "
-                   . getTable('folders') . " f "
-                   ." where c.parent=f.id and f.name != '' ";
+            $sql = "select  f.id, f.name, count(*) from " . getTable('channels') . " c "
+                   ."inne join " . getTable('folders') . " f on f.id = c.parent "
+                   ." where f.name != '' ";
 
             if (hidePrivate()) {