EGroupware / egroupware

setup/inc/class.setup_cmd_hooks.inc.php

Spacing +6 added lines, -6 removed lines

@@ -23,7 +23,7 @@ 
 	 * @param string $config_passwd=null pw of above user
 	 * @param boolean $verbose=false if true, echos out some status information during the run
 	 */
-	function __construct($domain,$config_user=null,$config_passwd=null)
+	function __construct($domain, $config_user = null, $config_passwd = null)
 	{
 		if (!is_array($domain))
 		{
@@ -45,17 +45,17 @@ 
 	 * @throws Exception(lang('Wrong credentials to access the header.inc.php file!'),2);
 	 * @throws Exception('header.inc.php not found!');
 	 */
-	protected function exec($check_only=false)
+	protected function exec($check_only = false)
 	{
-		if ($check_only) return true;	// nothing to check, no arguments ...
+		if ($check_only) return true; // nothing to check, no arguments ...
 
 		// instanciate setup object and check authorisation
-		$this->check_setup_auth($this->config_user,$this->config_passwd,$this->domain);
+		$this->check_setup_auth($this->config_user, $this->config_passwd, $this->domain);
 
-		$this->check_installed($this->domain,15,$this->verbose);
+		$this->check_installed($this->domain, 15, $this->verbose);
 
 		global $setup_info;
-		foreach($setup_info as $appname => $info)
+		foreach ($setup_info as $appname => $info)
 		{
 			if ($info['currentver']) self::$egw_setup->register_hooks($appname);
 		}

Braces +9 added lines, -2 removed lines

@@ -47,7 +47,11 @@ 
 	 */
 	protected function exec($check_only=false)
 	{
-		if ($check_only) return true;	// nothing to check, no arguments ...
+		if ($check_only)
+		{
+			return true;
+		}
+		// nothing to check, no arguments ...
 
 		// instanciate setup object and check authorisation
 		$this->check_setup_auth($this->config_user,$this->config_passwd,$this->domain);
@@ -57,7 +61,10 @@ 
 		global $setup_info;
 		foreach($setup_info as $appname => $info)
 		{
-			if ($info['currentver']) self::$egw_setup->register_hooks($appname);
+			if ($info['currentver'])
+			{
+				self::$egw_setup->register_hooks($appname);
+			}
 		}
 		$this->restore_db();
 

Doc Comments +3 added lines, -4 removed lines

@@ -19,9 +19,8 @@ 
 	 * Constructor
 	 *
 	 * @param string $domain string with domain-name or array with all arguments
-	 * @param string $config_user=null user to config the domain (or header_admin_user)
-	 * @param string $config_passwd=null pw of above user
-	 * @param boolean $verbose=false if true, echos out some status information during the run
+	 * @param string $config_user user to config the domain (or header_admin_user)
+	 * @param string $config_passwd pw of above user
 	 */
 	function __construct($domain,$config_user=null,$config_passwd=null)
 	{
@@ -40,7 +39,7 @@ 
 	/**
 	 * run the command: register all hooks
 	 *
-	 * @param boolean $check_only=false only run the checks (and throw the exceptions), but not the command itself
+	 * @param boolean $check_only only run the checks (and throw the exceptions), but not the command itself
 	 * @return string success message
 	 * @throws Exception(lang('Wrong credentials to access the header.inc.php file!'),2);
 	 * @throws Exception('header.inc.php not found!');

setup/inc/hook_config.inc.php

Spacing +35 added lines, -35 removed lines

@@ -20,14 +20,14 @@ 
  */
 function vfs_storage_mode_options($config)
 {
-	if (!isset($config['vfs_fstab']) || $config['vfs_fstab'] == json_encode($default=array(
+	if (!isset($config['vfs_fstab']) || $config['vfs_fstab'] == json_encode($default = array(
 		'/' => 'sqlfs://$host/',
 		'/apps' => 'links://$host/apps',
 	)) || $config['vfs_fstab'] == serialize($default))	// detect old serialized value too
 	{
 		$config['vfs_storage_mode'] = 'fs';
 	}
-	elseif($config['vfs_fstab'] == json_encode($default_db=array(
+	elseif ($config['vfs_fstab'] == json_encode($default_db = array(
 		'/' => 'sqlfs://$host/?storage=db',
 		'/apps' => 'links://$host/apps?storage=db',
 	)) || $config['vfs_fstab'] == serialize($default_db))	// detect old serialized value too
@@ -39,10 +39,10 @@ 
 		$config['vfs_storage_mode'] = 'custom';
 	}
 	//_debug_array(array_intersect_key($config,array('vfs_fstab'=>1,'vfs_storage_mode'=>1)));
-	foreach(array(
+	foreach (array(
 		'fs' => lang('Filesystem (default)'),
 		'db' => lang('Database').' (problems with files > 1MB)',
-		'custom' => lang('Custom set via %1','filemanager/cli.php mount'),
+		'custom' => lang('Custom set via %1', 'filemanager/cli.php mount'),
 	) as $name => $label)
 	{
 		if ($name != 'custom' || $name === $config['vfs_storage_mode'])	// dont show custom, if not custom
@@ -57,24 +57,24 @@ 
 
 function encryptalgo($config)
 {
-	if(@function_exists('mcrypt_list_algorithms'))
+	if (@function_exists('mcrypt_list_algorithms'))
 	{
 		$listed = array();
-		if(!isset($config['mcrypt_algo']))
+		if (!isset($config['mcrypt_algo']))
 		{
-			$config['mcrypt_algo'] = 'tripledes';  /* MCRYPT_TRIPLEDES */
+			$config['mcrypt_algo'] = 'tripledes'; /* MCRYPT_TRIPLEDES */
 		}
 		$algos = @mcrypt_list_algorithms();
 		$found = False;
 
 		$out = '';
-		while(list($key,$value) = each($algos))
+		while (list($key, $value) = each($algos))
 		{
 			$found = True;
 			/* Only show each once - seems this is a problem in some installs */
-			if(!in_array($value,$listed))
+			if (!in_array($value, $listed))
 			{
-				if($config['mcrypt_algo'] == $value)
+				if ($config['mcrypt_algo'] == $value)
 				{
 					$selected = ' selected="selected"';
 				}
@@ -84,29 +84,29 @@ 
 				}
 				$descr = strtoupper($value);
 
-				$out .= '<option value="' . $value . '"' . $selected . '>' . $descr . '</option>' . "\n";
+				$out .= '<option value="'.$value.'"'.$selected.'>'.$descr.'</option>'."\n";
 				$listed[] = $value;
 			}
 		}
-		if(!$found)
+		if (!$found)
 		{
 			/* Something is wrong with their mcrypt install or php.ini */
-			$out = '<option value="">' . lang('no algorithms available') . '</option>' . "\n";
+			$out = '<option value="">'.lang('no algorithms available').'</option>'."\n";
 		}
 	}
 	else
 	{
-		$out = '<option value="tripledes">TRIPLEDES</option>' . "\n";
+		$out = '<option value="tripledes">TRIPLEDES</option>'."\n";
 	}
 	return $out;
 }
 
 function encryptmode($config)
 {
-	if(@function_exists('mcrypt_list_modes'))
+	if (@function_exists('mcrypt_list_modes'))
 	{
 		$listed = array();
-		if(!isset($config['mcrypt_mode']))
+		if (!isset($config['mcrypt_mode']))
 		{
 			$config['mcrypt_mode'] = 'cbc'; /* MCRYPT_MODE_CBC */
 		}
@@ -114,13 +114,13 @@ 
 		$found = False;
 
 		$out = '';
-		while(list($key,$value) = each($modes))
+		while (list($key, $value) = each($modes))
 		{
 			$found = True;
 			/* Only show each once - seems this is a problem in some installs */
-			if(!in_array($value,$listed))
+			if (!in_array($value, $listed))
 			{
-				if($config['mcrypt_mode'] == $value)
+				if ($config['mcrypt_mode'] == $value)
 				{
 					$selected = ' selected="selected"';
 				}
@@ -130,34 +130,34 @@ 
 				}
 				$descr = strtoupper($value);
 
-				$out .= '<option value="' . $value . '"' . $selected . '>' . $descr . '</option>' . "\n";
+				$out .= '<option value="'.$value.'"'.$selected.'>'.$descr.'</option>'."\n";
 				$listed[] = $value;
 			}
 		}
-		if(!$found)
+		if (!$found)
 		{
 			/* Something is wrong with their mcrypt install or php.ini */
-			$out = '<option value="" selected="selected">' . lang('no modes available') . '</option>' . "\n";
+			$out = '<option value="" selected="selected">'.lang('no modes available').'</option>'."\n";
 		}
 	}
 	else
 	{
-		$out = '<option value="cbc" selected="selected">CBC</option>' . "\n";
+		$out = '<option value="cbc" selected="selected">CBC</option>'."\n";
 	}
 	return $out;
 }
 
-function passwdhashes($config,$return_hashes=false)
+function passwdhashes($config, $return_hashes = false)
 {
-	$hashes = sql_passwdhashes($config,true);
+	$hashes = sql_passwdhashes($config, true);
 	if (isset($hashes['crypt']))
 	{
-		$hashes['des'] = 'des (=crypt)';	// old LDAP name for crypt
+		$hashes['des'] = 'des (=crypt)'; // old LDAP name for crypt
 	}
 	return $return_hashes ? $hashes : _options_from($hashes, $config['ldap_encryption_type'] ? $config['ldap_encryption_type'] : 'des');
 }
 
-function sql_passwdhashes($config, $return_hashes=false, &$securest=null)
+function sql_passwdhashes($config, $return_hashes = false, &$securest = null)
 {
 	$hashes = Api\Auth::passwdhashes($securest);
 
@@ -172,19 +172,19 @@ 
  */
 function auth_types($config)
 {
-	return _options_from(setup_cmd_config::auth_types(),$config['auth_type']);
+	return _options_from(setup_cmd_config::auth_types(), $config['auth_type']);
 }
 function auth_type_syncml($config)
 {
-	return _options_from(setup_cmd_config::auth_types(),$config['auth_type_syncml']);
+	return _options_from(setup_cmd_config::auth_types(), $config['auth_type_syncml']);
 }
 function auth_type_groupdav($config)
 {
-	return _options_from(setup_cmd_config::auth_types(),$config['auth_type_groupdav']);
+	return _options_from(setup_cmd_config::auth_types(), $config['auth_type_groupdav']);
 }
 function auth_type_activesync($config)
 {
-	return _options_from(setup_cmd_config::auth_types(),$config['auth_type_activesync']);
+	return _options_from(setup_cmd_config::auth_types(), $config['auth_type_activesync']);
 }
 
 /**
@@ -205,12 +205,12 @@ 
  * @param string $selected value of selected optino
  * @return string
  */
-function _options_from(array $options,$selected)
+function _options_from(array $options, $selected)
 {
-	foreach($options as $value => $label)
+	foreach ($options as $value => $label)
 	{
-		$out .= '<option value="' . htmlspecialchars($value) . '"' .
-			($selected == $value ? ' selected="selected"' : '') . '>' . $label . '</option>' . "\n";
+		$out .= '<option value="'.htmlspecialchars($value).'"'.
+			($selected == $value ? ' selected="selected"' : '').'>'.$label.'</option>'."\n";
 	}
 	return $out;
 }

Braces +12 added lines, -3 removed lines

@@ -23,17 +23,23 @@ 
 	if (!isset($config['vfs_fstab']) || $config['vfs_fstab'] == json_encode($default=array(
 		'/' => 'sqlfs://$host/',
 		'/apps' => 'links://$host/apps',
-	)) || $config['vfs_fstab'] == serialize($default))	// detect old serialized value too
+	)) || $config['vfs_fstab'] == serialize($default))
+	{
+		// detect old serialized value too
 	{
 		$config['vfs_storage_mode'] = 'fs';
 	}
+	}
 	elseif($config['vfs_fstab'] == json_encode($default_db=array(
 		'/' => 'sqlfs://$host/?storage=db',
 		'/apps' => 'links://$host/apps?storage=db',
-	)) || $config['vfs_fstab'] == serialize($default_db))	// detect old serialized value too
+	)) || $config['vfs_fstab'] == serialize($default_db))
+	{
+		// detect old serialized value too
 	{
 		$config['vfs_storage_mode'] = 'db';
 	}
+	}
 	else
 	{
 		$config['vfs_storage_mode'] = 'custom';
@@ -45,11 +51,14 @@ 
 		'custom' => lang('Custom set via %1','filemanager/cli.php mount'),
 	) as $name => $label)
 	{
-		if ($name != 'custom' || $name === $config['vfs_storage_mode'])	// dont show custom, if not custom
+		if ($name != 'custom' || $name === $config['vfs_storage_mode'])
+		{
+			// dont show custom, if not custom
 		{
 			$options .= '<option value="'.$name.($name === $config['vfs_storage_mode'] ? '" selected="selected' : '').
 				'">'.htmlspecialchars($label)."</options>\n";
 		}
+		}
 	}
 	//echo "<pre>".htmlspecialchars($options)."</pre>\n";
 	return $options;

setup/inc/class.setup_cmd_update.inc.php

Spacing +12 added lines, -12 removed lines

@@ -30,7 +30,7 @@ 
 	 * @param boolean $verbose =false if true, echos out some status information during the run
 	 * @param string $app =null single application to update or install
 	 */
-	function __construct($domain,$config_user=null,$config_passwd=null,$backup=null,$verbose=false,$app=null)
+	function __construct($domain, $config_user = null, $config_passwd = null, $backup = null, $verbose = false, $app = null)
 	{
 		if (!is_array($domain))
 		{
@@ -55,32 +55,32 @@ 
 	 * @throws Exception(lang('Wrong credentials to access the header.inc.php file!'),2);
 	 * @throws Exception('header.inc.php not found!');
 	 */
-	protected function exec($check_only=false)
+	protected function exec($check_only = false)
 	{
 		global $setup_info;
 
 		// instanciate setup object and check authorisation
-		$this->check_setup_auth($this->config_user,$this->config_passwd,$this->domain);
+		$this->check_setup_auth($this->config_user, $this->config_passwd, $this->domain);
 
-		$this->check_installed($this->domain,array(14),$this->verbose);
+		$this->check_installed($this->domain, array(14), $this->verbose);
 
 		if ($GLOBALS['egw_info']['setup']['stage']['db'] != 4 &&
 			(!$this->app || !in_array($this->app, self::$apps_to_install) && !in_array($this->app, self::$apps_to_upgrade)) &&
 			!self::check_autoinstall())
 		{
-			return lang('No update necessary, domain %1(%2) is up to date.',$this->domain,$GLOBALS['egw_domain'][$this->domain]['db_type']);
+			return lang('No update necessary, domain %1(%2) is up to date.', $this->domain, $GLOBALS['egw_domain'][$this->domain]['db_type']);
 		}
 		if ($check_only) return lang('Update necessary.');
 
 		$setup_info = self::$egw_setup->detection->upgrade_exclude($setup_info);
 
-		self::$egw_setup->process->init_process();	// we need a new schema-proc instance for each new domain
+		self::$egw_setup->process->init_process(); // we need a new schema-proc instance for each new domain
 
 		// request to install a single app
 		if ($this->app && in_array($this->app, self::$apps_to_install))
 		{
 			$app_title = $setup_info[$this->app]['title'] ? $setup_info[$this->app]['title'] : $setup_info[$this->app]['name'];
-			self::_echo_message($this->verbose,lang('Start installing application %1 ...',$app_title));
+			self::_echo_message($this->verbose, lang('Start installing application %1 ...', $app_title));
 			ob_start();
 			$terror = array($this->app => $setup_info[$this->app]);
 
@@ -88,7 +88,7 @@ 
 			{
 				$errors = self::$egw_setup->process->current($terror, $this->verbose);
 				$terror = self::$egw_setup->process->default_records($errors, $this->verbose);
-				echo $app_title . ' ' . lang('tables installed, unless there are errors printed above') . '.';
+				echo $app_title.' '.lang('tables installed, unless there are errors printed above').'.';
 			}
 			else
 			{
@@ -102,20 +102,20 @@ 
 				{
 					self::$egw_setup->register_app($setup_info[$this->app]['name']);
 				}
-				echo $app_title . ' ' . lang('registered') . '.';
+				echo $app_title.' '.lang('registered').'.';
 
 				if ($setup_info[$this->app]['hooks'])
 				{
 					self::$egw_setup->register_hooks($setup_info[$this->app]['name']);
-					echo "\n".$app_title . ' ' . lang('hooks registered') . '.';
+					echo "\n".$app_title.' '.lang('hooks registered').'.';
 				}
 			}
 		}
 		else
 		{
-			self::_echo_message($this->verbose,lang('Start updating the database ...'));
+			self::_echo_message($this->verbose, lang('Start updating the database ...'));
 			ob_start();
-			self::$egw_setup->process->pass($setup_info,'upgrade',false);
+			self::$egw_setup->process->pass($setup_info, 'upgrade', false);
 		}
 		$messages = ob_get_contents();
 		ob_end_clean();

Braces +8 added lines, -2 removed lines

@@ -70,7 +70,10 @@ 
 		{
 			return lang('No update necessary, domain %1(%2) is up to date.',$this->domain,$GLOBALS['egw_domain'][$this->domain]['db_type']);
 		}
-		if ($check_only) return lang('Update necessary.');
+		if ($check_only)
+		{
+			return lang('Update necessary.');
+		}
 
 		$setup_info = self::$egw_setup->detection->upgrade_exclude($setup_info);
 
@@ -119,7 +122,10 @@ 
 		}
 		$messages = ob_get_contents();
 		ob_end_clean();
-		if ($messages && $this->verbose) echo strip_tags($messages)."\n";
+		if ($messages && $this->verbose)
+		{
+			echo strip_tags($messages)."\n";
+		}
 
 		$this->restore_db();
 

Doc Comments +5 added lines, -6 removed lines

@@ -24,11 +24,10 @@ 
 	 * Constructor
 	 *
 	 * @param string|array $domain string with domain-name or array with all arguments
-	 * @param string $config_user=null user to config the domain (or header_admin_user)
-	 * @param string $config_passwd=null pw of above user
-	 * @param string $backup=null filename of backup to use instead of new install, default new install
-	 * @param boolean $verbose=false if true, echos out some status information during the run
-	 * @param string $app=null single application to update or install
+	 * @param string $config_user user to config the domain (or header_admin_user)
+	 * @param string $config_passwd pw of above user
+	 * @param string $backup filename of backup to use instead of new install, default new install
+	 * @param boolean $verbose if true, echos out some status information during the run
 	 */
 	function __construct($domain,$config_user=null,$config_passwd=null,$backup=null,$verbose=false,$app=null)
 	{
@@ -50,7 +49,7 @@ 
 	/**
 	 * run the command: update or install/update a single app ($this->app)
 	 *
-	 * @param boolean $check_only=false only run the checks (and throw the exceptions), but not the command itself
+	 * @param boolean $check_only only run the checks (and throw the exceptions), but not the command itself
 	 * @return string success message
 	 * @throws Exception(lang('Wrong credentials to access the header.inc.php file!'),2);
 	 * @throws Exception('header.inc.php not found!');

setup/inc/class.setup.inc.php

Indentation +27 added lines, -27 removed lines

@@ -151,10 +151,10 @@ 
 	}
 
 	/**
-	* Set the domain used for cookies
-	*
-	* @return string domain
-	*/
+	 * Set the domain used for cookies
+	 *
+	 * @return string domain
+	 */
 	static function cookiedomain()
 	{
 		// Use HTTP_X_FORWARDED_HOST if set, which is the case behind a none-transparent proxy
@@ -175,12 +175,12 @@ 
 	}
 
 	/**
-	* Set a cookie
-	*
-	* @param string $cookiename name of cookie to be set
-	* @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)
-	*/
+	 * Set a cookie
+	 *
+	 * @param string $cookiename name of cookie to be set
+	 * @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)
 	{
 		if(!isset($this->cookie_domain))
@@ -344,19 +344,19 @@ 
 		return true;
 	}
 
-    /**
-    * check if username and password is valid
-    *
-    * this function compares the supplied and stored username and password
-	* as any of the passwords can be clear text or md5 we convert them to md5
-	* internal and compare always the md5 hashs
-    *
-    * @param string $user the user supplied username
-    * @param string $pw the user supplied password
-    * @param string $conf_user the configured username
-    * @param string $hash hash to check password agains (no {prefix} for plain and md5!)
-    * @returns bool true on success
-    */
+	/**
+	 * check if username and password is valid
+	 *
+	 * this function compares the supplied and stored username and password
+	 * as any of the passwords can be clear text or md5 we convert them to md5
+	 * internal and compare always the md5 hashs
+	 *
+	 * @param string $user the user supplied username
+	 * @param string $pw the user supplied password
+	 * @param string $conf_user the configured username
+	 * @param string $hash hash to check password agains (no {prefix} for plain and md5!)
+	 * @returns bool true on success
+	 */
 	static function check_auth($user, $pw, $conf_user, $hash)
 	{
 		if ($user !== $conf_user)
@@ -728,10 +728,10 @@ 
 	}
 
 	/**
-	  * call the hooks for a single application
-	  *
-	  * @param $location hook location - required
-	  * @param $appname application name - optional
+	 * call the hooks for a single application
+	 *
+	 * @param $location hook location - required
+	 * @param $appname application name - optional
 	 */
 	static function hook($location, $appname='')
 	{

Doc Comments +6 added lines, -6 removed lines

@@ -793,9 +793,9 @@ 
 
 	/**
 	 * egw version checking, is param 1 < param 2 in phpgw versionspeak?
-	 * @param	$a	phpgw version number to check if less than $b
-	 * @param	$b	phpgw version number to check $a against
-	 * @return	True if $a < $b
+	 * @param	string $a	phpgw version number to check if less than $b
+	 * @param	string $b	phpgw version number to check $a against
+	 * @return	boolean if $a < $b
 	 */
 	function alessthanb($a,$b,$DEBUG=False)
 	{
@@ -882,7 +882,7 @@ 
 	 *
 	 * @param	$a	phpgw version number to check if more than $b
 	 * @param	$b	phpgw version number to check $a against
-	 * @return	True if $a < $b
+	 * @return	boolean if $a < $b
 	 */
 	function amorethanb($a,$b,$DEBUG=False)
 	{
@@ -1152,7 +1152,7 @@ 
 	 *
 	 * Dont use it to set group-membership, use set_memberships instead!
 	 *
-	 * @param string|array $apps app-names
+	 * @param string $apps app-names
 	 * @param string $location eg. "run"
 	 * @param int|string $account accountid or account_lid
 	 * @param int $rights rights to set, default 1
@@ -1198,7 +1198,7 @@ 
 	/**
 	 * checks if one of the given tables exist, returns the first match
 	 *
-	 * @param array $tables array with possible table-names
+	 * @param string[] $tables array with possible table-names
 	 * @return string/boolean tablename or false
 	 */
 	function table_exist($tables,$force_refresh=False)

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($_SERVER['REMOTE_ADDR']))
+		if (!$this->checkip($_SERVER['REMOTE_ADDR']))
 		{
 			//error_log(__METHOD__."('$auth_type') invalid IP");
 			return false;
@@ -276,7 +276,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')
 				{
@@ -292,7 +292,7 @@ 
 			{
 				return false;
 			}
-			switch($auth_type)
+			switch ($auth_type)
 			{
 				case 'config':
 					if (!isset($GLOBALS['egw_domain'][$_POST['FormDomain']]) ||
@@ -332,7 +332,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');
@@ -387,37 +387,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;
 	}
 
@@ -428,14 +428,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;
 	}
@@ -455,55 +455,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();
 		}
@@ -517,27 +517,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';
 		}
@@ -554,38 +554,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__);
 		}
 	}
 
@@ -598,20 +598,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;
 	}
@@ -623,19 +623,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);
@@ -652,21 +652,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']);
 	}
 
 	/**
@@ -681,20 +681,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))
 		{
@@ -705,10 +705,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']))
 			{
@@ -722,14 +722,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);
 				}
@@ -758,12 +758,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;
 		}
@@ -771,7 +771,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);
 	}
@@ -782,13 +782,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);
 	}
 
 	/**
@@ -797,82 +797,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;
 		}
 	}
@@ -884,76 +884,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;
 		}
 	}
@@ -965,7 +965,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)
 		{
@@ -976,9 +976,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'];
 				}
@@ -991,7 +991,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;
 	}
@@ -1017,7 +1017,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();
 
@@ -1029,7 +1029,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',
@@ -1050,7 +1050,7 @@ 
 			}
 		}
 		// set password for existing account, if given and not '*unchanged*'
-		elseif($passwd && $passwd != '*unchanged*')
+		elseif ($passwd && $passwd != '*unchanged*')
 		{
 			try {
 				$auth = new auth;
@@ -1088,7 +1088,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;
@@ -1136,7 +1136,7 @@ 
 		{
 			return false;
 		}
-		foreach($accounts as $account)
+		foreach ($accounts as $account)
 		{
 			if ($account['account_lid'] != 'anonymous')
 			{
@@ -1157,7 +1157,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))
@@ -1165,32 +1165,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__);
 			}
 		}
 	}
@@ -1201,7 +1201,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;
 
@@ -1209,9 +1209,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];
 			}
@@ -1224,18 +1224,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)
 			{

Braces +128 added lines, -37 removed lines

@@ -88,11 +88,20 @@ 
 		$this->detection = new setup_detection();
 		$this->process   = new setup_process();
 
-		if (preg_match('/^[a-z0-9-]+$/i', $_REQUEST['system_charset'])) $this->system_charset = $_REQUEST['system_charset'];
+		if (preg_match('/^[a-z0-9-]+$/i', $_REQUEST['system_charset']))
+		{
+			$this->system_charset = $_REQUEST['system_charset'];
+		}
 
 		/* The setup application needs these */
-		if ($html) $this->html = new setup_html();
-		if ($translation) $this->translation = new setup_translation();
+		if ($html)
+		{
+			$this->html = new setup_html();
+		}
+		if ($translation)
+		{
+			$this->translation = new setup_translation();
+		}
 	}
 
 	/**
@@ -136,11 +145,14 @@ 
 					$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(
 							'app_name'  => 'phpgwapi',
 						),__LINE__,__FILE__);
+					}
 						$api_version = $this->db->next_record() ? $this->db->f(0) : false;
 					}
 					if (!$api_version || !$this->alessthanb($api_version,'1.0.1.019'))
@@ -210,7 +222,10 @@ 
 		}
 		else
 		{
-			if (!isset($_SESSION)) self::session_start();
+			if (!isset($_SESSION))
+			{
+				self::session_start();
+			}
 			$ConfigLang = $_SESSION['ConfigLang'];
 		}
 		if (!preg_match('/^[a-z]{2}(-[a-z]{2})?$/',$ConfigLang))
@@ -245,7 +260,10 @@ 
 			// if called via HTTPS, only send cookie for https and only allow cookie access via HTTP (true)
 			!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off', true);
 
-		if (isset($_COOKIE[self::SESSIONID])) session_id($_COOKIE[self::SESSIONID]);
+		if (isset($_COOKIE[self::SESSIONID]))
+		{
+			session_id($_COOKIE[self::SESSIONID]);
+		}
 
 		$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
@@ -657,10 +675,13 @@ 
 			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))
 		{
@@ -705,7 +726,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)
@@ -758,10 +782,13 @@ 
 	 */
 	function deregister_hooks($appname)
 	{
-		if(!$this->hooks_table)	// No hooks table yet
+		if(!$this->hooks_table)
+		{
+			// No hooks table yet
 		{
 			return False;
 		}
+		}
 
 		if(!$appname)
 		{
@@ -827,52 +854,72 @@ 
 
 		for($i=0;$i<count($testa);$i++)
 		{
-			if($DEBUG) { echo'<br>Checking if '. (int)$testa[$i] . ' is less than ' . (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.'; }
+				if ($DEBUG)
+				{
+echo ' yes.'; }
 				$less++;
 				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])
 			{
-				if($DEBUG) { echo ' no.'; }
+				if($DEBUG)
+				{
+echo ' no.'; }
 				$less--;
 				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($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)
 		{
-			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;
 		}
 	}
@@ -909,51 +956,71 @@ 
 
 		for($i=0;$i<count($testa);$i++)
 		{
-			if($DEBUG) { echo'<br>Checking if '. (int)$testa[$i] . ' is more than ' . (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)
 				{
 					/* 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])
 			{
-				if($DEBUG) { echo ' no.'; }
+				if($DEBUG)
+				{
+echo ' no.'; }
 				$less--;
 				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($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)
 		{
-			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;
 		}
 	}
@@ -990,7 +1057,10 @@ 
 				echo "<p><b>".$e->getMessage()."</b></p>\n";
 				return false;
 			}
-			if (!isset($GLOBALS['egw']->accounts)) $GLOBALS['egw']->accounts = $this->accounts;
+			if (!isset($GLOBALS['egw']->accounts))
+			{
+				$GLOBALS['egw']->accounts = $this->accounts;
+			}
 			accounts::cache_invalidate();	// the cache is shared for all instances of the class
 		}
 		return true;
@@ -1025,7 +1095,10 @@ 
 
 		if ($username == 'anonymous')
 		{
-			if (!isset($this->anonpw)) $this->anonpw = auth::randomstring(16);
+			if (!isset($this->anonpw))
+			{
+				$this->anonpw = auth::randomstring(16);
+			}
 			$passwd = $anonpw = $this->anonpw;
 		}
 
@@ -1084,11 +1157,17 @@ 
 				'account_lid' => $username,
 			));
 		}
-		if ($primary_group)	// only for users, NOT groups
+		if ($primary_group)
+		{
+			// only for users, NOT groups
 		{
 			$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;
@@ -1124,7 +1203,10 @@ 
 	 */
 	function accounts_exist()
 	{
-		if (!$this->setup_account_object()) return false;
+		if (!$this->setup_account_object())
+		{
+			return false;
+		}
 
 		$accounts = $this->accounts->search(array(
 			'type'   => 'accounts',
@@ -1205,9 +1287,15 @@ 
 	{
 		static $table_names = False;
 
-		if (!$table_names || $force_refresh) $table_names = $this->db->table_names();
+		if (!$table_names || $force_refresh)
+		{
+			$table_names = $this->db->table_names();
+		}
 
-		if (!$table_names) return false;
+		if (!$table_names)
+		{
+			return false;
+		}
 
 		foreach($table_names as $data)
 		{
@@ -1237,10 +1325,13 @@ 
 		{
 			$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)
+			if ($table && $table != $this->$name)
+			{
+				// only overwrite the default name, if we realy got one (important for new installs)
 			{
 				$this->$name = $table;
 			}
+			}
 			//echo "<p>setup::set_table_names: $name = '{$this->$name}'</p>\n";
 		}
 	}

setup/index.php

Indentation +1 added lines, -1 removed lines

@@ -222,7 +222,7 @@
 					. '<br />'.lang('to allow password authentification add the following line to your pg_hba.conf (above all others) AND restart postgres:')
 					. '<br /><i># TYPE DATABASE USER CIDR-ADDRESS METHOD</i>'
 					.($info['db_host'] ? "<br /><i><b>host $info[db_name] $info[db_user] $ip/32 password</b></i>" :
-					                     "<br /><i><b>local $info[db_name] $info[db_user] password</b></i>"));
+										 "<br /><i><b>local $info[db_name] $info[db_user] password</b></i>"));
 				//$setup_tpl->parse('V_db_stage_1','B_db_stage_1');
 				//break;
 			default:

Braces +15 added lines, -4 removed lines

@@ -49,10 +49,13 @@ 
 $GLOBALS['egw_info']['setup']['stage']['header'] = $GLOBALS['egw_setup']->detection->check_header();
 if ($GLOBALS['egw_info']['setup']['stage']['header'] != '10')
 {
-	if ($GLOBALS['egw_info']['setup']['stage']['header'] == 4)	// header needs update, go there direct
+	if ($GLOBALS['egw_info']['setup']['stage']['header'] == 4)
+	{
+		// header needs update, go there direct
 	{
 		Header('Location: manageheader.php');
 	}
+	}
 	else	// run check-install first
 	{
 		Header('Location: check_install.php?intro=1');
@@ -97,7 +100,9 @@ 
 	}
 }
 
-if ($GLOBALS['DEBUG']) { echo 'Stage: ' . $GLOBALS['egw_info']['setup']['stage']['db']; }
+if ($GLOBALS['DEBUG'])
+{
+echo 'Stage: ' . $GLOBALS['egw_info']['setup']['stage']['db']; }
 // begin DEBUG code
 //$GLOBALS['egw_info']['setup']['stage']['db'] = 0;
 //$action = 'Upgrade';
@@ -501,8 +506,14 @@ 
 		$msg = '';
 		if ($to_upgrade || $to_install)
 		{
-			if ($to_upgrade) $msg = '<b>'.lang('The following applications need to be upgraded:').'</b> '.implode(', ',$to_upgrade);
-			if ($to_install) $msg .= ($msg?'<br />':'').'<b>'.lang('The following applications are required, but NOT installed:').'</b> '.implode(', ',$to_install);
+			if ($to_upgrade)
+			{
+				$msg = '<b>'.lang('The following applications need to be upgraded:').'</b> '.implode(', ',$to_upgrade);
+			}
+			if ($to_install)
+			{
+				$msg .= ($msg?'<br />':'').'<b>'.lang('The following applications are required, but NOT installed:').'</b> '.implode(', ',$to_install);
+			}
 		}
 		$btn_manage_apps = $GLOBALS['egw_setup']->html->make_frm_btn_simple(
 			$msg ? $msg : lang('This stage is completed<br />'),

Switch Indentation +92 added lines, -92 removed lines

@@ -180,17 +180,17 @@ 
 
 switch($GLOBALS['egw_info']['setup']['stage']['db'])
 {
-	case 1:
-		$setup_tpl->set_var('dbnotexist','<b>'.lang('Your Database is not working!').'</b>: '.$GLOBALS['egw_setup']->db->Error);
-		$setup_tpl->set_var('makesure',lang('Make sure that your database is created and the account permissions are set'));
-		$setup_tpl->set_var('notcomplete',lang('not complete'));
-		$setup_tpl->set_var('oncesetup',lang('Once the database is setup correctly'));
-		$setup_tpl->set_var('createdb','<b>'.lang('Or we can attempt to create the database for you:').'</b>');
-		$setup_tpl->set_var('create_database',lang('Create database'));
-		$setup_tpl->set_var('instr','');
-		$info = $GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain];
-		switch ($info['db_type'])
-		{
+		case 1:
+			$setup_tpl->set_var('dbnotexist','<b>'.lang('Your Database is not working!').'</b>: '.$GLOBALS['egw_setup']->db->Error);
+			$setup_tpl->set_var('makesure',lang('Make sure that your database is created and the account permissions are set'));
+			$setup_tpl->set_var('notcomplete',lang('not complete'));
+			$setup_tpl->set_var('oncesetup',lang('Once the database is setup correctly'));
+			$setup_tpl->set_var('createdb','<b>'.lang('Or we can attempt to create the database for you:').'</b>');
+			$setup_tpl->set_var('create_database',lang('Create database'));
+			$setup_tpl->set_var('instr','');
+			$info = $GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain];
+			switch ($info['db_type'])
+			{
 			case 'mysql':
 			case 'mysqli':
 			case 'mysqlt':
@@ -223,76 +223,76 @@ 
 				//break;
 			default:
 				$setup_tpl->parse('V_db_stage_1','B_db_stage_1a');
-		}
+			}
 		$db_filled_block = $setup_tpl->get_var('V_db_stage_1');
 		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
 		break;
-	case 2:
-		$setup_tpl->set_var('prebeta',lang('You appear to be running a pre-beta version of eGroupWare.<br />These versions are no longer supported, and there is no upgrade path for them in setup.<br /> You may wish to first upgrade to 0.9.10 (the last version to support pre-beta upgrades) <br />and then upgrade from there with the current version.'));
-		$setup_tpl->set_var('notcomplete',lang('not complete'));
-		$setup_tpl->parse('V_db_stage_2','B_db_stage_2');
-		$db_filled_block = $setup_tpl->get_var('V_db_stage_2');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
-		break;
-	case 3:
-		$setup_tpl->set_var('dbexists','<b>'.lang('Your database is working, but you dont have any applications installed').'</b>');
-		$setup_tpl->set_var('install',lang('Install'));
-		$setup_tpl->set_var('proceed',lang('We can proceed'));
-		$setup_tpl->set_var('coreapps',lang('all applications'));
-		$setup_tpl->set_var('lang_debug',lang('enable for extra debug-messages'));
-		$setup_tpl->set_var('lang_restore',lang('Or you can install a previous backup.'));
-		$setup_tpl->set_var('upload','<input type="file" name="uploaded" /> &nbsp;'.
-			'<input type="submit" name="upload" value="'.htmlspecialchars(lang('install backup')).'" title="'.htmlspecialchars(lang("uploads a backup and installs it on your DB")).'" />');
-		$setup_tpl->set_var('convert_checkbox','<input type="checkbox" name="convert_charset" id="convert_checkbox" value="1"/>');
-		$setup_tpl->set_var('lang_convert_charset','<label for="convert_checkbox">'.
-			lang('Convert backup to charset selected above').'</label>');
-		$setup_tpl->parse('V_db_stage_3','B_db_stage_3');
-		$db_filled_block = $setup_tpl->get_var('V_db_stage_3');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
-		break;
-	case 4:
-		$setup_tpl->set_var('hidden_vars', html::input_hidden('csrf_token', egw_csrf::token(__FILE__)));
-		$setup_tpl->set_var('oldver',lang('You appear to be running version %1 of eGroupWare',$setup_info['phpgwapi']['currentver']));
-		$setup_tpl->set_var('automatic',lang('We will automatically update your tables/records to %1',$setup_info['phpgwapi']['version']));
-		$setup_tpl->set_var('backupwarn',lang('but we <u>highly recommend backing up</u> your tables in case the script causes damage to your data.<br /><strong>These automated scripts can easily destroy your data.</strong>'));
-		$setup_tpl->set_var('lang_backup',lang('create a backup before upgrading the DB'));
-		$setup_tpl->set_var('lang_debug',lang('enable for extra debug-messages'));
-		$setup_tpl->set_var('upgrade',lang('Upgrade'));
-		$setup_tpl->set_var('goto',lang('Go to'));
-		$setup_tpl->set_var('configuration',lang('configuration'));
-		$setup_tpl->set_var('admin_account',lang('Create admin account'));
-		$setup_tpl->set_var('applications',lang('Manage Applications'));
-		$setup_tpl->set_var('db_backup',lang('DB backup and restore'));
-		$setup_tpl->set_var('language_management',lang('Manage Languages'));
-		$setup_tpl->set_var('uninstall_all_applications',lang('Uninstall all applications'));
-		$setup_tpl->set_var('dont_touch_my_data',lang('Dont touch my data'));
-		$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
+		case 2:
+			$setup_tpl->set_var('prebeta',lang('You appear to be running a pre-beta version of eGroupWare.<br />These versions are no longer supported, and there is no upgrade path for them in setup.<br /> You may wish to first upgrade to 0.9.10 (the last version to support pre-beta upgrades) <br />and then upgrade from there with the current version.'));
+			$setup_tpl->set_var('notcomplete',lang('not complete'));
+			$setup_tpl->parse('V_db_stage_2','B_db_stage_2');
+			$db_filled_block = $setup_tpl->get_var('V_db_stage_2');
+			$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+			break;
+		case 3:
+			$setup_tpl->set_var('dbexists','<b>'.lang('Your database is working, but you dont have any applications installed').'</b>');
+			$setup_tpl->set_var('install',lang('Install'));
+			$setup_tpl->set_var('proceed',lang('We can proceed'));
+			$setup_tpl->set_var('coreapps',lang('all applications'));
+			$setup_tpl->set_var('lang_debug',lang('enable for extra debug-messages'));
+			$setup_tpl->set_var('lang_restore',lang('Or you can install a previous backup.'));
+			$setup_tpl->set_var('upload','<input type="file" name="uploaded" /> &nbsp;'.
+				'<input type="submit" name="upload" value="'.htmlspecialchars(lang('install backup')).'" title="'.htmlspecialchars(lang("uploads a backup and installs it on your DB")).'" />');
+			$setup_tpl->set_var('convert_checkbox','<input type="checkbox" name="convert_charset" id="convert_checkbox" value="1"/>');
+			$setup_tpl->set_var('lang_convert_charset','<label for="convert_checkbox">'.
+				lang('Convert backup to charset selected above').'</label>');
+			$setup_tpl->parse('V_db_stage_3','B_db_stage_3');
+			$db_filled_block = $setup_tpl->get_var('V_db_stage_3');
+			$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+			break;
+		case 4:
+			$setup_tpl->set_var('hidden_vars', html::input_hidden('csrf_token', egw_csrf::token(__FILE__)));
+			$setup_tpl->set_var('oldver',lang('You appear to be running version %1 of eGroupWare',$setup_info['phpgwapi']['currentver']));
+			$setup_tpl->set_var('automatic',lang('We will automatically update your tables/records to %1',$setup_info['phpgwapi']['version']));
+			$setup_tpl->set_var('backupwarn',lang('but we <u>highly recommend backing up</u> your tables in case the script causes damage to your data.<br /><strong>These automated scripts can easily destroy your data.</strong>'));
+			$setup_tpl->set_var('lang_backup',lang('create a backup before upgrading the DB'));
+			$setup_tpl->set_var('lang_debug',lang('enable for extra debug-messages'));
+			$setup_tpl->set_var('upgrade',lang('Upgrade'));
+			$setup_tpl->set_var('goto',lang('Go to'));
+			$setup_tpl->set_var('configuration',lang('configuration'));
+			$setup_tpl->set_var('admin_account',lang('Create admin account'));
+			$setup_tpl->set_var('applications',lang('Manage Applications'));
+			$setup_tpl->set_var('db_backup',lang('DB backup and restore'));
+			$setup_tpl->set_var('language_management',lang('Manage Languages'));
+			$setup_tpl->set_var('uninstall_all_applications',lang('Uninstall all applications'));
+			$setup_tpl->set_var('dont_touch_my_data',lang('Dont touch my data'));
+			$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
 
-		$setup_tpl->parse('V_db_stage_4','B_db_stage_4');
-		$db_filled_block = $setup_tpl->get_var('V_db_stage_4');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
-		break;
-	case 5:
-		$setup_tpl->set_var('hidden_vars', html::input_hidden('csrf_token', egw_csrf::token(__FILE__)));
-		$setup_tpl->set_var('are_you_sure',lang('ARE YOU SURE?'));
-		$setup_tpl->set_var('really_uninstall_all_applications',lang('REALLY Uninstall all applications'));
-		$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
-		$setup_tpl->set_var('cancel',lang('cancel'));
-		$setup_tpl->parse('V_db_stage_5','B_db_stage_5');
-		$db_filled_block = $setup_tpl->get_var('V_db_stage_5');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
-		break;
-	case 6:
-		$setup_tpl->set_var('status',lang('Status'));
-		$setup_tpl->set_var('notcomplete',lang('not complete'));
-		$setup_tpl->set_var('tblchange',lang('Table Change Messages'));
-		$setup_tpl->parse('V_db_stage_6_pre','B_db_stage_6_pre');
-		$db_filled_block = $setup_tpl->get_var('V_db_stage_6_pre');
-		$setup_tpl->set_var('tableshave',lang('If you did not receive any errors, your applications have been'));
+			$setup_tpl->parse('V_db_stage_4','B_db_stage_4');
+			$db_filled_block = $setup_tpl->get_var('V_db_stage_4');
+			$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+			break;
+		case 5:
+			$setup_tpl->set_var('hidden_vars', html::input_hidden('csrf_token', egw_csrf::token(__FILE__)));
+			$setup_tpl->set_var('are_you_sure',lang('ARE YOU SURE?'));
+			$setup_tpl->set_var('really_uninstall_all_applications',lang('REALLY Uninstall all applications'));
+			$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
+			$setup_tpl->set_var('cancel',lang('cancel'));
+			$setup_tpl->parse('V_db_stage_5','B_db_stage_5');
+			$db_filled_block = $setup_tpl->get_var('V_db_stage_5');
+			$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+			break;
+		case 6:
+			$setup_tpl->set_var('status',lang('Status'));
+			$setup_tpl->set_var('notcomplete',lang('not complete'));
+			$setup_tpl->set_var('tblchange',lang('Table Change Messages'));
+			$setup_tpl->parse('V_db_stage_6_pre','B_db_stage_6_pre');
+			$db_filled_block = $setup_tpl->get_var('V_db_stage_6_pre');
+			$setup_tpl->set_var('tableshave',lang('If you did not receive any errors, your applications have been'));
 
-		try {	// catch DB errors to report them
-			switch ($GLOBALS['egw_info']['setup']['currentver']['phpgwapi'])
-			{
+			try {	// catch DB errors to report them
+				switch ($GLOBALS['egw_info']['setup']['currentver']['phpgwapi'])
+				{
 				case 'dbcreate':
 					$GLOBALS['egw_setup']->db->create_database($_POST['db_root'], $_POST['db_pass'], 'utf8',	// create all new db's with utf8
 						!preg_match('/^[0-9.a-z_]+$/i', $_POST['db_grant_host']) ? 'localhost' : $_POST['db_grant_host']);
@@ -371,7 +371,7 @@ 
 						$GLOBALS['egw_info']['setup']['currentver']['phpgwapi'] = 'oldversion';
 					}
 					break;
-			}
+				}
 		}
 		catch (egw_exception_db $e)
 		{
@@ -383,21 +383,21 @@ 
 		$db_filled_block = $db_filled_block . $setup_tpl->get_var('V_db_stage_6_post');
 		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
 		break;
-	case 10:
-		$setup_tpl->set_var('tablescurrent',lang('Your eGroupWare API is current'));
-		$setup_tpl->set_var('uninstall_all_applications',lang('Uninstall all applications'));
-		$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
-		$setup_tpl->set_var('deletetables',lang('Uninstall all applications'));
-		$setup_tpl->parse('V_db_stage_10','B_db_stage_10');
-		$db_filled_block = $setup_tpl->get_var('V_db_stage_10');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
-		break;
-	default:
-		$setup_tpl->set_var('dbnotexist',lang('Your database does not exist'));
-		$setup_tpl->parse('V_db_stage_default','B_db_stage_default');
-		$db_filled_block = $setup_tpl->get_var('V_db_stage_default');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
-		break;
+		case 10:
+			$setup_tpl->set_var('tablescurrent',lang('Your eGroupWare API is current'));
+			$setup_tpl->set_var('uninstall_all_applications',lang('Uninstall all applications'));
+			$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
+			$setup_tpl->set_var('deletetables',lang('Uninstall all applications'));
+			$setup_tpl->parse('V_db_stage_10','B_db_stage_10');
+			$db_filled_block = $setup_tpl->get_var('V_db_stage_10');
+			$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+			break;
+		default:
+			$setup_tpl->set_var('dbnotexist',lang('Your database does not exist'));
+			$setup_tpl->parse('V_db_stage_default','B_db_stage_default');
+			$db_filled_block = $setup_tpl->get_var('V_db_stage_default');
+			$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+			break;
 }
 
 // Config Section

Spacing +182 added lines, -184 removed lines

@@ -16,9 +16,8 @@ 
 @set_time_limit(0);
 
 $tpl_root = $GLOBALS['egw_setup']->html->setup_tpl_dir('setup');
-$setup_tpl = CreateObject('phpgwapi.Template',$tpl_root);
-$setup_tpl->set_file(array
-(
+$setup_tpl = CreateObject('phpgwapi.Template', $tpl_root);
+$setup_tpl->set_file(array(
 	'T_head'       => 'head.tpl',
 	'T_footer'     => 'footer.tpl',
 	'T_alert_msg'  => 'msg_alert_msg.tpl',
@@ -28,19 +27,19 @@ 
 	'T_setup_db_blocks'    => 'setup_db_blocks.tpl'
 ));
 
-$setup_tpl->set_block('T_login_stage_header','B_multi_domain','V_multi_domain');
-$setup_tpl->set_block('T_login_stage_header','B_single_domain','V_single_domain');
+$setup_tpl->set_block('T_login_stage_header', 'B_multi_domain', 'V_multi_domain');
+$setup_tpl->set_block('T_login_stage_header', 'B_single_domain', 'V_single_domain');
 
-$setup_tpl->set_block('T_setup_db_blocks','B_db_stage_1','V_db_stage_1');
-$setup_tpl->set_block('T_setup_db_blocks','B_db_stage_1a','V_db_stage_1a');
-$setup_tpl->set_block('T_setup_db_blocks','B_db_stage_2','V_db_stage_2');
-$setup_tpl->set_block('T_setup_db_blocks','B_db_stage_3','V_db_stage_3');
-$setup_tpl->set_block('T_setup_db_blocks','B_db_stage_4','V_db_stage_4');
-$setup_tpl->set_block('T_setup_db_blocks','B_db_stage_5','V_db_stage_5');
-$setup_tpl->set_block('T_setup_db_blocks','B_db_stage_6_pre','V_db_stage_6_pre');
-$setup_tpl->set_block('T_setup_db_blocks','B_db_stage_6_post','V_db_stage_6_post');
-$setup_tpl->set_block('T_setup_db_blocks','B_db_stage_10','V_db_stage_10');
-$setup_tpl->set_block('T_setup_db_blocks','B_db_stage_default','V_db_stage_default');
+$setup_tpl->set_block('T_setup_db_blocks', 'B_db_stage_1', 'V_db_stage_1');
+$setup_tpl->set_block('T_setup_db_blocks', 'B_db_stage_1a', 'V_db_stage_1a');
+$setup_tpl->set_block('T_setup_db_blocks', 'B_db_stage_2', 'V_db_stage_2');
+$setup_tpl->set_block('T_setup_db_blocks', 'B_db_stage_3', 'V_db_stage_3');
+$setup_tpl->set_block('T_setup_db_blocks', 'B_db_stage_4', 'V_db_stage_4');
+$setup_tpl->set_block('T_setup_db_blocks', 'B_db_stage_5', 'V_db_stage_5');
+$setup_tpl->set_block('T_setup_db_blocks', 'B_db_stage_6_pre', 'V_db_stage_6_pre');
+$setup_tpl->set_block('T_setup_db_blocks', 'B_db_stage_6_post', 'V_db_stage_6_post');
+$setup_tpl->set_block('T_setup_db_blocks', 'B_db_stage_10', 'V_db_stage_10');
+$setup_tpl->set_block('T_setup_db_blocks', 'B_db_stage_default', 'V_db_stage_default');
 
 // Check header and authentication
 $GLOBALS['egw_info']['setup']['stage']['header'] = $GLOBALS['egw_setup']->detection->check_header();
@@ -56,9 +55,9 @@ 
 	}
 	exit;
 }
-elseif(!$GLOBALS['egw_setup']->auth('Config'))
+elseif (!$GLOBALS['egw_setup']->auth('Config'))
 {
-	$GLOBALS['egw_setup']->html->show_header(lang('Please login'),True);
+	$GLOBALS['egw_setup']->html->show_header(lang('Please login'), True);
 	$GLOBALS['egw_setup']->html->login_form();
 	$GLOBALS['egw_setup']->html->show_footer();
 	exit;
@@ -70,11 +69,11 @@ 
 	$GLOBALS['egw_info']['setup']['header_msg'],
 	False,
 	'config',
-	$GLOBALS['egw_setup']->ConfigDomain . ' (' . $GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'].'://'.
+	$GLOBALS['egw_setup']->ConfigDomain.' ('.$GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'].'://'.
 		$GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_user'].'@'.
 		$GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_host'].':'.
 		$GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_port'].'/'.
-		$GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_name'] . ')'
+		$GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_name'].')'
 );
 /* Add cleaning of app_sessions per skeeter, but with a check for the table being there, just in case */
 /* $GLOBALS['egw_setup']->clear_session_cache(); */
@@ -87,23 +86,23 @@ 
 	$setup_info = $GLOBALS['egw_setup']->detection->get_versions();
 	$setup_info = $GLOBALS['egw_setup']->detection->get_db_versions($setup_info);
 	$GLOBALS['egw_info']['setup']['stage']['db'] = $GLOBALS['egw_setup']->detection->check_db($setup_info);
-	if($GLOBALS['DEBUG'])
+	if ($GLOBALS['DEBUG'])
 	{
 		_debug_array($setup_info);
 	}
 }
 
-if ($GLOBALS['DEBUG']) { echo 'Stage: ' . $GLOBALS['egw_info']['setup']['stage']['db']; }
+if ($GLOBALS['DEBUG']) { echo 'Stage: '.$GLOBALS['egw_info']['setup']['stage']['db']; }
 // begin DEBUG code
 //$GLOBALS['egw_info']['setup']['stage']['db'] = 0;
 //$action = 'Upgrade';
 // end DEBUG code
 
-switch(@get_var('action',Array('POST')))
+switch (@get_var('action', Array('POST')))
 {
 	case 'Uninstall all applications':
 		$subtitle = lang('Deleting Tables');
-		$submsg = lang('Are you sure you want to delete your existing tables and data?') . '.';
+		$submsg = lang('Are you sure you want to delete your existing tables and data?').'.';
 		$subaction = lang('uninstall');
 		$GLOBALS['egw_info']['setup']['currentver']['phpgwapi'] = 'predrop';
 		$GLOBALS['egw_info']['setup']['stage']['db'] = 5;
@@ -117,7 +116,7 @@ 
 		break;
 	case 'REALLY Uninstall all applications':
 		$subtitle = lang('Deleting Tables');
-		$submsg = lang('At your request, this script is going to take the evil action of uninstalling all your apps, which deletes your existing tables and data') . '.';
+		$submsg = lang('At your request, this script is going to take the evil action of uninstalling all your apps, which deletes your existing tables and data').'.';
 		$subaction = lang('uninstalled');
 		$GLOBALS['egw_info']['setup']['currentver']['phpgwapi'] = 'drop';
 		$GLOBALS['egw_info']['setup']['stage']['db'] = 6;
@@ -148,17 +147,17 @@ 
 		$GLOBALS['egw_info']['setup']['stage']['db'] = 6;
 		break;
 }
-$setup_tpl->set_var('subtitle',@$subtitle);
-$setup_tpl->set_var('submsg',@$submsg);
-$setup_tpl->set_var('subaction',@$subaction);
+$setup_tpl->set_var('subtitle', @$subtitle);
+$setup_tpl->set_var('submsg', @$submsg);
+$setup_tpl->set_var('subaction', @$subaction);
 
 // Old PHP
-if ((float) PHP_VERSION < $GLOBALS['egw_setup']->required_php_version)
+if ((float)PHP_VERSION < $GLOBALS['egw_setup']->required_php_version)
 {
-	$GLOBALS['egw_setup']->html->show_header($GLOBALS['egw_info']['setup']['header_msg'],True);
+	$GLOBALS['egw_setup']->html->show_header($GLOBALS['egw_info']['setup']['header_msg'], True);
 	$GLOBALS['egw_setup']->html->show_alert_msg('Error',
 		lang('You are using PHP version %1. eGroupWare now requires %2 or later, recommended is PHP %3.',
-		PHP_VERSION,$GLOBALS['egw_setup']->required_php_version,$GLOBALS['egw_setup']->recommended_php_version));
+		PHP_VERSION, $GLOBALS['egw_setup']->required_php_version, $GLOBALS['egw_setup']->recommended_php_version));
 	$GLOBALS['egw_setup']->html->show_footer();
 	exit;
 }
@@ -167,134 +166,133 @@ 
 
 //$GLOBALS['egw_setup']->app_status();
 $GLOBALS['egw_info']['server']['app_images'] = 'templates/default/images';
-$incomplete = $GLOBALS['egw_info']['server']['app_images'] . '/incomplete.png';
-$completed  = $GLOBALS['egw_info']['server']['app_images'] . '/completed.png';
+$incomplete = $GLOBALS['egw_info']['server']['app_images'].'/incomplete.png';
+$completed  = $GLOBALS['egw_info']['server']['app_images'].'/completed.png';
 
-$setup_tpl->set_var('img_incomplete',$incomplete);
-$setup_tpl->set_var('img_completed',$completed);
+$setup_tpl->set_var('img_incomplete', $incomplete);
+$setup_tpl->set_var('img_completed', $completed);
 
-$setup_tpl->set_var('db_step_text',lang('Step %1 - Simple Application Management', ++$num));
-$setup_tpl->set_var('lang_system_charset',lang('<b>charset to use</b> (use utf-8 if you plan to use languages with different charsets):'));
-$setup_tpl->set_var('system_charset',str_replace('&amp;','&',
-	$GLOBALS['egw_setup']->translation->get_charsets('system_charset',$GLOBALS['egw_setup']->system_charset)));
+$setup_tpl->set_var('db_step_text', lang('Step %1 - Simple Application Management', ++$num));
+$setup_tpl->set_var('lang_system_charset', lang('<b>charset to use</b> (use utf-8 if you plan to use languages with different charsets):'));
+$setup_tpl->set_var('system_charset', str_replace('&amp;', '&',
+	$GLOBALS['egw_setup']->translation->get_charsets('system_charset', $GLOBALS['egw_setup']->system_charset)));
 
-switch($GLOBALS['egw_info']['setup']['stage']['db'])
+switch ($GLOBALS['egw_info']['setup']['stage']['db'])
 {
 	case 1:
-		$setup_tpl->set_var('dbnotexist','<b>'.lang('Your Database is not working!').'</b>: '.$GLOBALS['egw_setup']->db->Error);
-		$setup_tpl->set_var('makesure',lang('Make sure that your database is created and the account permissions are set'));
-		$setup_tpl->set_var('notcomplete',lang('not complete'));
-		$setup_tpl->set_var('oncesetup',lang('Once the database is setup correctly'));
-		$setup_tpl->set_var('createdb','<b>'.lang('Or we can attempt to create the database for you:').'</b>');
-		$setup_tpl->set_var('create_database',lang('Create database'));
-		$setup_tpl->set_var('instr','');
+		$setup_tpl->set_var('dbnotexist', '<b>'.lang('Your Database is not working!').'</b>: '.$GLOBALS['egw_setup']->db->Error);
+		$setup_tpl->set_var('makesure', lang('Make sure that your database is created and the account permissions are set'));
+		$setup_tpl->set_var('notcomplete', lang('not complete'));
+		$setup_tpl->set_var('oncesetup', lang('Once the database is setup correctly'));
+		$setup_tpl->set_var('createdb', '<b>'.lang('Or we can attempt to create the database for you:').'</b>');
+		$setup_tpl->set_var('create_database', lang('Create database'));
+		$setup_tpl->set_var('instr', '');
 		$info = $GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain];
 		switch ($info['db_type'])
 		{
 			case 'mysql':
 			case 'mysqli':
 			case 'mysqlt':
-				$set_charset = (float) $GLOBALS['egw_setup']->db->ServerInfo['version'] >= 4.1 ? ' DEFAULT CHARACTER SET utf8' : '';
+				$set_charset = (float)$GLOBALS['egw_setup']->db->ServerInfo['version'] >= 4.1 ? ' DEFAULT CHARACTER SET utf8' : '';
 				$setup_tpl->set_var('instr',
-					'<b>'.lang("Instructions for creating the database in %1:",'MySql').'</b>'
+					'<b>'.lang("Instructions for creating the database in %1:", 'MySql').'</b>'
 					. '<br />'.lang('Login to mysql -')
 					. '<br /><i>[user@server user]# <b>mysql -u root -p</b></i><br />'
 					. lang('Create the empty database and grant user permissions -')
 					. "<br /><i>mysql> <b>CREATE DATABASE $info[db_name]$set_charset;</b></i>"
-					. "<br /><i>mysql> <b>GRANT ALL ON " . $info['db_name']
-					. ".* TO " . $info['db_user'] . "@localhost IDENTIFIED BY '" . $info['db_pass'] . "';</b></i>");
-				$setup_tpl->parse('V_db_stage_1','B_db_stage_1');
+					. "<br /><i>mysql> <b>GRANT ALL ON ".$info['db_name']
+					. ".* TO ".$info['db_user']."@localhost IDENTIFIED BY '".$info['db_pass']."';</b></i>");
+				$setup_tpl->parse('V_db_stage_1', 'B_db_stage_1');
 				break;
 			case 'pgsql':
 				$ip = $info['db_host'] == 'localhost' ? '127.0.0.1' : '&lt;ip-address webserver&gt;';
 				$setup_tpl->set_var('instr',
-					'<b>'.lang('Instructions for creating the database in %1:','PostgreSQL').'</b>'
+					'<b>'.lang('Instructions for creating the database in %1:', 'PostgreSQL').'</b>'
 					. '<br />'.lang('Login as user postgres, eg. by using su as root')
 					. "<br /><i>[root@server /root]# <b>su - postgres</b></i><br />"
 					. lang('Create the empty database and grant user permissions -')
-					. "<br /><i>[postgres@server /var/lib/pgsql]\$ <b>createuser --no-adduser --no-createdb -P " . $info['db_user'] . "</b></i>"
-					. "<br /><i>Enter password for new user: <b>" . $info['db_pass'] . "</b></i>"
-					. "<br /><i>[postgres@server /var/lib/pgsql]\$ <b>createdb --encoding=utf-8 --owner " .  $info['db_user'] . ' ' . $info['db_name'] . "</b></i>"
+					. "<br /><i>[postgres@server /var/lib/pgsql]\$ <b>createuser --no-adduser --no-createdb -P ".$info['db_user']."</b></i>"
+					. "<br /><i>Enter password for new user: <b>".$info['db_pass']."</b></i>"
+					. "<br /><i>[postgres@server /var/lib/pgsql]\$ <b>createdb --encoding=utf-8 --owner ".$info['db_user'].' '.$info['db_name']."</b></i>"
 					. '<br />'.lang('to allow password authentification add the following line to your pg_hba.conf (above all others) AND restart postgres:')
 					. '<br /><i># TYPE DATABASE USER CIDR-ADDRESS METHOD</i>'
-					.($info['db_host'] ? "<br /><i><b>host $info[db_name] $info[db_user] $ip/32 password</b></i>" :
-					                     "<br /><i><b>local $info[db_name] $info[db_user] password</b></i>"));
+					.($info['db_host'] ? "<br /><i><b>host $info[db_name] $info[db_user] $ip/32 password</b></i>" : "<br /><i><b>local $info[db_name] $info[db_user] password</b></i>"));
 				//$setup_tpl->parse('V_db_stage_1','B_db_stage_1');
 				//break;
 			default:
-				$setup_tpl->parse('V_db_stage_1','B_db_stage_1a');
+				$setup_tpl->parse('V_db_stage_1', 'B_db_stage_1a');
 		}
 		$db_filled_block = $setup_tpl->get_var('V_db_stage_1');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+		$setup_tpl->set_var('V_db_filled_block', $db_filled_block);
 		break;
 	case 2:
-		$setup_tpl->set_var('prebeta',lang('You appear to be running a pre-beta version of eGroupWare.<br />These versions are no longer supported, and there is no upgrade path for them in setup.<br /> You may wish to first upgrade to 0.9.10 (the last version to support pre-beta upgrades) <br />and then upgrade from there with the current version.'));
-		$setup_tpl->set_var('notcomplete',lang('not complete'));
-		$setup_tpl->parse('V_db_stage_2','B_db_stage_2');
+		$setup_tpl->set_var('prebeta', lang('You appear to be running a pre-beta version of eGroupWare.<br />These versions are no longer supported, and there is no upgrade path for them in setup.<br /> You may wish to first upgrade to 0.9.10 (the last version to support pre-beta upgrades) <br />and then upgrade from there with the current version.'));
+		$setup_tpl->set_var('notcomplete', lang('not complete'));
+		$setup_tpl->parse('V_db_stage_2', 'B_db_stage_2');
 		$db_filled_block = $setup_tpl->get_var('V_db_stage_2');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+		$setup_tpl->set_var('V_db_filled_block', $db_filled_block);
 		break;
 	case 3:
-		$setup_tpl->set_var('dbexists','<b>'.lang('Your database is working, but you dont have any applications installed').'</b>');
-		$setup_tpl->set_var('install',lang('Install'));
-		$setup_tpl->set_var('proceed',lang('We can proceed'));
-		$setup_tpl->set_var('coreapps',lang('all applications'));
-		$setup_tpl->set_var('lang_debug',lang('enable for extra debug-messages'));
-		$setup_tpl->set_var('lang_restore',lang('Or you can install a previous backup.'));
-		$setup_tpl->set_var('upload','<input type="file" name="uploaded" /> &nbsp;'.
+		$setup_tpl->set_var('dbexists', '<b>'.lang('Your database is working, but you dont have any applications installed').'</b>');
+		$setup_tpl->set_var('install', lang('Install'));
+		$setup_tpl->set_var('proceed', lang('We can proceed'));
+		$setup_tpl->set_var('coreapps', lang('all applications'));
+		$setup_tpl->set_var('lang_debug', lang('enable for extra debug-messages'));
+		$setup_tpl->set_var('lang_restore', lang('Or you can install a previous backup.'));
+		$setup_tpl->set_var('upload', '<input type="file" name="uploaded" /> &nbsp;'.
 			'<input type="submit" name="upload" value="'.htmlspecialchars(lang('install backup')).'" title="'.htmlspecialchars(lang("uploads a backup and installs it on your DB")).'" />');
-		$setup_tpl->set_var('convert_checkbox','<input type="checkbox" name="convert_charset" id="convert_checkbox" value="1"/>');
-		$setup_tpl->set_var('lang_convert_charset','<label for="convert_checkbox">'.
+		$setup_tpl->set_var('convert_checkbox', '<input type="checkbox" name="convert_charset" id="convert_checkbox" value="1"/>');
+		$setup_tpl->set_var('lang_convert_charset', '<label for="convert_checkbox">'.
 			lang('Convert backup to charset selected above').'</label>');
-		$setup_tpl->parse('V_db_stage_3','B_db_stage_3');
+		$setup_tpl->parse('V_db_stage_3', 'B_db_stage_3');
 		$db_filled_block = $setup_tpl->get_var('V_db_stage_3');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+		$setup_tpl->set_var('V_db_filled_block', $db_filled_block);
 		break;
 	case 4:
 		$setup_tpl->set_var('hidden_vars', html::input_hidden('csrf_token', egw_csrf::token(__FILE__)));
-		$setup_tpl->set_var('oldver',lang('You appear to be running version %1 of eGroupWare',$setup_info['phpgwapi']['currentver']));
-		$setup_tpl->set_var('automatic',lang('We will automatically update your tables/records to %1',$setup_info['phpgwapi']['version']));
-		$setup_tpl->set_var('backupwarn',lang('but we <u>highly recommend backing up</u> your tables in case the script causes damage to your data.<br /><strong>These automated scripts can easily destroy your data.</strong>'));
-		$setup_tpl->set_var('lang_backup',lang('create a backup before upgrading the DB'));
-		$setup_tpl->set_var('lang_debug',lang('enable for extra debug-messages'));
-		$setup_tpl->set_var('upgrade',lang('Upgrade'));
-		$setup_tpl->set_var('goto',lang('Go to'));
-		$setup_tpl->set_var('configuration',lang('configuration'));
-		$setup_tpl->set_var('admin_account',lang('Create admin account'));
-		$setup_tpl->set_var('applications',lang('Manage Applications'));
-		$setup_tpl->set_var('db_backup',lang('DB backup and restore'));
-		$setup_tpl->set_var('language_management',lang('Manage Languages'));
-		$setup_tpl->set_var('uninstall_all_applications',lang('Uninstall all applications'));
-		$setup_tpl->set_var('dont_touch_my_data',lang('Dont touch my data'));
-		$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
+		$setup_tpl->set_var('oldver', lang('You appear to be running version %1 of eGroupWare', $setup_info['phpgwapi']['currentver']));
+		$setup_tpl->set_var('automatic', lang('We will automatically update your tables/records to %1', $setup_info['phpgwapi']['version']));
+		$setup_tpl->set_var('backupwarn', lang('but we <u>highly recommend backing up</u> your tables in case the script causes damage to your data.<br /><strong>These automated scripts can easily destroy your data.</strong>'));
+		$setup_tpl->set_var('lang_backup', lang('create a backup before upgrading the DB'));
+		$setup_tpl->set_var('lang_debug', lang('enable for extra debug-messages'));
+		$setup_tpl->set_var('upgrade', lang('Upgrade'));
+		$setup_tpl->set_var('goto', lang('Go to'));
+		$setup_tpl->set_var('configuration', lang('configuration'));
+		$setup_tpl->set_var('admin_account', lang('Create admin account'));
+		$setup_tpl->set_var('applications', lang('Manage Applications'));
+		$setup_tpl->set_var('db_backup', lang('DB backup and restore'));
+		$setup_tpl->set_var('language_management', lang('Manage Languages'));
+		$setup_tpl->set_var('uninstall_all_applications', lang('Uninstall all applications'));
+		$setup_tpl->set_var('dont_touch_my_data', lang('Dont touch my data'));
+		$setup_tpl->set_var('dropwarn', lang('Your tables will be dropped and you will lose data'));
 
-		$setup_tpl->parse('V_db_stage_4','B_db_stage_4');
+		$setup_tpl->parse('V_db_stage_4', 'B_db_stage_4');
 		$db_filled_block = $setup_tpl->get_var('V_db_stage_4');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+		$setup_tpl->set_var('V_db_filled_block', $db_filled_block);
 		break;
 	case 5:
 		$setup_tpl->set_var('hidden_vars', html::input_hidden('csrf_token', egw_csrf::token(__FILE__)));
-		$setup_tpl->set_var('are_you_sure',lang('ARE YOU SURE?'));
-		$setup_tpl->set_var('really_uninstall_all_applications',lang('REALLY Uninstall all applications'));
-		$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
-		$setup_tpl->set_var('cancel',lang('cancel'));
-		$setup_tpl->parse('V_db_stage_5','B_db_stage_5');
+		$setup_tpl->set_var('are_you_sure', lang('ARE YOU SURE?'));
+		$setup_tpl->set_var('really_uninstall_all_applications', lang('REALLY Uninstall all applications'));
+		$setup_tpl->set_var('dropwarn', lang('Your tables will be dropped and you will lose data'));
+		$setup_tpl->set_var('cancel', lang('cancel'));
+		$setup_tpl->parse('V_db_stage_5', 'B_db_stage_5');
 		$db_filled_block = $setup_tpl->get_var('V_db_stage_5');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+		$setup_tpl->set_var('V_db_filled_block', $db_filled_block);
 		break;
 	case 6:
-		$setup_tpl->set_var('status',lang('Status'));
-		$setup_tpl->set_var('notcomplete',lang('not complete'));
-		$setup_tpl->set_var('tblchange',lang('Table Change Messages'));
-		$setup_tpl->parse('V_db_stage_6_pre','B_db_stage_6_pre');
+		$setup_tpl->set_var('status', lang('Status'));
+		$setup_tpl->set_var('notcomplete', lang('not complete'));
+		$setup_tpl->set_var('tblchange', lang('Table Change Messages'));
+		$setup_tpl->parse('V_db_stage_6_pre', 'B_db_stage_6_pre');
 		$db_filled_block = $setup_tpl->get_var('V_db_stage_6_pre');
-		$setup_tpl->set_var('tableshave',lang('If you did not receive any errors, your applications have been'));
+		$setup_tpl->set_var('tableshave', lang('If you did not receive any errors, your applications have been'));
 
 		try {	// catch DB errors to report them
 			switch ($GLOBALS['egw_info']['setup']['currentver']['phpgwapi'])
 			{
 				case 'dbcreate':
-					$GLOBALS['egw_setup']->db->create_database($_POST['db_root'], $_POST['db_pass'], 'utf8',	// create all new db's with utf8
+					$GLOBALS['egw_setup']->db->create_database($_POST['db_root'], $_POST['db_pass'], 'utf8', // create all new db's with utf8
 						!preg_match('/^[0-9.a-z_]+$/i', $_POST['db_grant_host']) ? 'localhost' : $_POST['db_grant_host']);
 					break;
 				case 'drop':
@@ -310,25 +308,25 @@ 
 						if (is_array($_FILES['uploaded']) && !$_FILES['uploaded']['error'] &&
 							is_uploaded_file($_FILES['uploaded']['tmp_name']))
 						{
-							if (preg_match('/\.(bz2|gz)$/i',$_FILES['uploaded']['name'],$matches))
+							if (preg_match('/\.(bz2|gz)$/i', $_FILES['uploaded']['name'], $matches))
 							{
 								$ext = '.'.$matches[1];
-								move_uploaded_file($_FILES['uploaded']['tmp_name'],$_FILES['uploaded']['tmp_name'].$ext);
+								move_uploaded_file($_FILES['uploaded']['tmp_name'], $_FILES['uploaded']['tmp_name'].$ext);
 								$_FILES['uploaded']['tmp_name'] .= $ext;
 							}
-							if (is_resource($f = $db_backup->fopen_backup($_FILES['uploaded']['tmp_name'],true)))
+							if (is_resource($f = $db_backup->fopen_backup($_FILES['uploaded']['tmp_name'], true)))
 							{
-								echo '<p align="center">'.lang('restore started, this might take a few minutes ...')."</p>\n".str_repeat(' ',4096);
-								$db_backup->restore($f,$_POST['convert_charset'],$_FILES['uploaded']['tmp_name'],false);
+								echo '<p align="center">'.lang('restore started, this might take a few minutes ...')."</p>\n".str_repeat(' ', 4096);
+								$db_backup->restore($f, $_POST['convert_charset'], $_FILES['uploaded']['tmp_name'], false);
 								fclose($f);
 								echo '<p align="center">'.lang('restore finished')."</p>\n";
 								unlink($_FILES['uploaded']['tmp_name']);
 							}
 							else	// backup failed ==> dont start the upgrade
 							{
-								$setup_tpl->set_var('submsg',lang('Restore failed'));
-								$setup_tpl->set_var('tableshave','<b>'.$f.'</b>');
-								$setup_tpl->set_var('subaction','');
+								$setup_tpl->set_var('submsg', lang('Restore failed'));
+								$setup_tpl->set_var('tableshave', '<b>'.$f.'</b>');
+								$setup_tpl->set_var('subaction', '');
 							}
 						}
 					}
@@ -341,7 +339,7 @@ 
 							$GLOBALS['egw_setup']->system_charset = $_REQUEST['system_charset'];
 							$GLOBALS['egw_setup']->db->Link_ID->SetCharSet($_REQUEST['system_charset']);
 						}
-						$setup_info = $GLOBALS['egw_setup']->process->pass($setup_info,'new',$_REQUEST['debug'],True);
+						$setup_info = $GLOBALS['egw_setup']->process->pass($setup_info, 'new', $_REQUEST['debug'], True);
 						$GLOBALS['egw_info']['setup']['currentver']['phpgwapi'] = 'oldversion';
 					}
 					break;
@@ -350,24 +348,24 @@ 
 					// create a backup, before upgrading the tables
 					if ($_POST['backup'])
 					{
-						$db_backup =& CreateObject('phpgwapi.db_backup');
+						$db_backup = & CreateObject('phpgwapi.db_backup');
 						if (is_resource($f = $db_backup->fopen_backup()))
 						{
-							echo '<p align="center">'.lang('backup started, this might take a few minutes ...')."</p>\n".str_repeat(' ',4096);
+							echo '<p align="center">'.lang('backup started, this might take a few minutes ...')."</p>\n".str_repeat(' ', 4096);
 							$db_backup->backup($f);
 							fclose($f);
 							echo '<p align="center">'.lang('backup finished')."</p>\n";
 						}
 						else	// backup failed ==> dont start the upgrade
 						{
-							$setup_tpl->set_var('submsg',lang('Backup failed'));
-							$setup_tpl->set_var('tableshave','<b>'.$f.'</b>');
-							$setup_tpl->set_var('subaction','');
+							$setup_tpl->set_var('submsg', lang('Backup failed'));
+							$setup_tpl->set_var('tableshave', '<b>'.$f.'</b>');
+							$setup_tpl->set_var('subaction', '');
 						}
 					}
 					if (!@$_POST['backup'] || !is_string($f))
 					{
-						$setup_info = $GLOBALS['egw_setup']->process->pass($setup_info,'upgrade',$_REQUEST['debug']);
+						$setup_info = $GLOBALS['egw_setup']->process->pass($setup_info, 'upgrade', $_REQUEST['debug']);
 						$GLOBALS['egw_info']['setup']['currentver']['phpgwapi'] = 'oldversion';
 					}
 					break;
@@ -377,93 +375,93 @@ 
 		{
 			echo "<pre>".$e->getMessage()."</pre>\n";
 		}
-		$setup_tpl->set_var('re-check_my_installation',lang('Re-Check My Installation'));
-		$setup_tpl->set_var('system_charset',$GLOBALS['egw']->system_charset);
-		$setup_tpl->parse('V_db_stage_6_post','B_db_stage_6_post');
-		$db_filled_block = $db_filled_block . $setup_tpl->get_var('V_db_stage_6_post');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+		$setup_tpl->set_var('re-check_my_installation', lang('Re-Check My Installation'));
+		$setup_tpl->set_var('system_charset', $GLOBALS['egw']->system_charset);
+		$setup_tpl->parse('V_db_stage_6_post', 'B_db_stage_6_post');
+		$db_filled_block = $db_filled_block.$setup_tpl->get_var('V_db_stage_6_post');
+		$setup_tpl->set_var('V_db_filled_block', $db_filled_block);
 		break;
 	case 10:
-		$setup_tpl->set_var('tablescurrent',lang('Your eGroupWare API is current'));
-		$setup_tpl->set_var('uninstall_all_applications',lang('Uninstall all applications'));
-		$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
-		$setup_tpl->set_var('deletetables',lang('Uninstall all applications'));
-		$setup_tpl->parse('V_db_stage_10','B_db_stage_10');
+		$setup_tpl->set_var('tablescurrent', lang('Your eGroupWare API is current'));
+		$setup_tpl->set_var('uninstall_all_applications', lang('Uninstall all applications'));
+		$setup_tpl->set_var('dropwarn', lang('Your tables will be dropped and you will lose data'));
+		$setup_tpl->set_var('deletetables', lang('Uninstall all applications'));
+		$setup_tpl->parse('V_db_stage_10', 'B_db_stage_10');
 		$db_filled_block = $setup_tpl->get_var('V_db_stage_10');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+		$setup_tpl->set_var('V_db_filled_block', $db_filled_block);
 		break;
 	default:
-		$setup_tpl->set_var('dbnotexist',lang('Your database does not exist'));
-		$setup_tpl->parse('V_db_stage_default','B_db_stage_default');
+		$setup_tpl->set_var('dbnotexist', lang('Your database does not exist'));
+		$setup_tpl->parse('V_db_stage_default', 'B_db_stage_default');
 		$db_filled_block = $setup_tpl->get_var('V_db_stage_default');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+		$setup_tpl->set_var('V_db_filled_block', $db_filled_block);
 		break;
 }
 
 // Config Section
-$setup_tpl->set_var('config_step_text',lang('Step %1 - Configuration', ++$num));
+$setup_tpl->set_var('config_step_text', lang('Step %1 - Configuration', ++$num));
 $GLOBALS['egw_info']['setup']['stage']['config'] = $GLOBALS['egw_setup']->detection->check_config();
 
 // begin DEBUG code
 //$GLOBALS['egw_info']['setup']['stage']['config'] = 10;
 // end DEBUG code
 
-$setup_tpl->set_var('config_status_img',$incomplete);
-$setup_tpl->set_var('config_status_alt',lang('not completed'));
-switch($GLOBALS['egw_info']['setup']['stage']['config'])
+$setup_tpl->set_var('config_status_img', $incomplete);
+$setup_tpl->set_var('config_status_alt', lang('not completed'));
+switch ($GLOBALS['egw_info']['setup']['stage']['config'])
 {
 	case 1:	// AFAIK this dont happen any more, as we have setup_process::save_minimal_config() now -- RalfBecker
 		$btn_config_now = $GLOBALS['egw_setup']->html->make_frm_btn_simple(
 			lang('Please configure eGroupWare for your environment'),
-			'post','config.php',
-			'submit',lang('Configure Now'),
+			'post', 'config.php',
+			'submit', lang('Configure Now'),
 			'');
-		$setup_tpl->set_var('config_table_data',$btn_config_now);
+		$setup_tpl->set_var('config_table_data', $btn_config_now);
 		break;
 	case 10:
-		$setup_tpl->set_var('config_status_img',$completed);
-		$setup_tpl->set_var('config_status_alt',lang('completed'));
+		$setup_tpl->set_var('config_status_img', $completed);
+		$setup_tpl->set_var('config_status_alt', lang('completed'));
 		$config_msg = lang('Configuration completed');
 	case 2:
 		if ($GLOBALS['egw_info']['setup']['config_errors'])
 		{
-			$config_msg = implode('<br />',$GLOBALS['egw_info']['setup']['config_errors']);
+			$config_msg = implode('<br />', $GLOBALS['egw_info']['setup']['config_errors']);
 		}
 		$btn_edit_config = $GLOBALS['egw_setup']->html->make_frm_btn_simple(
 			$config_msg,
-			'post','config.php',
-			'submit',lang('Edit Current Configuration'),
+			'post', 'config.php',
+			'submit', lang('Edit Current Configuration'),
 			''
 		);
-		$setup_tpl->set_var('config_table_data',$btn_edit_config);
+		$setup_tpl->set_var('config_table_data', $btn_edit_config);
 		break;
 	default:
-		$setup_tpl->set_var('config_status_img',$incomplete);
-		$setup_tpl->set_var('config_status_alt',lang('not completed'));
-		$setup_tpl->set_var('config_table_data',lang('Not ready for this stage yet'));
+		$setup_tpl->set_var('config_status_img', $incomplete);
+		$setup_tpl->set_var('config_status_alt', lang('not completed'));
+		$setup_tpl->set_var('config_table_data', lang('Not ready for this stage yet'));
 		break;
 }
 // Admin Account Section
-$setup_tpl->set_var('admin_step_text',lang('Step %1 - Admin Account', ++$num));
+$setup_tpl->set_var('admin_step_text', lang('Step %1 - Admin Account', ++$num));
 
-switch($GLOBALS['egw_info']['setup']['stage']['config'])
+switch ($GLOBALS['egw_info']['setup']['stage']['config'])
 {
 	case 10:
 		// check if there is already a user account (not the anonymous account of sitemgr or a group)
 		$no_accounts = !$GLOBALS['egw_setup']->accounts_exist();
-		$setup_tpl->set_var('admin_status_img',$no_accounts ? $incomplete : $completed);
-		$setup_tpl->set_var('admin_status_alt',$no_accounts ? lang('not completed') : lang('completed'));
-		$setup_tpl->set_var('admin_table_data',$GLOBALS['egw_setup']->html->make_frm_btn_simple(
+		$setup_tpl->set_var('admin_status_img', $no_accounts ? $incomplete : $completed);
+		$setup_tpl->set_var('admin_status_alt', $no_accounts ? lang('not completed') : lang('completed'));
+		$setup_tpl->set_var('admin_table_data', $GLOBALS['egw_setup']->html->make_frm_btn_simple(
 			$no_accounts ? lang('No accounts existing') : lang('Accounts existing'),
-			'post','admin_account.php',
-			'submit',lang('Create admin account'),
+			'post', 'admin_account.php',
+			'submit', lang('Create admin account'),
 			''
 		));
 		break;
 	default:
-		$setup_tpl->set_var('admin_status_img',$incomplete);
-		$setup_tpl->set_var('admin_status_alt',lang('not completed'));
-		$setup_tpl->set_var('admin_table_data',lang('Not ready for this stage yet'));
+		$setup_tpl->set_var('admin_status_img', $incomplete);
+		$setup_tpl->set_var('admin_status_alt', lang('not completed'));
+		$setup_tpl->set_var('admin_table_data', lang('Not ready for this stage yet'));
 		break;
 }
 /*
@@ -514,69 +512,69 @@ 
 		break;
 }
 */
-$setup_tpl->set_var('apps_step_text',lang('Step %1 - Advanced Application Management', ++$num));
+$setup_tpl->set_var('apps_step_text', lang('Step %1 - Advanced Application Management', ++$num));
 //	$GLOBALS['egw_info']['setup']['stage']['apps'] = $GLOBALS['egw_setup']->check_apps();
-switch($GLOBALS['egw_info']['setup']['stage']['db'])
+switch ($GLOBALS['egw_info']['setup']['stage']['db'])
 {
 	case 10:
-		$setup_tpl->set_var('apps_status_img',$completed);
-		$setup_tpl->set_var('apps_status_alt',lang('completed'));
+		$setup_tpl->set_var('apps_status_img', $completed);
+		$setup_tpl->set_var('apps_status_alt', lang('completed'));
 		// check if we have apps to upgrade or essential apps not installed
 		$to_upgrade = $to_install = array();
-		foreach($setup_info as $app => $data)
+		foreach ($setup_info as $app => $data)
 		{
 			if ($data['currentver'] && $data['version'] && $data['version'] != $data['currentver'])
 			{
 				$to_upgrade[] = $app;
-				$setup_tpl->set_var('apps_status_img',$incomplete);
+				$setup_tpl->set_var('apps_status_img', $incomplete);
 			}
 		}
 		// warn if essential apps are not installed
-		foreach(array('phpgwapi','etemplate','home','admin','preferences','emailadmin') as $app)
+		foreach (array('phpgwapi', 'etemplate', 'home', 'admin', 'preferences', 'emailadmin') as $app)
 		{
 			if (!isset($setup_info[$app]) || empty($setup_info[$app]['currentver']))
 			{
 				$to_install[] = $app;
-				$setup_tpl->set_var('apps_status_img',$incomplete);
+				$setup_tpl->set_var('apps_status_img', $incomplete);
 			}
 		}
 		$msg = '';
 		if ($to_upgrade || $to_install)
 		{
-			if ($to_upgrade) $msg = '<b>'.lang('The following applications need to be upgraded:').'</b> '.implode(', ',$to_upgrade);
-			if ($to_install) $msg .= ($msg?'<br />':'').'<b>'.lang('The following applications are required, but NOT installed:').'</b> '.implode(', ',$to_install);
+			if ($to_upgrade) $msg = '<b>'.lang('The following applications need to be upgraded:').'</b> '.implode(', ', $to_upgrade);
+			if ($to_install) $msg .= ($msg ? '<br />' : '').'<b>'.lang('The following applications are required, but NOT installed:').'</b> '.implode(', ', $to_install);
 		}
 		$btn_manage_apps = $GLOBALS['egw_setup']->html->make_frm_btn_simple(
 			$msg ? $msg : lang('This stage is completed<br />'),
-			'post','applications.php',
-			'submit',lang('Manage Applications'),
+			'post', 'applications.php',
+			'submit', lang('Manage Applications'),
 			'');
-		$setup_tpl->set_var('apps_table_data',$btn_manage_apps);
+		$setup_tpl->set_var('apps_table_data', $btn_manage_apps);
 		break;
 	default:
-		$setup_tpl->set_var('apps_status_img',$incomplete);
-		$setup_tpl->set_var('apps_status_alt',lang('not completed'));
-		$setup_tpl->set_var('apps_table_data',lang('Not ready for this stage yet'));
+		$setup_tpl->set_var('apps_status_img', $incomplete);
+		$setup_tpl->set_var('apps_status_alt', lang('not completed'));
+		$setup_tpl->set_var('apps_table_data', lang('Not ready for this stage yet'));
 		break;
 }
 // Backup and restore section
-$setup_tpl->set_var('backup_step_text',lang('Step %1 - DB backup and restore', ++$num));
+$setup_tpl->set_var('backup_step_text', lang('Step %1 - DB backup and restore', ++$num));
 if ($GLOBALS['egw_info']['setup']['stage']['db'] == 10 && !$no_backup_dir)
 {
-	$setup_tpl->set_var('backup_status_img',$completed);
-	$setup_tpl->set_var('backup_status_alt',lang('completed'));
-	$setup_tpl->set_var('backup_table_data',$GLOBALS['egw_setup']->html->make_frm_btn_simple(
+	$setup_tpl->set_var('backup_status_img', $completed);
+	$setup_tpl->set_var('backup_status_alt', lang('completed'));
+	$setup_tpl->set_var('backup_table_data', $GLOBALS['egw_setup']->html->make_frm_btn_simple(
 		''/*lang('This stage is completed<br />')*/,
-		'post','db_backup.php',
-		'submit',lang('backup and restore'),
+		'post', 'db_backup.php',
+		'submit', lang('backup and restore'),
 		''));
 }
 else
 {
-	$setup_tpl->set_var('backup_status_img',$incomplete);
-	$setup_tpl->set_var('backup_status_alt',lang('not completed'));
-	$setup_tpl->set_var('backup_table_data',$no_backup_dir ? $no_backup_dir : lang('Not ready for this stage yet'));
+	$setup_tpl->set_var('backup_status_img', $incomplete);
+	$setup_tpl->set_var('backup_status_alt', lang('not completed'));
+	$setup_tpl->set_var('backup_table_data', $no_backup_dir ? $no_backup_dir : lang('Not ready for this stage yet'));
 }
 
-$setup_tpl->pparse('out','T_setup_main');
+$setup_tpl->pparse('out', 'T_setup_main');
 $GLOBALS['egw_setup']->html->show_footer();

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -99,7 +99,7 @@
 //$action = 'Upgrade';
 // end DEBUG code
 
-switch(@get_var('action',Array('POST')))
+switch(@get_var('action',array('POST')))
 {
 	case 'Uninstall all applications':
 		$subtitle = lang('Deleting Tables');

setup/applications.php

Indentation +1 added lines, -1 removed lines

@@ -350,7 +350,7 @@
 			{
 				echo lang('because it depends upon') . ':<br />' . "\n";
 				list($depapp,$depver) = parsedep($setup_info[$resolve]['depends'],False);
-                            $depapp_count = count($depapp);
+							$depapp_count = count($depapp);
 				for ($i=0; $i<$depapp_count; $i++)
 				{
 					echo '<br />' . $depapp[$i] . ': ';

Spacing +233 added lines, -233 removed lines

@@ -31,7 +31,7 @@ 
 // Does not return unless user is authorized
 
 $tpl_root = $GLOBALS['egw_setup']->html->setup_tpl_dir('setup');
-$setup_tpl = CreateObject('phpgwapi.Template',$tpl_root);
+$setup_tpl = CreateObject('phpgwapi.Template', $tpl_root);
 $setup_tpl->set_file(array(
 	'T_head' => 'head.tpl',
 	'T_footer' => 'footer.tpl',
@@ -48,36 +48,36 @@ 
 	egw_csrf::validate($_POST['csrf_token'], __FILE__);
 }
 
-$setup_tpl->set_block('T_login_stage_header','B_multi_domain','V_multi_domain');
-$setup_tpl->set_block('T_login_stage_header','B_single_domain','V_single_domain');
-$setup_tpl->set_block('T_setup_main','header','header');
-$setup_tpl->set_block('T_setup_main','app_header','app_header');
-$setup_tpl->set_block('T_setup_main','apps','apps');
-$setup_tpl->set_block('T_setup_main','detail','detail');
-$setup_tpl->set_block('T_setup_main','table','table');
-$setup_tpl->set_block('T_setup_main','hook','hook');
-$setup_tpl->set_block('T_setup_main','dep','dep');
-$setup_tpl->set_block('T_setup_main','app_footer','app_footer');
-$setup_tpl->set_block('T_setup_main','submit','submit');
-$setup_tpl->set_block('T_setup_main','footer','footer');
-
-$bgcolor = array('#DDDDDD','#EEEEEE');
-
-function parsedep($depends,$main=True)
+$setup_tpl->set_block('T_login_stage_header', 'B_multi_domain', 'V_multi_domain');
+$setup_tpl->set_block('T_login_stage_header', 'B_single_domain', 'V_single_domain');
+$setup_tpl->set_block('T_setup_main', 'header', 'header');
+$setup_tpl->set_block('T_setup_main', 'app_header', 'app_header');
+$setup_tpl->set_block('T_setup_main', 'apps', 'apps');
+$setup_tpl->set_block('T_setup_main', 'detail', 'detail');
+$setup_tpl->set_block('T_setup_main', 'table', 'table');
+$setup_tpl->set_block('T_setup_main', 'hook', 'hook');
+$setup_tpl->set_block('T_setup_main', 'dep', 'dep');
+$setup_tpl->set_block('T_setup_main', 'app_footer', 'app_footer');
+$setup_tpl->set_block('T_setup_main', 'submit', 'submit');
+$setup_tpl->set_block('T_setup_main', 'footer', 'footer');
+
+$bgcolor = array('#DDDDDD', '#EEEEEE');
+
+function parsedep($depends, $main = True)
 {
 	$depstring = '(';
-	foreach($depends as $a => $b)
+	foreach ($depends as $a => $b)
 	{
-		foreach($b as $c => $d)
+		foreach ($b as $c => $d)
 		{
 			if (is_array($d))
 			{
-				$depstring .= $c . ': ' .implode(',',$d) . '; ';
+				$depstring .= $c.': '.implode(',', $d).'; ';
 				$depver[] = $d;
 			}
 			else
 			{
-				$depstring .= $c . ': ' . $d . '; ';
+				$depstring .= $c.': '.$d.'; ';
 				$depapp[] = $d;
 			}
 		}
@@ -89,7 +89,7 @@ 
 	}
 	else
 	{
-		return array($depapp,$depver);
+		return array($depapp, $depver);
 	}
 }
 
@@ -106,29 +106,29 @@ 
 //var_dump($setup_info);exit;
 @ksort($setup_info);
 
-if(@get_var('cancel',Array('POST')))
+if (@get_var('cancel', Array('POST')))
 {
 	Header("Location: index.php");
 	exit;
 }
 
-if(@get_var('submit',Array('POST')))
+if (@get_var('submit', Array('POST')))
 {
-	$GLOBALS['egw_setup']->html->show_header(lang('Application Management'),False,'config',$GLOBALS['egw_setup']->ConfigDomain . '(' . $GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'] . ')');
-	$setup_tpl->set_var('description',lang('App install/remove/upgrade') . ':');
-	$setup_tpl->pparse('out','header');
+	$GLOBALS['egw_setup']->html->show_header(lang('Application Management'), False, 'config', $GLOBALS['egw_setup']->ConfigDomain.'('.$GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'].')');
+	$setup_tpl->set_var('description', lang('App install/remove/upgrade').':');
+	$setup_tpl->pparse('out', 'header');
 
-	$appname = get_var('appname',Array('POST'));
-	$remove  = get_var('remove',Array('POST'));
-	$install = get_var('install',Array('POST'));
-	$upgrade = get_var('upgrade',Array('POST'));
+	$appname = get_var('appname', Array('POST'));
+	$remove  = get_var('remove', Array('POST'));
+	$install = get_var('install', Array('POST'));
+	$upgrade = get_var('upgrade', Array('POST'));
 
-	if(!empty($remove) && is_array($remove))
+	if (!empty($remove) && is_array($remove))
 	{
 		$historylog = CreateObject('phpgwapi.historylog');
 		$historylog->db = $GLOBALS['egw_setup']->db;
 
-		foreach($remove as $appname => $key)
+		foreach ($remove as $appname => $key)
 		{
 			$app_title = $setup_info[$appname]['title'] ? $setup_info[$appname]['title'] : $setup_info[$appname]['name'];
 			$terror = array();
@@ -136,33 +136,33 @@ 
 
 			if ($setup_info[$appname]['tables'])
 			{
-				$GLOBALS['egw_setup']->process->droptables($terror,$DEBUG);
-				echo '<br />' . $app_title . ' ' . lang('tables dropped') . '.';
+				$GLOBALS['egw_setup']->process->droptables($terror, $DEBUG);
+				echo '<br />'.$app_title.' '.lang('tables dropped').'.';
 			}
 
 			$GLOBALS['egw_setup']->deregister_app($setup_info[$appname]['name']);
-			echo '<br />' . $app_title . ' ' . lang('deregistered') . '.';
+			echo '<br />'.$app_title.' '.lang('deregistered').'.';
 
 			if ($GLOBALS['egw_setup']->deregister_hooks($setup_info[$appname]['name']))
 			{
-				echo '<br />' . $app_title . ' ' . lang('hooks deregistered') . '.';
+				echo '<br />'.$app_title.' '.lang('hooks deregistered').'.';
 			}
 
 			$historylog->appname = $appname;
 			if ($historylog->delete(null))
 			{
-				echo '<br />' . $app_title . ' ' . lang('Historylog removed') . '.';
+				echo '<br />'.$app_title.' '.lang('Historylog removed').'.';
 			}
 
 			// delete all application categories and ACL
-			$GLOBALS['egw_setup']->db->delete($GLOBALS['egw_setup']->cats_table,array('cat_appname' => $appname),__LINE__,__FILE__);
-			$GLOBALS['egw_setup']->db->delete($GLOBALS['egw_setup']->acl_table,array('acl_appname' => $appname),__LINE__,__FILE__);
+			$GLOBALS['egw_setup']->db->delete($GLOBALS['egw_setup']->cats_table, array('cat_appname' => $appname), __LINE__, __FILE__);
+			$GLOBALS['egw_setup']->db->delete($GLOBALS['egw_setup']->acl_table, array('acl_appname' => $appname), __LINE__, __FILE__);
 		}
 	}
 
-	if(!empty($install) && is_array($install))
+	if (!empty($install) && is_array($install))
 	{
-		foreach($install as $appname => $key)
+		foreach ($install as $appname => $key)
 		{
 			$app_title = $setup_info[$appname]['title'] ? $setup_info[$appname]['title'] : $setup_info[$appname]['name'];
 			$terror = array();
@@ -170,15 +170,15 @@ 
 
 			if ($setup_info[$appname]['tables'])
 			{
-				$terror = $GLOBALS['egw_setup']->process->current($terror,$DEBUG);
-				$terror = $GLOBALS['egw_setup']->process->default_records($terror,$DEBUG);
-				echo '<br />' . $app_title . ' '
-					. lang('tables installed, unless there are errors printed above') . '.';
+				$terror = $GLOBALS['egw_setup']->process->current($terror, $DEBUG);
+				$terror = $GLOBALS['egw_setup']->process->default_records($terror, $DEBUG);
+				echo '<br />'.$app_title.' '
+					. lang('tables installed, unless there are errors printed above').'.';
 			}
 			else
 			{
 				// check default_records for apps without tables, they might need some initial work too
-				$terror = $GLOBALS['egw_setup']->process->default_records($terror,$DEBUG);
+				$terror = $GLOBALS['egw_setup']->process->default_records($terror, $DEBUG);
 				if ($GLOBALS['egw_setup']->app_registered($setup_info[$appname]['name']))
 				{
 					$GLOBALS['egw_setup']->update_app($setup_info[$appname]['name']);
@@ -187,260 +187,260 @@ 
 				{
 					$GLOBALS['egw_setup']->register_app($setup_info[$appname]['name']);
 				}
-				echo '<br />' . $app_title . ' ' . lang('registered') . '.';
+				echo '<br />'.$app_title.' '.lang('registered').'.';
 
 				if ($setup_info[$appname]['hooks'])
 				{
 					$GLOBALS['egw_setup']->register_hooks($setup_info[$appname]['name']);
-					echo '<br />' . $app_title . ' ' . lang('hooks registered') . '.';
+					echo '<br />'.$app_title.' '.lang('hooks registered').'.';
 				}
 			}
 		}
 	}
 
-	if(!empty($upgrade) && is_array($upgrade))
+	if (!empty($upgrade) && is_array($upgrade))
 	{
-		foreach($upgrade as $appname => $key)
+		foreach ($upgrade as $appname => $key)
 		{
 			$app_title = $setup_info[$appname]['title'] ? $setup_info[$appname]['title'] : $setup_info[$appname]['name'];
 			$terror = array();
 			$terror[$appname] = $setup_info[$appname];
 
-			$GLOBALS['egw_setup']->process->upgrade($terror,$DEBUG);
+			$GLOBALS['egw_setup']->process->upgrade($terror, $DEBUG);
 			if ($setup_info[$appname]['tables'])
 			{
-				echo '<br />' . $app_title . ' ' . lang('tables upgraded') . '.';
+				echo '<br />'.$app_title.' '.lang('tables upgraded').'.';
 				// The process_upgrade() function also handles registration
 			}
 			else
 			{
-				echo '<br />' . $app_title . ' ' . lang('upgraded') . '.';
+				echo '<br />'.$app_title.' '.lang('upgraded').'.';
 			}
 		}
 	}
 	//$setup_tpl->set_var('goback',
-	echo '<br /><a href="applications.php?debug='.$DEBUG.'">' . lang('Go back') . '</a>';
+	echo '<br /><a href="applications.php?debug='.$DEBUG.'">'.lang('Go back').'</a>';
 	//$setup_tpl->pparse('out','submit');
-	$setup_tpl->pparse('out','footer');
+	$setup_tpl->pparse('out', 'footer');
 	exit;
 }
 else
 {
-	$GLOBALS['egw_setup']->html->show_header(lang('Application Management'),False,'config',$GLOBALS['egw_setup']->ConfigDomain . '(' . $GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'] . ')');
+	$GLOBALS['egw_setup']->html->show_header(lang('Application Management'), False, 'config', $GLOBALS['egw_setup']->ConfigDomain.'('.$GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'].')');
 }
 
-if(@get_var('hooks', Array('GET')))
+if (@get_var('hooks', Array('GET')))
 {
 	egw_cache::flush(egw_cache::INSTANCE);
 
 	// Find & register all application hooks
-	foreach($setup_info as $appname => $info)
+	foreach ($setup_info as $appname => $info)
 	{
 		if ($info['currentver']) $GLOBALS['egw_setup']->register_hooks($appname);
 	}
-	echo lang('All hooks registered') . '<br />';
+	echo lang('All hooks registered').'<br />';
 }
-$detail = get_var('detail',Array('GET'));
-$resolve = get_var('resolve',Array('GET'));
-if(@$detail)
+$detail = get_var('detail', Array('GET'));
+$resolve = get_var('resolve', Array('GET'));
+if (@$detail)
 {
 	@ksort($setup_info[$detail]);
-	$setup_tpl->set_var('description',lang('App details') . ':');
-	$setup_tpl->pparse('out','header');
+	$setup_tpl->set_var('description', lang('App details').':');
+	$setup_tpl->pparse('out', 'header');
 
-	$setup_tpl->set_var('name','application');
+	$setup_tpl->set_var('name', 'application');
 	$setup_tpl->set_var('details', lang($setup_info[$detail]['title']));
-	$setup_tpl->pparse('out','detail');
+	$setup_tpl->pparse('out', 'detail');
 
-	foreach($setup_info[$detail] as $key => $val)
+	foreach ($setup_info[$detail] as $key => $val)
 	{
-		if($key != 'title')
+		if ($key != 'title')
 		{
 			$i = ($i ? 0 : 1);
 
 			if ($key == 'tables')
 			{
 				$tblcnt = count($setup_info[$detail][$key]);
-				if(is_array($val))
+				if (is_array($val))
 				{
-					$key = '<a href="sqltoarray.php?appname=' . $detail . '&submit=True&apps=True">' . $key . '(' . $tblcnt . ')</a>' . "\n";
-					$val = implode(',' . "\n",$val);
+					$key = '<a href="sqltoarray.php?appname='.$detail.'&submit=True&apps=True">'.$key.'('.$tblcnt.')</a>'."\n";
+					$val = implode(','."\n", $val);
 				}
 			}
-			if ($key == 'hooks')   { $val = implode(',',$val); }
+			if ($key == 'hooks') { $val = implode(',', $val); }
 			if ($key == 'depends') { $val = parsedep($val); }
-			if (is_array($val))    { $val = implode(',',$val); }
+			if (is_array($val)) { $val = implode(',', $val); }
 
-			$setup_tpl->set_var('bg_color',$bgcolor[$i]);
-			$setup_tpl->set_var('name',$key);
-			$setup_tpl->set_var('details',$val);
-			$setup_tpl->pparse('out','detail');
+			$setup_tpl->set_var('bg_color', $bgcolor[$i]);
+			$setup_tpl->set_var('name', $key);
+			$setup_tpl->set_var('details', $val);
+			$setup_tpl->pparse('out', 'detail');
 		}
 	}
 
-	echo '<br /><a href="applications.php?debug='.$DEBUG.'">' . lang('Go back') . '</a>';
-	$setup_tpl->pparse('out','footer');
+	echo '<br /><a href="applications.php?debug='.$DEBUG.'">'.lang('Go back').'</a>';
+	$setup_tpl->pparse('out', 'footer');
 	exit;
 }
 elseif (@$resolve)
 {
-	$version  = get_var('version',Array('GET'));
-	$notables = get_var('notables',Array('GET'));
-	$setup_tpl->set_var('description',lang('Problem resolution'). ':');
-	$setup_tpl->pparse('out','header');
+	$version  = get_var('version', Array('GET'));
+	$notables = get_var('notables', Array('GET'));
+	$setup_tpl->set_var('description', lang('Problem resolution').':');
+	$setup_tpl->pparse('out', 'header');
 	$app_title = $setup_info[$resolve]['title'] ? $setup_info[$resolve]['title'] : $setup_info[$resolve]['name'];
 
-	if(get_var('post',Array('GET')))
+	if (get_var('post', Array('GET')))
 	{
-		echo '"' . $app_title . '" ' . lang('may be broken') . ' ';
+		echo '"'.$app_title.'" '.lang('may be broken').' ';
 		echo lang('because an application it depends upon was upgraded');
 		echo '<br />';
-		echo lang('to a version it does not know about') . '.';
+		echo lang('to a version it does not know about').'.';
 		echo '<br />';
-		echo lang('However, the application may still work') . '.';
+		echo lang('However, the application may still work').'.';
 	}
-	elseif(get_var('badinstall',Array('GET')))
+	elseif (get_var('badinstall', Array('GET')))
 	{
-		echo '"' . $app_title . '" ' . lang('is broken') . ' ';
-		echo lang('because of a failed upgrade or install') . '.';
+		echo '"'.$app_title.'" '.lang('is broken').' ';
+		echo lang('because of a failed upgrade or install').'.';
 		echo '<br />';
-		echo lang('Some or all of its tables are missing') . '.';
+		echo lang('Some or all of its tables are missing').'.';
 		echo '<br />';
-		echo lang('You should either uninstall and then reinstall it, or attempt manual repairs') . '.';
+		echo lang('You should either uninstall and then reinstall it, or attempt manual repairs').'.';
 	}
-	elseif(get_var('deleted',Array('GET')))
+	elseif (get_var('deleted', Array('GET')))
 	{
-		echo '"' . $app_title . '" ' . lang('is broken') . ' ';
-		echo lang('because its sources are missing') . '!';
+		echo '"'.$app_title.'" '.lang('is broken').' ';
+		echo lang('because its sources are missing').'!';
 		echo '<br />';
-		echo lang('However the tables are still in the database') . '.';
+		echo lang('However the tables are still in the database').'.';
 		echo '<br />';
-		echo lang('You should either install the sources or uninstall it, to get rid of the tables') . '.';
+		echo lang('You should either install the sources or uninstall it, to get rid of the tables').'.';
 	}
 	elseif (!$version)
 	{
-		if($setup_info[$resolve]['enabled'])
+		if ($setup_info[$resolve]['enabled'])
 		{
-			echo '"' . $app_title . '" ' . lang('is broken') . ' ';
+			echo '"'.$app_title.'" '.lang('is broken').' ';
 		}
 		else
 		{
-			echo '"' . $app_title . '" ' . lang('is disabled') . ' ';
+			echo '"'.$app_title.'" '.lang('is disabled').' ';
 		}
 
 		if (!$notables)
 		{
-			if($setup_info[$resolve]['status'] == 'D')
+			if ($setup_info[$resolve]['status'] == 'D')
 			{
-				echo lang('because it depends upon') . ':<br />' . "\n";
-				list($depapp,$depver) = parsedep($setup_info[$resolve]['depends'],False);
+				echo lang('because it depends upon').':<br />'."\n";
+				list($depapp, $depver) = parsedep($setup_info[$resolve]['depends'], False);
                             $depapp_count = count($depapp);
-				for ($i=0; $i<$depapp_count; $i++)
+				for ($i = 0; $i < $depapp_count; $i++)
 				{
-					echo '<br />' . $depapp[$i] . ': ';
+					echo '<br />'.$depapp[$i].': ';
 					$list = '';
-					foreach($depver[$i] as $x => $y)
+					foreach ($depver[$i] as $x => $y)
 					{
-						$list .= $y . ', ';
+						$list .= $y.', ';
 					}
-					$list = substr($list,0,-2);
+					$list = substr($list, 0, -2);
 					echo "$list\n";
 				}
-				echo '<br /><br />' . lang('The table definition was correct, and the tables were installed') . '.';
+				echo '<br /><br />'.lang('The table definition was correct, and the tables were installed').'.';
 			}
 			else
 			{
-				echo lang('because it was manually disabled') . '.';
+				echo lang('because it was manually disabled').'.';
 			}
 		}
-		elseif($setup_info[$resolve]['enable'] == 2)
+		elseif ($setup_info[$resolve]['enable'] == 2)
 		{
-			echo lang('because it is not a user application, or access is controlled via acl') . '.';
+			echo lang('because it is not a user application, or access is controlled via acl').'.';
 		}
-		elseif($setup_info[$resolve]['enable'] == 0)
+		elseif ($setup_info[$resolve]['enable'] == 0)
 		{
-			echo lang('because the enable flag for this app is set to 0, or is undefined') . '.';
+			echo lang('because the enable flag for this app is set to 0, or is undefined').'.';
 		}
 		else
 		{
-			echo lang('because it requires manual table installation, <br />or the table definition was incorrect') . ".\n"
-				. lang("Please check for sql scripts within the application's directory") . '.';
+			echo lang('because it requires manual table installation, <br />or the table definition was incorrect').".\n"
+				. lang("Please check for sql scripts within the application's directory").'.';
 		}
-		echo '<br />' . lang('However, the application is otherwise installed') . '.';
+		echo '<br />'.lang('However, the application is otherwise installed').'.';
 	}
 	else
 	{
-		echo $app_title . ' ' . lang('has a version mismatch') . ' ';
-		echo lang('because of a failed upgrade, or the database is newer than the installed version of this app') . '.';
+		echo $app_title.' '.lang('has a version mismatch').' ';
+		echo lang('because of a failed upgrade, or the database is newer than the installed version of this app').'.';
 		echo '<br />';
-		echo lang('If the application has no defined tables, selecting upgrade should remedy the problem') . '.';
-		echo '<br />' . lang('However, the application is otherwise installed') . '.';
+		echo lang('If the application has no defined tables, selecting upgrade should remedy the problem').'.';
+		echo '<br />'.lang('However, the application is otherwise installed').'.';
 	}
 
-	echo '<br /><a href="applications.php?debug='.$DEBUG.'">' . lang('Go back') . '</a>';
-	$setup_tpl->pparse('out','footer');
+	echo '<br /><a href="applications.php?debug='.$DEBUG.'">'.lang('Go back').'</a>';
+	$setup_tpl->pparse('out', 'footer');
 	exit;
 }
 else
 {
-	$setup_tpl->set_var('description',lang('Select the desired action(s) from the available choices'));
-	$setup_tpl->set_var('action_url','applications.php');
-	$setup_tpl->pparse('out','header');
-
-	$setup_tpl->set_var('appdata',lang('Application Data'));
-	$setup_tpl->set_var('actions',lang('Actions'));
-	$setup_tpl->set_var('app_info',lang('Application Name and Status Information'));
-	$setup_tpl->set_var('app_title',lang('Application Title'));
-	$setup_tpl->set_var('app_currentver',lang('Current Version'));
-	$setup_tpl->set_var('app_version',lang('Available Version'));
-	$setup_tpl->set_var('app_install',lang('Install'));
-	$setup_tpl->set_var('app_remove',lang('Remove'));
-	$setup_tpl->set_var('app_upgrade',lang('Upgrade'));
-	$setup_tpl->set_var('app_resolve',lang('Resolve'));
-	$setup_tpl->set_var('check','check.png');
-	$setup_tpl->set_var('install_all',lang('Install All'));
-	$setup_tpl->set_var('upgrade_all',lang('Upgrade All'));
-	$setup_tpl->set_var('remove_all',lang('Remove All'));
-	$setup_tpl->set_var('lang_debug',lang('enable for extra debug-messages'));
-	$setup_tpl->set_var('debug','<input type="checkbox" name="debug" value="True"' .($DEBUG ? ' checked="checked"' : '') . ' />');
-	$setup_tpl->set_var('bg_color',$bgcolor[0]);
-
-	$setup_tpl->pparse('out','app_header');
+	$setup_tpl->set_var('description', lang('Select the desired action(s) from the available choices'));
+	$setup_tpl->set_var('action_url', 'applications.php');
+	$setup_tpl->pparse('out', 'header');
+
+	$setup_tpl->set_var('appdata', lang('Application Data'));
+	$setup_tpl->set_var('actions', lang('Actions'));
+	$setup_tpl->set_var('app_info', lang('Application Name and Status Information'));
+	$setup_tpl->set_var('app_title', lang('Application Title'));
+	$setup_tpl->set_var('app_currentver', lang('Current Version'));
+	$setup_tpl->set_var('app_version', lang('Available Version'));
+	$setup_tpl->set_var('app_install', lang('Install'));
+	$setup_tpl->set_var('app_remove', lang('Remove'));
+	$setup_tpl->set_var('app_upgrade', lang('Upgrade'));
+	$setup_tpl->set_var('app_resolve', lang('Resolve'));
+	$setup_tpl->set_var('check', 'check.png');
+	$setup_tpl->set_var('install_all', lang('Install All'));
+	$setup_tpl->set_var('upgrade_all', lang('Upgrade All'));
+	$setup_tpl->set_var('remove_all', lang('Remove All'));
+	$setup_tpl->set_var('lang_debug', lang('enable for extra debug-messages'));
+	$setup_tpl->set_var('debug', '<input type="checkbox" name="debug" value="True"'.($DEBUG ? ' checked="checked"' : '').' />');
+	$setup_tpl->set_var('bg_color', $bgcolor[0]);
+
+	$setup_tpl->pparse('out', 'app_header');
 
 	$i = 0;
-	foreach($setup_info as $key => $value)
+	foreach ($setup_info as $key => $value)
 	{
-		if(@$value['name'])
+		if (@$value['name'])
 		{
 			$i = ($i ? 0 : 1);
-			$setup_tpl->set_var('apptitle',$value['title']?$value['title']:lang($value['name']));
-			$setup_tpl->set_var('currentver',@$value['currentver']);
-			$setup_tpl->set_var('version',$value['version']);
-			$setup_tpl->set_var('bg_color',$bgcolor[$i]);
+			$setup_tpl->set_var('apptitle', $value['title'] ? $value['title'] : lang($value['name']));
+			$setup_tpl->set_var('currentver', @$value['currentver']);
+			$setup_tpl->set_var('version', $value['version']);
+			$setup_tpl->set_var('bg_color', $bgcolor[$i]);
 
-			switch($value['status'])
+			switch ($value['status'])
 			{
 				case 'C':
-					$setup_tpl->set_var('remove',$key == 'phpgwapi' ? '&nbsp;' : '<input type="checkbox" name="remove[' . $value['name'] . ']" />');
-					$setup_tpl->set_var('upgrade','&nbsp;');
+					$setup_tpl->set_var('remove', $key == 'phpgwapi' ? '&nbsp;' : '<input type="checkbox" name="remove['.$value['name'].']" />');
+					$setup_tpl->set_var('upgrade', '&nbsp;');
 					if (!$GLOBALS['egw_setup']->detection->check_app_tables($value['name']))
 					{
 						// App installed and enabled, but some tables are missing
-						$setup_tpl->set_var('instimg','table.png');
-						$setup_tpl->set_var('bg_color','FFCCAA');
-						$setup_tpl->set_var('instalt',lang('Not Completed'));
-						$setup_tpl->set_var('resolution','<a href="applications.php?resolve=' . $value['name'] . '&badinstall=True">' . lang('Potential Problem') . '</a>');
-						$status = lang('Requires reinstall or manual repair') . ' - ' . $value['status'];
+						$setup_tpl->set_var('instimg', 'table.png');
+						$setup_tpl->set_var('bg_color', 'FFCCAA');
+						$setup_tpl->set_var('instalt', lang('Not Completed'));
+						$setup_tpl->set_var('resolution', '<a href="applications.php?resolve='.$value['name'].'&badinstall=True">'.lang('Potential Problem').'</a>');
+						$status = lang('Requires reinstall or manual repair').' - '.$value['status'];
 					}
 					else
 					{
-						$setup_tpl->set_var('instimg','completed.png');
-						$setup_tpl->set_var('instalt',lang('Completed'));
-						$setup_tpl->set_var('install','&nbsp;');
-						if($value['enabled'])
+						$setup_tpl->set_var('instimg', 'completed.png');
+						$setup_tpl->set_var('instalt', lang('Completed'));
+						$setup_tpl->set_var('install', '&nbsp;');
+						if ($value['enabled'])
 						{
-							$setup_tpl->set_var('resolution','');
-							$status = lang('OK') . ' - ' . $value['status'];
+							$setup_tpl->set_var('resolution', '');
+							$status = lang('OK').' - '.$value['status'];
 						}
 						else
 						{
@@ -448,123 +448,123 @@ 
 							{
 								$notables = '&notables=True';
 							}
-							$setup_tpl->set_var('bg_color','CCCCFF');
+							$setup_tpl->set_var('bg_color', 'CCCCFF');
 							$setup_tpl->set_var('resolution',
-								'<a href="applications.php?resolve=' . $value['name'] .  $notables . '">' . lang('Possible Reasons') . '</a>'
+								'<a href="applications.php?resolve='.$value['name'].$notables.'">'.lang('Possible Reasons').'</a>'
 							);
-							$status = lang('Disabled') . ' - ' . $value['status'];
+							$status = lang('Disabled').' - '.$value['status'];
 						}
 					}
 					break;
 				case 'U':
-					$setup_tpl->set_var('instimg','incomplete.png');
-					$setup_tpl->set_var('instalt',lang('Not Completed'));
+					$setup_tpl->set_var('instimg', 'incomplete.png');
+					$setup_tpl->set_var('instalt', lang('Not Completed'));
 					if (!@$value['currentver'])
 					{
-						if ($value['tables'] && $GLOBALS['egw_setup']->detection->check_app_tables($value['name'],True))
+						if ($value['tables'] && $GLOBALS['egw_setup']->detection->check_app_tables($value['name'], True))
 						{
 							// Some tables missing
-							$setup_tpl->set_var('remove',$key == 'phpgwapi' ? '&nbsp;' : '<input type="checkbox" name="remove[' . $value['name'] . ']" />');
-							$setup_tpl->set_var('resolution','<a href="applications.php?resolve=' . $value['name'] . '&badinstall=True">' . lang('Potential Problem') . '</a>');
-							$status = lang('Requires reinstall or manual repair') . ' - ' . $value['status'];
+							$setup_tpl->set_var('remove', $key == 'phpgwapi' ? '&nbsp;' : '<input type="checkbox" name="remove['.$value['name'].']" />');
+							$setup_tpl->set_var('resolution', '<a href="applications.php?resolve='.$value['name'].'&badinstall=True">'.lang('Potential Problem').'</a>');
+							$status = lang('Requires reinstall or manual repair').' - '.$value['status'];
 						}
 						else
 						{
-							$setup_tpl->set_var('remove','&nbsp;');
-							$setup_tpl->set_var('resolution','');
-							$status = lang('Requires upgrade') . ' - ' . $value['status'];
+							$setup_tpl->set_var('remove', '&nbsp;');
+							$setup_tpl->set_var('resolution', '');
+							$status = lang('Requires upgrade').' - '.$value['status'];
 						}
 						// show not installed apps without icon
-						$setup_tpl->set_var('instimg','spacer.png');
-						$setup_tpl->set_var('instalt','');
-						$setup_tpl->set_var('bg_color','CCFFCC');
-						$setup_tpl->set_var('install','<input type="checkbox" name="install[' . $value['name'] . ']" />');
-						$setup_tpl->set_var('upgrade','&nbsp;');
-						$status = lang('Please install') . ' - ' . $value['status'];
+						$setup_tpl->set_var('instimg', 'spacer.png');
+						$setup_tpl->set_var('instalt', '');
+						$setup_tpl->set_var('bg_color', 'CCFFCC');
+						$setup_tpl->set_var('install', '<input type="checkbox" name="install['.$value['name'].']" />');
+						$setup_tpl->set_var('upgrade', '&nbsp;');
+						$status = lang('Please install').' - '.$value['status'];
 					}
 					else
 					{
-						$setup_tpl->set_var('bg_color','CCCCFF');
-						$setup_tpl->set_var('install','&nbsp;');
+						$setup_tpl->set_var('bg_color', 'CCCCFF');
+						$setup_tpl->set_var('install', '&nbsp;');
 						// TODO display some info about breakage if you mess with this app
-						$setup_tpl->set_var('upgrade','<input type="checkbox" name="upgrade[' . $value['name'] . ']" />');
-						$setup_tpl->set_var('remove',$key == 'phpgwapi' ? '&nbsp;' : '<input type="checkbox" name="remove[' . $value['name'] . ']" />');
-						$setup_tpl->set_var('resolution','');
-						$status = lang('Requires upgrade') . ' - ' . $value['status'];
+						$setup_tpl->set_var('upgrade', '<input type="checkbox" name="upgrade['.$value['name'].']" />');
+						$setup_tpl->set_var('remove', $key == 'phpgwapi' ? '&nbsp;' : '<input type="checkbox" name="remove['.$value['name'].']" />');
+						$setup_tpl->set_var('resolution', '');
+						$status = lang('Requires upgrade').' - '.$value['status'];
 					}
 					break;
 				case 'V':
-					$setup_tpl->set_var('instimg','incomplete.png');
-					$setup_tpl->set_var('instalt',lang('Not Completed'));
-					$setup_tpl->set_var('install','&nbsp;');
-					$setup_tpl->set_var('remove',$key == 'phpgwapi' ? '&nbsp;' : '<input type="checkbox" name="remove[' . $value['name'] . ']" />');
+					$setup_tpl->set_var('instimg', 'incomplete.png');
+					$setup_tpl->set_var('instalt', lang('Not Completed'));
+					$setup_tpl->set_var('install', '&nbsp;');
+					$setup_tpl->set_var('remove', $key == 'phpgwapi' ? '&nbsp;' : '<input type="checkbox" name="remove['.$value['name'].']" />');
 					if ($value['version'] == 'deleted')
 					{
-						$setup_tpl->set_var('bg_color','CCAAAA');
-						$setup_tpl->set_var('upgrade','&nbsp;');
-						$setup_tpl->set_var('resolution','<a href="applications.php?resolve=' . $value['name'] . '&deleted=True">' . lang('Possible Solutions') . '</a>');
-						$status = lang('Sources deleted/missing') . ' - ' . $value['status'];
+						$setup_tpl->set_var('bg_color', 'CCAAAA');
+						$setup_tpl->set_var('upgrade', '&nbsp;');
+						$setup_tpl->set_var('resolution', '<a href="applications.php?resolve='.$value['name'].'&deleted=True">'.lang('Possible Solutions').'</a>');
+						$status = lang('Sources deleted/missing').' - '.$value['status'];
 					}
 					else
 					{
-						$setup_tpl->set_var('upgrade','<input type="checkbox" name="upgrade[' . $value['name'] . ']" />');
-						$setup_tpl->set_var('resolution','<a href="applications.php?resolve=' . $value['name'] . '&version=True">' . lang('Possible Solutions') . '</a>');
-						$status = lang('Version Mismatch') . ' - ' . $value['status'];
+						$setup_tpl->set_var('upgrade', '<input type="checkbox" name="upgrade['.$value['name'].']" />');
+						$setup_tpl->set_var('resolution', '<a href="applications.php?resolve='.$value['name'].'&version=True">'.lang('Possible Solutions').'</a>');
+						$status = lang('Version Mismatch').' - '.$value['status'];
 					}
 					break;
 				case 'D':
-					$setup_tpl->set_var('bg_color','FFCCCC');
+					$setup_tpl->set_var('bg_color', 'FFCCCC');
 					$depstring = parsedep($value['depends']);
 					$depstring .= ')';
-					$setup_tpl->set_var('instimg','dep.png');
-					$setup_tpl->set_var('instalt',lang('Dependency Failure'));
-					$setup_tpl->set_var('install','&nbsp;');
+					$setup_tpl->set_var('instimg', 'dep.png');
+					$setup_tpl->set_var('instalt', lang('Dependency Failure'));
+					$setup_tpl->set_var('install', '&nbsp;');
 					if ($values['currentver'])
 					{
-						$setup_tpl->set_var('remove',$key == 'phpgwapi' ? '&nbsp;' : '<input type="checkbox" name="remove[' . $value['name'] . ']" />');
-						$setup_tpl->set_var('resolution','<a href="applications.php?resolve=' . $value['name'] . '">' . lang('Possible Solutions') . '</a>');
+						$setup_tpl->set_var('remove', $key == 'phpgwapi' ? '&nbsp;' : '<input type="checkbox" name="remove['.$value['name'].']" />');
+						$setup_tpl->set_var('resolution', '<a href="applications.php?resolve='.$value['name'].'">'.lang('Possible Solutions').'</a>');
 					}
 					else
 					{
-						$setup_tpl->set_var('remove','&nbsp;');
-						$setup_tpl->set_var('resolution','&nbsp;');
+						$setup_tpl->set_var('remove', '&nbsp;');
+						$setup_tpl->set_var('resolution', '&nbsp;');
 					}
-					$setup_tpl->set_var('upgrade','&nbsp;');
-					$status = lang('Dependency Failure') . ':' . $depstring . $value['status'];
+					$setup_tpl->set_var('upgrade', '&nbsp;');
+					$status = lang('Dependency Failure').':'.$depstring.$value['status'];
 					break;
 				case 'P':
-					$setup_tpl->set_var('bg_color','FFCCFF');
+					$setup_tpl->set_var('bg_color', 'FFCCFF');
 					$depstring = parsedep($value['depends']);
 					$depstring .= ')';
-					$setup_tpl->set_var('instimg','dep.png');
-					$setup_tpl->set_var('instalt',lang('Post-install Dependency Failure'));
-					$setup_tpl->set_var('install','&nbsp;');
-					$setup_tpl->set_var('remove','&nbsp;');
-					$setup_tpl->set_var('upgrade','&nbsp;');
-					$setup_tpl->set_var('resolution','<a href="applications.php?resolve=' . $value['name'] . '&post=True">' . lang('Possible Solutions') . '</a>');
-					$status = lang('Post-install Dependency Failure') . ':' . $depstring . $value['status'];
+					$setup_tpl->set_var('instimg', 'dep.png');
+					$setup_tpl->set_var('instalt', lang('Post-install Dependency Failure'));
+					$setup_tpl->set_var('install', '&nbsp;');
+					$setup_tpl->set_var('remove', '&nbsp;');
+					$setup_tpl->set_var('upgrade', '&nbsp;');
+					$setup_tpl->set_var('resolution', '<a href="applications.php?resolve='.$value['name'].'&post=True">'.lang('Possible Solutions').'</a>');
+					$status = lang('Post-install Dependency Failure').':'.$depstring.$value['status'];
 					break;
 				default:
-					$setup_tpl->set_var('instimg','incomplete.png');
-					$setup_tpl->set_var('instalt',lang('Not Completed'));
-					$setup_tpl->set_var('install','&nbsp;');
-					$setup_tpl->set_var('remove','&nbsp;');
-					$setup_tpl->set_var('upgrade','&nbsp;');
-					$setup_tpl->set_var('resolution','');
+					$setup_tpl->set_var('instimg', 'incomplete.png');
+					$setup_tpl->set_var('instalt', lang('Not Completed'));
+					$setup_tpl->set_var('install', '&nbsp;');
+					$setup_tpl->set_var('remove', '&nbsp;');
+					$setup_tpl->set_var('upgrade', '&nbsp;');
+					$setup_tpl->set_var('resolution', '');
 					$status = '';
 					break;
 			}
 			//$setup_tpl->set_var('appname',$value['name'] . '-' . $status . ',' . $value['filename']);
-			$setup_tpl->set_var('appinfo',$value['name'] . '-' . $status);
-			$setup_tpl->set_var('appname',$value['name']);
+			$setup_tpl->set_var('appinfo', $value['name'].'-'.$status);
+			$setup_tpl->set_var('appname', $value['name']);
 
-			$setup_tpl->pparse('out','apps',True);
+			$setup_tpl->pparse('out', 'apps', True);
 		}
 	}
 
-	$setup_tpl->set_var('submit',lang('Save'));
-	$setup_tpl->set_var('cancel',lang('Cancel'));
-	$setup_tpl->pparse('out','app_footer');
-	$setup_tpl->pparse('out','footer');
+	$setup_tpl->set_var('submit', lang('Save'));
+	$setup_tpl->set_var('cancel', lang('Cancel'));
+	$setup_tpl->pparse('out', 'app_footer');
+	$setup_tpl->pparse('out', 'footer');
 	$GLOBALS['egw_setup']->html->show_footer();
 }

Braces +13 added lines, -4 removed lines

@@ -236,7 +236,10 @@ 
 	// Find & register all application hooks
 	foreach($setup_info as $appname => $info)
 	{
-		if ($info['currentver']) $GLOBALS['egw_setup']->register_hooks($appname);
+		if ($info['currentver'])
+		{
+			$GLOBALS['egw_setup']->register_hooks($appname);
+		}
 	}
 	echo lang('All hooks registered') . '<br />';
 }
@@ -267,9 +270,15 @@ 
 					$val = implode(',' . "\n",$val);
 				}
 			}
-			if ($key == 'hooks')   { $val = implode(',',$val); }
-			if ($key == 'depends') { $val = parsedep($val); }
-			if (is_array($val))    { $val = implode(',',$val); }
+			if ($key == 'hooks')
+			{
+$val = implode(',',$val); }
+			if ($key == 'depends')
+			{
+$val = parsedep($val); }
+			if (is_array($val))
+			{
+$val = implode(',',$val); }
 
 			$setup_tpl->set_var('bg_color',$bgcolor[$i]);
 			$setup_tpl->set_var('name',$key);

Upper-Lower-Casing +14 added lines, -14 removed lines

@@ -106,22 +106,22 @@ 
 //var_dump($setup_info);exit;
 @ksort($setup_info);
 
-if(@get_var('cancel',Array('POST')))
+if(@get_var('cancel',array('POST')))
 {
 	Header("Location: index.php");
 	exit;
 }
 
-if(@get_var('submit',Array('POST')))
+if(@get_var('submit',array('POST')))
 {
 	$GLOBALS['egw_setup']->html->show_header(lang('Application Management'),False,'config',$GLOBALS['egw_setup']->ConfigDomain . '(' . $GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'] . ')');
 	$setup_tpl->set_var('description',lang('App install/remove/upgrade') . ':');
 	$setup_tpl->pparse('out','header');
 
-	$appname = get_var('appname',Array('POST'));
-	$remove  = get_var('remove',Array('POST'));
-	$install = get_var('install',Array('POST'));
-	$upgrade = get_var('upgrade',Array('POST'));
+	$appname = get_var('appname',array('POST'));
+	$remove  = get_var('remove',array('POST'));
+	$install = get_var('install',array('POST'));
+	$upgrade = get_var('upgrade',array('POST'));
 
 	if(!empty($remove) && is_array($remove))
 	{
@@ -229,7 +229,7 @@ 
 	$GLOBALS['egw_setup']->html->show_header(lang('Application Management'),False,'config',$GLOBALS['egw_setup']->ConfigDomain . '(' . $GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'] . ')');
 }
 
-if(@get_var('hooks', Array('GET')))
+if(@get_var('hooks', array('GET')))
 {
 	egw_cache::flush(egw_cache::INSTANCE);
 
@@ -240,8 +240,8 @@ 
 	}
 	echo lang('All hooks registered') . '<br />';
 }
-$detail = get_var('detail',Array('GET'));
-$resolve = get_var('resolve',Array('GET'));
+$detail = get_var('detail',array('GET'));
+$resolve = get_var('resolve',array('GET'));
 if(@$detail)
 {
 	@ksort($setup_info[$detail]);
@@ -284,13 +284,13 @@ 
 }
 elseif (@$resolve)
 {
-	$version  = get_var('version',Array('GET'));
-	$notables = get_var('notables',Array('GET'));
+	$version  = get_var('version',array('GET'));
+	$notables = get_var('notables',array('GET'));
 	$setup_tpl->set_var('description',lang('Problem resolution'). ':');
 	$setup_tpl->pparse('out','header');
 	$app_title = $setup_info[$resolve]['title'] ? $setup_info[$resolve]['title'] : $setup_info[$resolve]['name'];
 
-	if(get_var('post',Array('GET')))
+	if(get_var('post',array('GET')))
 	{
 		echo '"' . $app_title . '" ' . lang('may be broken') . ' ';
 		echo lang('because an application it depends upon was upgraded');
@@ -299,7 +299,7 @@ 
 		echo '<br />';
 		echo lang('However, the application may still work') . '.';
 	}
-	elseif(get_var('badinstall',Array('GET')))
+	elseif(get_var('badinstall',array('GET')))
 	{
 		echo '"' . $app_title . '" ' . lang('is broken') . ' ';
 		echo lang('because of a failed upgrade or install') . '.';
@@ -308,7 +308,7 @@ 
 		echo '<br />';
 		echo lang('You should either uninstall and then reinstall it, or attempt manual repairs') . '.';
 	}
-	elseif(get_var('deleted',Array('GET')))
+	elseif(get_var('deleted',array('GET')))
 	{
 		echo '"' . $app_title . '" ' . lang('is broken') . ' ';
 		echo lang('because its sources are missing') . '!';

setup/doc/chown.php

Spacing +6 added lines, -6 removed lines

@@ -11,7 +11,7 @@ 
  * @version $Id$
  */
 
-chdir(dirname(__FILE__));	// to enable our relative pathes to work
+chdir(dirname(__FILE__)); // to enable our relative pathes to work
 
 if (php_sapi_name() !== 'cli')	// security precaution: forbit calling as web-page
 {
@@ -39,7 +39,7 @@ 
 }
 $ids = explode(',', $_SERVER['argv'][0]);
 $change = array();
-while($ids)
+while ($ids)
 {
 	$from = (int)array_shift($ids);
 	$to = (int)array_shift($ids);
@@ -66,24 +66,24 @@ 
 
 chown_grp($path, null, $recursive);
 
-function chown_grp($path, array $stat=null, $recursive=false)
+function chown_grp($path, array $stat = null, $recursive = false)
 {
 	global $change;
 
 	if (is_null($stat) && !($stat = stat($path))) return false;
 
-	if (isset($change[$stat['uid']]) && !chown($path, $uid=$change[$stat['uid']]))
+	if (isset($change[$stat['uid']]) && !chown($path, $uid = $change[$stat['uid']]))
 	{
 		echo "Faild to set new owner #$uid for $path\n";
 	}
-	if (isset($change[-$stat['gid']]) && !chgrp($path, $gid=-$change[-$stat['gid']]))
+	if (isset($change[-$stat['gid']]) && !chgrp($path, $gid = -$change[-$stat['gid']]))
 	{
 		echo "Faild to set new group #$gid for $path\n";
 	}
 
 	if ($recursive && is_dir($path))
 	{
-		foreach(new DirectoryIterator($path) as $child)
+		foreach (new DirectoryIterator($path) as $child)
 		{
 			if (!$child->isDot())
 				chown_grp($child->getPathname(), array(

Braces +11 added lines, -3 removed lines

@@ -13,10 +13,13 @@ 
 
 chdir(dirname(__FILE__));	// to enable our relative pathes to work
 
-if (php_sapi_name() !== 'cli')	// security precaution: forbit calling as web-page
+if (php_sapi_name() !== 'cli')
+{
+	// security precaution: forbit calling as web-page
 {
 	die('<h1>setup/doc/chown.php must NOT be called as web-page --> exiting !!!</h1>');
 }
+}
 
 $recursive = false;
 
@@ -70,7 +73,10 @@ 
 {
 	global $change;
 
-	if (is_null($stat) && !($stat = stat($path))) return false;
+	if (is_null($stat) && !($stat = stat($path)))
+	{
+		return false;
+	}
 
 	if (isset($change[$stat['uid']]) && !chown($path, $uid=$change[$stat['uid']]))
 	{
@@ -86,10 +92,12 @@ 
 		foreach(new DirectoryIterator($path) as $child)
 		{
 			if (!$child->isDot())
-				chown_grp($child->getPathname(), array(
+			{
+							chown_grp($child->getPathname(), array(
 					'uid' => $child->getOwner(),
 					'gid' => $child->getGroup(),
 				), $recursive);
+			}
 		}
 	}
 }

importexport/setup/setup.inc.php

Spacing +2 added lines, -2 removed lines

@@ -20,9 +20,9 @@
 	'name'  => 'eGroupware core team',
 	'email' => 'egroupware-developers@lists.sf.net'
 );
-$setup_info['importexport']['autoinstall'] = true;	// install automatically on update
+$setup_info['importexport']['autoinstall'] = true; // install automatically on update
 
-$setup_info['importexport']['license']  = 'GPL';
+$setup_info['importexport']['license'] = 'GPL';
 $setup_info['importexport']['description'] =
 '';
 $setup_info['importexport']['note'] =

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -37,11 +37,11 @@
 /* Dependencies for this app to work */
 $setup_info['importexport']['depends'][] = array(
 	 'appname' => 'phpgwapi',
-	 'versions' => Array('14.1')
+	 'versions' => array('14.1')
 );
 $setup_info['importexport']['depends'][] = array(
 	 'appname' => 'etemplate',
-	 'versions' => Array('14.1')
+	 'versions' => array('14.1')
 );
 
 // installation checks for importexport

importexport/setup/tables_current.inc.php

Spacing +8 added lines, -8 removed lines

@@ -12,15 +12,15 @@
 $phpgw_baseline = array(
 	'egw_importexport_definitions' => array(
 		'fd' => array(
-			'definition_id' => array('type' => 'auto','nullable' => False),
-			'name' => array('type' => 'varchar','precision' => '255'),
-			'application' => array('type' => 'varchar','precision' => '50'),
-			'plugin' => array('type' => 'varchar','precision' => '100'),
-			'type' => array('type' => 'varchar','precision' => '20'),
-			'allowed_users' => array('type' => 'varchar','meta' => 'account-commasep','precision' => '255'),
+			'definition_id' => array('type' => 'auto', 'nullable' => False),
+			'name' => array('type' => 'varchar', 'precision' => '255'),
+			'application' => array('type' => 'varchar', 'precision' => '50'),
+			'plugin' => array('type' => 'varchar', 'precision' => '100'),
+			'type' => array('type' => 'varchar', 'precision' => '20'),
+			'allowed_users' => array('type' => 'varchar', 'meta' => 'account-commasep', 'precision' => '255'),
 			'plugin_options' => array('type' => 'longtext'),
-			'owner' => array('type' => 'int','meta' => 'account','precision' => '4'),
-			'description' => array('type' => 'varchar','precision' => '255'),
+			'owner' => array('type' => 'int', 'meta' => 'account', 'precision' => '4'),
+			'description' => array('type' => 'varchar', 'precision' => '255'),
 			'modified' => array('type' => 'timestamp'),
 			'filter' => array('type' => 'longtext')
 		),