1
0

More coding style tweaks

This commit is contained in:
Bharat Mediratta 2009-08-02 20:36:03 -07:00
parent a765d88d17
commit 8f8d87bad8
3 changed files with 40 additions and 47 deletions

View File

@ -1,5 +1,5 @@
<?php defined("SYSPATH") or die("No direct script access.");
/*
/**
* Gallery - a web based photo album viewer and editor
* Copyright (C) 2000-2009 Bharat Mediratta
*
@ -19,19 +19,15 @@
*/
class user_homes_event_Core {
/**
* called when a user logs in. This will setup the session with the
* 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);
}
if ($home->loaded && $home->home != 0) {
Session::instance()->set("redirect_home", $home->home);
}
}
@ -44,101 +40,99 @@ class user_homes_event_Core {
$session = Session::instance();
$home = $session->get("redirect_home");
if ($home) {
// remove from session to ensure redirect does not
// occur again
// 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
* 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();
->where("id", $user->id)
->delete_all();
}
/**
* called when admin is adding a user
* 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);
->label(t("Home Gallery"))
->options(self::createGalleryArray())
->selected(0);
}
/**
* called after a user has been added
* 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->id = $user->id;
$home->home = $form->add_user->user_home->value;
$home->save();
}
/**
* called when admin is editing a user
* 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) {
if ($home->loaded) {
$selected = $home->home;
} else {
$selected = 0;
}
$form->edit_user->dropdown("user_home")
->label(t("Home Gallery"))
->options(self::createGalleryArray())
->selected($selected);
->label(t("Home Gallery"))
->options(self::createGalleryArray())
->selected($selected);
}
/**
* called after a user had been edited by the admin
* 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->id = $user->id;
$home->home = $form->edit_user->user_home->value;
$home->save();
}
/**
* called when user is editing their own form
* 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) {
if ($home->loaded) {
$selected = $home->home;
} else {
$selected = 0;
}
$form->edit_user->dropdown("user_home")
->label(t("Home Gallery"))
->options(self::createGalleryArray())
->selected($selected);
->label(t("Home Gallery"))
->options(self::createGalleryArray())
->selected($selected);
}
/**
* called after a user had been edited by the user
* 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->id = $user->id;
$home->home = $form->edit_user->user_home->value;
$home->save();
}
/**
* creates an array of galleries
* Creates an array of galleries
*/
static function createGalleryArray() {
$array[0] = "none";
@ -158,9 +152,9 @@ class user_homes_event_Core {
}
$albums = ORM::factory("item")
->where(array("parent_id" => $parent->id, "type" => "album"))
->orderby(array("title" => "ASC"))
->find_all();
->where(array("parent_id" => $parent->id, "type" => "album"))
->orderby(array("title" => "ASC"))
->find_all();
foreach ($albums as $album) {
self::tree($album, "-$dashes", $array);
}

View File

@ -1,5 +1,5 @@
<?php defined("SYSPATH") or die("No direct script access.");
/*
/**
* Gallery - a web based photo album viewer and editor
* Copyright (C) 2000-2009 Bharat Mediratta
*
@ -24,8 +24,7 @@ class user_homes_installer {
}
/**
* installs the the table of user homes when the
* module is installed
* Installs the table of user homes when the module is installed.
*/
static function activate() {
$db = Database::instance();
@ -35,11 +34,11 @@ class user_homes_installer {
PRIMARY KEY (`id`),
UNIQUE KEY(`id`))
ENGINE=InnoDB DEFAULT CHARSET=utf8;");
module::set_version("user_homes", 1);
}
/**
* drops the table of user homes when the
* module is uninstalled
* Drops the table of user homes when the module is uninstalled.
*/
static function deactivate() {
$db = Database::instance();

View File

@ -1,5 +1,5 @@
<?php defined("SYSPATH") or die("No direct script access.");
/*
/**
* Gallery - a web based photo album viewer and editor
* Copyright (C) 2000-2009 Bharat Mediratta
*