Changeset 1595 for branches/multiuser/admin

Timestamp:

10/04/06 06:55:02 (2 years ago)

Author:

mdodoo

Message:

Partial sync with trunk. Only up to changeset [1542].

Location:

branches/multiuser/admin

Files:

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

branches/multiuser/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);
 
@@ -747 +749 @@
 
 function channel_edit_form($cid) {
-    $sql = "select id, title, url, siteurl, parent, descr, icon, mode from " .getTable("channels") ." where id=$cid";
+    $sql = "select id, title, url, siteurl, parent, descr, icon, mode, daterefreshed, dateadded from " .getTable("channels") ." where id=$cid";
     $res = rss_query($sql);
-    list ($id, $title, $url, $siteurl, $parent, $descr, $icon,$mode) = rss_fetch_row($res);
+    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 = "";
@@ -763 +767 @@
 
     echo "<form method=\"post\" action=\"" .$_SERVER['PHP_SELF'] ."#fa$cid\" id=\"channeledit\">\n";
-    echo "<fieldset id=\"channeleditfs\">"
-    ."<p>";
+    echo "<fieldset id=\"channeleditfs\">";
+    // Timestamps
+    if(!empty($daterefreshed)) {
+      echo "<p><label>" . LBL_ADDED . ": " . date("M-d-Y H:i", strtotime($dateadded)) . "</label></p>"
+                    ."<p><label>" . LBL_LAST_UPDATE . ": ".date("M-d-Y H:i", strtotime($daterefreshed))."</label></p>\n";
+    } else {
+      echo "<p><label>" . LBL_ADDED . ": " . date("M-d-Y H:i", strtotime($dateadded)) . "</label></p>"
+                    ."<p><label>" . LBL_LAST_UPDATE . ": " . LBL_FOOTER_LAST_MODIF_NEVER . "</label></p>\n";
+    }
     // Item name
-    echo "<label for=\"c_name\">". LBL_ADMIN_CHANNEL_NAME ."</label>\n"
+    echo "<p><label for=\"c_name\">". LBL_ADMIN_CHANNEL_NAME ."</label>\n"
     ."<input type=\"text\" id=\"c_name\" name=\"c_name\" value=\"$title\" />"
     ."<input type=\"hidden\" name=\"".CST_ADMIN_DOMAIN."\" value=\"". CST_ADMIN_DOMAIN_CHANNEL."\" />\n"

branches/multiuser/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";