From 8751bf10d261aba68999f0fab26b5e9bd652a40c Mon Sep 17 00:00:00 2001 From: Ben Smith Date: Sun, 2 Aug 2009 19:17:36 +1200 Subject: [PATCH] Formatted to Gallery3 coding standards (I hope!) --- .../user_homes/helpers/user_homes_event.php | 320 +++++++++--------- .../helpers/user_homes_installer.php | 73 ++-- modules/user_homes/models/user_home.php | 21 +- 3 files changed, 213 insertions(+), 201 deletions(-) diff --git a/modules/user_homes/helpers/user_homes_event.php b/modules/user_homes/helpers/user_homes_event.php index 7636079a..00842f23 100644 --- a/modules/user_homes/helpers/user_homes_event.php +++ b/modules/user_homes/helpers/user_homes_event.php @@ -1,187 +1,169 @@ where("id", $user->id)->find(); - if ($home) - { - if ($home->home!=0) - { - $session = Session::instance(); - $session->set("redirect_home",$home->home); - } - } +class user_homes_event_Core { - } + /** + * called when a user logs in. This will setup the session with the + * user home if it exists on the database. This means when the page + * is refreshed after logging in the direction can occur. + */ + static function user_login($user) { + $home = ORM::factory("user_home")->where("id", $user->id)->find(); + if ($home) { + if ($home->home!=0) { + $session = Session::instance(); + $session->set("redirect_home",$home->home); + } + } + } - /** - * called after a log in occurs and when the first gallery is loaded. - * if the home variable exists on the session then a redirect will - * occur to that home and the variable removed from the session to - */ - static function gallery_ready() - { - - $session = Session::instance(); - $home = $session->get("redirect_home"); - if ($home) - { - // remove from session to ensure redirect does not - // occur again - $session->set("redirect_home",null); - url::redirect("albums/$home"); - } + /** + * called after a log in occurs and when the first gallery is loaded. + * if the home variable exists on the session then a redirect will + * occur to that home and the variable removed from the session to + */ + static function gallery_ready() { + $session = Session::instance(); + $home = $session->get("redirect_home"); + if ($home) { + // remove from session to ensure redirect does not + // occur again + $session->set("redirect_home",null); + url::redirect("albums/$home"); + } + } - } + /** + * called just before a user is deleted. This will remove the user from + * the user_homes directory. + */ + static function user_before_delete($user) { + ORM::factory("user_home") + ->where("id", $user->id) + ->delete_all(); + } - /** - * called just before a user is deleted. This will remove the user from - * the user_homes directory. - */ - static function user_before_delete($user) - { - ORM::factory("user_home") - ->where("id", $user->id) - ->delete_all(); - } + /** + * called when admin is adding a user + */ + static function user_add_form_admin($user, $form) { + $form->add_user->dropdown("user_home") + ->label(t("Home Gallery")) + ->options(self::createGalleryArray()) + ->selected(0); + } - /** - * called when admin is adding a user - */ - static function user_add_form_admin($user, $form) - { - $form->add_user->dropdown("user_home") - ->label(t("Home Gallery")) - ->options(self::createGalleryArray()) - ->selected(0); - } + /** + * called after a user has been added + */ + static function user_add_form_admin_completed($user, $form) { + $home = ORM::factory("user_home")->where("id", $user->id)->find(); + $home->id=$user->id; + $home->home=$form->add_user->user_home->value; + $home->save(); + } - /** - * called after a user has been added - */ - static function user_add_form_admin_completed($user, $form) - { - $home = ORM::factory("user_home") - ->where("id", $user->id)->find(); - $home->id=$user->id; - $home->home=$form->add_user->user_home->value; - $home->save(); - } + /** + * called when admin is editing a user + */ + static function user_edit_form_admin($user, $form) { + $home = ORM::factory("user_home")->where("id", $user->id)->find(); - /** - * called when admin is editing a user - */ - static function user_edit_form_admin($user, $form) - { - $home = ORM::factory("user_home") - ->where("id", $user->id)->find(); + if ($home) { + $selected = $home->home; + } else { + $selected = 0; + } + $form->edit_user->dropdown("user_home") + ->label(t("Home Gallery")) + ->options(self::createGalleryArray()) + ->selected($selected); + } - if ($home) - { - $selected = $home->home; - } - else - { - $selected = 0; - } - $form->edit_user->dropdown("user_home") - ->label(t("Home Gallery")) - ->options(self::createGalleryArray()) - ->selected($selected); - } - /** - * called after a user had been edited by the admin - */ - static function user_edit_form_admin_completed($user, $form) - { - $home = ORM::factory("user_home") - ->where("id", $user->id)->find(); - $home->id=$user->id; - $home->home=$form->edit_user->user_home->value; - $home->save(); - - } + /** + * called after a user had been edited by the admin + */ + static function user_edit_form_admin_completed($user, $form) { + $home = ORM::factory("user_home")->where("id", $user->id)->find(); + $home->id=$user->id; + $home->home=$form->edit_user->user_home->value; + $home->save(); + } - - /** - * called when user is editing their own form - */ - static function user_edit_form($user, $form) - { - $home = ORM::factory("user_home") - ->where("id", $user->id)->find(); - if ($home) - { - $selected = $home->home; - } - else - { - $selected = 0; - } - $form->edit_user->dropdown("user_home") - ->label(t("Home Gallery")) - ->options(self::createGalleryArray()) - ->selected($selected); - } + /** + * called when user is editing their own form + */ + static function user_edit_form($user, $form) { + $home = ORM::factory("user_home")->where("id", $user->id)->find(); - /** - * called after a user had been edited by the user - */ - static function user_edit_form_completed($user, $form) - { - $home = ORM::factory("user_home") - ->where("id", $user->id)->find(); - $home->id=$user->id; - $home->home=$form->edit_user->user_home->value; - $home->save(); - - } - - /** - * creates an array of galleries - */ - static function createGalleryArray() - { - $array[0] = "none"; - $root = ORM::factory("item", 1); - self::tree($root, "", $array); + if ($home) { + $selected = $home->home; + } else { + $selected = 0; + } - return $array; - } + $form->edit_user->dropdown("user_home") + ->label(t("Home Gallery")) + ->options(self::createGalleryArray()) + ->selected($selected); + } - /** - * recursive function to build array for drop down list - */ - static function tree($parent, $dashes, &$array) - { - if ($parent->id == "1") - { - $array[$parent->id] = "home"; - } - else - { - $array[$parent->id] = "$dashes $parent->name"; - } + /** + * called after a user had been edited by the user + */ + static function user_edit_form_completed($user, $form) { + $home = ORM::factory("user_home")->where("id", $user->id)->find(); + $home->id=$user->id; + $home->home=$form->edit_user->user_home->value; + $home->save(); + } - $albums = ORM::factory("item") - ->where(array("parent_id" => $parent->id, "type" => "album")) - ->orderby(array("title" => "ASC")) - ->find_all(); - foreach ($albums as $album) - { - self::tree($album, "-$dashes", $array); - } - return; - } + /** + * creates an array of galleries + */ + static function createGalleryArray() { + $array[0] = "none"; + $root = ORM::factory("item", 1); + self::tree($root, "", $array); + return $array; + } - + /** + * recursive function to build array for drop down list + */ + static function tree($parent, $dashes, &$array) { + if ($parent->id == "1") { + $array[$parent->id] = "home"; + } else { + $array[$parent->id] = "$dashes $parent->name"; + } + + $albums = ORM::factory("item") + ->where(array("parent_id" => $parent->id, "type" => "album")) + ->orderby(array("title" => "ASC")) + ->find_all(); + foreach ($albums as $album) { + self::tree($album, "-$dashes", $array); + } + return; + } } diff --git a/modules/user_homes/helpers/user_homes_installer.php b/modules/user_homes/helpers/user_homes_installer.php index ff464736..e29e6844 100644 --- a/modules/user_homes/helpers/user_homes_installer.php +++ b/modules/user_homes/helpers/user_homes_installer.php @@ -1,35 +1,48 @@ query("CREATE TABLE IF NOT EXISTS {user_homes} ( - `id` int(9) NOT NULL, - `home` int(9) default NULL, - PRIMARY KEY (`id`), - UNIQUE KEY(`id`)) - ENGINE=InnoDB DEFAULT CHARSET=utf8;"); - } + /** + * installs the the table of user homes when the + * module is installed + */ + static function activate() { + $db = Database::instance(); + $db->query("CREATE TABLE IF NOT EXISTS {user_homes} ( + `id` int(9) NOT NULL, + `home` int(9) default NULL, + PRIMARY KEY (`id`), + UNIQUE KEY(`id`)) + ENGINE=InnoDB DEFAULT CHARSET=utf8;"); + } - /** - * drops the table of user homes when the - * module is uninstalled - */ - static function deactivate() - { - $db = Database::instance(); - $db->query("DROP TABLE IF EXISTS {user_homes};"); - } + /** + * drops the table of user homes when the + * module is uninstalled + */ + static function deactivate() { + $db = Database::instance(); + $db->query("DROP TABLE IF EXISTS {user_homes};"); + } } diff --git a/modules/user_homes/models/user_home.php b/modules/user_homes/models/user_home.php index 83cef0df..5b773877 100644 --- a/modules/user_homes/models/user_home.php +++ b/modules/user_homes/models/user_home.php @@ -1,5 +1,22 @@