Formatted to Gallery3 coding standards (I hope!)

modules/user_homes/helpers/user_homes_event.php

@@ -1,25 +1,38 @@
 <?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
    * 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)
+  static function user_login($user) {
-	{
+    $home = ORM::factory("user_home")->where("id", $user->id)->find();
-		$home = ORM::factory("user_home")
+    if ($home) {
-			->where("id", $user->id)->find();
+      if ($home->home!=0) {
-	  	if ($home)
-		{
-			if ($home->home!=0)
-			{
         $session = Session::instance();
         $session->set("redirect_home",$home->home);
       }
     }
-
   }
 
   /**
@@ -27,27 +40,22 @@ class user_homes_event_Core
    * 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()
+  static function gallery_ready() {
-	{
-		
     $session = Session::instance();
     $home = $session->get("redirect_home");
-		if ($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) 
+  static function user_before_delete($user) {
-	{
     ORM::factory("user_home")
         ->where("id", $user->id)
         ->delete_all();
@@ -56,8 +64,7 @@ class user_homes_event_Core
   /**
    * 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")
           ->label(t("Home Gallery"))
           ->options(self::createGalleryArray())
@@ -67,10 +74,8 @@ class user_homes_event_Core
   /**
    * 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")
-			->where("id", $user->id)->find();
     $home->id=$user->id;
     $home->home=$form->add_user->user_home->value;
     $home->save();
@@ -79,17 +84,12 @@ class user_homes_event_Core
   /**
    * 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")
-			->where("id", $user->id)->find();
 
-		if ($home)
+    if ($home) {
-		{
       $selected = $home->home;
-		}
+    } else {
-		else
-		{
       $selected = 0;
     }
     $form->edit_user->dropdown("user_home")
@@ -97,36 +97,30 @@ class user_homes_event_Core
                     ->options(self::createGalleryArray())
                     ->selected($selected);
   }
+
   /**
    * called after a user had been edited by the admin
    */
-	static function user_edit_form_admin_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")
-			->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)
+  static function user_edit_form($user, $form) {
-	{
+    $home = ORM::factory("user_home")->where("id", $user->id)->find();
-		$home = ORM::factory("user_home")
-			->where("id", $user->id)->find();
 
-		if ($home)
+    if ($home) {
-		{
       $selected = $home->home;
-		}
+    } else {
-		else
-		{
       $selected = 0;
     }
+
     $form->edit_user->dropdown("user_home")
                     ->label(t("Home Gallery"))
                     ->options(self::createGalleryArray())
@@ -136,39 +130,30 @@ class user_homes_event_Core
   /**
    * called after a user had been edited by the user
    */
-	static function user_edit_form_completed($user, $form)
+  static function user_edit_form_completed($user, $form) {
-	{
+    $home = ORM::factory("user_home")->where("id", $user->id)->find();
-		$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()
+  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) 
+  static function tree($parent, $dashes, &$array) {
-	{
+    if ($parent->id == "1") {
-    		if ($parent->id == "1")
-		{
       $array[$parent->id] = "home";
-    		}
+    } else {
-    		else
-		{
       $array[$parent->id] = "$dashes $parent->name";
     }
 
@@ -176,12 +161,9 @@ class user_homes_event_Core
         ->where(array("parent_id" => $parent->id, "type" => "album"))
         ->orderby(array("title" => "ASC"))
         ->find_all();
-		foreach ($albums as $album) 
+    foreach ($albums as $album) {
-		{
       self::tree($album, "-$dashes", $array);
     }
     return;
   }
-
-	
 }

modules/user_homes/helpers/user_homes_installer.php

@@ -1,9 +1,25 @@
 <?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);
   }
 
@@ -11,9 +27,7 @@ class user_homes_installer
    * installs the the table of user homes when the
    * module is installed
    */
-	 
+  static function activate() {
-	static function activate()
-	{
     $db = Database::instance();
     $db->query("CREATE TABLE IF NOT EXISTS {user_homes} (
                   `id` int(9) NOT NULL,
@@ -27,8 +41,7 @@ class user_homes_installer
    * drops the table of user homes when the
    * module is uninstalled
    */
-	static function deactivate() 
+  static function deactivate() {
-	{
     $db = Database::instance();
     $db->query("DROP TABLE IF EXISTS {user_homes};");
   }

modules/user_homes/models/user_home.php

@@ -1,5 +1,22 @@
 <?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 {
 }