EGroupware / egroupware

setup/inc/class.setup.inc.php

Spacing +185 added lines, -185 removed lines

@@ -75,10 +75,10 @@ 
 	 */
 	var $recommended_php_version = '5.5';
 
-	function __construct($html=False, $translation=False)
+	function __construct($html = False, $translation = False)
 	{
 		// setup us as $GLOBALS['egw_setup'], as this gets used in our sub-objects
-		$GLOBALS['egw_setup'] =& $this;
+		$GLOBALS['egw_setup'] = & $this;
 
 		if (!is_object($GLOBALS['egw']))
 		{
@@ -98,11 +98,11 @@ 
 	/**
 	 * include api db class for the ConfigDomain and connect to the db
 	 */
-	function loaddb($connect_and_setcharset=true)
+	function loaddb($connect_and_setcharset = true)
 	{
-		if(!isset($this->ConfigDomain) || empty($this->ConfigDomain))
+		if (!isset($this->ConfigDomain) || empty($this->ConfigDomain))
 		{
-			$this->ConfigDomain = get_var('ConfigDomain',array('COOKIE','POST'),$_POST['FormDomain']);
+			$this->ConfigDomain = get_var('ConfigDomain', array('COOKIE', 'POST'), $_POST['FormDomain']);
 		}
 		$GLOBALS['egw_info']['server']['db_type'] = $GLOBALS['egw_domain'][$this->ConfigDomain]['db_type'];
 
@@ -123,27 +123,27 @@ 
 		if ($connect_and_setcharset)
 		{
 			try {
-				$this->set_table_names();		// sets/checks config- and applications-table-name
+				$this->set_table_names(); // sets/checks config- and applications-table-name
 
 				// Set the DB's client charset if a system-charset is set
-				$this->db->select($this->config_table,'config_value',array(
+				$this->db->select($this->config_table, 'config_value', array(
 					'config_app'  => 'phpgwapi',
 					'config_name' => 'system_charset',
-				),__LINE__,__FILE__);
+				), __LINE__, __FILE__);
 				if ($this->db->next_record() && $this->db->f(0))
 				{
 					$this->system_charset = $this->db->f(0);
-					$this->db_charset_was = $this->db->Link_ID->GetCharSet();	// needed for the update
+					$this->db_charset_was = $this->db->Link_ID->GetCharSet(); // needed for the update
 
 					// we can NOT set the DB charset for mysql, if the api version < 1.0.1.019, as it would mess up the DB content!!!
-					if (substr($this->db->Type,0,5) == 'mysql')	// we need to check the api version
+					if (substr($this->db->Type, 0, 5) == 'mysql')	// we need to check the api version
 					{
-						$this->db->select($this->applications_table,'app_version',array(
+						$this->db->select($this->applications_table, 'app_version', array(
 							'app_name'  => 'phpgwapi',
-						),__LINE__,__FILE__);
+						), __LINE__, __FILE__);
 						$api_version = $this->db->next_record() ? $this->db->f(0) : false;
 					}
-					if (!$api_version || !$this->alessthanb($api_version,'1.0.1.019'))
+					if (!$api_version || !$this->alessthanb($api_version, '1.0.1.019'))
 					{
 						$this->db->Link_ID->SetCharSet($this->system_charset);
 					}
@@ -163,15 +163,15 @@ 
 	static function cookiedomain()
 	{
 		// Use HTTP_X_FORWARDED_HOST if set, which is the case behind a none-transparent proxy
-		$cookie_domain = isset($_SERVER['HTTP_X_FORWARDED_HOST']) ?  $_SERVER['HTTP_X_FORWARDED_HOST'] : $_SERVER['HTTP_HOST'];
+		$cookie_domain = isset($_SERVER['HTTP_X_FORWARDED_HOST']) ? $_SERVER['HTTP_X_FORWARDED_HOST'] : $_SERVER['HTTP_HOST'];
 
 		// remove port from HTTP_HOST
 		$arr = null;
-		if (preg_match("/^(.*):(.*)$/",$cookie_domain,$arr))
+		if (preg_match("/^(.*):(.*)$/", $cookie_domain, $arr))
 		{
 			$cookie_domain = $arr[1];
 		}
-		if (count(explode('.',$cookie_domain)) <= 1)
+		if (count(explode('.', $cookie_domain)) <= 1)
 		{
 			// setcookie dont likes domains without dots, leaving it empty, gets setcookie to fill the domain in
 			$cookie_domain = '';
@@ -186,9 +186,9 @@ 
 	* @param string $cookievalue value to be used, if unset cookie is cleared (optional)
 	* @param int $cookietime when cookie should expire, 0 for session only (optional)
 	*/
-	function set_cookie($cookiename,$cookievalue='',$cookietime=0)
+	function set_cookie($cookiename, $cookievalue = '', $cookietime = 0)
 	{
-		if(!isset($this->cookie_domain))
+		if (!isset($this->cookie_domain))
 		{
 			$this->cookie_domain = self::cookiedomain();
 		}
@@ -213,9 +213,9 @@ 
 			if (!isset($_SESSION)) self::session_start();
 			$ConfigLang = $_SESSION['ConfigLang'];
 		}
-		if (!preg_match('/^[a-z]{2}(-[a-z]{2})?$/',$ConfigLang))
+		if (!preg_match('/^[a-z]{2}(-[a-z]{2})?$/', $ConfigLang))
 		{
-			$ConfigLang = null;	// not returning 'en', as it suppresses the language selection in check_install and manageheader
+			$ConfigLang = null; // not returning 'en', as it suppresses the language selection in check_install and manageheader
 		}
 		//error_log(__METHOD__."() \$_POST['ConfigLang']=".array2string($_POST['ConfigLang']).", \$_SESSION['ConfigLang']=".array2string($_SESSION['ConfigLang'])." returning ".array2string($ConfigLang));
 		return $ConfigLang;
@@ -247,7 +247,7 @@ 
 
 		if (isset($_COOKIE[self::SESSIONID])) session_id($_COOKIE[self::SESSIONID]);
 
-		$ok = @session_start();	// suppress notice if session already started or warning in CLI
+		$ok = @session_start(); // suppress notice if session already started or warning in CLI
 		// need to decrypt session, in case session encryption is switched on in header.inc.php
 		egw_session::decrypt();
 		//error_log(__METHOD__."() returning ".array2string($ok).' _SESSION='.array2string($_SESSION));
@@ -259,12 +259,12 @@ 
 	 *
 	 * @param string $_auth_type ='config' 'config' or 'header' (caseinsensitiv)
 	 */
-	function auth($_auth_type='config')
+	function auth($_auth_type = 'config')
 	{
 		$auth_type = strtolower($_auth_type);
 		$GLOBALS['egw_info']['setup']['HeaderLoginMSG'] = $GLOBALS['egw_info']['setup']['ConfigLoginMSG'] = '';
 
-		if(!$this->checkip(isset($_SERVER['HTTP_X_FORWARDED_FOR']) ?
+		if (!$this->checkip(isset($_SERVER['HTTP_X_FORWARDED_FOR']) ?
 			$_SERVER['HTTP_X_FORWARDED_FOR'] : $_SERVER['REMOTE_ADDR']))
 		{
 			//error_log(__METHOD__."('$auth_type') invalid IP");
@@ -277,7 +277,7 @@ 
 			//error_log(__METHOD__."('$auth_type') \$_COOKIE['".self::SESSIONID."'] = ".array2string($_COOKIE[self::SESSIONID]).", \$_SESSION=".array2string($_SESSION).", \$_POST=".array2string($_POST));
 			if (isset($_REQUEST['FormLogout']))
 			{
-				$this->set_cookie(self::SESSIONID, '', time()-86400);
+				$this->set_cookie(self::SESSIONID, '', time() - 86400);
 				session_destroy();
 				if ($_REQUEST['FormLogout'] == 'config')
 				{
@@ -293,7 +293,7 @@ 
 			{
 				return false;
 			}
-			switch($auth_type)
+			switch ($auth_type)
 			{
 				case 'config':
 					if (!isset($GLOBALS['egw_domain'][$_POST['FormDomain']]) ||
@@ -333,7 +333,7 @@ 
 		//error_log(__METHOD__."('$auth_type') \$_COOKIE['".self::SESSIONID."'] = ".array2string($_COOKIE[self::SESSIONID]).", \$_SESSION=".array2string($_SESSION));
 		if ($_SESSION['egw_last_action_time'] < time() - self::TIMEOUT)
 		{
-			$this->set_cookie(self::SESSIONID, '', time()-86400);
+			$this->set_cookie(self::SESSIONID, '', time() - 86400);
 			session_destroy();
 			$GLOBALS['egw_info']['setup'][$_SESSION['egw_setup_auth_type'] == 'config' ? 'ConfigLoginMSG' : 'HeaderLoginMSG'] =
 				lang('Session expired');
@@ -388,37 +388,37 @@ 
 	 * @param string $remoteip
 	 * @return boolean
 	 */
-	function checkip($remoteip='')
+	function checkip($remoteip = '')
 	{
 		//echo "<p>setup::checkip($remoteip) against setup_acl='".$GLOBALS['egw_info']['server']['setup_acl']."'</p>\n";
-		$allowed_ips = explode(',',@$GLOBALS['egw_info']['server']['setup_acl']);
-		if(empty($GLOBALS['egw_info']['server']['setup_acl']) || !is_array($allowed_ips))
+		$allowed_ips = explode(',', @$GLOBALS['egw_info']['server']['setup_acl']);
+		if (empty($GLOBALS['egw_info']['server']['setup_acl']) || !is_array($allowed_ips))
 		{
-			return True;	// no test
+			return True; // no test
 		}
-		$remotes = explode('.',$remoteip);
-		foreach($allowed_ips as $value)
+		$remotes = explode('.', $remoteip);
+		foreach ($allowed_ips as $value)
 		{
-			if (!preg_match('/^[0-9.]+$/',$value))
+			if (!preg_match('/^[0-9.]+$/', $value))
 			{
-				$value = gethostbyname($was=$value);		// resolve domain-name, eg. a dyndns account
+				$value = gethostbyname($was = $value); // resolve domain-name, eg. a dyndns account
 				//echo "resolving '$was' to '$value'<br>\n";
 			}
-			$values = explode('.',$value);
-			for($i = 0; $i < count($values); ++$i)
+			$values = explode('.', $value);
+			for ($i = 0; $i < count($values); ++$i)
 			{
-				if ((int) $values[$i] != (int) $remotes[$i])
+				if ((int)$values[$i] != (int)$remotes[$i])
 				{
 					break;
 				}
 			}
 			if ($i == count($values))
 			{
-				return True;	// match
+				return True; // match
 			}
 		}
 		$GLOBALS['egw_info']['setup']['ConfigLoginMSG'] = lang('Invalid IP address').' '.$remoteip;
-		error_log(__METHOD__.'-> checking IP failed:'.print_r($remoteip,true));
+		error_log(__METHOD__.'-> checking IP failed:'.print_r($remoteip, true));
 		return False;
 	}
 
@@ -429,14 +429,14 @@ 
 	 */
 	function get_major($versionstring)
 	{
-		if(!$versionstring)
+		if (!$versionstring)
 		{
 			return False;
 		}
 
-		$version = str_replace('pre','.',$versionstring);
-		$varray  = explode('.',$version);
-		$major   = implode('.',array($varray[0],$varray[1],$varray[2]));
+		$version = str_replace('pre', '.', $versionstring);
+		$varray  = explode('.', $version);
+		$major   = implode('.', array($varray[0], $varray[1], $varray[2]));
 
 		return $major;
 	}
@@ -456,55 +456,55 @@ 
 	 * @param $appname Application 'name' with a matching $setup_info[$appname] array slice
 	 * @param $_enable =99 set to True/False to override setup.inc.php setting
 	 */
-	function register_app($appname, $_enable=99)
+	function register_app($appname, $_enable = 99)
 	{
 		$setup_info = $GLOBALS['setup_info'];
 
-		if(!$appname)
+		if (!$appname)
 		{
 			return False;
 		}
 
-		if($_enable == 99)
+		if ($_enable == 99)
 		{
 			$_enable = $setup_info[$appname]['enable'];
 		}
 		$enable = (int)$_enable;
 
-		if($GLOBALS['DEBUG'])
+		if ($GLOBALS['DEBUG'])
 		{
-			echo '<br>register_app(): ' . $appname . ', version: ' . $setup_info[$appname]['version'] . ', tables: ' . implode(', ',$setup_info[$appname]['tables']) . '<br>';
+			echo '<br>register_app(): '.$appname.', version: '.$setup_info[$appname]['version'].', tables: '.implode(', ', $setup_info[$appname]['tables']).'<br>';
 			// _debug_array($setup_info[$appname]);
 		}
 
-		if($setup_info[$appname]['version'])
+		if ($setup_info[$appname]['version'])
 		{
-			if($setup_info[$appname]['tables'])
+			if ($setup_info[$appname]['tables'])
 			{
-				$tables = implode(',',$setup_info[$appname]['tables']);
+				$tables = implode(',', $setup_info[$appname]['tables']);
 			}
 			if ($setup_info[$appname]['tables_use_prefix'] == True)
 			{
-				if($GLOBALS['DEBUG'])
+				if ($GLOBALS['DEBUG'])
 				{
-					echo "<br>$appname uses tables_use_prefix, storing ". $setup_info[$appname]['tables_prefix']." as prefix for tables\n";
+					echo "<br>$appname uses tables_use_prefix, storing ".$setup_info[$appname]['tables_prefix']." as prefix for tables\n";
 				}
-				$this->db->insert($this->config_table,array(
+				$this->db->insert($this->config_table, array(
 						'config_app'	=> $appname,
 						'config_name'	=> $appname.'_tables_prefix',
 						'config_value'	=> $setup_info[$appname]['tables_prefix'],
-					),False,__LINE__,__FILE__);
+					), False, __LINE__, __FILE__);
 			}
-			$this->db->insert($this->applications_table,array(
+			$this->db->insert($this->applications_table, array(
 					'app_name'		=> $appname,
 					'app_enabled'	=> $enable,
 					'app_order'		=> $setup_info[$appname]['app_order'],
-					'app_tables'	=> (string)$tables,	// app_tables is NOT NULL
+					'app_tables'	=> (string)$tables, // app_tables is NOT NULL
 					'app_version'	=> $setup_info[$appname]['version'],
 					'app_index'     => $setup_info[$appname]['index'],
 					'app_icon'      => $setup_info[$appname]['icon'],
 					'app_icon_app'  => $setup_info[$appname]['icon_app'],
-				),False,__LINE__,__FILE__);
+				), False, __LINE__, __FILE__);
 
 			$this->clear_session_cache();
 		}
@@ -518,27 +518,27 @@ 
 	 */
 	function app_registered($appname)
 	{
-		if(!$appname)
+		if (!$appname)
 		{
 			return False;
 		}
 
-		if(@$GLOBALS['DEBUG'])
+		if (@$GLOBALS['DEBUG'])
 		{
-			echo '<br>app_registered(): checking ' . $appname . ', table: ' . $this->applications_table;
+			echo '<br>app_registered(): checking '.$appname.', table: '.$this->applications_table;
 			// _debug_array($setup_info[$appname]);
 		}
 
-		$this->db->select($this->applications_table,'COUNT(*)',array('app_name' => $appname),__LINE__,__FILE__);
-		if($this->db->next_record() && $this->db->f(0))
+		$this->db->select($this->applications_table, 'COUNT(*)', array('app_name' => $appname), __LINE__, __FILE__);
+		if ($this->db->next_record() && $this->db->f(0))
 		{
-			if(@$GLOBALS['DEBUG'])
+			if (@$GLOBALS['DEBUG'])
 			{
 				echo '... app previously registered.';
 			}
 			return True;
 		}
-		if(@$GLOBALS['DEBUG'])
+		if (@$GLOBALS['DEBUG'])
 		{
 			echo '... app not registered';
 		}
@@ -555,38 +555,38 @@ 
 	{
 		$setup_info = $GLOBALS['setup_info'];
 
-		if(!$appname)
+		if (!$appname)
 		{
 			return False;
 		}
 
-		if($GLOBALS['DEBUG'])
+		if ($GLOBALS['DEBUG'])
 		{
-			echo '<br>update_app(): ' . $appname . ', version: ' . $setup_info[$appname]['currentver'] . ', table: ' . $this->applications_table . '<br>';
+			echo '<br>update_app(): '.$appname.', version: '.$setup_info[$appname]['currentver'].', table: '.$this->applications_table.'<br>';
 			// _debug_array($setup_info[$appname]);
 		}
 
-		if(!$this->app_registered($appname))
+		if (!$this->app_registered($appname))
 		{
 			return False;
 		}
 
-		if($setup_info[$appname]['version'])
+		if ($setup_info[$appname]['version'])
 		{
 			//echo '<br>' . $setup_info[$appname]['version'];
-			if($setup_info[$appname]['tables'])
+			if ($setup_info[$appname]['tables'])
 			{
-				$tables = implode(',',$setup_info[$appname]['tables']);
+				$tables = implode(',', $setup_info[$appname]['tables']);
 			}
-			$this->db->update($this->applications_table,array(
+			$this->db->update($this->applications_table, array(
 					'app_enabled'	=> $setup_info[$appname]['enable'],
 					'app_order'		=> $setup_info[$appname]['app_order'],
-					'app_tables'	=> (string)$tables,	// app_tables is NOT NULL
+					'app_tables'	=> (string)$tables, // app_tables is NOT NULL
 					'app_version'	=> $setup_info[$appname]['version'],
 					'app_index'     => $setup_info[$appname]['index'],
 					'app_icon'      => $setup_info[$appname]['icon'],
 					'app_icon_app'  => $setup_info[$appname]['icon_app'],
-				),array('app_name'=>$appname),__LINE__,__FILE__);
+				), array('app_name'=>$appname), __LINE__, __FILE__);
 		}
 	}
 
@@ -599,20 +599,20 @@ 
 	 */
 	function update_app_version($setup_info, $appname, $tableschanged = True)
 	{
-		if(!$appname)
+		if (!$appname)
 		{
 			return False;
 		}
 
-		if($tableschanged == True)
+		if ($tableschanged == True)
 		{
 			$GLOBALS['egw_info']['setup']['tableschanged'] = True;
 		}
-		if($setup_info[$appname]['currentver'])
+		if ($setup_info[$appname]['currentver'])
 		{
-			$this->db->update($this->applications_table,array(
+			$this->db->update($this->applications_table, array(
 					'app_version'	=> $setup_info[$appname]['currentver'],
-				),array('app_name'=>$appname),__LINE__,__FILE__);
+				), array('app_name'=>$appname), __LINE__, __FILE__);
 		}
 		return $setup_info;
 	}
@@ -624,19 +624,19 @@ 
 	 */
 	function deregister_app($appname)
 	{
-		if(!$appname)
+		if (!$appname)
 		{
 			return False;
 		}
 
 		// Remove categories
-		$this->db->delete(categories::TABLE, array('cat_appname'=>$appname),__LINE__,__FILE__);
+		$this->db->delete(categories::TABLE, array('cat_appname'=>$appname), __LINE__, __FILE__);
 		categories::invalidate_cache($appname);
 
 		// Remove config
-		$this->db->delete(config::TABLE, array('config_app'=>$appname),__LINE__,__FILE__);
+		$this->db->delete(config::TABLE, array('config_app'=>$appname), __LINE__, __FILE__);
 		//echo 'DELETING application: ' . $appname;
-		$this->db->delete($this->applications_table,array('app_name'=>$appname),__LINE__,__FILE__);
+		$this->db->delete($this->applications_table, array('app_name'=>$appname), __LINE__, __FILE__);
 
 		// Remove links to the app
 		egw_link::unlink(0, $appname);
@@ -653,21 +653,21 @@ 
 	{
 		$setup_info = $GLOBALS['setup_info'];
 
-		if(!$appname)
+		if (!$appname)
 		{
 			return False;
 		}
 
-		if(!$this->hooks_table)	// No hooks table yet
+		if (!$this->hooks_table)	// No hooks table yet
 		{
 			return False;
 		}
 
 		if (!is_object($this->hooks))
 		{
-			$this->hooks =& CreateObject('phpgwapi.hooks',$this->db,$this->hooks_table);
+			$this->hooks = & CreateObject('phpgwapi.hooks', $this->db, $this->hooks_table);
 		}
-		$this->hooks->register_hooks($appname,$setup_info[$appname]['hooks']);
+		$this->hooks->register_hooks($appname, $setup_info[$appname]['hooks']);
 	}
 
 	/**
@@ -682,20 +682,20 @@ 
 
 		if (!isset($setup_info) || !isset($setup_info['hooks']))
 		{
-			return false;	// app not found or no hook
+			return false; // app not found or no hook
 		}
 		$GLOBALS['settings'] = array();
 		if (isset($setup_info['hooks']['settings']))
 		{
-			$settings = ExecMethod($setup_info['hooks']['settings'],array('location' => 'settings','setup' => true));
+			$settings = ExecMethod($setup_info['hooks']['settings'], array('location' => 'settings', 'setup' => true));
 		}
-		elseif(in_array('settings',$setup_info['hooks']) && file_exists($file = EGW_INCLUDE_ROOT.'/'.$appname.'/inc/hook_settings.inc.php'))
+		elseif (in_array('settings', $setup_info['hooks']) && file_exists($file = EGW_INCLUDE_ROOT.'/'.$appname.'/inc/hook_settings.inc.php'))
 		{
 			include_once($file);
 		}
 		if (!isset($settings) || !is_array($settings))
 		{
-			$settings = $GLOBALS['settings'];	// old file hook or not updated new hook
+			$settings = $GLOBALS['settings']; // old file hook or not updated new hook
 		}
 		if (!is_array($settings) || !count($settings))
 		{
@@ -706,10 +706,10 @@ 
 		{
 			$GLOBALS['settings'] = array();
 			include_once($file);
-			if ($GLOBALS['settings']) $settings = array_merge($settings,$GLOBALS['settings']);
+			if ($GLOBALS['settings']) $settings = array_merge($settings, $GLOBALS['settings']);
 		}
 		$default = $forced = array();
-		foreach($settings as $name => $setting)
+		foreach ($settings as $name => $setting)
 		{
 			if (isset($setting['default']))
 			{
@@ -723,14 +723,14 @@ 
 		// store default/forced preferences, if any found
 		$preferences = new preferences();
 		$preferences->read_repository(false);
-		foreach(array(
+		foreach (array(
 			'default' => $default,
 			'forced'  => $forced,
 		) as $type => $prefs)
 		{
 			if ($prefs)
 			{
-				foreach($prefs as $name => $value)
+				foreach ($prefs as $name => $value)
 				{
 					$preferences->add($appname == 'preferences' ? 'common' : $appname, $name, $value, $type);
 				}
@@ -759,12 +759,12 @@ 
 	 */
 	function deregister_hooks($appname)
 	{
-		if(!$this->hooks_table)	// No hooks table yet
+		if (!$this->hooks_table)	// No hooks table yet
 		{
 			return False;
 		}
 
-		if(!$appname)
+		if (!$appname)
 		{
 			return False;
 		}
@@ -772,7 +772,7 @@ 
 		//echo "DELETING hooks for: " . $setup_info[$appname]['name'];
 		if (!is_object($this->hooks))
 		{
-			$this->hooks =& CreateObject('phpgwapi.hooks',$this->db,$this->hooks_table);
+			$this->hooks = & CreateObject('phpgwapi.hooks', $this->db, $this->hooks_table);
 		}
 		return $this->hooks->register_hooks($appname);
 	}
@@ -783,13 +783,13 @@ 
 	  * @param $location hook location - required
 	  * @param $appname application name - optional
 	 */
-	function hook($location, $appname='')
+	function hook($location, $appname = '')
 	{
 		if (!is_object($this->hooks))
 		{
-			$this->hooks =& CreateObject('phpgwapi.hooks',$this->db,$this->hooks_table);
+			$this->hooks = & CreateObject('phpgwapi.hooks', $this->db, $this->hooks_table);
 		}
-		return $this->hooks->single($location,$appname,True,True);
+		return $this->hooks->single($location, $appname, True, True);
 	}
 
 	/**
@@ -798,82 +798,82 @@ 
 	 * @param	$b	phpgw version number to check $a against
 	 * @return	True if $a < $b
 	 */
-	function alessthanb($a,$b,$DEBUG=False)
+	function alessthanb($a, $b, $DEBUG = False)
 	{
-		$num = array('1st','2nd','3rd','4th');
+		$num = array('1st', '2nd', '3rd', '4th');
 
-		if($DEBUG)
+		if ($DEBUG)
 		{
 			echo'<br>Input values: '
 				. 'A="'.$a.'", B="'.$b.'"';
 		}
-		$newa = str_replace('pre','.',$a);
-		$newb = str_replace('pre','.',$b);
-		$testa = explode('.',$newa);
-		if(@$testa[1] == '')
+		$newa = str_replace('pre', '.', $a);
+		$newb = str_replace('pre', '.', $b);
+		$testa = explode('.', $newa);
+		if (@$testa[1] == '')
 		{
 			$testa[1] = 0;
 		}
 
-		$testb = explode('.',$newb);
-		if(@$testb[1] == '')
+		$testb = explode('.', $newb);
+		if (@$testb[1] == '')
 		{
 			$testb[1] = 0;
 		}
-		if(@$testb[3] == '')
+		if (@$testb[3] == '')
 		{
 			$testb[3] = 0;
 		}
 		$less = 0;
 
-		for($i=0;$i<count($testa);$i++)
+		for ($i = 0; $i < count($testa); $i++)
 		{
-			if($DEBUG) { echo'<br>Checking if '. (int)$testa[$i] . ' is less than ' . (int)$testb[$i] . ' ...'; }
-			if((int)$testa[$i] < (int)$testb[$i])
+			if ($DEBUG) { echo'<br>Checking if '.(int)$testa[$i].' is less than '.(int)$testb[$i].' ...'; }
+			if ((int)$testa[$i] < (int)$testb[$i])
 			{
 				if ($DEBUG) { echo ' yes.'; }
 				$less++;
-				if($i<3)
+				if ($i < 3)
 				{
 					/* Ensure that this is definitely smaller */
-					if($DEBUG) { echo"  This is the $num[$i] octet, so A is definitely less than B."; }
+					if ($DEBUG) { echo"  This is the $num[$i] octet, so A is definitely less than B."; }
 					$less = 5;
 					break;
 				}
 			}
-			elseif((int)$testa[$i] > (int)$testb[$i])
+			elseif ((int)$testa[$i] > (int)$testb[$i])
 			{
-				if($DEBUG) { echo ' no.'; }
+				if ($DEBUG) { echo ' no.'; }
 				$less--;
-				if($i<2)
+				if ($i < 2)
 				{
 					/* Ensure that this is definitely greater */
-					if($DEBUG) { echo"  This is the $num[$i] octet, so A is definitely greater than B."; }
+					if ($DEBUG) { echo"  This is the $num[$i] octet, so A is definitely greater than B."; }
 					$less = -5;
 					break;
 				}
 			}
 			else
 			{
-				if($DEBUG) { echo ' no, they are equal or of different length.'; }
+				if ($DEBUG) { echo ' no, they are equal or of different length.'; }
 				// makes sure eg. '1.0.0' is counted less the '1.0.0.xxx' !
 				$less = count($testa) < count($testb) ? 1 : 0;
 			}
 		}
-		if($DEBUG) { echo '<br>Check value is: "'.$less.'"'; }
-		if($less>0)
+		if ($DEBUG) { echo '<br>Check value is: "'.$less.'"'; }
+		if ($less > 0)
 		{
-			if($DEBUG) { echo '<br>A is less than B'; }
+			if ($DEBUG) { echo '<br>A is less than B'; }
 			return True;
 		}
-		elseif($less<0)
+		elseif ($less < 0)
 		{
-			if($DEBUG) { echo '<br>A is greater than B'; }
+			if ($DEBUG) { echo '<br>A is greater than B'; }
 			return False;
 		}
 		else
 		{
-			if($DEBUG) { echo '<br>A is equal to B'; }
+			if ($DEBUG) { echo '<br>A is equal to B'; }
 			return False;
 		}
 	}
@@ -885,76 +885,76 @@ 
 	 * @param	$b	phpgw version number to check $a against
 	 * @return	True if $a < $b
 	 */
-	function amorethanb($a,$b,$DEBUG=False)
+	function amorethanb($a, $b, $DEBUG = False)
 	{
-		$num = array('1st','2nd','3rd','4th');
+		$num = array('1st', '2nd', '3rd', '4th');
 
-		if($DEBUG)
+		if ($DEBUG)
 		{
 			echo'<br>Input values: '
 				. 'A="'.$a.'", B="'.$b.'"';
 		}
-		$newa = str_replace('pre','.',$a);
-		$newb = str_replace('pre','.',$b);
-		$testa = explode('.',$newa);
-		if($testa[3] == '')
+		$newa = str_replace('pre', '.', $a);
+		$newb = str_replace('pre', '.', $b);
+		$testa = explode('.', $newa);
+		if ($testa[3] == '')
 		{
 			$testa[3] = 0;
 		}
-		$testb = explode('.',$newb);
-		if($testb[3] == '')
+		$testb = explode('.', $newb);
+		if ($testb[3] == '')
 		{
 			$testb[3] = 0;
 		}
 		$less = 0;
 
-		for($i=0;$i<count($testa);$i++)
+		for ($i = 0; $i < count($testa); $i++)
 		{
-			if($DEBUG) { echo'<br>Checking if '. (int)$testa[$i] . ' is more than ' . (int)$testb[$i] . ' ...'; }
-			if((int)$testa[$i] > (int)$testb[$i])
+			if ($DEBUG) { echo'<br>Checking if '.(int)$testa[$i].' is more than '.(int)$testb[$i].' ...'; }
+			if ((int)$testa[$i] > (int)$testb[$i])
 			{
-				if($DEBUG) { echo ' yes.'; }
+				if ($DEBUG) { echo ' yes.'; }
 				$less++;
-				if($i<3)
+				if ($i < 3)
 				{
 					/* Ensure that this is definitely greater */
-					if($DEBUG) { echo"  This is the $num[$i] octet, so A is definitely greater than B."; }
+					if ($DEBUG) { echo"  This is the $num[$i] octet, so A is definitely greater than B."; }
 					$less = 5;
 					break;
 				}
 			}
-			elseif((int)$testa[$i] < (int)$testb[$i])
+			elseif ((int)$testa[$i] < (int)$testb[$i])
 			{
-				if($DEBUG) { echo ' no.'; }
+				if ($DEBUG) { echo ' no.'; }
 				$less--;
-				if($i<2)
+				if ($i < 2)
 				{
 					/* Ensure that this is definitely smaller */
-					if($DEBUG) { echo"  This is the $num[$i] octet, so A is definitely less than B."; }
+					if ($DEBUG) { echo"  This is the $num[$i] octet, so A is definitely less than B."; }
 					$less = -5;
 					break;
 				}
 			}
 			else
 			{
-				if($DEBUG) { echo ' no, they are equal.'; }
+				if ($DEBUG) { echo ' no, they are equal.'; }
 				$less = 0;
 			}
 		}
-		if($DEBUG) { echo '<br>Check value is: "'.$less.'"'; }
-		if($less>0)
+		if ($DEBUG) { echo '<br>Check value is: "'.$less.'"'; }
+		if ($less > 0)
 		{
-			if($DEBUG) { echo '<br>A is greater than B'; }
+			if ($DEBUG) { echo '<br>A is greater than B'; }
 			return True;
 		}
-		elseif($less<0)
+		elseif ($less < 0)
 		{
-			if($DEBUG) { echo '<br>A is less than B'; }
+			if ($DEBUG) { echo '<br>A is less than B'; }
 			return False;
 		}
 		else
 		{
-			if($DEBUG) { echo '<br>A is equal to B'; }
+			if ($DEBUG) { echo '<br>A is equal to B'; }
 			return False;
 		}
 	}
@@ -966,7 +966,7 @@ 
 	 */
 	var $accounts;
 
-	function setup_account_object(array $config=array())
+	function setup_account_object(array $config = array())
 	{
 		if (!isset($this->accounts) || $this->accounts->config || $config)
 		{
@@ -977,9 +977,9 @@ 
 			if (!$config)
 			{
 				// load the configuration from the database
-				foreach($this->db->select($this->config_table,'config_name,config_value',
+				foreach ($this->db->select($this->config_table, 'config_name,config_value',
 					"config_name LIKE 'ads%' OR config_name LIKE 'ldap%' OR config_name LIKE 'account_%' OR config_name LIKE '%encryption%' OR config_name='auth_type'",
-					__LINE__,__FILE__) as $row)
+					__LINE__, __FILE__) as $row)
 				{
 					$GLOBALS['egw_info']['server'][$row['config_name']] = $config[$row['config_name']] = $row['config_value'];
 				}
@@ -992,7 +992,7 @@ 
 				return false;
 			}
 			if (!isset($GLOBALS['egw']->accounts)) $GLOBALS['egw']->accounts = $this->accounts;
-			accounts::cache_invalidate();	// the cache is shared for all instances of the class
+			accounts::cache_invalidate(); // the cache is shared for all instances of the class
 		}
 		return true;
 	}
@@ -1018,7 +1018,7 @@ 
 	 * @param string &$anonpw=null on return password for anonymous user
 	 * @return int the numerical user-id
 	 */
-	function add_account($username,$first,$last,$passwd,$primary_group='Default',$changepw=False,$email='',&$anonpw=null)
+	function add_account($username, $first, $last, $passwd, $primary_group = 'Default', $changepw = False, $email = '', &$anonpw = null)
 	{
 		$this->setup_account_object();
 
@@ -1030,7 +1030,7 @@ 
 			$passwd = $anonpw = $this->anonpw;
 		}
 
-		if(!($accountid = $this->accounts->name2id($username, 'account_lid', $primary_group ? 'u' : 'g')))
+		if (!($accountid = $this->accounts->name2id($username, 'account_lid', $primary_group ? 'u' : 'g')))
 		{
 			$account = array(
 				'account_type'      => $primary_group ? 'u' : 'g',
@@ -1051,7 +1051,7 @@ 
 			}
 		}
 		// set password for existing account, if given and not '*unchanged*'
-		elseif($passwd && $passwd != '*unchanged*')
+		elseif ($passwd && $passwd != '*unchanged*')
 		{
 			try {
 				$auth = new auth;
@@ -1089,7 +1089,7 @@ 
 		{
 			$this->set_memberships(array($primary_group_id), $accountid);
 
-			if (!$changepw) $this->add_acl('preferences','nopasswordchange',$accountid);
+			if (!$changepw) $this->add_acl('preferences', 'nopasswordchange', $accountid);
 		}
 		//error_log("setup::add_account('$username','$first','$last',\$passwd,'$primary_group',$changepw,'$email') successfull created accountid=$accountid");
 		return $accountid;
@@ -1137,7 +1137,7 @@ 
 		{
 			return false;
 		}
-		foreach($accounts as $account)
+		foreach ($accounts as $account)
 		{
 			if ($account['account_lid'] != 'anonymous')
 			{
@@ -1158,7 +1158,7 @@ 
 	 * @param int|string $account accountid or account_lid
 	 * @param int $rights rights to set, default 1
 	 */
-	function add_acl($apps,$location,$account,$rights=1)
+	function add_acl($apps, $location, $account, $rights = 1)
 	{
 		//error_log("setup::add_acl(".(is_array($apps) ? "array('".implode("','",$apps)."')" : "'$apps'").",'$location',$account,$rights)");
 		if (!is_numeric($account))
@@ -1166,32 +1166,32 @@ 
 			$this->setup_account_object();
 			$account = $this->accounts->name2id($account);
 		}
-		if(!is_object($this->db))
+		if (!is_object($this->db))
 		{
 			$this->loaddb();
 		}
 
-		if(!is_array($apps))
+		if (!is_array($apps))
 		{
 			$apps = array($apps);
 		}
-		foreach($apps as $app)
+		foreach ($apps as $app)
 		{
-			$this->db->delete($this->acl_table,array(
+			$this->db->delete($this->acl_table, array(
 				'acl_appname'  => $app,
 				'acl_location' => $location,
 				'acl_account'  => $account
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 
-			if ((int) $rights)
+			if ((int)$rights)
 			{
-				$this->db->insert($this->acl_table,array(
+				$this->db->insert($this->acl_table, array(
 					'acl_rights' => $rights
-				),array(
+				), array(
 					'acl_appname'  => $app,
 					'acl_location' => $location,
 					'acl_account'  => $account,
-				),__LINE__,__FILE__);
+				), __LINE__, __FILE__);
 			}
 		}
 	}
@@ -1202,7 +1202,7 @@ 
 	 * @param array $tables array with possible table-names
 	 * @return string/boolean tablename or false
 	 */
-	function table_exist($tables,$force_refresh=False)
+	function table_exist($tables, $force_refresh = False)
 	{
 		static $table_names = False;
 
@@ -1210,9 +1210,9 @@ 
 
 		if (!$table_names) return false;
 
-		foreach($table_names as $data)
+		foreach ($table_names as $data)
 		{
-			if (($key = array_search($data['table_name'],$tables)) !== false)
+			if (($key = array_search($data['table_name'], $tables)) !== false)
 			{
 				return $tables[$key];
 			}
@@ -1225,18 +1225,18 @@ 
 	 *
 	 * Other tables can always use the most up to date name
 	 */
-	function set_table_names($force_refresh=False)
+	function set_table_names($force_refresh = False)
 	{
-		foreach(array(
-			'config_table'       => array('egw_config','phpgw_config','config'),
-			'applications_table' => array('egw_applications','phpgw_applications','applications'),
-			'accounts_table'     => array('egw_accounts','phpgw_accounts'),
-			'acl_table'          => array('egw_acl','phpgw_acl'),
-			'lang_table'         => array('egw_lang','phpgw_lang','lang'),
-			'languages_table'    => array('egw_languages','phpgw_languages','languages'),
+		foreach (array(
+			'config_table'       => array('egw_config', 'phpgw_config', 'config'),
+			'applications_table' => array('egw_applications', 'phpgw_applications', 'applications'),
+			'accounts_table'     => array('egw_accounts', 'phpgw_accounts'),
+			'acl_table'          => array('egw_acl', 'phpgw_acl'),
+			'lang_table'         => array('egw_lang', 'phpgw_lang', 'lang'),
+			'languages_table'    => array('egw_languages', 'phpgw_languages', 'languages'),
 		) as $name => $tables)
 		{
-			$table = $this->table_exist($tables,$force_refresh);
+			$table = $this->table_exist($tables, $force_refresh);
 
 			if ($table && $table != $this->$name)	// only overwrite the default name, if we realy got one (important for new installs)
 			{