stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-04-20 20:49:18 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Preliminary work to cut over to Kohana 2.4

Browse Source 
- Kohana::log() -> Kohana_Log::add()
- Kohana::config_XXX -> Kohana_Config::instance()->XXX
- Implement View::set_global in MY_View
- Updated Cache_Database_Driver to latest APIs
- ORM::$loaded -> ORM::loaded()
- Updated item::viewable() to use K2.4 parenthesization
This commit is contained in:
Bharat Mediratta
2009-11-25 13:22:24 -08:00
parent e201536d82
commit 2e420522ec
63 changed files with 257 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/akismet/helpers/akismet.php
View File

@@ -166,7 +166,7 @@ class akismet_Core {
}
$response = "";
Kohana::log("debug", "Send request\n" . print_r($http_request, 1));
Kohana_Log::add("debug", "Send request\n" . print_r($http_request, 1));
if (false !== ($fs = @fsockopen($host, 80, $errno, $errstr, 5))) {
fwrite($fs, $http_request);
while ( !feof($fs) ) {
@@ -181,7 +181,7 @@ class akismet_Core {
} else {
throw new Exception("@todo CONNECTION TO SPAM SERVICE FAILED");
}
Kohana::log("debug", "Received response\n" . print_r($response, 1));
Kohana_Log::add("debug", "Received response\n" . print_r($response, 1));
return $response;
}

2
modules/comment/controllers/admin_comments.php
View File

@@ -110,7 +110,7 @@ class Admin_Comments_Controller extends Admin_Controller {
$comment = ORM::factory("comment", $id);
$orig = clone $comment;
if ($comment->loaded) {
if ($comment->loaded()) {
$comment->state = $state;
$comment->save();
}

2
modules/comment/models/comment.php
View File

@@ -59,7 +59,7 @@ class Comment_Model extends ORM {
public function save() {
if (!empty($this->changed)) {
$this->updated = time();
if (!$this->loaded && empty($this->created)) {
if (!$this->loaded() && empty($this->created)) {
$this->created = $this->updated;
$created = true;
}

2
modules/comment/tests/Comment_Event_Test.php
View File

@@ -27,6 +27,6 @@ class Comment_Event_Test extends Unit_Test_Case {
$album->delete();
$deleted_comment = ORM::factory("comment", $comment->id);
$this->assert_false($deleted_comment->loaded);
$this->assert_false($deleted_comment->loaded());
}
}

2
modules/digibug/controllers/digibug.php
View File

@@ -81,7 +81,7 @@ class Digibug_Controller extends Controller {
}
$proxy = ORM::factory("digibug_proxy", array("uuid" => $id));
if (!$proxy->loaded || !$proxy->item->loaded) {
if (!$proxy->loaded() || !$proxy->item->loaded()) {
Kohana::show_404();
}

4
modules/exif/helpers/exif.php
View File

@@ -74,7 +74,7 @@ class exif_Core {
$item->save();
$record = ORM::factory("exif_record")->where("item_id", $item->id)->find();
if (!$record->loaded) {
if (!$record->loaded()) {
$record->item_id = $item->id;
}
$record->data = serialize($keys);
@@ -88,7 +88,7 @@ class exif_Core {
$record = ORM::factory("exif_record")
->where("item_id", $item->id)
->find();
if (!$record->loaded) {
if (!$record->loaded()) {
return array();
}

14
modules/g2_import/helpers/g2_import.php
View File

@@ -458,7 +458,7 @@ class g2_import_Core {
switch ($g2_type) {
case "GalleryPhotoItem":
if (!in_array($g2_item->getMimeType(), array("image/jpeg", "image/gif", "image/png"))) {
Kohana::log("alert", "$g2_path is an unsupported image type; using a placeholder gif");
Kohana_Log::add("alert", "$g2_path is an unsupported image type; using a placeholder gif");
$message[] = t("'%path' is an unsupported image type, using a placeholder",
array("path" => $g2_path));
$g2_path = MODPATH . "g2_import/data/broken-image.gif";
@@ -473,7 +473,7 @@ class g2_import_Core {
self::_decode_html_special_chars(self::extract_description($g2_item)),
self::map($g2_item->getOwnerId()));
} catch (Exception $e) {
Kohana::log(
Kohana_Log::add(
"alert", "Corrupt image $g2_path\n" . $e->__toString());
$message[] = t("Corrupt image '%path'", array("path" => $g2_path));
$message[] = $e->__toString();
@@ -493,13 +493,13 @@ class g2_import_Core {
self::_decode_html_special_chars(self::extract_description($g2_item)),
self::map($g2_item->getOwnerId()));
} catch (Exception $e) {
Kohana::log("alert", "Corrupt movie $g2_path\n" . $e->__toString());
Kohana_Log::add("alert", "Corrupt movie $g2_path\n" . $e->__toString());
$message[] = t("Corrupt movie '%path'", array("path" => $g2_path));
$message[] = $e->__toString();
$corrupt = 1;
}
} else {
Kohana::log("alert", "$g2_path is an unsupported movie type");
Kohana_Log::add("alert", "$g2_path is an unsupported movie type");
$message[] = t("'%path' is an unsupported movie type", array("path" => $g2_path));
$corrupt = 1;
}
@@ -868,7 +868,7 @@ class g2_import_Core {
static function map($g2_id) {
if (!array_key_exists($g2_id, self::$map)) {
$g2_map = ORM::factory("g2_map")->where("g2_id", $g2_id)->find();
self::$map[$g2_id] = $g2_map->loaded ? $g2_map->g3_id : null;
self::$map[$g2_id] = $g2_map->loaded() ? $g2_map->g3_id : null;
}
return self::$map[$g2_id];
@@ -887,7 +887,7 @@ class g2_import_Core {
static function log($msg) {
message::warning($msg);
Kohana::log("alert", $msg);
Kohana_Log::add("alert", $msg);
}
}
@@ -906,7 +906,7 @@ function g2() {
$args = func_get_arg(0);
$ret = array_shift($args);
if ($ret) {
Kohana::log("error", "Gallery 2 call failed with: " . $ret->getAsText());
Kohana_Log::add("error", "Gallery 2 call failed with: " . $ret->getAsText());
throw new Exception("@todo G2_FUNCTION_FAILED");
}
if (count($args) == 1) {

2
modules/g2_import/helpers/g2_import_task.php
View File

@@ -66,7 +66,7 @@ class g2_import_task_Core {
$root_g2_id = g2(GalleryCoreApi::getDefaultAlbumId());
$root = ORM::factory("g2_map")->where("g2_id", $root_g2_id)->find();
if (!$root->loaded) {
if (!$root->loaded()) {
$root->g2_id = $root_g2_id;
$root->g3_id = 1;
$root->save();

8
modules/gallery/controllers/admin_maintenance.php
View File

@@ -75,7 +75,7 @@ class Admin_Maintenance_Controller extends Admin_Controller {
access::verify_csrf();
$task = ORM::factory("task", $task_id);
if (!$task->loaded) {
if (!$task->loaded()) {
throw new Exception("@todo MISSING_TASK");
}
$view = new View("admin_maintenance_task.html");
@@ -97,7 +97,7 @@ class Admin_Maintenance_Controller extends Admin_Controller {
access::verify_csrf();
$task = ORM::factory("task", $task_id);
if (!$task->loaded) {
if (!$task->loaded()) {
throw new Exception("@todo MISSING_TASK");
}
$view = new View("admin_maintenance_show_log.html");
@@ -114,7 +114,7 @@ class Admin_Maintenance_Controller extends Admin_Controller {
access::verify_csrf();
$task = ORM::factory("task", $task_id);
if (!$task->loaded) {
if (!$task->loaded()) {
throw new Exception("@todo MISSING_TASK");
}
@@ -184,7 +184,7 @@ class Admin_Maintenance_Controller extends Admin_Controller {
try {
$task = task::run($task_id);
} catch (Exception $e) {
Kohana::log(
Kohana_Log::add(
"error",
sprintf(
"%s in %s at line %s:\n%s", $e->getMessage(), $e->getFile(),

3
modules/gallery/controllers/albums.php
View File

@@ -66,6 +66,7 @@ class Albums_Controller extends Items_Controller {
$template = new Theme_View("page.html", "collection", "album");
$template->set_global("page", $page);
$template->set_global("page_title", null);
$template->set_global("max_pages", $max_pages);
$template->set_global("page_size", $page_size);
$template->set_global("item", $album);
@@ -76,7 +77,7 @@ class Albums_Controller extends Items_Controller {
// We can't use math in ORM or the query builder, so do this by hand. It's important
// that we do this with math, otherwise concurrent accesses will damage accuracy.
Database::instance()->query(
db::query(
"UPDATE {items} SET `view_count` = `view_count` + 1 WHERE `id` = $album->id");
print $template;

6
modules/gallery/controllers/file_proxy.php
View File

@@ -58,7 +58,7 @@ class File_Proxy_Controller extends Controller {
// We now have the relative path to the item. Search for it in the path cache
$item = ORM::factory("item")->where("relative_path_cache", $path)->find();
if (!$item->loaded) {
if (!$item->loaded()) {
// We didn't turn it up. It's possible that the relative_path_cache is out of date here.
// There was fallback code, but bharat deleted it in 8f1bca74. If it turns out to be
// necessary, it's easily resurrected.
@@ -70,14 +70,14 @@ class File_Proxy_Controller extends Controller {
foreach (array("flv", "mp4") as $ext) {
$movie_path = preg_replace('/.jpg$/', ".$ext", $path);
$item = ORM::factory("item")->where("relative_path_cache", $movie_path)->find();
if ($item->loaded) {
if ($item->loaded()) {
break;
}
}
}
}
if (!$item->loaded) {
if (!$item->loaded()) {
kohana::show_404();
}

6
modules/gallery/controllers/l10n_client.php
View File

@@ -33,7 +33,7 @@ class L10n_Client_Controller extends Controller {
"locale" => "root"))
->find();
if (!$root_message->loaded) {
if (!$root_message->loaded()) {
throw new Exception("@todo bad request data / illegal state");
}
$is_plural = Gallery_I18n::is_plural_message(unserialize($root_message->message));
@@ -60,7 +60,7 @@ class L10n_Client_Controller extends Controller {
"locale" => $locale))
->find();
if (!$entry->loaded) {
if (!$entry->loaded()) {
$entry->key = $key;
$entry->locale = $locale;
$entry->message = $root_message->message;
@@ -74,7 +74,7 @@ class L10n_Client_Controller extends Controller {
"locale" => $locale))
->find();
if (!$entry_from_incoming->loaded) {
if (!$entry_from_incoming->loaded()) {
$entry->base_revision = $entry_from_incoming->revision;
}

2
modules/gallery/controllers/permissions.php
View File

@@ -57,7 +57,7 @@ class Permissions_Controller extends Controller {
access::required("view", $item);
access::required("edit", $item);
if (!empty($group) && $perm->loaded && $item->loaded) {
if (!empty($group) && $perm->loaded() && $item->loaded()) {
switch($command) {
case "allow":
access::allow($group, $perm->name, $item);

4
modules/gallery/controllers/rest.php
View File

@@ -82,7 +82,7 @@ class REST_Controller extends Controller {
}
$resource = ORM::factory($this->resource_type, (int)$function);
if (!$resource->loaded && $request_method != "post") {
if (!$resource->loaded() && $request_method != "post") {
return Kohana::show_404();
}
@@ -111,7 +111,7 @@ class REST_Controller extends Controller {
}
$resource = ORM::factory($this->resource_type, $resource_id);
if (!$resource->loaded) {
if (!$resource->loaded()) {
return Kohana::show_404();
}

2
modules/gallery/controllers/simple_uploader.php
View File

@@ -72,7 +72,7 @@ class Simple_Uploader_Controller extends Controller {
module::event("add_photos_form_completed", $item, $form);
}
} catch (Exception $e) {
Kohana::log("alert", $e->__toString());
Kohana_Log::add("alert", $e->__toString());
if (file_exists($temp_filename)) {
unlink($temp_filename);
}

4
modules/gallery/helpers/MY_url.php
View File

@@ -32,7 +32,7 @@ class url extends url_Core {
}
$item = self::get_item_from_uri(Router::$current_uri);
if ($item && $item->loaded) {
if ($item && $item->loaded()) {
Router::$controller = "{$item->type}s";
Router::$controller_path = MODPATH . "gallery/controllers/{$item->type}s.php";
Router::$method = $item->id;
@@ -51,7 +51,7 @@ class url extends url_Core {
// but failing that, walk down the tree until we find it. The fallback code will fix caches
// as it goes, so it'll never be run frequently.
$item = ORM::factory("item")->where("relative_url_cache", $current_uri)->find();
if (!$item->loaded) {
if (!$item->loaded()) {
$count = count(Router::$segments);
foreach (ORM::factory("item")
->where("slug", html_entity_decode(Router::$segments[$count - 1], ENT_QUOTES))

18
modules/gallery/helpers/access.php
View File

@@ -91,7 +91,7 @@ class access_Core {
* @return boolean
*/
static function user_can($user, $perm_name, $item) {
if (!$item->loaded) {
if (!$item->loaded()) {
return false;
}
@@ -101,7 +101,7 @@ class access_Core {
$resource = $perm_name == "view" ?
$item : model_cache::get("access_cache", $item->id, "item_id");
foreach ($user->groups as $group) {
foreach ($user->groups->find_all() as $group) {
if ($resource->__get("{$perm_name}_{$group->id}") === self::ALLOW) {
return true;
}
@@ -175,7 +175,7 @@ class access_Core {
->limit(1)
->find();
if ($lock->loaded) {
if ($lock->loaded()) {
return $lock;
} else {
return null;
@@ -201,7 +201,7 @@ class access_Core {
if (!($group instanceof Group_Definition)) {
throw new Exception("@todo PERMISSIONS_ONLY_WORK_ON_GROUPS");
}
if (!$album->loaded) {
if (!$album->loaded()) {
throw new Exception("@todo INVALID_ALBUM $album->id");
}
if (!$album->is_album()) {
@@ -282,7 +282,7 @@ class access_Core {
*/
static function register_permission($name, $display_name) {
$permission = ORM::factory("permission", $name);
if ($permission->loaded) {
if ($permission->loaded()) {
throw new Exception("@todo PERMISSION_ALREADY_EXISTS $name");
}
$permission->name = $name;
@@ -305,7 +305,7 @@ class access_Core {
self::_drop_columns($name, $group);
}
$permission = ORM::factory("permission")->where("name", $name)->find();
if ($permission->loaded) {
if ($permission->loaded()) {
$permission->delete();
}
}
@@ -342,7 +342,7 @@ class access_Core {
*/
static function add_item($item) {
$access_intent = ORM::factory("access_intent", $item->id);
if ($access_intent->loaded) {
if ($access_intent->loaded()) {
throw new Exception("@todo ITEM_ALREADY_ADDED $item->id");
}
$access_intent = ORM::factory("access_intent");
@@ -497,7 +497,7 @@ class access_Core {
->orderby("left_ptr", "DESC")
->limit(1)
->find();
if ($tmp_item->loaded) {
if ($tmp_item->loaded()) {
$item = $tmp_item;
}
}
@@ -568,7 +568,7 @@ class access_Core {
->orderby("left_ptr", "DESC")
->limit(1)
->find();
if ($tmp_item->loaded) {
if ($tmp_item->loaded()) {
$item = $tmp_item;
}
}

2
modules/gallery/helpers/album.php
View File

@@ -34,7 +34,7 @@ class album_Core {
* @return Item_Model
*/
static function create($parent, $name, $title, $description=null, $owner_id=null, $slug=null) {
if (!$parent->loaded || !$parent->is_album()) {
if (!$parent->loaded() || !$parent->is_album()) {
throw new Exception("@todo INVALID_PARENT");
}

2
modules/gallery/helpers/auth.php
View File

@@ -46,7 +46,7 @@ class auth_Core {
try {
Session::instance()->destroy();
} catch (Exception $e) {
Kohana::log("error", $e);
Kohana_Log::add("error", $e);
}
module::event("user_logout", $user);
}

2
modules/gallery/helpers/gallery_graphics.php
View File

@@ -123,7 +123,7 @@ class gallery_graphics_Core {
module::event("graphics_composite_completed", $input_file, $output_file, $options);
} catch (ErrorException $e) {
Kohana::log("error", $e->get_message());
Kohana_Log::add("error", $e->get_message());
}
}
}

2
modules/gallery/helpers/gallery_task.php
View File

@@ -66,7 +66,7 @@ class gallery_task_Core {
}
$item = ORM::factory("item", $row->id);
if ($item->loaded) {
if ($item->loaded()) {
try {
graphics::generate($item);
$completed++;

2
modules/gallery/helpers/graphics.php
View File

@@ -171,7 +171,7 @@ class graphics_Core {
} catch (Exception $e) {
// Something went wrong rebuilding the image. Leave it dirty and move on.
// @todo we should handle this better.
Kohana::log("error", "Caught exception rebuilding image: {$item->title}\n" .
Kohana_Log::add("error", "Caught exception rebuilding image: {$item->title}\n" .
$e->getMessage() . "\n" . $e->getTraceAsString());
throw $e;
}

4
modules/gallery/helpers/identity.php
View File

@@ -75,14 +75,14 @@ class identity_Core {
if (!$session->get("group_ids")) {
$ids = array();
foreach ($user->groups as $group) {
foreach ($user->groups->find_all() as $group) {
$ids[] = $group->id;
}
$session->set("group_ids", $ids);
}
} catch (Exception $e) {
// Log it, so we at least have so notification that we swallowed the exception.
Kohana::log("error", "Load_user Exception: " . $e->__toString());
Kohana_Log::add("error", "Load_user Exception: " . $e->__toString());
try {
Session::instance()->destroy();
} catch (Exception $e) {

18
modules/gallery/helpers/item.php
View File

@@ -156,13 +156,7 @@ class item_Core {
$view_restrictions = array();
if (!identity::active_user()->admin) {
foreach (identity::group_ids_for_active_user() as $id) {
// Separate the first restriction from the rest to make it easier for us to formulate
// our where clause below
if (empty($view_restrictions)) {
$view_restrictions[0] = "items.view_$id";
} else {
$view_restrictions[1]["items.view_$id"] = access::ALLOW;
}
$view_restrictions[] = "items.view_$id";
}
}
switch (count($view_restrictions)) {
@@ -170,14 +164,14 @@ class item_Core {
break;
case 1:
$model->where($view_restrictions[0], access::ALLOW);
$model->where($view_restrictions[0], "=", access::ALLOW);
break;
default:
$model->open_paren();
$model->where($view_restrictions[0], access::ALLOW);
$model->orwhere($view_restrictions[1]);
$model->close_paren();
$model
->and_open()
->or_where($view_restrictions, "=", access::ALLOW)
->close();
break;
}

2
modules/gallery/helpers/l10n_client.php
View File

@@ -136,7 +136,7 @@ class l10n_client_Core {
$entry = ORM::factory("incoming_translation")
->where(array("key" => $key, "locale" => $locale))
->find();
if (!$entry->loaded) {
if (!$entry->loaded()) {
// @todo Load a message key -> message (text) dict into memory outside of this loop
$root_entry = ORM::factory("incoming_translation")
->where(array("key" => $key, "locale" => "root"))

2
modules/gallery/helpers/l10n_scanner.php
View File

@@ -43,7 +43,7 @@ class l10n_scanner_Core {
}
$entry = ORM::factory("incoming_translation", array("key" => $key));
if (!$entry->loaded) {
if (!$entry->loaded()) {
$entry->key = $key;
$entry->message = serialize($message);
$entry->locale = "root";

4
modules/gallery/helpers/model_cache.php
View File

@@ -22,8 +22,8 @@ class model_cache_Core {
static function get($model_name, $id, $field_name="id") {
if (TEST_MODE || empty(self::$cache->$model_name->$field_name->$id)) {
$model = ORM::factory($model_name)->where($field_name, $id)->find();
if (!$model->loaded) {
$model = ORM::factory($model_name)->where($field_name, "=", $id)->find();
if (!$model->loaded()) {
throw new Exception("@todo MISSING_MODEL $model_name:$id");
}
self::$cache->$model_name->$field_name->$id = $model;

35
modules/gallery/helpers/module.php
View File

@@ -36,13 +36,13 @@ class module_Core {
*/
static function set_version($module_name, $version) {
$module = self::get($module_name);
if (!$module->loaded) {
if (!$module->loaded()) {
$module->name = $module_name;
$module->active = $module_name == "gallery"; // only gallery is active by default
}
$module->version = $version;
$module->save();
Kohana::log("debug", "$module_name: version is now $version");
Kohana_Log::add("debug", "$module_name: version is now $version");
}
/**
@@ -126,9 +126,10 @@ class module_Core {
* @param string $module_name
*/
static function install($module_name) {
$kohana_modules = Kohana::config("core.modules");
$config = Kohana_Config::instance();
$kohana_modules = $config->get("core.modules");
array_unshift($kohana_modules, MODPATH . $module_name);
Kohana::config_set("core.modules", $kohana_modules);
$config->set("core.modules", $kohana_modules);
// Rebuild the include path so the module installer can benefit from auto loading
Kohana::include_paths(true);
@@ -142,7 +143,7 @@ class module_Core {
// Now the module is installed but inactive, so don't leave it in the active path
array_shift($kohana_modules);
Kohana::config_set("core.modules", $kohana_modules);
$config->set("core.modules", $kohana_modules);
log::success(
"module", t("Installed module %module_name", array("module_name" => $module_name)));
@@ -193,9 +194,10 @@ class module_Core {
* @param string $module_name
*/
static function activate($module_name) {
$kohana_modules = Kohana::config("core.modules");
$config = Kohana_Config::instance();
$kohana_modules = $config->get("core.modules");
array_unshift($kohana_modules, MODPATH . $module_name);
Kohana::config_set("core.modules", $kohana_modules);
$config->set("core.modules", $kohana_modules);
$installer_class = "{$module_name}_installer";
if (method_exists($installer_class, "activate")) {
@@ -203,7 +205,7 @@ class module_Core {
}
$module = self::get($module_name);
if ($module->loaded) {
if ($module->loaded()) {
$module->active = true;
$module->save();
}
@@ -230,7 +232,7 @@ class module_Core {
}
$module = self::get($module_name);
if ($module->loaded) {
if ($module->loaded()) {
$module->active = false;
$module->save();
}
@@ -257,7 +259,7 @@ class module_Core {
graphics::remove_rules($module_name);
$module = self::get($module_name);
if ($module->loaded) {
if ($module->loaded()) {
$module->delete();
}
module::load_modules();
@@ -290,8 +292,9 @@ class module_Core {
}
}
self::$active[] = $gallery; // put gallery last in the module list to match core.modules
Kohana::config_set(
"core.modules", array_merge($kohana_modules, Kohana::config("core.modules")));
$config = Kohana_Config::instance();
$config->set(
"core.modules", array_merge($kohana_modules, $config->get("core.modules")));
}
/**
@@ -348,11 +351,11 @@ class module_Core {
// We cache all vars in gallery._cache so that we can load all vars at once for
// performance.
if (empty(self::$var_cache)) {
$row = Database::instance()
$row = db::build()
->select("value")
->from("vars")
->where(array("module_name" => "gallery", "name" => "_cache"))
->get()
->execute()
->current();
if ($row) {
self::$var_cache = unserialize($row->value);
@@ -395,7 +398,7 @@ class module_Core {
->where("module_name", $module_name)
->where("name", $name)
->find();
if (!$var->loaded) {
if (!$var->loaded()) {
$var->module_name = $module_name;
$var->name = $name;
}
@@ -432,7 +435,7 @@ class module_Core {
->where("module_name", $module_name)
->where("name", $name)
->find();
if ($var->loaded) {
if ($var->loaded()) {
$var->delete();
}

2
modules/gallery/helpers/movie.php
View File

@@ -36,7 +36,7 @@ class movie_Core {
*/
static function create($parent, $filename, $name, $title,
$description=null, $owner_id=null, $slug=null) {
if (!$parent->loaded || !$parent->is_album()) {
if (!$parent->loaded() || !$parent->is_album()) {
throw new Exception("@todo INVALID_PARENT");
}

2
modules/gallery/helpers/photo.php
View File

@@ -36,7 +36,7 @@ class photo_Core {
*/
static function create($parent, $filename, $name, $title,
$description=null, $owner_id=null, $slug=null) {
if (!$parent->loaded || !$parent->is_album()) {
if (!$parent->loaded() || !$parent->is_album()) {
throw new Exception("@todo INVALID_PARENT");
}

4
modules/gallery/helpers/site_status.php
View File

@@ -69,7 +69,7 @@ class site_status_Core {
$message = ORM::factory("message")
->where("key", $permanent_key)
->find();
if (!$message->loaded) {
if (!$message->loaded()) {
$message->key = $permanent_key;
}
$message->severity = $severity;
@@ -83,7 +83,7 @@ class site_status_Core {
*/
static function clear($permanent_key) {
$message = ORM::factory("message")->where("key", $permanent_key)->find();
if ($message->loaded) {
if ($message->loaded()) {
$message->delete();
}
}

8
modules/gallery/helpers/task.php
View File

@@ -51,7 +51,7 @@ class task_Core {
static function cancel($task_id) {
$task = ORM::factory("task", $task_id);
if (!$task->loaded) {
if (!$task->loaded()) {
throw new Exception("@todo MISSING_TASK");
}
$task->done = 1;
@@ -65,14 +65,14 @@ class task_Core {
static function remove($task_id) {
$task = ORM::factory("task", $task_id);
if ($task->loaded) {
if ($task->loaded()) {
$task->delete();
}
}
static function run($task_id) {
$task = ORM::factory("task", $task_id);
if (!$task->loaded) {
if (!$task->loaded()) {
throw new Exception("@todo MISSING_TASK");
}
@@ -84,7 +84,7 @@ class task_Core {
}
$task->save();
} catch (Exception $e) {
Kohana::log("error", $e->__toString());
Kohana_Log::add("error", $e->__toString());
$task->log($e->__toString());
$task->state = "error";
$task->done = true;

2
modules/gallery/helpers/theme.php
View File

@@ -43,7 +43,7 @@ class theme_Core {
}
$modules = Kohana::config("core.modules");
array_unshift($modules, THEMEPATH . $theme_name);
Kohana::config_set("core.modules", $modules);
Kohana_Config::instance()->set("core.modules", $modules);
}
static function get_edit_form_admin() {

2
modules/gallery/libraries/Admin_View.php
View File

@@ -31,7 +31,7 @@ class Admin_View_Core extends Gallery_View {
if (!file_exists(THEMEPATH . $theme_name)) {
module::set_var("gallery", "active_admin_theme", "admin_wind");
theme::load_themes();
Kohana::log("error", "Unable to locate theme '$theme_name', switching to default theme.");
Kohana_Log::add("error", "Unable to locate theme '$theme_name', switching to default theme.");
}
parent::__construct($name);

8
modules/gallery/libraries/Gallery_I18n.php
View File

@@ -128,21 +128,21 @@ class Gallery_I18n_Core {
if (!isset($this->_cache[$locale])) {
$this->_cache[$locale] = array();
// TODO: Load data from locale file instead of the DB.
foreach (Database::instance()
foreach (db::build()
->select("key", "translation")
->from("incoming_translations")
->where(array("locale" => $locale))
->get()
->execute()
->as_array() as $row) {
$this->_cache[$locale][$row->key] = unserialize($row->translation);
}
// Override incoming with outgoing...
foreach (Database::instance()
foreach (db::build()
->select("key", "translation")
->from("outgoing_translations")
->where(array("locale" => $locale))
->get()
->execute()
->as_array() as $row) {
$this->_cache[$locale][$row->key] = unserialize($row->translation);
}

6
modules/gallery/libraries/Gallery_View.php
View File

@@ -32,7 +32,7 @@ class Gallery_View_Core extends View {
if (($path = gallery::find_file("js", $file, false))) {
$this->scripts[$path] = 1;
} else {
Kohana::log("error", "Can't find script file: $file");
Kohana_Log::add("error", "Can't find script file: $file");
}
}
@@ -55,7 +55,7 @@ class Gallery_View_Core extends View {
if (($path = gallery::find_file("css", $file, false))) {
$this->css[$path] = 1;
} else {
Kohana::log("error", "Can't find css file: $file");
Kohana_Log::add("error", "Can't find css file: $file");
}
}
@@ -130,7 +130,7 @@ class Gallery_View_Core extends View {
$search[] = $match[0];
$replace[] = "url('" . url::abs_file($relative) . "')";
} else {
Kohana::log("error", "Missing URL reference '{$match[1]}' in CSS file '$css_file'");
Kohana_Log::add("error", "Missing URL reference '{$match[1]}' in CSS file '$css_file'");
}
}
$replace = str_replace(DIRECTORY_SEPARATOR, "/", $replace);

4
modules/gallery/libraries/IdentityProvider.php
View File

@@ -54,7 +54,7 @@ class IdentityProvider_Core {
*/
static function reset() {
self::$instance = null;
Kohana::config_clear("identity");
Kohana_Config::instance()->clear("identity");
}
/**
@@ -90,7 +90,7 @@ class IdentityProvider_Core {
get_class($this), "IdentityProvider_Driver");
}
Kohana::log("debug", "Identity Library initialized");
Kohana_Log::add("debug", "Identity Library initialized");
}
/**

10
modules/gallery/libraries/MY_ORM.php
View File

@@ -21,16 +21,6 @@ class ORM extends ORM_Core {
// Track the original value of this ORM so that we can look it up in ORM::original()
protected $original = null;
public function open_paren() {
$this->db->open_paren();
return $this;
}
public function close_paren() {
$this->db->close_paren();
return $this;
}
public function save() {
model_cache::clear();
$result = parent::save();

27
modules/gallery/libraries/MY_View.php
View File

@@ -18,6 +18,31 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
class View extends View_Core {
static $global_data;
/**
* Reimplement Kohana 2.3's View::set_global() functionality.
*/
public function set_global($key, $value) {
View::$global_data->$key = $value;
$this->$key = $value;
}
public function __isset($key) {
if (isset(View::$global_data->$key)) {
return true;
}
return parent::__isset($key);
}
public function &__get($key) {
Kohana_Log::add("error",print_r("__get($key)",1));
if (isset(View::$global_data->$key)) {
return View::$global_data->$key;
}
return parent::__get($key);
}
/**
* Override View_Core::__construct so that we can set the csrf value into all views.
*
@@ -38,7 +63,7 @@ class View extends View_Core {
try {
return parent::render($print, $renderer);
} catch (Exception $e) {
Kohana::Log("error", $e->getMessage() . "\n" . $e->getTraceAsString());
Kohana_Log::add("error", $e->getMessage() . "\n" . $e->getTraceAsString());
return "";
}
}

56
modules/gallery/libraries/ORM_MPTT.php
View File

@@ -133,10 +133,10 @@ class ORM_MPTT_Core extends ORM {
*/
function parents() {
return $this
->where("`left_ptr` <= {$this->left_ptr}")
->where("`right_ptr` >= {$this->right_ptr}")
->where("id <> {$this->id}")
->orderby("left_ptr", "ASC")
->where("left_ptr", "<=", $this->left_ptr)
->where("right_ptr", ">=", $this->right_ptr)
->where("id", "<>", $this->id)
->order_by("left_ptr", "ASC")
->find_all();
}
@@ -147,14 +147,17 @@ class ORM_MPTT_Core extends ORM {
* @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=array("id" => "ASC")) {
function children($limit=null, $offset=0, $where=null, $order_by=array("id" => "ASC")) {
if ($where) {
$this->where($where);
}
return $this
->where("parent_id", $this->id)
->where($where)
->orderby($orderby)
->where("parent_id", "=", $this->id)
->order_by($order_by)
->find_all($limit, $offset);
}
@@ -165,10 +168,13 @@ class ORM_MPTT_Core extends ORM {
* @param array additional where clauses
* @return array ORM
*/
function children_count($where=array()) {
function children_count($where=null) {
if ($where) {
$this->where($where);
}
return $this
->where($where)
->where("parent_id", $this->id)
->where("parent_id", "=", $this->id)
->count_all();
}
@@ -178,15 +184,18 @@ class ORM_MPTT_Core extends ORM {
* @param integer SQL limit
* @param integer SQL offset
* @param array additional where clauses
* @param array orderby
* @param array order_by
* @return object ORM_Iterator
*/
function descendants($limit=null, $offset=0, $where=array(), $orderby=array("id" => "ASC")) {
function descendants($limit=null, $offset=0, $where=null, $order_by=array("id" => "ASC")) {
if ($where) {
$this->where($where);
}
return $this
->where("left_ptr >", $this->left_ptr)
->where("right_ptr <=", $this->right_ptr)
->where($where)
->orderby($orderby)
->where("left_ptr", ">", $this->left_ptr)
->where("right_ptr", "<=", $this->right_ptr)
->order_by($order_by)
->find_all($limit, $offset);
}
@@ -196,11 +205,14 @@ class ORM_MPTT_Core extends ORM {
* @param array additional where clauses
* @return integer child count
*/
function descendants_count($where=array()) {
function descendants_count($where=null) {
if ($where) {
$this->where($where);
}
return $this
->where("left_ptr >", $this->left_ptr)
->where("right_ptr <=", $this->right_ptr)
->where($where)
->where("left_ptr", ">", $this->left_ptr)
->where("right_ptr", "<=", $this->right_ptr)
->count_all();
}

2
modules/gallery/libraries/SafeString.php
View File

@@ -146,7 +146,7 @@ class SafeString_Core {
* Escape special HTML chars ("<", ">", "&", etc.) to HTML entities.
*/
private static function _escape_for_html($dirty_html) {
return html::specialchars($dirty_html);
return html::chars($dirty_html);
}
/**

4
modules/gallery/libraries/Sendmail.php
View File

@@ -52,7 +52,7 @@ class Sendmail_Core {
break;
case "header":
if (count($value) != 2) {
Kohana::log("error", wordwrap("Invalid header parameters\n" . Kohana::debug($value)));
Kohana_Log::add("error", wordwrap("Invalid header parameters\n" . Kohana::debug($value)));
throw new Exception("@todo INVALID_HEADER_PARAMETERS");
}
$this->headers[$value[0]] = $value[1];
@@ -71,7 +71,7 @@ class Sendmail_Core {
public function send() {
if (empty($this->to)) {
Kohana::log("error", wordwrap("Sending mail failed:\nNo to address specified"));
Kohana_Log::add("error", wordwrap("Sending mail failed:\nNo to address specified"));
throw new Exception("@todo TO_IS_REQUIRED_FOR_MAIL");
}
$to = implode(", ", $this->to);

2
modules/gallery/libraries/Theme_View.php
View File

@@ -33,7 +33,7 @@ class Theme_View_Core extends Gallery_View {
if (!file_exists(THEMEPATH . $theme_name)) {
module::set_var("gallery", "active_site_theme", "wind");
theme::load_themes();
Kohana::log("error", "Unable to locate theme '$theme_name', switching to default theme.");
Kohana_Log::add("error", "Unable to locate theme '$theme_name', switching to default theme.");
}
parent::__construct($name);

95
modules/gallery/libraries/drivers/Cache/Database.php
View File

@@ -20,22 +20,10 @@
/*
* Based on the Cache_Sqlite_Driver developed by the Kohana Team
*/
class Cache_Database_Driver implements Cache_Driver {
class Cache_Database_Driver extends Cache_Driver {
// Kohana database instance
protected $db;
/**
* Tests that the storage location is a directory and is writable.
*/
public function __construct() {
// Open up an instance of the database
$this->db = Database::instance();
if (!$this->db->table_exists("caches")) {
throw new Exception("@todo Cache table is not defined");
}
}
/**
* Checks if a cache id is already set.
*
@@ -43,20 +31,22 @@ class Cache_Database_Driver implements Cache_Driver {
* @return boolean
*/
public function exists($id) {
$count = $this->db->count_records("caches", array("key" => $id, "expiration >=" => time()));
$count = db::build()
->where("key", "=", $id)
->where("expiration", ">=", "time()")
->count_records("caches");
return $count > 0;
}
/**
* Sets a cache item to the given data, tags, and lifetime.
*
* @param string cache id to set
* @param string data in the cache
* @param array assoc array of key => value pairs
* @param array cache tags
* @param integer lifetime
* @return bool
*/
public function set($id, $data, array $tags = NULL, $lifetime) {
public function set($items, $tags=null, $lifetime=null) {
if (!empty($tags)) {
// Escape the tags, adding brackets so the tag can be explicitly matched
$tags = "<" . implode(">,<", $tags) . ">";
@@ -69,46 +59,46 @@ class Cache_Database_Driver implements Cache_Driver {
$lifetime += time();
}
if ($this->exists($id)) {
$status = $this->db->update(
"caches",
array("tags" => $tags, "expiration" => $lifetime, "cache" => serialize($data)), array("key" => $id));
} else {
$status = $this->db->insert(
"caches",
array("key" => $id, "tags" => $tags, "expiration" => $lifetime, "cache" => serialize($data)));
foreach ($items as $id => $data) {
if ($this->exists($id)) {
$status = db::build()->update(
"caches",
array("tags" => $tags, "expiration" => $lifetime, "cache" => serialize($data)),
array("key", "=", $id));
} else {
$status = db::build()->insert(
"caches",
array("key" => $id, "tags" => $tags, "expiration" => $lifetime, "cache" => serialize($data)));
}
}
return count($status) > 0;
return true;
}
/**
* Finds an array of ids for a given tag.
*
* @param string tag name
* @return array of ids that match the tag
* Get cache items by tag
* @param array cache tags
* @return array cached data
*/
public function find($tag) {
$db_result = $this->db->from("caches")
->like("tags", "<$tag>")
->get()
->result(true);
public function get_tag($tags) {
$db = db::build()->from("caches");
foreach ($tags as $tag) {
$db->where("tags", "like", "<$tag>");
}
$db_result = $db->execute()->as_array();
// An array will always be returned
$result = array();
// Disable notices for unserializing
$ER = error_reporting(~E_NOTICE);
if ($db_result->count() > 0) {
// Disable notices for unserializing
$ER = error_reporting(~E_NOTICE);
foreach ($db_result as $row) {
// Add each cache to the array
$result[$row->key] = unserialize($row->cache);
}
// Turn notices back on
error_reporting($ER);
}
error_reporting($ER);
return $result;
}
@@ -120,9 +110,13 @@ class Cache_Database_Driver implements Cache_Driver {
* @param string cache id
* @return mixed|NULL
*/
public function get($id) {
public function get($keys, $single=false) {
$data = null;
$result = $this->db->getwhere("caches", array("key" => $id));
$result = db::build()
->from("caches")
->where("key", "IN", $keys)
->select()
->execute();
if (count($result) > 0) {
$cache = $result->current();
@@ -168,6 +162,13 @@ class Cache_Database_Driver implements Cache_Driver {
return count($status) > 0;
}
/**
* Delete cache items by tag
*/
public function delete_tag($tags) {
return $this->delete($tags, true);
}
/**
* Deletes all cache files that are older than the current time.
*/
@@ -180,4 +181,10 @@ class Cache_Database_Driver implements Cache_Driver {
return count($status) > 0;
}
} // End Cache Database Driver
/**
* Empty the cache
*/
public function delete_all() {
db::build()->query("TRUNCATE {caches}");
}
}

6
modules/gallery/models/item.php
View File

@@ -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 {

2
modules/gallery/models/log.php
View File

@@ -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 {

8
modules/gallery/tests/Access_Helper_Test.php
View File

@@ -106,15 +106,15 @@ class Access_Helper_Test extends Unit_Test_Case {
$item = album::create($root, rand(), "test album");
// New rows exist
$this->assert_true(ORM::factory("access_cache")->where("item_id", $item->id)->find()->loaded);
$this->assert_true(ORM::factory("access_intent")->where("item_id", $item->id)->find()->loaded);
$this->assert_true(ORM::factory("access_cache")->where("item_id", $item->id)->find()->loaded());
$this->assert_true(ORM::factory("access_intent")->where("item_id", $item->id)->find()->loaded());
// Delete the item
$item->delete();
// Rows are gone
$this->assert_false(ORM::factory("access_cache")->where("item_id", $item->id)->find()->loaded);
$this->assert_false(ORM::factory("access_intent")->where("item_id", $item->id)->find()->loaded);
$this->assert_false(ORM::factory("access_cache")->where("item_id", $item->id)->find()->loaded());
$this->assert_false(ORM::factory("access_intent")->where("item_id", $item->id)->find()->loaded());
}
public function new_photos_inherit_parent_permissions_test() {

2
modules/gallery/views/kohana_error_page.php
View File

@@ -120,7 +120,7 @@
<? else: ?>
<? $trace = $PHP_ERROR ? array_slice(debug_backtrace(), 1) : $exception->getTraceAsString(); ?>
<? if (!empty($trace)): ?>
<? Kohana::Log("error", print_r($trace, 1)); ?>
<? Kohana_Log::add("error", print_r($trace, 1)); ?>
<? endif ?>
<? endif ?>
</body>

2
modules/notification/helpers/notification.php
View File

@@ -38,7 +38,7 @@ class notification {
->where("item_id", $item->id)
->where("user_id", $user->id)
->find()
->loaded;
->loaded();
}
static function add_watch($item, $user=null) {

28
modules/notification/helpers/notification_event.php
View File

@@ -25,8 +25,8 @@ class notification_event_Core {
try {
notification::send_item_updated($new);
} catch (Exception $e) {
Kohana::log("error", "@todo notification_event::item_updated() failed");
Kohana::Log("error", $e->getMessage() . "\n" . $e->getTraceAsString());
Kohana_Log::add("error", "@todo notification_event::item_updated() failed");
Kohana_Log::add("error", $e->getMessage() . "\n" . $e->getTraceAsString());
}
}
@@ -34,8 +34,8 @@ class notification_event_Core {
try {
notification::send_item_add($item);
} catch (Exception $e) {
Kohana::log("error", "@todo notification_event::item_created() failed");
Kohana::Log("error", $e->getMessage() . "\n" . $e->getTraceAsString());
Kohana_Log::add("error", "@todo notification_event::item_created() failed");
Kohana_Log::add("error", $e->getMessage() . "\n" . $e->getTraceAsString());
}
}
@@ -47,8 +47,8 @@ class notification_event_Core {
notification::remove_watch($item);
}
} catch (Exception $e) {
Kohana::log("error", "@todo notification_event::item_deleted() failed");
Kohana::Log("error", $e->getMessage() . "\n" . $e->getTraceAsString());
Kohana_Log::add("error", "@todo notification_event::item_deleted() failed");
Kohana_Log::add("error", $e->getMessage() . "\n" . $e->getTraceAsString());
}
}
@@ -69,8 +69,8 @@ class notification_event_Core {
notification::send_comment_published($comment);
}
} catch (Exception $e) {
Kohana::log("error", "@todo notification_event::comment_created() failed");
Kohana::Log("error", $e->getMessage() . "\n" . $e->getTraceAsString());
Kohana_Log::add("error", "@todo notification_event::comment_created() failed");
Kohana_Log::add("error", $e->getMessage() . "\n" . $e->getTraceAsString());
}
}
@@ -80,8 +80,8 @@ class notification_event_Core {
notification::send_comment_published($new);
}
} catch (Exception $e) {
Kohana::log("error", "@todo notification_event::comment_updated() failed");
Kohana::Log("error", $e->getMessage() . "\n" . $e->getTraceAsString());
Kohana_Log::add("error", "@todo notification_event::comment_updated() failed");
Kohana_Log::add("error", $e->getMessage() . "\n" . $e->getTraceAsString());
}
}
@@ -91,8 +91,8 @@ class notification_event_Core {
->where("user_id", $user->id)
->delete_all();
} catch (Exception $e) {
Kohana::log("error", "@todo notification_event::user_before_delete() failed");
Kohana::Log("error", $e->getMessage() . "\n" . $e->getTraceAsString());
Kohana_Log::add("error", "@todo notification_event::user_before_delete() failed");
Kohana_Log::add("error", $e->getMessage() . "\n" . $e->getTraceAsString());
}
}
@@ -100,8 +100,8 @@ class notification_event_Core {
try {
notification::send_pending_notifications();
} catch (Exception $e) {
Kohana::log("error", "@todo notification_event::batch_complete() failed");
Kohana::Log("error", $e->getMessage() . "\n" . $e->getTraceAsString());
Kohana_Log::add("error", "@todo notification_event::batch_complete() failed");
Kohana_Log::add("error", $e->getMessage() . "\n" . $e->getTraceAsString());
}
}

2
modules/search/helpers/search.php
View File

@@ -61,7 +61,7 @@ class search_Core {
static function update($item) {
$data = new ArrayObject();
$record = ORM::factory("search_record")->where("item_id", $item->id)->find();
if (!$record->loaded) {
if (!$record->loaded()) {
$record->item_id = $item->id;
}

4
modules/server_add/controllers/server_add.php
View File

@@ -103,7 +103,7 @@ class Server_Add_Controller extends Admin_Controller {
access::verify_csrf();
$task = ORM::factory("task", $task_id);
if (!$task->loaded || $task->owner_id != identity::active_user()->id) {
if (!$task->loaded() || $task->owner_id != identity::active_user()->id) {
access::forbidden();
}
@@ -216,7 +216,7 @@ class Server_Add_Controller extends Admin_Controller {
// Look up the parent item for this entry. By now it should exist, but if none was
// specified, then this belongs as a child of the current item.
$parent_entry = ORM::factory("server_add_file", $entry->parent_id);
if (!$parent_entry->loaded) {
if (!$parent_entry->loaded()) {
$parent = ORM::factory("item", $task->get("item_id"));
} else {
$parent = ORM::factory("item", $parent_entry->item_id);

8
modules/tag/controllers/admin_tags.php
View File

@@ -35,7 +35,7 @@ class Admin_Tags_Controller extends Admin_Controller {
public function form_delete($id) {
$tag = ORM::factory("tag", $id);
if ($tag->loaded) {
if ($tag->loaded()) {
print tag::get_delete_form($tag);
}
}
@@ -44,7 +44,7 @@ class Admin_Tags_Controller extends Admin_Controller {
access::verify_csrf();
$tag = ORM::factory("tag", $id);
if (!$tag->loaded) {
if (!$tag->loaded()) {
kohana::show_404();
}
@@ -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,7 +79,7 @@ class Admin_Tags_Controller extends Admin_Controller {
access::verify_csrf();
$tag = ORM::factory("tag", $id);
if (!$tag->loaded) {
if (!$tag->loaded()) {
kohana::show_404();
}

2
modules/tag/helpers/tag.php
View File

@@ -34,7 +34,7 @@ class tag_Core {
}
$tag = ORM::factory("tag")->where("name", $tag_name)->find();
if (!$tag->loaded) {
if (!$tag->loaded()) {
$tag->name = $tag_name;
$tag->count = 0;
$tag->save();

2
modules/tag/helpers/tag_event.php
View File

@@ -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());
}
}

2
modules/tag/helpers/tag_rss.php
View File

@@ -31,7 +31,7 @@ class tag_rss_Core {
static function feed($feed_id, $offset, $limit, $id) {
if ($feed_id == "tag") {
$tag = ORM::factory("tag", $id);
if (!$tag->loaded) {
if (!$tag->loaded()) {
Kohana::show_404();
}
$feed->children = $tag->items($limit, $offset, "photo");

2
modules/user/controllers/admin_users.php
View File

@@ -265,7 +265,7 @@ class Admin_Users_Controller extends Admin_Controller {
if ($valid) {
$new_name = $form->edit_group->inputs["name"]->value;
$group = group::lookup_by_name($name);
if ($group->loaded) {
if ($group->loaded()) {
$form->edit_group->inputs["name"]->add_error("in_use", 1);
$valid = false;
}

2
modules/user/controllers/password.php
View File

@@ -47,7 +47,7 @@ class Password_Controller extends Controller {
$valid = $form->validate();
if ($valid) {
$user = user::lookup_by_name($form->reset->inputs["name"]->value);
if (!$user->loaded || empty($user->email)) {
if (!$user->loaded() || empty($user->email)) {
$form->reset->inputs["name"]->add_error("no_email", 1);
$valid = false;
}

4
modules/user/helpers/group.php
View File

@@ -32,7 +32,7 @@ class group_Core {
*/
static function create($name) {
$group = ORM::factory("group")->where("name", $name)->find();
if ($group->loaded) {
if ($group->loaded()) {
throw new Exception("@todo GROUP_ALREADY_EXISTS $name");
}
@@ -86,7 +86,7 @@ class group_Core {
private static function _lookup_by_field($field_name, $value) {
try {
$user = model_cache::get("group", $value, $field_name);
if ($user->loaded) {
if ($user->loaded()) {
return $user;
}
} catch (Exception $e) {

4
modules/user/helpers/user.php
View File

@@ -45,7 +45,7 @@ class user_Core {
*/
static function create($name, $full_name, $password) {
$user = ORM::factory("user")->where("name", $name)->find();
if ($user->loaded) {
if ($user->loaded()) {
throw new Exception("@todo USER_ALREADY_EXISTS $name");
}
@@ -163,7 +163,7 @@ class user_Core {
private static function _lookup_user_by_field($field_name, $value) {
try {
$user = model_cache::get("user", $value, $field_name);
if ($user->loaded) {
if ($user->loaded()) {
return $user;
}
} catch (Exception $e) {

2
modules/user/models/group.php
View File

@@ -34,7 +34,7 @@ class Group_Model extends ORM implements Group_Definition {
}
public function save() {
if (!$this->loaded) {
if (!$this->loaded()) {
$created = 1;
}
parent::save();

2
modules/user/models/user.php
View File

@@ -62,7 +62,7 @@ class User_Model extends ORM implements User_Definition {
}
public function save() {
if (!$this->loaded) {
if (!$this->loaded()) {
$created = 1;
}
parent::save();

4
modules/user/tests/User_Groups_Test.php
View File

@@ -22,14 +22,14 @@ class User_Groups_Test extends Unit_Test_Case {
public function teardown() {
try {
$group = ORM::factory("group")->where("name", "user_groups_test")->find();
if ($group->loaded) {
if ($group->loaded()) {
$group->delete();
}
} catch (Exception $e) { }
try {
$user = ORM::factory("user")->where("name", "user_groups_test")->find();
if ($user->loaded) {
if ($user->loaded()) {
$user->delete();
}
} catch (Exception $e) { }