1
0

Merge commit 'gallery3-contrib/master'

This commit is contained in:
rWatcher 2009-08-04 00:55:20 -04:00
commit 4cda882daa
3 changed files with 207 additions and 202 deletions

View File

@ -1,63 +1,65 @@
<?php defined("SYSPATH") or die("No direct script access."); <?php defined("SYSPATH") or die("No direct script access.");
/**
* Gallery - a web based photo album viewer and editor
* Copyright (C) 2000-2009 Bharat Mediratta
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
class user_homes_event_Core 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 * user home if it exists on the database. This means when the page
* is refreshed after logging in the direction can occur. * is refreshed after logging in the direction can occur.
*/ */
static function user_login($user) static function user_login($user) {
{ $home = ORM::factory("user_home")->where("id", $user->id)->find();
$home = ORM::factory("user_home") if ($home->loaded && $home->home != 0) {
->where("id", $user->id)->find(); Session::instance()->set("redirect_home", $home->home);
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. * 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 * if the home variable exists on the session then a redirect will
* occur to that home and the variable removed from the session to * occur to that home and the variable removed from the session to
*/ */
static function gallery_ready() static function gallery_ready() {
{
$session = Session::instance(); $session = Session::instance();
$home = $session->get("redirect_home"); $home = $session->get("redirect_home");
if ($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); $session->set("redirect_home",null);
url::redirect("albums/$home"); 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. * the user_homes directory.
*/ */
static function user_before_delete($user) static function user_before_delete($user) {
{
ORM::factory("user_home") ORM::factory("user_home")
->where("id", $user->id) ->where("id", $user->id)
->delete_all(); ->delete_all();
} }
/** /**
* called when admin is adding a user * Called when admin is adding a user
*/ */
static function user_add_form_admin($user, $form) static function user_add_form_admin($user, $form) {
{
$form->add_user->dropdown("user_home") $form->add_user->dropdown("user_home")
->label(t("Home Gallery")) ->label(t("Home Gallery"))
->options(self::createGalleryArray()) ->options(self::createGalleryArray())
@ -65,66 +67,23 @@ class user_homes_event_Core
} }
/** /**
* called after a user has been added * Called after a user has been added
*/ */
static function user_add_form_admin_completed($user, $form) static function user_add_form_admin_completed($user, $form) {
{ $home = ORM::factory("user_home")->where("id", $user->id)->find();
$home = ORM::factory("user_home") $home->id = $user->id;
->where("id", $user->id)->find(); $home->home = $form->add_user->user_home->value;
$home->id=$user->id;
$home->home=$form->add_user->user_home->value;
$home->save(); $home->save();
} }
/** /**
* called when admin is editing a user * Called when admin is editing a user
*/ */
static function user_edit_form_admin($user, $form) static function user_edit_form_admin($user, $form) {
{ $home = ORM::factory("user_home")->where("id", $user->id)->find();
$home = ORM::factory("user_home") if ($home->loaded) {
->where("id", $user->id)->find();
if ($home)
{
$selected = $home->home; $selected = $home->home;
} } else {
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 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; $selected = 0;
} }
$form->edit_user->dropdown("user_home") $form->edit_user->dropdown("user_home")
@ -134,41 +93,61 @@ class user_homes_event_Core
} }
/** /**
* called after a user had been edited by the user * Called after a user had been edited by the admin
*/ */
static function user_edit_form_completed($user, $form) static function user_edit_form_admin_completed($user, $form) {
{ $home = ORM::factory("user_home")->where("id", $user->id)->find();
$home = ORM::factory("user_home") $home->id = $user->id;
->where("id", $user->id)->find(); $home->home = $form->edit_user->user_home->value;
$home->id=$user->id;
$home->home=$form->edit_user->user_home->value;
$home->save(); $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->loaded) {
$selected = $home->home;
} else {
$selected = 0;
}
$form->edit_user->dropdown("user_home")
->label(t("Home Gallery"))
->options(self::createGalleryArray())
->selected($selected);
} }
/** /**
* creates an array of galleries * Called after a user had been edited by the user
*/ */
static function createGalleryArray() 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"; $array[0] = "none";
$root = ORM::factory("item", 1); $root = ORM::factory("item", 1);
self::tree($root, "", $array); self::tree($root, "", $array);
return $array; return $array;
} }
/** /**
* recursive function to build array for drop down list * recursive function to build array for drop down list
*/ */
static function tree($parent, $dashes, &$array) static function tree($parent, $dashes, &$array) {
{ if ($parent->id == "1") {
if ($parent->id == "1") $array[$parent->id] = ORM::factory("item", 1)->title;
{ } else {
$array[$parent->id] = "home";
}
else
{
$array[$parent->id] = "$dashes $parent->name"; $array[$parent->id] = "$dashes $parent->name";
} }
@ -176,12 +155,9 @@ class user_homes_event_Core
->where(array("parent_id" => $parent->id, "type" => "album")) ->where(array("parent_id" => $parent->id, "type" => "album"))
->orderby(array("title" => "ASC")) ->orderby(array("title" => "ASC"))
->find_all(); ->find_all();
foreach ($albums as $album) foreach ($albums as $album) {
{
self::tree($album, "-$dashes", $array); self::tree($album, "-$dashes", $array);
} }
return; return;
} }
} }

View File

@ -1,19 +1,32 @@
<?php defined("SYSPATH") or die("No direct script access."); <?php defined("SYSPATH") or die("No direct script access.");
/**
* Gallery - a web based photo album viewer and editor
* Copyright (C) 2000-2009 Bharat Mediratta
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
class user_homes_installer class user_homes_installer {
{ static function install() {
static function install()
{
module::set_version("user_homes", 1); module::set_version("user_homes", 1);
} }
/** /**
* installs the the table of user homes when the * Installs the table of user homes when the module is installed.
* module is installed
*/ */
static function activate() {
static function activate()
{
$db = Database::instance(); $db = Database::instance();
$db->query("CREATE TABLE IF NOT EXISTS {user_homes} ( $db->query("CREATE TABLE IF NOT EXISTS {user_homes} (
`id` int(9) NOT NULL, `id` int(9) NOT NULL,
@ -21,14 +34,13 @@ class user_homes_installer
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
UNIQUE KEY(`id`)) UNIQUE KEY(`id`))
ENGINE=InnoDB DEFAULT CHARSET=utf8;"); ENGINE=InnoDB DEFAULT CHARSET=utf8;");
module::set_version("user_homes", 1);
} }
/** /**
* drops the table of user homes when the * Drops the table of user homes when the module is uninstalled.
* module is uninstalled
*/ */
static function deactivate() static function deactivate() {
{
$db = Database::instance(); $db = Database::instance();
$db->query("DROP TABLE IF EXISTS {user_homes};"); $db->query("DROP TABLE IF EXISTS {user_homes};");
} }

View File

@ -1,5 +1,22 @@
<?php defined("SYSPATH") or die("No direct script access."); <?php defined("SYSPATH") or die("No direct script access.");
class User_home_Model extends ORM /**
{ * Gallery - a web based photo album viewer and editor
* Copyright (C) 2000-2009 Bharat Mediratta
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
class User_home_Model extends ORM {
} }