Merge pull request #86 from mikeage/tag_name

Tags by name (includes a G2 mapping)

Fixes #1940.

3 files changed, 55 insertions, 3 deletions

diff --git a/modules/g2_import/controllers/g2.php b/modules/g2_import/controllers/g2.php
index 6c960893..98eb57f1 100644
--- a/modules/g2_import/controllers/g2.php
+++ b/modules/g2_import/controllers/g2.php
@@ -34,6 +34,11 @@ class G2_Controller extends Controller {
     $path = $input->get("path");
     $id = $input->get("g2_itemId");
 
+    /* Tags are handled specially, since there's no mapping for them */
+    if (($path && 0 === strpos($path, "tag/"))) {
+      url::redirect("tag_name/" . substr($path, 4));
+    }
+
     if (($path && $path != 'index.php' && $path != 'main.php') || $id) {
       if ($id) {
         // Requests by id are either core.DownloadItem or core.ShowItem requests. Later versions of
@@ -94,4 +99,4 @@ class G2_Controller extends Controller {
       throw new Kohana_404_Exception();
     }
   }
-}
\ No newline at end of file
+}
diff --git a/modules/tag/controllers/tag_name.php b/modules/tag/controllers/tag_name.php
new file mode 100644
index 00000000..1a1179fe
--- /dev/null
+++ b/modules/tag/controllers/tag_name.php
@@ -0,0 +1,33 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2012 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class Tag_Name_Controller extends Controller {
+  public function __call($function, $args) {
+    $tag_name = $function;
+    $tag = ORM::factory("tag")->where("name", "=", $tag_name)->find();
+    if (!$tag->loaded()) {
+      // No matching tag was found. If this was an imported tag, this is probably a bug.
+      // If the user typed the URL manually, it might just be wrong
+      throw new Kohana_404_Exception();
+    }
+
+    url::redirect($tag->abs_url());
+  }
+
+}
diff --git a/modules/tag/models/tag.php b/modules/tag/models/tag.php
index 298e4647..213ea0df 100644
--- a/modules/tag/models/tag.php
+++ b/modules/tag/models/tag.php
@@ -141,7 +141,7 @@ class Tag_Model_Core extends ORM {
 
   /**
    * Return the server-relative url to this item, eg:
-   *   /gallery3/index.php/tags/35
+   *   /gallery3/index.php/tags/35/Bob
    *
    * @param string $query the query string (eg "page=3")
    */
@@ -152,4 +152,18 @@ class Tag_Model_Core extends ORM {
     }
     return $url;
   }
-}
\ No newline at end of file
+
+  /**
+   * Return the full url to this item, eg:
+   *   http://example.com/gallery3/index.php/tags/35/Bob
+   *
+   * @param string $query the query string (eg "page=3")
+   */
+  public function abs_url($query=null) {
+    $url = url::abs_site("tag/{$this->id}/" . urlencode($this->name));
+    if ($query) {
+      $url .= "?$query";
+    }
+    return $url;
+  }
+}