From fa0c17ab5be2724b7fa850f2077afe7e69d6ef4d Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 23 Jul 2009 09:26:04 -0700
Subject: Make tag handling consistent by converting spaces to periods and
 using commas or semi-colons as separators

---
 modules/tag/controllers/tags.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/tag/controllers')

diff --git a/modules/tag/controllers/tags.php b/modules/tag/controllers/tags.php
index 85f6d16e..5dd07935 100644
--- a/modules/tag/controllers/tags.php
+++ b/modules/tag/controllers/tags.php
@@ -53,10 +53,10 @@ class Tags_Controller extends REST_Controller {
 
     $form = tag::get_add_form($item);
     if ($form->validate()) {
-      foreach (split("[\,\ \;]", $form->add_tag->inputs["name"]->value) as $tag_name) {
+      foreach (split("[\,\;]", $form->add_tag->inputs["name"]->value) as $tag_name) {
         $tag_name = trim($tag_name);
         if ($tag_name) {
-          $tag = tag::add($item, $tag_name);
+          $tag = tag::add($item, str_replace(" ", ".", $tag_name));
         }
       }
 
-- 
cgit v1.2.3


From fa1d32e6466d8c6ffe77d163e2da9c71688a3c61 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 24 Jul 2009 11:24:43 -0700
Subject: Partial implementation of ticket #80. Provide auto complete and
 suggestions on the tag add form in the tag sidebar block.  Updated the xss
 golden file as well.  Still to do figure out how toget it into the edit popup
 dialog

---
 modules/gallery/tests/xss_data.txt   |  4 ++--
 modules/tag/controllers/tags.php     | 17 +++++++++++++++++
 modules/tag/helpers/tag.php          |  2 +-
 modules/tag/helpers/tag_theme.php    |  2 ++
 modules/tag/js/tag.js                | 15 +++++++++++++++
 modules/tag/views/tag_block.html.php | 10 ++++++++++
 6 files changed, 47 insertions(+), 3 deletions(-)

(limited to 'modules/tag/controllers')

diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index 5a05d4ef..981bf31e 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -442,8 +442,8 @@ modules/tag/views/admin_tags.html.php                        50  DIRTY $tag->id
 modules/tag/views/admin_tags.html.php                        50        $tag->name
 modules/tag/views/admin_tags.html.php                        51  DIRTY $tag->count
 modules/tag/views/admin_tags.html.php                        52  DIRTY $tag->id
-modules/tag/views/tag_block.html.php                         3   DIRTY $cloud
-modules/tag/views/tag_block.html.php                         5   DIRTY $form
+modules/tag/views/tag_block.html.php                         13  DIRTY $cloud
+modules/tag/views/tag_block.html.php                         15  DIRTY $form
 modules/tag/views/tag_cloud.html.php                         4   DIRTY $tag->count
 modules/tag/views/tag_cloud.html.php                         4   DIRTY $max_count
 modules/tag/views/tag_cloud.html.php                         5   DIRTY $tag->count
diff --git a/modules/tag/controllers/tags.php b/modules/tag/controllers/tags.php
index 5dd07935..a600ea1a 100644
--- a/modules/tag/controllers/tags.php
+++ b/modules/tag/controllers/tags.php
@@ -78,4 +78,21 @@ class Tags_Controller extends REST_Controller {
 
     return tag::get_add_form($item);
   }
+
+  public function autocomplete() {
+    $tags = array();
+    $tag_parts = preg_split("#[,\s;]+# ", $this->input->get("q"));
+    $limit = $this->input->get("limit");
+    $tag_part = end($tag_parts);
+    $tag_list = ORM::factory("tag")
+      ->like("name", "{$tag_part}%", false)
+      ->orderby("name", "ASC")
+      ->limit($limit)
+      ->find_all();
+    foreach ($tag_list as $tag) {
+      $tags[] = $tag->name;
+    }
+
+    print implode("\n", $tags);
+  }
 }
diff --git a/modules/tag/helpers/tag.php b/modules/tag/helpers/tag.php
index 5efa6a19..be5461a4 100644
--- a/modules/tag/helpers/tag.php
+++ b/modules/tag/helpers/tag.php
@@ -104,7 +104,7 @@ class tag_Core {
       ($item->is_photo() ? t("Add tag to photo") : t("Add tag to movie"));
 
     $group = $form->group("add_tag")->label("Add Tag");
-    $group->input("name")->label($label)->rules("required|length[1,64]");
+    $group->input("name")->label($label)->rules("required");
     $group->hidden("item_id")->value($item->id);
     $group->submit("")->value(t("Add Tag"));
     return $form;
diff --git a/modules/tag/helpers/tag_theme.php b/modules/tag/helpers/tag_theme.php
index d46a91e9..1bce9bd8 100644
--- a/modules/tag/helpers/tag_theme.php
+++ b/modules/tag/helpers/tag_theme.php
@@ -19,6 +19,8 @@
  */
 class tag_theme_Core {
   static function head($theme) {
+    $theme->css("jquery.autocomplete.css");
+    $theme->script("jquery.autocomplete.js");
     $theme->script("tag.js");
   }
 
diff --git a/modules/tag/js/tag.js b/modules/tag/js/tag.js
index a5aaa3f8..282da1ea 100644
--- a/modules/tag/js/tag.js
+++ b/modules/tag/js/tag.js
@@ -66,3 +66,18 @@ function editInPlace(element) {
   };
   ajaxify_editInPlaceForm();
 }
+
+function formatTagAutoCompleteResult(row) {
+  var text = $("#gAddTagForm input:text").val();
+  if (/[\s,;]/.test(text)) {
+    for (var i= text.length - 1; i >= 0; i--) {
+      var chr = text.charAt(i);
+      if (chr == " " || chr == "," || chr == ";") {
+        break;
+      }
+    }
+    return text.substr(0, i + 1) + row[0];
+  } else {
+    return row[0];
+  }
+}
diff --git a/modules/tag/views/tag_block.html.php b/modules/tag/views/tag_block.html.php
index 12c90857..233eb361 100644
--- a/modules/tag/views/tag_block.html.php
+++ b/modules/tag/views/tag_block.html.php
@@ -1,4 +1,14 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
+<script>
+  $("#gAddTagForm").ready(function() {
+    var url = $("#gTagCloud").attr("title") + "/autocomplete";
+    $("#gAddTagForm input:text").autocomplete(
+      url, {
+        max: 30,
+        formatResult: formatTagAutoCompleteResult}
+    );
+  });
+</script>
 <div id="gTagCloud" title="<?= url::site("tags") ?>">
   <?= $cloud ?>
 </div>
-- 
cgit v1.2.3