summaryrefslogtreecommitdiff
path: root/modules/gallery/models
diff options
context:
space:
mode:
Diffstat (limited to 'modules/gallery/models')
-rw-r--r--modules/gallery/models/item.php82
-rw-r--r--modules/gallery/models/log.php2
2 files changed, 43 insertions, 41 deletions
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index d27e331b..8a42cc1e 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -21,7 +21,7 @@ class Item_Model extends ORM_MPTT {
protected $children = 'items';
protected $sorting = array();
- var $rules = array(
+ var $form_rules = array(
"name" => "required|length[0,255]",
"title" => "required|length[0,255]",
"description" => "length[0,65535]",
@@ -285,14 +285,14 @@ class Item_Model extends ORM_MPTT {
private function _build_relative_caches() {
$names = array();
$slugs = array();
- foreach (Database::instance()
+ foreach (db::build()
->select(array("name", "slug"))
->from("items")
- ->where("left_ptr <=", $this->left_ptr)
- ->where("right_ptr >=", $this->right_ptr)
- ->where("id <>", 1)
- ->orderby("left_ptr", "ASC")
- ->get() as $row) {
+ ->where("left_ptr", "<=", $this->left_ptr)
+ ->where("right_ptr", ">=", $this->right_ptr)
+ ->where("id", "<>", 1)
+ ->order_by("left_ptr", "ASC")
+ ->execute() as $row) {
// Don't encode the names segment
$names[] = rawurlencode($row->name);
$slugs[] = rawurlencode($row->slug);
@@ -309,7 +309,7 @@ class Item_Model extends ORM_MPTT {
* @return string
*/
public function relative_path() {
- if (!$this->loaded) {
+ if (!$this->loaded()) {
return;
}
@@ -324,7 +324,7 @@ class Item_Model extends ORM_MPTT {
* @return string
*/
public function relative_url() {
- if (!$this->loaded) {
+ if (!$this->loaded()) {
return;
}
@@ -383,7 +383,7 @@ class Item_Model extends ORM_MPTT {
if (!empty($this->changed) && $significant_changes) {
$this->updated = time();
- if (!$this->loaded) {
+ if (!$this->loaded()) {
$this->created = $this->updated;
$this->weight = item::get_max_weight();
} else {
@@ -428,14 +428,14 @@ class Item_Model extends ORM_MPTT {
} else {
$comp = "<";
}
- $db = Database::instance();
+ $db = db::build();
// If the comparison column has NULLs in it, we can't use comparators on it and will have to
// deal with it the hard way.
$count = $db->from("items")
- ->where("parent_id", $this->id)
- ->where($this->sort_column, NULL)
- ->where($where)
+ ->where("parent_id", "=", $this->id)
+ ->where($this->sort_column, "=", NULL)
+ ->merge_where($where)
->count_records();
if (empty($count)) {
@@ -443,9 +443,9 @@ class Item_Model extends ORM_MPTT {
$sort_column = $this->sort_column;
$position = $db->from("items")
- ->where("parent_id", $this->id)
- ->where("$sort_column $comp ", $child->$sort_column)
- ->where($where)
+ ->where("parent_id", "=", $this->id)
+ ->where($sort_column, $comp, $child->$sort_column)
+ ->merge_where($where)
->count_records();
// We stopped short of our target value in the sort (notice that we're using a < comparator
@@ -456,12 +456,14 @@ class Item_Model extends ORM_MPTT {
//
// Fix this by doing a 2nd query where we iterate over the equivalent columns and add them to
// our base value.
- foreach ($db->from("items")
- ->where("parent_id", $this->id)
- ->where($sort_column, $child->$sort_column)
- ->where($where)
- ->orderby(array("id" => "ASC"))
- ->get() as $row) {
+ foreach ($db
+ ->select("id")
+ ->from("items")
+ ->where("parent_id", "=", $this->id)
+ ->where($sort_column, "=", $child->$sort_column)
+ ->merge_where($where)
+ ->order_by(array("id" => "ASC"))
+ ->execute() as $row) {
$position++;
if ($row->id == $child->id) {
break;
@@ -475,19 +477,19 @@ 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;
foreach ($db->select("id")
->from("items")
- ->where("parent_id", $this->id)
- ->where($where)
- ->orderby($orderby)
- ->get() as $row) {
+ ->where("parent_id", "=", $this->id)
+ ->merge_where($where)
+ ->order_by($order_by)
+ ->execute() as $row) {
$position++;
if ($row->id == $child->id) {
break;
@@ -592,18 +594,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=null, $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 +619,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);
}
}
diff --git a/modules/gallery/models/log.php b/modules/gallery/models/log.php
index c816a4a7..a2044325 100644
--- a/modules/gallery/models/log.php
+++ b/modules/gallery/models/log.php
@@ -28,7 +28,7 @@ class Log_Model extends ORM {
try {
return identity::lookup_user($this->user_id);
} catch (Exception $e) {
- Kohana::log("alert", "Unable to load user with id $this->user_id");
+ Kohana_Log::add("alert", "Unable to load user with id $this->user_id");
return null;
}
} else {
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 21:09:03 +0000