summaryrefslogtreecommitdiff
path: root/modules/gallery
diff options
context:
space:
mode:
Diffstat (limited to 'modules/gallery')
-rw-r--r--modules/gallery/controllers/admin_advanced_settings.php2
-rw-r--r--modules/gallery/controllers/admin_maintenance.php4
-rw-r--r--modules/gallery/helpers/access.php10
-rw-r--r--modules/gallery/helpers/gallery_block.php4
-rw-r--r--modules/gallery/helpers/gallery_rss.php4
-rw-r--r--modules/gallery/helpers/graphics.php2
-rw-r--r--modules/gallery/helpers/item.php2
-rw-r--r--modules/gallery/helpers/module.php2
-rw-r--r--modules/gallery/models/item.php32
9 files changed, 31 insertions, 31 deletions
diff --git a/modules/gallery/controllers/admin_advanced_settings.php b/modules/gallery/controllers/admin_advanced_settings.php
index 79bc1183..c9de7e57 100644
--- a/modules/gallery/controllers/admin_advanced_settings.php
+++ b/modules/gallery/controllers/admin_advanced_settings.php
@@ -22,7 +22,7 @@ class Admin_Advanced_Settings_Controller extends Admin_Controller {
$view = new Admin_View("admin.html");
$view->content = new View("admin_advanced_settings.html");
$view->content->vars = ORM::factory("var")
- ->orderby("module_name", "name")
+ ->order_by("module_name", "name")
->find_all();
print $view;
}
diff --git a/modules/gallery/controllers/admin_maintenance.php b/modules/gallery/controllers/admin_maintenance.php
index fe5059e7..3b896553 100644
--- a/modules/gallery/controllers/admin_maintenance.php
+++ b/modules/gallery/controllers/admin_maintenance.php
@@ -41,9 +41,9 @@ class Admin_Maintenance_Controller extends Admin_Controller {
$view->content = new View("admin_maintenance.html");
$view->content->task_definitions = task::get_definitions();
$view->content->running_tasks = ORM::factory("task")
- ->where("done", 0)->orderby("updated", "DESC")->find_all();
+ ->where("done", 0)->order_by("updated", "DESC")->find_all();
$view->content->finished_tasks = ORM::factory("task")
- ->where("done", 1)->orderby("updated", "DESC")->find_all();
+ ->where("done", 1)->order_by("updated", "DESC")->find_all();
print $view;
}
diff --git a/modules/gallery/helpers/access.php b/modules/gallery/helpers/access.php
index 9d27181a..d0200a73 100644
--- a/modules/gallery/helpers/access.php
+++ b/modules/gallery/helpers/access.php
@@ -171,7 +171,7 @@ class access_Core {
->where("items.id <> $item->id")
->join("access_intents", "items.id", "access_intents.item_id")
->where("access_intents.view_$group->id", self::DENY)
- ->orderby("level", "DESC")
+ ->order_by("level", "DESC")
->limit(1)
->find();
@@ -494,7 +494,7 @@ class access_Core {
->where("right_ptr >", $item->right_ptr)
->join("access_intents", "access_intents.item_id", "items.id")
->where("access_intents.$field", self::DENY)
- ->orderby("left_ptr", "DESC")
+ ->order_by("left_ptr", "DESC")
->limit(1)
->find();
if ($tmp_item->loaded()) {
@@ -516,7 +516,7 @@ class access_Core {
->where("right_ptr <=", $item->right_ptr)
->where("type", "album")
->where("access_intents.$field IS NOT", self::INHERIT)
- ->orderby("level", "DESC")
+ ->order_by("level", "DESC")
->find_all();
foreach ($query as $row) {
if ($row->$field == self::ALLOW) {
@@ -565,7 +565,7 @@ class access_Core {
->where("left_ptr <", $item->left_ptr)
->where("right_ptr >", $item->right_ptr)
->where("$field IS NOT", self::UNKNOWN)
- ->orderby("left_ptr", "DESC")
+ ->order_by("left_ptr", "DESC")
->limit(1)
->find();
if ($tmp_item->loaded()) {
@@ -581,7 +581,7 @@ class access_Core {
->where("left_ptr >=", $item->left_ptr)
->where("right_ptr <=", $item->right_ptr)
->where("$field IS NOT", self::INHERIT)
- ->orderby("level", "ASC")
+ ->order_by("level", "ASC")
->find_all();
foreach ($query as $row) {
$value = ($row->$field === self::ALLOW) ? "TRUE" : "FALSE";
diff --git a/modules/gallery/helpers/gallery_block.php b/modules/gallery/helpers/gallery_block.php
index b5c32ad2..d09f1c80 100644
--- a/modules/gallery/helpers/gallery_block.php
+++ b/modules/gallery/helpers/gallery_block.php
@@ -46,7 +46,7 @@ class gallery_block_Core {
$block->title = t("Photo stream");
$block->content = new View("admin_block_photo_stream.html");
$block->content->photos =
- ORM::factory("item")->where("type", "photo")->orderby("created", "DESC")->find_all(10);
+ ORM::factory("item")->where("type", "photo")->order_by("created", "DESC")->find_all(10);
break;
case "log_entries":
@@ -54,7 +54,7 @@ class gallery_block_Core {
$block->title = t("Log entries");
$block->content = new View("admin_block_log_entries.html");
$block->content->entries = ORM::factory("log")
- ->orderby(array("timestamp" => "DESC", "id" => "DESC"))->find_all(5);
+ ->order_by(array("timestamp" => "DESC", "id" => "DESC"))->find_all(5);
break;
case "stats":
diff --git a/modules/gallery/helpers/gallery_rss.php b/modules/gallery/helpers/gallery_rss.php
index 155edfb5..e195be8d 100644
--- a/modules/gallery/helpers/gallery_rss.php
+++ b/modules/gallery/helpers/gallery_rss.php
@@ -30,13 +30,13 @@ class gallery_rss_Core {
$feed->children = ORM::factory("item")
->viewable()
->where("type !=", "album")
- ->orderby("created", "DESC")
+ ->order_by("created", "DESC")
->find_all($limit, $offset);
$all_children = ORM::factory("item")
->viewable()
->where("type !=", "album")
- ->orderby("created", "DESC");
+ ->order_by("created", "DESC");
$feed->max_pages = ceil($all_children->find_all()->count() / $limit);
$feed->title = t("Recent updates");
diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index a78cadd0..aef09003 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -183,7 +183,7 @@ class graphics_Core {
foreach (ORM::factory("graphics_rule")
->where("target", $target)
->where("active", true)
- ->orderby("priority", "asc")
+ ->order_by("priority", "asc")
->find_all() as $rule) {
$rules[] = (object)$rule->as_array();
}
diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php
index 109fa6f8..7496d368 100644
--- a/modules/gallery/helpers/item.php
+++ b/modules/gallery/helpers/item.php
@@ -142,7 +142,7 @@ class item_Core {
// @todo: figure out a better way to bootstrap the weight.
$result = Database::instance()
->select("weight")->from("items")
- ->orderby("weight", "desc")->limit(1)
+ ->order_by("weight", "desc")->limit(1)
->get()->current();
return ($result ? $result->weight : 0) + 1;
}
diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index e54a4352..b7e13b9a 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -364,7 +364,7 @@ class module_Core {
foreach (Database::instance()
->select("module_name", "name", "value")
->from("vars")
- ->orderby("module_name", "name")
+ ->order_by("module_name", "name")
->get() as $row) {
if ($row->module_name == "gallery" && $row->name == "_cache") {
// This could happen if there's a race condition
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index bd1f9af5..1efac37f 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -291,7 +291,7 @@ class Item_Model extends ORM_MPTT {
->where("left_ptr <=", $this->left_ptr)
->where("right_ptr >=", $this->right_ptr)
->where("id <>", 1)
- ->orderby("left_ptr", "ASC")
+ ->order_by("left_ptr", "ASC")
->get() as $row) {
// Don't encode the names segment
$names[] = rawurlencode($row->name);
@@ -460,7 +460,7 @@ class Item_Model extends ORM_MPTT {
->where("parent_id", $this->id)
->where($sort_column, $child->$sort_column)
->where($where)
- ->orderby(array("id" => "ASC"))
+ ->order_by(array("id" => "ASC"))
->get() as $row) {
$position++;
if ($row->id == $child->id) {
@@ -475,10 +475,10 @@ class Item_Model extends ORM_MPTT {
//
// Reproduce the children() functionality here using Database directly to avoid loading the
// whole ORM for each row.
- $orderby = array($this->sort_column => $this->sort_order);
+ $order_by = array($this->sort_column => $this->sort_order);
// Use id as a tie breaker
if ($this->sort_column != "id") {
- $orderby["id"] = "ASC";
+ $order_by["id"] = "ASC";
}
$position = 0;
@@ -486,7 +486,7 @@ class Item_Model extends ORM_MPTT {
->from("items")
->where("parent_id", $this->id)
->where($where)
- ->orderby($orderby)
+ ->order_by($order_by)
->get() as $row) {
$position++;
if ($row->id == $child->id) {
@@ -592,18 +592,18 @@ class Item_Model extends ORM_MPTT {
* @param integer SQL limit
* @param integer SQL offset
* @param array additional where clauses
- * @param array orderby
+ * @param array order_by
* @return array ORM
*/
- function children($limit=null, $offset=0, $where=array(), $orderby=null) {
- if (empty($orderby)) {
- $orderby = array($this->sort_column => $this->sort_order);
+ function children($limit=null, $offset=0, $where=array(), $order_by=null) {
+ if (empty($order_by)) {
+ $order_by = array($this->sort_column => $this->sort_order);
// Use id as a tie breaker
if ($this->sort_column != "id") {
- $orderby["id"] = "ASC";
+ $order_by["id"] = "ASC";
}
}
- return parent::children($limit, $offset, $where, $orderby);
+ return parent::children($limit, $offset, $where, $order_by);
}
/**
@@ -617,14 +617,14 @@ class Item_Model extends ORM_MPTT {
* @param array additional where clauses
* @return object ORM_Iterator
*/
- function descendants($limit=null, $offset=0, $where=array(), $orderby=null) {
- if (empty($orderby)) {
- $orderby = array($this->sort_column => $this->sort_order);
+ function descendants($limit=null, $offset=0, $where=array(), $order_by=null) {
+ if (empty($order_by)) {
+ $order_by = array($this->sort_column => $this->sort_order);
// Use id as a tie breaker
if ($this->sort_column != "id") {
- $orderby["id"] = "ASC";
+ $order_by["id"] = "ASC";
}
}
- return parent::descendants($limit, $offset, $where, $orderby);
+ return parent::descendants($limit, $offset, $where, $order_by);
}
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 10:36:31 +0000