Merge branch 'master' into bharat_dev

6 files changed, 35 insertions, 10 deletions

diff --git a/modules/tag/helpers/tag.php b/modules/tag/helpers/tag.php
index 733215b3..83a00080 100644
--- a/modules/tag/helpers/tag.php
+++ b/modules/tag/helpers/tag.php
@@ -48,6 +48,7 @@ class tag_Core {
    * @return ORM_Iterator of Tag_Model in descending tag count order
    */
   static function popular_tags($count) {
+    $count = max($count, 1);
     return ORM::factory("tag")
       ->order_by("count", "DESC")
       ->limit($count)
@@ -135,4 +136,23 @@ class tag_Core {
     // extremely rare case.
     db::build()->delete("tags")->where("count", "=", 0)->execute();
   }
+
+  /**
+   * Find the position of the given item in the tag collection.  The resulting
+   * value is 1-indexed, so the first child in the album is at position 1.
+   *
+   * @param Tag_Model  $tag
+   * @param Item_Model $item
+   * @param array      $where an array of arrays, each compatible with ORM::where()
+   */
+  static function get_position($tag, $item, $where=array()) {
+    return ORM::factory("item")
+      ->viewable()
+      ->join("items_tags", "items.id", "items_tags.item_id")
+      ->where("items_tags.tag_id", "=", $tag->id)
+      ->where("items.id", "<=", $item->id)
+      ->merge_where($where)
+      ->order_by("items.id")
+      ->count_all();
+  }
 }
\ No newline at end of file
diff --git a/modules/tag/helpers/tag_block.php b/modules/tag/helpers/tag_block.php
index 8df58a6e..69a9a1c4 100644
--- a/modules/tag/helpers/tag_block.php
+++ b/modules/tag/helpers/tag_block.php
@@ -30,7 +30,7 @@ class tag_block_Core {
       $block->css_id = "g-tag";
       $block->title = t("Popular tags");
       $block->content = new View("tag_block.html");
-      $block->content->cloud = tag::cloud(30);
+      $block->content->cloud = tag::cloud(module::get_var("tag", "tag_cloud_size", 30));
 
       if ($theme->item() && $theme->page_subtype() != "tag" && access::can("edit", $theme->item())) {
         $controller = new Tags_Controller();
diff --git a/modules/tag/helpers/tag_event.php b/modules/tag/helpers/tag_event.php
index cd79f734..b415b42d 100644
--- a/modules/tag/helpers/tag_event.php
+++ b/modules/tag/helpers/tag_event.php
@@ -36,10 +36,7 @@ class tag_event_Core {
             $tag = str_replace("\0",  "", $tag);
             foreach (explode(",", $tag) as $word) {
               $word = trim($word);
-              if (function_exists("mb_detect_encoding") &&
-                  mb_detect_encoding($word, "ISO-8859-1, UTF-8") != "UTF-8") {
-                $word = utf8_encode($word);
-              }
+              $word = encoding::convert_to_utf8($word);
               $tags[$word] = 1;
             }
           }
@@ -113,11 +110,11 @@ class tag_event_Core {
   }
 
   static function add_photos_form($album, $form) {
-    if (!isset($group->uploadify)) {
+    $group = $form->add_photos;
+    if (!is_object($group->uploadify)) {
       return;
     }
 
-    $group = $form->add_photos;
     $group->input("tags")
       ->label(t("Add tags to all uploaded files"))
       ->value("");
@@ -136,7 +133,8 @@ class tag_event_Core {
   }
 
   static function add_photos_form_completed($album, $form) {
-    if (!isset($group->uploadify)) {
+    $group = $form->add_photos;
+    if (!is_object($group->uploadify)) {
       return;
     }
 
@@ -151,7 +149,7 @@ class tag_event_Core {
   static function info_block_get_metadata($block, $item) {
     $tags = array();
     foreach (tag::item_tags($item) as $tag) {
-      $tags[] = "<a href=\"" . url::site("tag/{$tag->name}") . "\">{$tag->name}</a>";
+      $tags[] = "<a href=\"{$tag->url()}\">{$tag->name}</a>";
     }
     if ($tags) {
       $info = $block->content->metadata;
diff --git a/modules/tag/helpers/tag_installer.php b/modules/tag/helpers/tag_installer.php
index 16ad1239..66a78b91 100644
--- a/modules/tag/helpers/tag_installer.php
+++ b/modules/tag/helpers/tag_installer.php
@@ -36,7 +36,8 @@ class tag_installer {
                  KEY(`tag_id`, `id`),
                  KEY(`item_id`, `id`))
                DEFAULT CHARSET=utf8;");
-    module::set_version("tag", 2);
+    module::set_var("tag", "tag_cloud_size", 30);
+    module::set_version("tag", 3);
   }
 
   static function upgrade($version) {
@@ -45,6 +46,10 @@ class tag_installer {
       $db->query("ALTER TABLE {tags} MODIFY COLUMN `name` VARCHAR(128)");
       module::set_version("tag", $version = 2);
     }
+    if ($version == 2) {
+      module::set_var("tag", "tag_cloud_size", 30);
+      module::set_version("tag", $version = 3);
+    }
   }
 
   static function uninstall() {
diff --git a/modules/tag/helpers/tag_item_rest.php b/modules/tag/helpers/tag_item_rest.php
index a8d3d0bc..be1fa653 100644
--- a/modules/tag/helpers/tag_item_rest.php
+++ b/modules/tag/helpers/tag_item_rest.php
@@ -29,6 +29,7 @@ class tag_item_rest_Core {
 
   static function delete($request) {
     list ($tag, $item) = rest::resolve($request->url);
+    access::required("edit", $item);
     $tag->remove($item);
     $tag->save();
   }
diff --git a/modules/tag/helpers/tag_items_rest.php b/modules/tag/helpers/tag_items_rest.php
index 535ab513..8ed07276 100644
--- a/modules/tag/helpers/tag_items_rest.php
+++ b/modules/tag/helpers/tag_items_rest.php
@@ -51,6 +51,7 @@ class tag_items_rest_Core {
 
   static function delete($request) {
     list ($tag, $item) = rest::resolve($request->url);
+    access::required("edit", $item);
     $tag->remove($item);
     $tag->save();
   }