Changeset 1604 for branches/multiuser/tags.php

Timestamp:

10/16/06 06:31:35 (2 years ago)

Author:

mdodoo

Message:

Sync with trunk up to (but not including changeset [1585]). I should *definitely* do this more often, because this was really annoying.

Files:

• branches/multiuser/tags.php (modified) (9 diffs)

branches/multiuser/tags.php

@@ -36 +36 @@
     $twhere .= "1=0";
 
-    $sql = "select fid,tid,m.tdate from ".getTable('metatag')
-    ." m, ".getTable('tag')." t  where m.tid=t.id and m.ttype = 'item'"
-    ." and ($twhere)";
+    $sql = "select fid,tid,m.tdate from ".getTable('metatag') . " m "
+        . "inner join " . getTable('tag')." t  on m.tid=t.id "
+        . "where m.ttype = 'item' and ($twhere)";
 
     //echo $sql;
@@ -54 +54 @@
     if (count($fids)) {
         $sql = "select t.tag, count(*) as cnt from ".getTable('metatag')
-        ." m left join ".getTable('item')." i on (m.fid=i.id), "
-        .getTable('tag')." t "
-        ." where m.tid=t.id and m.fid in (".implode(",", $fids).")"
+        ." m left join ".getTable('item')." i on (m.fid=i.id) "
+        ." inner join " . getTable('tag')." t on (m.tid=t.id)"
+        ." where m.fid in (".implode(",", $fids).")"
         ." and t.id not in (".implode(",", $tids).")";
 
@@ -79 +79 @@
     $twhere = "";
     $tarr = explode(" ", $tag);
-    $hrTag = implode(" ".LBL_AND." ", $tarr);
+    $hrTag = implode(" ".__('and')." ", $tarr);
     $urlTag = implode("+", $tarr);
 
@@ -87 +87 @@
     $twhere .= " 1=0";
 
-    $sql = "select fid, count(*) as cnt from "
-    .getTable('metatag')." m, "
-    .getTable('tag')." t "
-    ." where m.tid=t.id and ($twhere) "
-    ." and m.ttype = 'item'"
+    $sql = "select fid, count(*) as cnt from ".getTable('metatag')." m "
+    ."inner join " . getTable('tag')." t on m.tid=t.id "
+    ." where ($twhere) and m.ttype = 'item'"
     ." group by fid order by 2 desc";
 
@@ -116 +114 @@
             $relPlus = array_key_exists($rtag, $taggedItems->allTags);
             if ($relPlus) {
-                $relLbl .= "&nbsp;[<a "."title=\"$cnt ". ($cnt > 1 ? LBL_ITEMS : LBL_ITEM)." ". ($cnt > 1 || $cnt == 0 ? LBL_TAG_TAGGEDP : LBL_TAG_TAGGED)." '".$hrTag." ".LBL_AND." $rtag'\" "."href=\"".getPath()."". (getConfig('rss.output.usemodrewrite') ? "tag/$rtag" : "tags.php?tag=$rtag").""."+".$urlTag."\">+</a>]";
+                $relLbl .= "&nbsp;[<a "."title=\"$cnt ". ($cnt > 1 ? __('items') : __('item'))." ". ($cnt > 1 || $cnt == 0 ? __('tagged') : __('tagged'))." '".$hrTag." ".__('and')." $rtag'\" "."href=\"".getPath()."". (getConfig('rss.output.usemodrewrite') ? "tag/$rtag" : "tags.php?tag=$rtag").""."+".$urlTag."\">+</a>]";
             }
             $idx = ($relPlus ? $taggedItems->allTags[$rtag] : 0);
@@ -128 +126 @@
         rss_require('cls/rdf.php');
         // RSS view
-        $title = _TITLE_." - ".LBL_TAG_TAGS." - ".$hrTag;
+        $title = _TITLE_." - ".__('Tags')." - ".$hrTag;
         $baselink = guessTransportProto().$_SERVER['HTTP_HOST'].getPath()
         . (getConfig('rss.output.usemodrewrite') ? "tag/" : "tags.php?tag=");
@@ -151 +149 @@
         if ($gotsome) {
 
-            $title = $taggedItems->itemCount." ". ($taggedItems->itemCount > 1 ? LBL_ITEMS : LBL_ITEM)." "
-            . ($taggedItems->itemCount > 1 || $taggedItems->itemCount == 0 ? LBL_TAG_TAGGEDP : LBL_TAG_TAGGED)
+            $title = $taggedItems->itemCount." ". ($taggedItems->itemCount > 1 ? __('items') : __('item'))." "
+            . ($taggedItems->itemCount > 1 || $taggedItems->itemCount == 0 ? __('tagged') : __('tagged'))
             .""." \"".$hrTag."\"";
 
             if (count($related)) {
-                $taggedItems->beforeList = "\n<p>".LBL_TAG_RELATED."\n".implode(", \n", $related)."\n</p>\n";
+                $taggedItems->beforeList = "\n<p>".__('Related tags: ')."\n".implode(", \n", $related)."\n</p>\n";
             }
 
@@ -167 +165 @@
         } else {
             echo "<p style=\"height: 10em; text-align:center\">";
-            printf(LBL_TAG_ERROR_NO_TAG, $hrTag);
+            printf(__('Oops! No items tagged &laquo;%s&raquo; were found.'), $hrTag);
             echo "</p>";
         }
@@ -177 +175 @@
     rss_require('cls/alltags.php');
 
-    $GLOBALS['rss']->header = new Header("Tags ".TITLE_SEP." ".LBL_TAG_ALL_TAGS);
+    $GLOBALS['rss']->header = new Header("Tags ".TITLE_SEP." ".__('All Tags'));
     $GLOBALS['rss']->feedList = new FeedList(false);
     $allTags = new Tags();