Changeset 1542

Timestamp:

08/23/06 22:39:49 (2 years ago)

Author:

cfriesen

Message:

Some SQL modifications. Hope this doesn't mess anything up..

Location:

trunk/gregarius/admin

Files:

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

trunk/gregarius/admin/channels.php

@@ -98 +98 @@
     $sql = "select "
            ." c.id, c.title, c.url, c.siteurl, d.name, c.descr, c.parent, c.icon, c.mode, c.daterefreshed "
-           ." 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 ";
 
     if (getConfig('rss.config.absoluteordering')) {
@@ -123 +124 @@
         // get feed's tags
         $tags = "";
-        $sql2 = "select t.id, t.tag from " . getTable('tag') . " t, "
-                . getTable('metatag') . " m where t.id = m.tid "
-                . "and m.ttype = 'channel' and m.fid = $id";
+        $sql2 = "select t.id, t.tag from " . getTable('tag') . " t "
+                . "inner join " . getTable('metatag') . " m "
+                . "  on m.tid = t.id "
+                . "where m.ttype = 'channel' and m.fid = $id";
         $res2 = rss_query($sql2);
 
@@ -751 +753 @@
     list ($id, $title, $url, $siteurl, $parent, $descr, $icon, $mode, $daterefreshed, $dateadded) = rss_fetch_row($res);
     // get tags
-    $sql = "select t.tag from " . getTable('tag')." t, " . getTable('metatag')
-           . " m where t.id = m.tid and m.ttype = 'channel' and m.fid = $cid";
+    $sql = "select t.tag from " . getTable('tag')." t " 
+         . "  inner join " . getTable('metatag') . " m "
+         . "    on m.tid = t.id "
+         . "where m.ttype = 'channel' and m.fid = $cid";
     $res = rss_query($sql);
     $tags = "";

trunk/gregarius/admin/items.php

@@ -96 +96 @@
                 break;
             }
-            $sql = " from ".getTable('item') ." i INNER JOIN " .getTable('channels') . " c ON c.id=i.cid "
+            $sql = " from ".getTable('item') ." i inner join " .getTable('channels') . " c on c.id=i.cid "
                    ." where 1=1 ";
 
@@ -131 +131 @@
                     }
 
-                    $tsql = " select distinct fid from ". getTable('metatag') . " m, "
-                            . getTable('tag') . " t"
-                            ." where m.tid=t.id and t.tag in ('"
+                    $tsql = " select distinct fid from ". getTable('metatag') . " m "
+                            . " inner join " . getTable('tag') . " t"
+                            . "   on t.id = m.tid "
+                            . " where t.tag in ('"
                             . implode("', '", $trimmed_exclude_tags) ."')";
                 }
@@ -151 +152 @@
                 //delete the tags for these items
                 $sqlids = "select distinct i.id,i.cid " . $sql
-                          . " and i.cid=c.id order by i.cid, i.id desc";
+                          . " order by i.cid, i.id desc";