From cc3247e481543b3b994fccd8ffc5fc652200e284 Mon Sep 17 00:00:00 2001
From: Miles Lott <milosch@alumni.egroupware.org>
Date: Sun, 23 Sep 2001 19:23:49 +0000
Subject: [PATCH] formatting

---
 phpgwapi/inc/class.hooks.inc.php | 39 +++++++++++++++-----------------
 phpgwapi/inc/class.vfs.inc.php   | 12 ++++------
 2 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/phpgwapi/inc/class.hooks.inc.php b/phpgwapi/inc/class.hooks.inc.php
index ff33c44897..187caa3311 100644
--- a/phpgwapi/inc/class.hooks.inc.php
+++ b/phpgwapi/inc/class.hooks.inc.php
@@ -39,15 +39,14 @@
 		*/
 		function read()
 		{
-			global $phpgw;
-			$db = $phpgw->db;
+			$db = $GLOBALS['phpgw']->db;
 
-			$db->query("select * from phpgw_hooks");
+			$db->query('select * from phpgw_hooks');
 			while ($db->next_record())
 			{
-				$return_array[$db->f("hook_id")]["app"]      = $db->f("hook_appname");
-				$return_array[$db->f("hook_id")]["location"] = $db->f("hook_location");
-				$return_array[$db->f("hook_id")]["filename"] = $db->f("hook_filename");
+				$return_array[$db->f('hook_id')]['app']      = $db->f('hook_appname');
+				$return_array[$db->f('hook_id')]['location'] = $db->f('hook_location');
+				$return_array[$db->f('hook_id')]['filename'] = $db->f('hook_filename');
 			}
 			if(isset($return_array))
 			{
@@ -66,14 +65,12 @@
 		@param \$type 
 		@param \$where
 		*/
-		function process($type,$where = "")
+		function process($type,$where='')
 		{
-			global $phpgw_info, $phpgw;
-
-			$currentapp = $phpgw_info["flags"]["currentapp"];
+			$currentapp = $GLOBALS['phpgw_info']['flags']['currentapp'];
 			$type = strtolower($type);
 
-			if ($type != "location" && $type != "app")
+			if ($type != 'location' && $type != 'app')
 			{
 				return False;
 			}
@@ -81,15 +78,15 @@
 			// Add a check to see if that location/app has a hook
 			// This way it doesn't have to loop everytime
 
-			while ($hook = each($phpgw_info["hooks"]))
+			while ($hook = each($GLOBALS['phpgw_info']['hooks']))
 			{
-				if ($type == "app")
+				if ($type == 'app')
 				{
-					if ($hook[1]["app"] == $currentapp)
+					if ($hook[1]['app'] == $currentapp)
 					{
-						$include_file = $phpgw_info["server"]["server_root"] . "/"
-							. $currentapp . "/hooks/"
-							. $hook[1]["app"] . $hook[1]["filename"];
+						$include_file = $GLOBALS['phpgw_info']['server']['server_root'] . '/'
+							. $currentapp . '/hooks/'
+							. $hook[1]['app'] . $hook[1]['filename'];
 						include($include_file);
 					}
 				}
@@ -97,12 +94,12 @@
 				{
 					if ($hook[1]["location"] == $where)
 					{
-						$include_file = $phpgw_info["server"]["server_root"] . "/"
-							. $hook[1]["app"] . "/hooks/"
-							. $hook[1]["filename"];
+						$include_file = $GLOBALS['phpgw_info']['server']['server_root'] . '/'
+							. $hook[1]['app'] . '/hooks/'
+							. $hook[1]['filename'];
 						if (! is_file($include_file))
 						{
-							$phpgw->common->phpgw_error("Failed to include hook: $include_file");
+							$GLOBALS['phpgw']->common->phpgw_error('Failed to include hook: ' . $include_file);
 						}
 						else
 						{
diff --git a/phpgwapi/inc/class.vfs.inc.php b/phpgwapi/inc/class.vfs.inc.php
index 3f483ff9fb..d3be175b62 100644
--- a/phpgwapi/inc/class.vfs.inc.php
+++ b/phpgwapi/inc/class.vfs.inc.php
@@ -1,10 +1,8 @@
 <?php
+	if (empty ($GLOBALS['phpgw_info']['server']['file_repository']))
+	{
+		$GLOBALS['phpgw_info']['server']['file_repository'] = 'sql';
+	}
 
-if (empty ($phpgw_info['server']['file_repository']))
-{
-	$phpgw_info['server']['file_repository'] = 'sql';
-}
-
-include (PHPGW_API_INC . '/class.vfs_' . $phpgw_info['server']['file_repository'] . '.inc.php');
-
+	include (PHPGW_API_INC . '/class.vfs_' . $GLOBALS['phpgw_info']['server']['file_repository'] . '.inc.php');
 ?>