summaryrefslogtreecommitdiff
path: root/modules/tag
diff options
context:
space:
mode:
Diffstat (limited to 'modules/tag')
-rw-r--r--modules/tag/controllers/admin_tags.php20
-rw-r--r--modules/tag/controllers/tags.php10
-rw-r--r--modules/tag/helpers/tag.php28
-rw-r--r--modules/tag/helpers/tag_event.php2
-rw-r--r--modules/tag/helpers/tag_rss.php4
-rw-r--r--modules/tag/models/tag.php32
-rw-r--r--modules/tag/tests/Tag_Test.php6
7 files changed, 60 insertions, 42 deletions
diff --git a/modules/tag/controllers/admin_tags.php b/modules/tag/controllers/admin_tags.php
index 67587c2e..e20b8ac8 100644
--- a/modules/tag/controllers/admin_tags.php
+++ b/modules/tag/controllers/admin_tags.php
@@ -19,7 +19,7 @@
*/
class Admin_Tags_Controller extends Admin_Controller {
public function index() {
- $filter = $this->input->get("filter");
+ $filter = Input::instance()->get("filter");
$view = new Admin_View("admin.html");
$view->content = new View("admin_tags.html");
@@ -29,13 +29,13 @@ class Admin_Tags_Controller extends Admin_Controller {
if ($filter) {
$query->like("name", $filter);
}
- $view->content->tags = $query->orderby("name", "ASC")->find_all();
+ $view->content->tags = $query->order_by("name", "ASC")->find_all();
print $view;
}
public function form_delete($id) {
$tag = ORM::factory("tag", $id);
- if ($tag->loaded) {
+ if ($tag->loaded()) {
print tag::get_delete_form($tag);
}
}
@@ -44,14 +44,14 @@ class Admin_Tags_Controller extends Admin_Controller {
access::verify_csrf();
$tag = ORM::factory("tag", $id);
- if (!$tag->loaded) {
- kohana::show_404();
+ if (!$tag->loaded()) {
+ throw new Kohana_404_Exception();
}
$form = tag::get_delete_form($tag);
if ($form->validate()) {
$name = $tag->name;
- Database::instance()->delete("items_tags", array("tag_id" => "$tag->id"));
+ db::build()->delete("items_tags")->where("tag_id", "=", $tag->id)->execute();
$tag->delete();
message::success(t("Deleted tag %tag_name", array("tag_name" => $name)));
log::success("tags", t("Deleted tag %tag_name", array("tag_name" => $name)));
@@ -68,7 +68,7 @@ class Admin_Tags_Controller extends Admin_Controller {
public function form_rename($id) {
$tag = ORM::factory("tag", $id);
- if ($tag->loaded) {
+ if ($tag->loaded()) {
print InPlaceEdit::factory($tag->name)
->action("admin/tags/rename/$id")
->render();
@@ -79,8 +79,8 @@ class Admin_Tags_Controller extends Admin_Controller {
access::verify_csrf();
$tag = ORM::factory("tag", $id);
- if (!$tag->loaded) {
- kohana::show_404();
+ if (!$tag->loaded()) {
+ throw new Kohana_404_Exception();
}
$in_place_edit = InPlaceEdit::factory($tag->name)
@@ -106,7 +106,7 @@ class Admin_Tags_Controller extends Admin_Controller {
}
public function check_for_duplicate(Validation $post_data, $field) {
- $tag_exists = ORM::factory("tag")->where("name", $post_data[$field])->count_all();
+ $tag_exists = ORM::factory("tag")->where("name", "=", $post_data[$field])->count_all();
if ($tag_exists) {
$post_data->add_error($field, "in_use");
}
diff --git a/modules/tag/controllers/tags.php b/modules/tag/controllers/tags.php
index 9f9e45d9..992c7411 100644
--- a/modules/tag/controllers/tags.php
+++ b/modules/tag/controllers/tags.php
@@ -21,7 +21,7 @@ class Tags_Controller extends Controller {
public function show($tag_id) {
$tag = ORM::factory("tag", $tag_id);
$page_size = module::get_var("gallery", "page_size", 9);
- $page = (int) $this->input->get("page", "1");
+ $page = (int) Input::instance()->get("page", "1");
$children_count = $tag->items_count();
$offset = ($page-1) * $page_size;
$max_pages = max(ceil($children_count / $page_size), 1);
@@ -79,12 +79,12 @@ class Tags_Controller extends Controller {
public function autocomplete() {
$tags = array();
- $tag_parts = preg_split("#,#", $this->input->get("q"));
- $limit = $this->input->get("limit");
+ $tag_parts = preg_split("#,#", Input::instance()->get("q"));
+ $limit = Input::instance()->get("limit");
$tag_part = end($tag_parts);
$tag_list = ORM::factory("tag")
- ->like("name", "{$tag_part}%", false)
- ->orderby("name", "ASC")
+ ->where("name", "LIKE", "{$tag_part}%")
+ ->order_by("name", "ASC")
->limit($limit)
->find_all();
foreach ($tag_list as $tag) {
diff --git a/modules/tag/helpers/tag.php b/modules/tag/helpers/tag.php
index 89a27034..8075afe4 100644
--- a/modules/tag/helpers/tag.php
+++ b/modules/tag/helpers/tag.php
@@ -33,8 +33,8 @@ class tag_Core {
throw new exception("@todo MISSING_TAG_NAME");
}
- $tag = ORM::factory("tag")->where("name", $tag_name)->find();
- if (!$tag->loaded) {
+ $tag = ORM::factory("tag")->where("name", "=", $tag_name)->find();
+ if (!$tag->loaded()) {
$tag->name = $tag_name;
$tag->count = 0;
$tag->save();
@@ -57,7 +57,7 @@ class tag_Core {
*/
static function popular_tags($count) {
return ORM::factory("tag")
- ->orderby("count", "DESC")
+ ->order_by("count", "DESC")
->limit($count)
->find_all();
}
@@ -89,12 +89,12 @@ class tag_Core {
*/
static function item_tags($item) {
$tags = array();
- foreach (Database::instance()
+ foreach (db::build()
->select("name")
->from("tags")
->join("items_tags", "tags.id", "items_tags.tag_id", "left")
- ->where("items_tags.item_id", $item->id)
- ->get() as $row) {
+ ->where("items_tags.item_id", "=", $item->id)
+ ->execute() as $row) {
$tags[] = $row->name;
}
return $tags;
@@ -125,10 +125,16 @@ class tag_Core {
* Delete all tags associated with an item
*/
static function clear_all($item) {
- $db = Database::instance();
- $db->query("UPDATE {tags} SET `count` = `count` - 1 WHERE `count` > 0 " .
- "AND `id` IN (SELECT `tag_id` from {items_tags} WHERE `item_id` = $item->id)");
- $db->delete("items_tags", array("item_id" => "$item->id"));
+ db::build()
+ ->update("tags")
+ ->set("count", new Database_Expression("`count` - 1"))
+ ->where("count", ">", 0)
+ ->where("id", "IN", db::build()->select("tag_id")->from("items_tags")->where("item_id", "=", $item->id))
+ ->execute();
+ db::build()
+ ->delete("items_tags")
+ ->where("item_id", "=", $item->id)
+ ->execute();
}
/**
@@ -138,6 +144,6 @@ class tag_Core {
// @todo There's a potential race condition here which we can solve by adding a lock around
// this and all the cases where we create/update tags. I'm loathe to do that since it's an
// extremely rare case.
- Database::instance() ->delete("tags", array("count" => 0));
+ db::build()->delete("tags")->where("count", "=", 0)->execute();
}
} \ No newline at end of file
diff --git a/modules/tag/helpers/tag_event.php b/modules/tag/helpers/tag_event.php
index a857a99d..6ee8e708 100644
--- a/modules/tag/helpers/tag_event.php
+++ b/modules/tag/helpers/tag_event.php
@@ -51,7 +51,7 @@ class tag_event_Core {
try {
tag::add($photo, $tag);
} catch (Exception $e) {
- Kohana::log("error", "Error adding tag: $tag\n" .
+ Kohana_Log::add("error", "Error adding tag: $tag\n" .
$e->getMessage() . "\n" . $e->getTraceAsString());
}
}
diff --git a/modules/tag/helpers/tag_rss.php b/modules/tag/helpers/tag_rss.php
index de5d6c72..f09a4530 100644
--- a/modules/tag/helpers/tag_rss.php
+++ b/modules/tag/helpers/tag_rss.php
@@ -31,8 +31,8 @@ class tag_rss_Core {
static function feed($feed_id, $offset, $limit, $id) {
if ($feed_id == "tag") {
$tag = ORM::factory("tag", $id);
- if (!$tag->loaded) {
- Kohana::show_404();
+ if (!$tag->loaded()) {
+ throw new Kohana_404_Exception();
}
$feed->children = $tag->items($limit, $offset, "photo");
$feed->max_pages = ceil($tag->count / $limit);
diff --git a/modules/tag/models/tag.php b/modules/tag/models/tag.php
index be020f5f..b2ce9eda 100644
--- a/modules/tag/models/tag.php
+++ b/modules/tag/models/tag.php
@@ -31,9 +31,9 @@ class Tag_Model extends ORM {
$model = ORM::factory("item")
->viewable()
->join("items_tags", "items.id", "items_tags.item_id")
- ->where("items_tags.tag_id", $this->id);
+ ->where("items_tags.tag_id", "=", $this->id);
if ($type) {
- $model->where("items.type", $type);
+ $model->where("items.type", "=", $type);
}
return $model->find_all($limit, $offset);
}
@@ -47,10 +47,10 @@ class Tag_Model extends ORM {
$model = ORM::factory("item")
->viewable()
->join("items_tags", "items.id", "items_tags.item_id")
- ->where("items_tags.tag_id", $this->id);
+ ->where("items_tags.tag_id", "=", $this->id);
if ($type) {
- $model->where("items.type", $type);
+ $model->where("items.type", "=", $type);
}
return $model->count_all();
}
@@ -61,20 +61,29 @@ class Tag_Model extends ORM {
* event for the union of all related items before and after the save.
*/
public function save() {
- $db = Database::instance();
$related_item_ids = array();
- foreach ($db->getwhere("items_tags", array("tag_id" => $this->id)) as $row) {
+ foreach (db::build()
+ ->select("item_id")
+ ->from("items_tags")
+ ->where("tag_id", "=", $this->id)
+ ->execute() as $row) {
$related_item_ids[$row->item_id] = 1;
}
$result = parent::save();
- foreach ($db->getwhere("items_tags", array("tag_id" => $this->id)) as $row) {
+ foreach (db::build()
+ ->select("item_id")
+ ->from("items_tags")
+ ->where("tag_id", "=", $this->id)
+ ->execute() as $row) {
$related_item_ids[$row->item_id] = 1;
}
if ($related_item_ids) {
- foreach (ORM::factory("item")->in("id", array_keys($related_item_ids))->find_all() as $item) {
+ foreach (ORM::factory("item")
+ ->where("id", "IN", array_keys($related_item_ids))
+ ->find_all() as $item) {
module::event("item_related_update", $item);
}
}
@@ -88,8 +97,11 @@ class Tag_Model extends ORM {
*/
public function delete() {
$related_item_ids = array();
- $db = Database::Instance();
- foreach ($db->getwhere("items_tags", array("tag_id" => $this->id)) as $row) {
+ foreach (db::build()
+ ->select("item_id")
+ ->from("items_tags")
+ ->where("tag_id", "=", $this->id)
+ ->execute() as $row) {
$related_item_ids[$row->item_id] = 1;
}
diff --git a/modules/tag/tests/Tag_Test.php b/modules/tag/tests/Tag_Test.php
index c9a96286..c96e7f2b 100644
--- a/modules/tag/tests/Tag_Test.php
+++ b/modules/tag/tests/Tag_Test.php
@@ -25,18 +25,18 @@ class Tag_Test extends Unit_Test_Case {
$tag1 = "tag1";
tag::add($album, $tag1);
- $tag = ORM::factory("tag")->where("name", $tag1)->find();
+ $tag = ORM::factory("tag")->where("name", "=", $tag1)->find();
$this->assert_true(1, $tag->count);
// Make sure adding the tag again doesn't increase the count
tag::add($album, $tag1);
- $tag = ORM::factory("tag")->where("name", $tag1)->find();
+ $tag = ORM::factory("tag")->where("name", "=", $tag1)->find();
$this->assert_true(1, $tag->count);
$rand = rand();
$album = album::create($root, $rand, $rand, $rand);
tag::add($album, $tag1);
- $tag = ORM::factory("tag")->where("name", $tag1)->find();
+ $tag = ORM::factory("tag")->where("name", "=", $tag1)->find();
$this->assert_true(2, $tag->count);
}
} \ No newline at end of file
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-16 13:24:18 +0000