EGroupware / egroupware

setup/inc/class.setup_cmd_admin.inc.php

Spacing +13 added lines, -13 removed lines

@@ -38,8 +38,8 @@ 
 	 * @param array $config =array() extra config for the account object: account_repository, ldap_*
 	 * @param string $lang ='en'
 	 */
-	function __construct($domain,$config_user=null,$config_passwd=null,$admin_user=null,$admin_password=null,
-		$admin_firstname=null,$admin_lastname=null,$admin_email=null,array $config=array(),$lang='en')
+	function __construct($domain, $config_user = null, $config_passwd = null, $admin_user = null, $admin_password = null,
+		$admin_firstname = null, $admin_lastname = null, $admin_email = null, array $config = array(), $lang = 'en')
 	{
 		if (!is_array($domain))
 		{
@@ -68,21 +68,21 @@ 
 	 * @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 && $this->remote_id)
 		{
-			return true;	// can only check locally
+			return true; // can only check locally
 		}
-		$this->check_installed($this->domain,15);
+		$this->check_installed($this->domain, 15);
 
 		if (!$this->admin_firstname) $this->set_defaults['admin_firstname'] = $this->admin_firstname = lang('Admin');
 		if (!$this->admin_lastname) $this->set_defaults['admin_lastname'] = $this->admin_lastname = lang('User');
-		if (strpos($this->admin_email,'$') !== false)
+		if (strpos($this->admin_email, '$') !== false)
 		{
 			$this->set_defaults['email'] = $this->admin_email = str_replace(
-				array('$domain','$uid','$account_lid'),
-				array($this->domain,$this->admin_user,$this->admin_user),$this->admin_email);
+				array('$domain', '$uid', '$account_lid'),
+				array($this->domain, $this->admin_user, $this->admin_user), $this->admin_email);
 		}
 		$_POST['username'] = $this->admin_user;
 		$_POST['passwd2']  = $_POST['passwd'] = $this->admin_password;
@@ -99,9 +99,9 @@ 
 		switch ($error)
 		{
 			case 41:
-				throw new Api\Exception\WrongUserinput(lang('Error in admin-creation !!!'),41);
+				throw new Api\Exception\WrongUserinput(lang('Error in admin-creation !!!'), 41);
 			case 42:
-				throw new Api\Exception\WrongUserinput(lang('Error in group-creation !!!'),42);
+				throw new Api\Exception\WrongUserinput(lang('Error in group-creation !!!'), 42);
 		}
 		$this->restore_db();
 
@@ -112,13 +112,13 @@ 
 		if (php_sapi_name() !== 'cli' || !file_exists(EGW_SERVER_ROOT.'/stylite') || file_exists(EGW_SERVER_ROOT.'/managementserver'))
 		{
 			$output = $ret = null;
-			exec($cmd,$output,$ret);
+			exec($cmd, $output, $ret);
 		}
-		$output = implode("\n",$output);
+		$output = implode("\n", $output);
 		//echo "ret=$ret\n".$output;
 		if ($ret)
 		{
-			throw new Api\Exception ($output,$ret);
+			throw new Api\Exception($output, $ret);
 		}
 		return lang('Admin account successful created.');
 	}

Braces +8 added lines, -2 removed lines

@@ -76,8 +76,14 @@
 		}
 		$this->check_installed($this->domain,15);
 
-		if (!$this->admin_firstname) $this->set_defaults['admin_firstname'] = $this->admin_firstname = lang('Admin');
-		if (!$this->admin_lastname) $this->set_defaults['admin_lastname'] = $this->admin_lastname = lang('User');
+		if (!$this->admin_firstname)
+		{
+			$this->set_defaults['admin_firstname'] = $this->admin_firstname = lang('Admin');
+		}
+		if (!$this->admin_lastname)
+		{
+			$this->set_defaults['admin_lastname'] = $this->admin_lastname = lang('User');
+		}
 		if (strpos($this->admin_email,'$') !== false)
 		{
 			$this->set_defaults['email'] = $this->admin_email = str_replace(

setup/inc/class.setup_cmd.inc.php

Spacing +47 added lines, -47 removed lines

@@ -35,7 +35,7 @@ 
 		if (!$this->header_secret && $this->header_admin_user)	// no secret specified but header_admin_user/password
 		{
 			if (!$this->uid) $this->uid = true;
-			$this->set_header_secret($this->header_admin_user,$this->header_admin_password);
+			$this->set_header_secret($this->header_admin_user, $this->header_admin_password);
 		}
 		$secret = $this->_calc_header_secret($GLOBALS['egw_info']['server']['header_admin_user'],
 				$GLOBALS['egw_info']['server']['header_admin_password']);
@@ -44,7 +44,7 @@ 
 		if ($this->header_secret != $secret)
 		{
 			//echo "_check_header_access: header_secret='$this->header_secret' != '$secret'=_calc_header_secret({$GLOBALS['egw_info']['server']['header_admin_user']},{$GLOBALS['egw_info']['server']['header_admin_password']})\n";
-			throw new Api\Exception\NoPermission(lang('Wrong credentials to access the header.inc.php file!'),5);
+			throw new Api\Exception\NoPermission(lang('Wrong credentials to access the header.inc.php file!'), 5);
 		}
 
 	}
@@ -55,15 +55,15 @@ 
 	 * @param string $user
 	 * @param string $pw password or md5 hash of it
 	 */
-	public function set_header_secret($user,$pw)
+	public function set_header_secret($user, $pw)
 	{
 		if ($this->uid || parent::save(false))	// we need to save first, to get the uid
 		{
-			$this->header_secret = $this->_calc_header_secret($user,$pw);
+			$this->header_secret = $this->_calc_header_secret($user, $pw);
 		}
 		else
 		{
-			throw new Exception ('failed to set header_secret!');
+			throw new Exception('failed to set header_secret!');
 		}
 	}
 
@@ -76,7 +76,7 @@ 
 	 * @param string $header_admin_password
 	 * @return string
 	 */
-	private function _calc_header_secret($header_admin_user=null,$header_admin_password=null)
+	private function _calc_header_secret($header_admin_user = null, $header_admin_password = null)
 	{
 		if (!self::is_md5($header_admin_password)) $header_admin_password = md5($header_admin_password);
 
@@ -91,7 +91,7 @@ 
 	 * @param boolean $set_modifier =true set the current user as modifier or 0 (= run by the system)
 	 * @return boolean true on success, false otherwise
 	 */
-	function save($set_modifier=true)
+	function save($set_modifier = true)
 	{
 		if (isset($GLOBALS['egw']->db) && is_object($GLOBALS['egw']->db) && $GLOBALS['egw']->db->Database)
 		{
@@ -112,12 +112,12 @@ 
 	/**
 	 * Create the setup enviroment (for running within setup or eGW)
 	 */
-	static protected function _setup_enviroment($domain=null)
+	static protected function _setup_enviroment($domain = null)
 	{
 		if (!is_object($GLOBALS['egw_setup']))
 		{
 			require_once(EGW_INCLUDE_ROOT.'/setup/inc/class.setup.inc.php');
-			$GLOBALS['egw_setup'] = new setup(true,true);
+			$GLOBALS['egw_setup'] = new setup(true, true);
 		}
 		self::$egw_setup = $GLOBALS['egw_setup'];
 		self::$egw_setup->ConfigDomain = $domain;
@@ -126,7 +126,7 @@ 
 			is_object($GLOBALS['egw']) && $GLOBALS['egw'] instanceof Egw)
 		{
 			// we run inside eGW, not setup --> read egw_domain array from the header via the showheader cmd
-			$cmd = new setup_cmd_showheader(null);	// null = only header, no db stuff, no hashes
+			$cmd = new setup_cmd_showheader(null); // null = only header, no db stuff, no hashes
 			$header = $cmd->run();
 			$GLOBALS['egw_domain'] = $header['egw_domain'];
 
@@ -179,26 +179,26 @@ 
 	 * @throws Api\Exception\NoPermission(lang('Access denied: wrong username or password for manage-header !!!'),21);
 	 * @throws Api\Exception\NoPermission(lang("Access denied: wrong username or password to configure the domain '%1(%2)' !!!",$domain,$GLOBALS['egw_domain'][$domain]['db_type']),40);
 	 */
-	static function check_setup_auth($user,$pw,$domain=null)
+	static function check_setup_auth($user, $pw, $domain = null)
 	{
 		self::_setup_enviroment($domain);
 
 		// check the authentication if a header_admin_password is set, if not we dont have a header yet and no authentication
 		if ($GLOBALS['egw_info']['server']['header_admin_password'])	// if that's not given we dont have a header yet
 		{
-			if (!self::$egw_setup->check_auth($user,$pw,$GLOBALS['egw_info']['server']['header_admin_user'],
+			if (!self::$egw_setup->check_auth($user, $pw, $GLOBALS['egw_info']['server']['header_admin_user'],
 					$GLOBALS['egw_info']['server']['header_admin_password']) &&
 				(is_null($domain) || !isset($GLOBALS['egw_domain'][$domain]) || // if valid domain given check it's config user/pw
-					!self::$egw_setup->check_auth($user,$pw,$GLOBALS['egw_domain'][$domain]['config_user'],
+					!self::$egw_setup->check_auth($user, $pw, $GLOBALS['egw_domain'][$domain]['config_user'],
 						$GLOBALS['egw_domain'][$domain]['config_passwd'])))
 			{
 				if (is_null($domain))
 				{
-					throw new Api\Exception\NoPermission(lang('Access denied: wrong username or password for manage-header !!!'),21);
+					throw new Api\Exception\NoPermission(lang('Access denied: wrong username or password for manage-header !!!'), 21);
 				}
 				else
 				{
-					throw new Api\Exception\NoPermission(lang("Access denied: wrong username or password to configure the domain '%1(%2)' !!!",$domain,$GLOBALS['egw_domain'][$domain]['db_type']),40);
+					throw new Api\Exception\NoPermission(lang("Access denied: wrong username or password to configure the domain '%1(%2)' !!!", $domain, $GLOBALS['egw_domain'][$domain]['db_type']), 40);
 				}
 			}
 		}
@@ -209,13 +209,13 @@ 
 	 *
 	 * @var array
 	 */
-	static public $apps_to_install=array();
+	static public $apps_to_install = array();
 	/**
 	 * Applications which are currently need update (set after call to check_installed, for the last/only domain only)
 	 *
 	 * @var array
 	 */
-	static public $apps_to_upgrade=array();
+	static public $apps_to_upgrade = array();
 
 	/**
 	 * Check if eGW is installed, which versions and if an update is needed
@@ -227,66 +227,66 @@ 
 	 * @param boolean $verbose =false echo messages as they happen, instead returning them
 	 * @return array with translated messages
 	 */
-	static function check_installed($domain='',$stop=0,$verbose=false)
+	static function check_installed($domain = '', $stop = 0, $verbose = false)
 	{
 		self::_setup_enviroment($domain);
 
 		global $setup_info;
-		static $header_checks=true;	// output the header checks only once
+		static $header_checks = true; // output the header checks only once
 
 		$messages = array();
 
 		if ($stop && !is_array($stop)) $stop = array($stop);
 
-		$versions =& $GLOBALS['egw_info']['server']['versions'];
+		$versions = & $GLOBALS['egw_info']['server']['versions'];
 
 		if (!$versions['api'])
 		{
 			if (!include(EGW_INCLUDE_ROOT.'/api/setup/setup.inc.php'))
 			{
-				throw new Api\Exception\WrongUserinput(lang("EGroupware sources in '%1' are not complete, file '%2' missing !!!",realpath('..'),'api/setup/setup.inc.php'),99);	// should not happen ;-)
+				throw new Api\Exception\WrongUserinput(lang("EGroupware sources in '%1' are not complete, file '%2' missing !!!", realpath('..'), 'api/setup/setup.inc.php'), 99); // should not happen ;-)
 			}
 			$versions['api'] = $setup_info['api']['version'];
 			unset($setup_info);
 		}
 		if ($header_checks)
 		{
-			$messages[] = self::_echo_message($verbose,lang('EGroupware API version %1 found.',$versions['api']));
+			$messages[] = self::_echo_message($verbose, lang('EGroupware API version %1 found.', $versions['api']));
 		}
 		$header_stage = self::$egw_setup->detection->check_header();
-		if ($stop && in_array($header_stage,$stop)) return true;
+		if ($stop && in_array($header_stage, $stop)) return true;
 
 		switch ($header_stage)
 		{
-			case 1: throw new Api\Exception\WrongUserinput(lang('EGroupware configuration file (header.inc.php) does NOT exist.')."\n".lang('Use --create-header to create the configuration file (--usage gives more options).'),1);
+			case 1: throw new Api\Exception\WrongUserinput(lang('EGroupware configuration file (header.inc.php) does NOT exist.')."\n".lang('Use --create-header to create the configuration file (--usage gives more options).'), 1);
 
 //			case 2: throw new Api\Exception\WrongUserinput(lang('EGroupware configuration file (header.inc.php) version %1 exists%2',$versions['header'],'.')."\n".lang('No header admin password set! Use --edit-header <password>[,<user>] to set one (--usage gives more options).'),2);
 
-			case 3: throw new Api\Exception\WrongUserinput(lang('EGroupware configuration file (header.inc.php) version %1 exists%2',$versions['header'],'.')."\n".lang('No EGroupware domains / database instances exist! Use --edit-header --domain to add one (--usage gives more options).'),3);
+			case 3: throw new Api\Exception\WrongUserinput(lang('EGroupware configuration file (header.inc.php) version %1 exists%2', $versions['header'], '.')."\n".lang('No EGroupware domains / database instances exist! Use --edit-header --domain to add one (--usage gives more options).'), 3);
 
-			case 4: throw new Api\Exception\WrongUserinput(lang('EGroupware configuration file (header.inc.php) version %1 exists%2',$versions['header'],'.')."\n".lang('It needs upgrading to version %1! Use --update-header <password>[,<user>] to do so (--usage gives more options).',$versions['current_header']),4);
+			case 4: throw new Api\Exception\WrongUserinput(lang('EGroupware configuration file (header.inc.php) version %1 exists%2', $versions['header'], '.')."\n".lang('It needs upgrading to version %1! Use --update-header <password>[,<user>] to do so (--usage gives more options).', $versions['current_header']), 4);
 		}
 		if ($header_checks)
 		{
-			$messages[] = self::_echo_message($verbose,lang('EGroupware configuration file (header.inc.php) version %1 exists%2',
-				$versions['header'],' '.lang('and is up to date')));
+			$messages[] = self::_echo_message($verbose, lang('EGroupware configuration file (header.inc.php) version %1 exists%2',
+				$versions['header'], ' '.lang('and is up to date')));
 		}
-		unset($header_checks);	// no further output of the header checks
+		unset($header_checks); // no further output of the header checks
 
 		$domains = $GLOBALS['egw_domain'];
 		if ($domain)	// domain to check given
 		{
-			if (!isset($GLOBALS['egw_domain'][$domain])) throw new Api\Exception\WrongUserinput(lang("Domain '%1' does NOT exist !!!",$domain), 92);
+			if (!isset($GLOBALS['egw_domain'][$domain])) throw new Api\Exception\WrongUserinput(lang("Domain '%1' does NOT exist !!!", $domain), 92);
 
 			$domains = array($domain => $GLOBALS['egw_domain'][$domain]);
 		}
-		foreach($domains as $domain => $data)
+		foreach ($domains as $domain => $data)
 		{
-			self::$egw_setup->ConfigDomain = $domain;	// set the domain the setup class operates on
+			self::$egw_setup->ConfigDomain = $domain; // set the domain the setup class operates on
 			if (count($GLOBALS['egw_domain']) > 1)
 			{
 				self::_echo_message($verbose);
-				$messages[] = self::_echo_message($verbose,lang('EGroupware domain/instance %1(%2):',$domain,$data['db_type']));
+				$messages[] = self::_echo_message($verbose, lang('EGroupware domain/instance %1(%2):', $domain, $data['db_type']));
 			}
 			$setup_info = self::$egw_setup->detection->get_versions();
 			// check if there's already a db-connection and close if, otherwise the db-connection of the previous domain will be used
@@ -298,27 +298,27 @@ 
 
 			$db = $data['db_type'].'://'.$data['db_user'].':'.$data['db_pass'].'@'.$data['db_host'].'/'.$data['db_name'];
 
-			$db_stage =& $GLOBALS['egw_info']['setup']['stage']['db'];
+			$db_stage = & $GLOBALS['egw_info']['setup']['stage']['db'];
 			if (($db_stage = self::$egw_setup->detection->check_db($setup_info)) != 1)
 			{
 				$setup_info = self::$egw_setup->detection->get_db_versions($setup_info);
 				$db_stage = self::$egw_setup->detection->check_db($setup_info);
 			}
-			if ($stop && in_array(10+$db_stage,$stop))
+			if ($stop && in_array(10 + $db_stage, $stop))
 			{
 				return $messages;
 			}
-			switch($db_stage)
+			switch ($db_stage)
 			{
-				case 1: throw new Api\Exception\WrongUserinput(lang('Your Database is not working!')." $db: ".self::$egw_setup->db->Error,11);
+				case 1: throw new Api\Exception\WrongUserinput(lang('Your Database is not working!')." $db: ".self::$egw_setup->db->Error, 11);
 
-				case 3: throw new Api\Exception\WrongUserinput(lang('Your database is working, but you dont have any applications installed')." ($db). ".lang("Use --install to install EGroupware."),13);
+				case 3: throw new Api\Exception\WrongUserinput(lang('Your database is working, but you dont have any applications installed')." ($db). ".lang("Use --install to install EGroupware."), 13);
 
-				case 4: throw new Api\Exception\WrongUserinput(lang('EGroupware API needs a database (schema) update from version %1 to %2!',$setup_info['phpgwapi']['currentver'],$versions['phpgwapi']).' '.lang('Use --update to do so.'),14);
+				case 4: throw new Api\Exception\WrongUserinput(lang('EGroupware API needs a database (schema) update from version %1 to %2!', $setup_info['phpgwapi']['currentver'], $versions['phpgwapi']).' '.lang('Use --update to do so.'), 14);
 
 				case 10:	// also check apps of updates
 					self::$apps_to_upgrade = self::$apps_to_install = array();
-					foreach($setup_info as $app => $data)
+					foreach ($setup_info as $app => $data)
 					{
 						if ($data['currentver'] && $data['version'] && $data['version'] != 'deleted' && $data['version'] != $data['currentver'])
 						{
@@ -332,23 +332,23 @@ 
 					if (self::$apps_to_install)
 					{
 						self::_echo_message($verbose);
-						$messages[] = self::_echo_message($verbose,lang('The following applications are NOT installed:').' '.implode(', ',self::$apps_to_install));
+						$messages[] = self::_echo_message($verbose, lang('The following applications are NOT installed:').' '.implode(', ', self::$apps_to_install));
 					}
 					if (self::$apps_to_upgrade)
 					{
 						$db_stage = 4;
-						if ($stop && in_array(10+$db_stage,$stop)) return $messages;
+						if ($stop && in_array(10 + $db_stage, $stop)) return $messages;
 
-						throw new Api\Exception\WrongUserinput(lang('The following applications need to be upgraded:').' '.implode(', ',self::$apps_to_upgrade).'! '.lang('Use --update to do so.'),14);
+						throw new Api\Exception\WrongUserinput(lang('The following applications need to be upgraded:').' '.implode(', ', self::$apps_to_upgrade).'! '.lang('Use --update to do so.'), 14);
 					}
 					break;
 			}
-			$messages[] = self::_echo_message($verbose,lang("database is version %1 and up to date.",$setup_info['api']['currentver']));
+			$messages[] = self::_echo_message($verbose, lang("database is version %1 and up to date.", $setup_info['api']['currentver']));
 
 			self::$egw_setup->detection->check_config();
-			if ($GLOBALS['egw_info']['setup']['config_errors'] && $stop && !in_array(15,$stop))
+			if ($GLOBALS['egw_info']['setup']['config_errors'] && $stop && !in_array(15, $stop))
 			{
-				throw new Api\Exception\WrongUserinput(lang('You need to configure EGroupware:')."\n- ".@implode("\n- ",$GLOBALS['egw_info']['setup']['config_errors']),15);
+				throw new Api\Exception\WrongUserinput(lang('You need to configure EGroupware:')."\n- ".@implode("\n- ", $GLOBALS['egw_info']['setup']['config_errors']), 15);
 			}
 		}
 		return $messages;
@@ -377,7 +377,7 @@ 
 	 * @param string $msg
 	 * @return string $msg
 	 */
-	static function _echo_message($verbose,$msg='')
+	static function _echo_message($verbose, $msg = '')
 	{
 		if ($verbose) echo $msg."\n";
 

Braces +48 added lines, -12 removed lines

@@ -32,14 +32,20 @@ 
 	 */
 	protected function _check_header_access()
 	{
-		if (!$this->header_secret && $this->header_admin_user)	// no secret specified but header_admin_user/password
+		if (!$this->header_secret && $this->header_admin_user)
+		{
+			// no secret specified but header_admin_user/password
 		{
 			if (!$this->uid) $this->uid = true;
+		}
 			$this->set_header_secret($this->header_admin_user,$this->header_admin_password);
 		}
 		$secret = $this->_calc_header_secret($GLOBALS['egw_info']['server']['header_admin_user'],
 				$GLOBALS['egw_info']['server']['header_admin_password']);
-		if ($this->uid === true) unset($this->uid);
+		if ($this->uid === true)
+		{
+			unset($this->uid);
+		}
 
 		if ($this->header_secret != $secret)
 		{
@@ -57,10 +63,13 @@ 
 	 */
 	public function set_header_secret($user,$pw)
 	{
-		if ($this->uid || parent::save(false))	// we need to save first, to get the uid
+		if ($this->uid || parent::save(false))
+		{
+			// we need to save first, to get the uid
 		{
 			$this->header_secret = $this->_calc_header_secret($user,$pw);
 		}
+		}
 		else
 		{
 			throw new Exception ('failed to set header_secret!');
@@ -78,7 +87,10 @@ 
 	 */
 	private function _calc_header_secret($header_admin_user=null,$header_admin_password=null)
 	{
-		if (!self::is_md5($header_admin_password)) $header_admin_password = md5($header_admin_password);
+		if (!self::is_md5($header_admin_password))
+		{
+			$header_admin_password = md5($header_admin_password);
+		}
 
 		$secret = md5($this->uid.$header_admin_user.$header_admin_password);
 		//echo "header_secret='$secret' = md5('$this->uid'.'$header_admin_user'.'$header_admin_password')\n";
@@ -135,7 +147,10 @@ 
 				self::$egw_accounts_backup = $GLOBALS['egw']->accounts;
 				unset($GLOBALS['egw']->accounts);
 			}
-			if ($this->config) self::$egw_setup->setup_account_object($this->config);
+			if ($this->config)
+			{
+				self::$egw_setup->setup_account_object($this->config);
+			}
 		}
 		if (is_object($GLOBALS['egw']->db) && $domain)
 		{
@@ -184,7 +199,9 @@ 
 		self::_setup_enviroment($domain);
 
 		// check the authentication if a header_admin_password is set, if not we dont have a header yet and no authentication
-		if ($GLOBALS['egw_info']['server']['header_admin_password'])	// if that's not given we dont have a header yet
+		if ($GLOBALS['egw_info']['server']['header_admin_password'])
+		{
+			// if that's not given we dont have a header yet
 		{
 			if (!self::$egw_setup->check_auth($user,$pw,$GLOBALS['egw_info']['server']['header_admin_user'],
 					$GLOBALS['egw_info']['server']['header_admin_password']) &&
@@ -195,6 +212,7 @@ 
 				if (is_null($domain))
 				{
 					throw new Api\Exception\NoPermission(lang('Access denied: wrong username or password for manage-header !!!'),21);
+		}
 				}
 				else
 				{
@@ -236,7 +254,10 @@ 
 
 		$messages = array();
 
-		if ($stop && !is_array($stop)) $stop = array($stop);
+		if ($stop && !is_array($stop))
+		{
+			$stop = array($stop);
+		}
 
 		$versions =& $GLOBALS['egw_info']['server']['versions'];
 
@@ -254,7 +275,10 @@ 
 			$messages[] = self::_echo_message($verbose,lang('EGroupware API version %1 found.',$versions['api']));
 		}
 		$header_stage = self::$egw_setup->detection->check_header();
-		if ($stop && in_array($header_stage,$stop)) return true;
+		if ($stop && in_array($header_stage,$stop))
+		{
+			return true;
+		}
 
 		switch ($header_stage)
 		{
@@ -274,9 +298,12 @@ 
 		unset($header_checks);	// no further output of the header checks
 
 		$domains = $GLOBALS['egw_domain'];
-		if ($domain)	// domain to check given
+		if ($domain)
+		{
+			// domain to check given
 		{
 			if (!isset($GLOBALS['egw_domain'][$domain])) throw new Api\Exception\WrongUserinput(lang("Domain '%1' does NOT exist !!!",$domain), 92);
+		}
 
 			$domains = array($domain => $GLOBALS['egw_domain'][$domain]);
 		}
@@ -324,10 +351,13 @@ 
 						{
 							self::$apps_to_upgrade[] = $app;
 						}
-						if (!isset($data['enabled']) && isset($data['version']))	// jdots eg. is no app, but a template
+						if (!isset($data['enabled']) && isset($data['version']))
+						{
+							// jdots eg. is no app, but a template
 						{
 							self::$apps_to_install[] = $app;
 						}
+						}
 					}
 					if (self::$apps_to_install)
 					{
@@ -337,7 +367,10 @@ 
 					if (self::$apps_to_upgrade)
 					{
 						$db_stage = 4;
-						if ($stop && in_array(10+$db_stage,$stop)) return $messages;
+						if ($stop && in_array(10+$db_stage,$stop))
+						{
+							return $messages;
+						}
 
 						throw new Api\Exception\WrongUserinput(lang('The following applications need to be upgraded:').' '.implode(', ',self::$apps_to_upgrade).'! '.lang('Use --update to do so.'),14);
 					}
@@ -379,7 +412,10 @@ 
 	 */
 	static function _echo_message($verbose,$msg='')
 	{
-		if ($verbose) echo $msg."\n";
+		if ($verbose)
+		{
+			echo $msg."\n";
+		}
 
 		return $msg;
 	}

setup/inc/functions.inc.php

Spacing +20 added lines, -20 removed lines

@@ -13,10 +13,10 @@ 
  * @version $Id$
  */
 
-error_reporting(error_reporting() & ~E_NOTICE & ~E_STRICT);
+error_reporting(error_reporting()&~E_NOTICE&~E_STRICT);
 
 // for an old header, we need to setup the reference before including it
-$GLOBALS['phpgw_info'] =& $GLOBALS['egw_info'];
+$GLOBALS['phpgw_info'] = & $GLOBALS['egw_info'];
 
 $GLOBALS['egw_info'] = array(
 	'flags' => array(
@@ -25,48 +25,48 @@ 
 		'currentapp' => 'setup',
 		'noapi' => True
 ));
-if(file_exists('../header.inc.php'))
+if (file_exists('../header.inc.php'))
 {
 	include('../header.inc.php');
 }
 // for an old header we need to setup a reference for the domains
-if (!is_array($GLOBALS['egw_domain'])) $GLOBALS['egw_domain'] =& $GLOBALS['phpgw_domain'];
+if (!is_array($GLOBALS['egw_domain'])) $GLOBALS['egw_domain'] = & $GLOBALS['phpgw_domain'];
 
 /*  If we included the header.inc.php, but it is somehow broken, cover ourselves... */
-if(!defined('EGW_SERVER_ROOT') && !defined('EGW_INCLUDE_ROOT'))
+if (!defined('EGW_SERVER_ROOT') && !defined('EGW_INCLUDE_ROOT'))
 {
 	if (defined('PHPGW_SERVER_ROOT') && defined('PHPGW_INCLUDE_ROOT'))	// pre 1.2 install
 	{
-		define('EGW_SERVER_ROOT',PHPGW_SERVER_ROOT);
-		define('EGW_INCLUDE_ROOT',PHPGW_INCLUDE_ROOT);
+		define('EGW_SERVER_ROOT', PHPGW_SERVER_ROOT);
+		define('EGW_INCLUDE_ROOT', PHPGW_INCLUDE_ROOT);
 	}
 	else	// no install
 	{
-		define('EGW_SERVER_ROOT',realpath('..'));
-		define('EGW_INCLUDE_ROOT',realpath('..'));
-		define('PHPGW_SERVER_ROOT',realpath('..'));
-		define('PHPGW_INCLUDE_ROOT',realpath('..'));
+		define('EGW_SERVER_ROOT', realpath('..'));
+		define('EGW_INCLUDE_ROOT', realpath('..'));
+		define('PHPGW_SERVER_ROOT', realpath('..'));
+		define('PHPGW_INCLUDE_ROOT', realpath('..'));
 	}
-	define('EGW_API_INC',EGW_SERVER_ROOT.'/phpgwapi/inc');
+	define('EGW_API_INC', EGW_SERVER_ROOT.'/phpgwapi/inc');
 }
 
-require_once(EGW_INCLUDE_ROOT . '/api/src/loader/common.php');
+require_once(EGW_INCLUDE_ROOT.'/api/src/loader/common.php');
 
 /**
  * function to handle multilanguage support
  *
  */
-function lang($key,$vars=null)
+function lang($key, $vars = null)
 {
-	if(!is_array($vars))
+	if (!is_array($vars))
 	{
 		$vars = func_get_args();
-		array_shift($vars);	// remove $key
+		array_shift($vars); // remove $key
 	}
 	return $GLOBALS['egw_setup']->translation->translate("$key", $vars);
 }
 
-if(file_exists(EGW_SERVER_ROOT.'/api/setup/setup.inc.php'))
+if (file_exists(EGW_SERVER_ROOT.'/api/setup/setup.inc.php'))
 {
 	include(EGW_SERVER_ROOT.'/api/setup/setup.inc.php'); /* To set the current core version */
 	/* This will change to just use setup_info */
@@ -79,10 +79,10 @@ 
 
 $GLOBALS['egw_info']['server']['app_images'] = 'templates/default/images';
 
-CreateObject('setup.setup',True,True);	// setup constuctor assigns itself to $GLOBALS['egw_setup'], doing it twice fails on some php4
-$GLOBALS['phpgw_setup'] =& $GLOBALS['egw_setup'];
+CreateObject('setup.setup', True, True); // setup constuctor assigns itself to $GLOBALS['egw_setup'], doing it twice fails on some php4
+$GLOBALS['phpgw_setup'] = & $GLOBALS['egw_setup'];
 
-if (!function_exists('version_compare') || version_compare(PHP_VERSION,$GLOBALS['egw_setup']->required_php_version,'<'))
+if (!function_exists('version_compare') || version_compare(PHP_VERSION, $GLOBALS['egw_setup']->required_php_version, '<'))
 {
 	if (isset($_SERVER['HTTP_HOST'])) echo "<pre>\n";
 	echo "EGroupware now requires PHP {$GLOBALS['egw_setup']->required_php_version} or greater.\nYour PHP version is: ".PHP_VERSION."\n";

Braces +12 added lines, -3 removed lines

@@ -30,14 +30,20 @@ 
 	include('../header.inc.php');
 }
 // for an old header we need to setup a reference for the domains
-if (!is_array($GLOBALS['egw_domain'])) $GLOBALS['egw_domain'] =& $GLOBALS['phpgw_domain'];
+if (!is_array($GLOBALS['egw_domain']))
+{
+	$GLOBALS['egw_domain'] =& $GLOBALS['phpgw_domain'];
+}
 
 /*  If we included the header.inc.php, but it is somehow broken, cover ourselves... */
 if(!defined('EGW_SERVER_ROOT') && !defined('EGW_INCLUDE_ROOT'))
 {
-	if (defined('PHPGW_SERVER_ROOT') && defined('PHPGW_INCLUDE_ROOT'))	// pre 1.2 install
+	if (defined('PHPGW_SERVER_ROOT') && defined('PHPGW_INCLUDE_ROOT'))
+	{
+		// pre 1.2 install
 	{
 		define('EGW_SERVER_ROOT',PHPGW_SERVER_ROOT);
+	}
 		define('EGW_INCLUDE_ROOT',PHPGW_INCLUDE_ROOT);
 	}
 	else	// no install
@@ -84,7 +90,10 @@ 
 
 if (!function_exists('version_compare') || version_compare(PHP_VERSION,$GLOBALS['egw_setup']->required_php_version,'<'))
 {
-	if (isset($_SERVER['HTTP_HOST'])) echo "<pre>\n";
+	if (isset($_SERVER['HTTP_HOST']))
+	{
+		echo "<pre>\n";
+	}
 	echo "EGroupware now requires PHP {$GLOBALS['egw_setup']->required_php_version} or greater.\nYour PHP version is: ".PHP_VERSION."\n";
 	echo 'Please contact your System Administrator.';
 	exit;

setup/inc/class.setup_cmd_install.inc.php

Spacing +12 added lines, -12 removed lines

@@ -34,7 +34,7 @@ 
 	 * @param array $config =array() configuration to preset the defaults during the install, eg. set the account_repository
 	 * @param string $lang ='en'
 	 */
-	function __construct($domain,$config_user=null,$config_passwd=null,$backup=null,$charset='utf-8',$verbose=false,array $config=array(),$lang='en')
+	function __construct($domain, $config_user = null, $config_passwd = null, $backup = null, $charset = 'utf-8', $verbose = false, array $config = array(), $lang = 'en')
 	{
 		if (!is_array($domain))
 		{
@@ -49,7 +49,7 @@ 
 				'lang'          => $lang,
 			);
 		}
-		elseif(!$domain['charset'])
+		elseif (!$domain['charset'])
 		{
 			$domain['charset'] = 'utf-8';
 		}
@@ -65,24 +65,24 @@ 
 	 * @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)
 	{
-		unset($check_only);	// not used;
+		unset($check_only); // not used;
 		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(13,14,20),$this->verbose);
+		$this->check_installed($this->domain, array(13, 14, 20), $this->verbose);
 
 		// use uploaded backup, instead installing from scratch
 		if ($this->backup)
 		{
 			$db_backup = new db_backup();
 
-			if (!is_resource($f = $db_backup->fopen_backup($this->backup,true)))
+			if (!is_resource($f = $db_backup->fopen_backup($this->backup, true)))
 			{
-				throw new Api\Exception\WrongUserinput(lang('Restore failed').' ('.$f.')',31);
+				throw new Api\Exception\WrongUserinput(lang('Restore failed').' ('.$f.')', 31);
 			}
 			if ($this->verbose)
 			{
@@ -90,9 +90,9 @@ 
 			}
 			else
 			{
-				ob_start();	// restore echos the table structure
+				ob_start(); // restore echos the table structure
 			}
-			$db_backup->restore($f,$this->charset,$this->backup);
+			$db_backup->restore($f, $this->charset, $this->backup);
 			fclose($f);
 
 			if (!$this->verbose)
@@ -104,7 +104,7 @@ 
 		// regular (new) install
 		if ($GLOBALS['egw_info']['setup']['stage']['db'] != 3)
 		{
-			throw new Api\Exception\WrongUserinput(lang('eGroupWare is already installed!'),30);
+			throw new Api\Exception\WrongUserinput(lang('eGroupWare is already installed!'), 30);
 		}
 		$setup_info = self::$egw_setup->detection->upgrade_exclude($setup_info);
 
@@ -114,7 +114,7 @@ 
 		$_POST['ConfigLang'] = $this->lang;
 
 		if ($this->verbose) echo lang('Installation started, this might take a few minutes ...')."\n";
-		if (true) $setup_info = self::$egw_setup->process->pass($setup_info,'new',false,True,$this->config);
+		if (true) $setup_info = self::$egw_setup->process->pass($setup_info, 'new', false, True, $this->config);
 
 		$this->restore_db();
 

Braces +8 added lines, -2 removed lines

@@ -113,8 +113,14 @@
 		self::$egw_setup->db->Link_ID->SetCharSet($this->charset);
 		$_POST['ConfigLang'] = $this->lang;
 
-		if ($this->verbose) echo lang('Installation started, this might take a few minutes ...')."\n";
-		if (true) $setup_info = self::$egw_setup->process->pass($setup_info,'new',false,True,$this->config);
+		if ($this->verbose)
+		{
+			echo lang('Installation started, this might take a few minutes ...')."\n";
+		}
+		if (true)
+		{
+			$setup_info = self::$egw_setup->process->pass($setup_info,'new',false,True,$this->config);
+		}
 
 		$this->restore_db();
 

setup/inc/class.setup_html.inc.php

Spacing +83 added lines, -83 removed lines

@@ -28,54 +28,54 @@ 
 		// variable names with underscores.
 
 		$GLOBALS['header_template']->set_file(array('header' => 'header.inc.php.template'));
-		$GLOBALS['header_template']->set_block('header','domain','domain');
+		$GLOBALS['header_template']->set_block('header', 'domain', 'domain');
 		$var = Array();
 
 		$deletedomain = $_POST['deletedomain'];
 		$domains = $_POST['domains'];
 
-		foreach($domains as $k => $v)
+		foreach ($domains as $k => $v)
 		{
-			if(is_array($deletedomain) && isset($deletedomain[$k]))
+			if (is_array($deletedomain) && isset($deletedomain[$k]))
 			{
 				continue;
 			}
-			$variableName = str_replace('.','_',$k);
+			$variableName = str_replace('.', '_', $k);
 			$dom = $_POST['setting_'.$variableName];
-			$GLOBALS['header_template']->set_var('DB_DOMAIN',$v);
-			foreach($dom as $x => $y)
+			$GLOBALS['header_template']->set_var('DB_DOMAIN', $v);
+			foreach ($dom as $x => $y)
 			{
-				if(strtoupper($x) == 'CONFIG_PASS')
+				if (strtoupper($x) == 'CONFIG_PASS')
 				{
-					$GLOBALS['header_template']->set_var(strtoupper($x),md5($y));
+					$GLOBALS['header_template']->set_var(strtoupper($x), md5($y));
 				}
 				else
 				{
-					$GLOBALS['header_template']->set_var(strtoupper($x),$y);
+					$GLOBALS['header_template']->set_var(strtoupper($x), $y);
 				}
 			}
 			/* Admin did not type a new password, so use the old one from the hidden field,
 			 * which is already md5 encoded.
 			 */
-			if($dom['config_password'] && !$dom['config_pass'])
+			if ($dom['config_password'] && !$dom['config_pass'])
 			{
 				/* Real == hidden */
-				$GLOBALS['header_template']->set_var('CONFIG_PASS',$dom['config_password']);
+				$GLOBALS['header_template']->set_var('CONFIG_PASS', $dom['config_password']);
 			}
 			/* If the admin didn't select a db_port, set to the default */
-			if(!$dom['db_port'])
+			if (!$dom['db_port'])
 			{
-				$GLOBALS['header_template']->set_var('DB_PORT',$GLOBALS['default_db_ports'][$dom['db_type']]);
+				$GLOBALS['header_template']->set_var('DB_PORT', $GLOBALS['default_db_ports'][$dom['db_type']]);
 			}
-			$GLOBALS['header_template']->parse('domains','domain',True);
+			$GLOBALS['header_template']->parse('domains', 'domain', True);
 		}
 
-		$GLOBALS['header_template']->set_var('domain','');
+		$GLOBALS['header_template']->set_var('domain', '');
 
 		$setting = $_POST['setting'];
-		while($setting && list($k,$v) = @each($setting))
+		while ($setting && list($k, $v) = @each($setting))
 		{
-			if(strtoupper($k) == 'HEADER_ADMIN_PASSWORD')
+			if (strtoupper($k) == 'HEADER_ADMIN_PASSWORD')
 			{
 				$var[strtoupper($k)] = md5($v);
 			}
@@ -87,21 +87,21 @@ 
 		/* Admin did not type a new header password, so use the old one from the hidden field,
 		 * which is already md5 encoded.
 		 */
-		if($var['HEADER_ADMIN_PASS'] && empty($setting['HEADER_ADMIN_PASSWORD']))
+		if ($var['HEADER_ADMIN_PASS'] && empty($setting['HEADER_ADMIN_PASSWORD']))
 		{
 			/* Real == hidden */
 			$var['HEADER_ADMIN_PASSWORD'] = $var['HEADER_ADMIN_PASS'];
 		}
 		$GLOBALS['header_template']->set_var($var);
-		return $GLOBALS['header_template']->parse('out','header');
+		return $GLOBALS['header_template']->parse('out', 'header');
 	}
 
-	static function setup_tpl_dir($app_name='setup')
+	static function setup_tpl_dir($app_name = 'setup')
 	{
 		/* hack to get tpl dir */
 		if (is_dir(EGW_SERVER_ROOT))
 		{
-			$srv_root = EGW_SERVER_ROOT . '/' . $app_name . '/';
+			$srv_root = EGW_SERVER_ROOT.'/'.$app_name.'/';
 		}
 		else
 		{
@@ -109,16 +109,16 @@ 
 		}
 
 		$tpl_typical = 'templates/default';
-		$tpl_root = "$srv_root" ."$tpl_typical";
+		$tpl_root = "$srv_root"."$tpl_typical";
 		return $tpl_root;
 	}
 
-	static function show_header($title='',$nologoutbutton=False, $logoutfrom='config', $configdomain='')
+	static function show_header($title = '', $nologoutbutton = False, $logoutfrom = 'config', $configdomain = '')
 	{
 		// add a content-type header to overwrite an existing default charset in apache (AddDefaultCharset directiv)
 		header('Content-type: text/html; charset='.$GLOBALS['egw_setup']->system_charset);
 
-		$GLOBALS['setup_tpl']->set_var('charset',$GLOBALS['egw_setup']->system_charset);
+		$GLOBALS['setup_tpl']->set_var('charset', $GLOBALS['egw_setup']->system_charset);
 		$style = array(
 			'th_bg'		=> '#486591',
 			'th_text'	=> '#FFFFFF',
@@ -130,34 +130,34 @@ 
 		$GLOBALS['setup_tpl']->set_var($style);
 		if ($nologoutbutton)
 		{
-			$GLOBALS['setup_tpl']->set_block('T_head','loged_in');
-			$GLOBALS['setup_tpl']->set_var('loged_in','');
+			$GLOBALS['setup_tpl']->set_block('T_head', 'loged_in');
+			$GLOBALS['setup_tpl']->set_var('loged_in', '');
 		}
 		else
 		{
-			$btn_logout = '<a href="index.php?FormLogout=' . $logoutfrom . '" class="link">' . lang('Logout').'</a>';
+			$btn_logout = '<a href="index.php?FormLogout='.$logoutfrom.'" class="link">'.lang('Logout').'</a>';
 			$check_install = '<a class="textsidebox" href="check_install.php">'.lang('Check installation').'</a>';
 			$register_hooks = '<a class="textsidebox" href="applications.php?hooks=1">'.lang('Clear cache and register hooks').'</a>';
 		}
 
 		$GLOBALS['setup_tpl']->set_var('lang_setup', lang('setup'));
-		$GLOBALS['setup_tpl']->set_var('page_title',$title);
+		$GLOBALS['setup_tpl']->set_var('page_title', $title);
 		if ($configdomain == '')
 		{
-			$GLOBALS['setup_tpl']->set_var('configdomain','');
+			$GLOBALS['setup_tpl']->set_var('configdomain', '');
 		}
 		else
 		{
-			$GLOBALS['setup_tpl']->set_var('configdomain',' - ' . lang('Domain') . ': ' . $configdomain);
+			$GLOBALS['setup_tpl']->set_var('configdomain', ' - '.lang('Domain').': '.$configdomain);
 		}
 
-		if(basename($_SERVER['SCRIPT_FILENAME']) != 'index.php')
+		if (basename($_SERVER['SCRIPT_FILENAME']) != 'index.php')
 		{
-			$index_btn = '<a href="index.php" class="link">' . lang('Setup Main Menu') . '</a>';
+			$index_btn = '<a href="index.php" class="link">'.lang('Setup Main Menu').'</a>';
 			$index_img = '<img src="../api/templates/default/images/bullet.png" />';
 		}
 
-		$GLOBALS['setup_tpl']->set_var('lang_version',lang('version'));
+		$GLOBALS['setup_tpl']->set_var('lang_version', lang('version'));
 		if (!isset($GLOBALS['setup_info']) || !isset($GLOBALS['setup_info']['api']))
 		{
 			include(EGW_SERVER_ROOT.'/api/setup/setup.inc.php');
@@ -179,66 +179,66 @@ 
 
 		// manual / help link to the install manual on egroupware.org
 		$manual_remote_egw_url = 'http://manual.egroupware.org/egroupware';
-		$url_parts = explode('/',$_SERVER['PHP_SELF']);
+		$url_parts = explode('/', $_SERVER['PHP_SELF']);
 		$script = array_pop($url_parts);
 		$lang = setup::get_lang();
 		$url = $manual_remote_egw_url.'/manual/index.php?referer='.urlencode($manual_remote_egw_url.'/setup/'.$script).
 			($lang ? '&lang='.urlencode($lang) : '');
-		$GLOBALS['setup_tpl']->set_var('manual','<a href="'.$url.'" target="manual" onclick="'.
+		$GLOBALS['setup_tpl']->set_var('manual', '<a href="'.$url.'" target="manual" onclick="'.
 			"window.open('$url','manual','width=800,height=600,scrollbars=yes,resizable=yes'); return false;".'">'.
 			htmlspecialchars(lang('Manual / help')).'</a>');
 
-		$GLOBALS['setup_tpl']->pparse('out','T_head');
+		$GLOBALS['setup_tpl']->pparse('out', 'T_head');
 		/* $setup_tpl->set_var('T_head',''); */
 	}
 
 	static function show_footer()
 	{
-		$GLOBALS['setup_tpl']->pparse('out','T_footer');
+		$GLOBALS['setup_tpl']->pparse('out', 'T_footer');
 		unset($GLOBALS['setup_tpl']);
 	}
 
-	static function show_alert_msg($alert_word='Setup alert',$alert_msg='setup alert (generic)')
+	static function show_alert_msg($alert_word = 'Setup alert', $alert_msg = 'setup alert (generic)')
 	{
-		$GLOBALS['setup_tpl']->set_var('V_alert_word',$alert_word);
-		$GLOBALS['setup_tpl']->set_var('V_alert_msg',$alert_msg);
-		$GLOBALS['setup_tpl']->pparse('out','T_alert_msg');
+		$GLOBALS['setup_tpl']->set_var('V_alert_word', $alert_word);
+		$GLOBALS['setup_tpl']->set_var('V_alert_msg', $alert_msg);
+		$GLOBALS['setup_tpl']->pparse('out', 'T_alert_msg');
 	}
 
-	static function make_frm_btn_simple($pre_frm_blurb='',$frm_method='post',$frm_action='',$input_type='submit',$input_value='',$post_frm_blurb='')
+	static function make_frm_btn_simple($pre_frm_blurb = '', $frm_method = 'post', $frm_action = '', $input_type = 'submit', $input_value = '', $post_frm_blurb = '')
 	{
 		/* a simple form has simple components */
-		$simple_form = $pre_frm_blurb  ."\n"
-			. '<form method="' . $frm_method . '" action="' . $frm_action  . '">' . "\n"
-			. '<input type="'  . $input_type . '" value="'  . $input_value . '" />' . "\n"
-			. '</form>' . "\n"
-			. $post_frm_blurb . "\n";
+		$simple_form = $pre_frm_blurb."\n"
+			. '<form method="'.$frm_method.'" action="'.$frm_action.'">'."\n"
+			. '<input type="'.$input_type.'" value="'.$input_value.'" />'."\n"
+			. '</form>'."\n"
+			. $post_frm_blurb."\n";
 		return $simple_form;
 	}
 
-	static function make_href_link_simple($pre_link_blurb='',$href_link='',$href_text='default text',$post_link_blurb='')
+	static function make_href_link_simple($pre_link_blurb = '', $href_link = '', $href_text = 'default text', $post_link_blurb = '')
 	{
 		/* a simple href link has simple components */
 		$simple_link = $pre_link_blurb
-			. '<a href="' . $href_link . '">' . $href_text . '</a> '
-			. $post_link_blurb . "\n";
+			. '<a href="'.$href_link.'">'.$href_text.'</a> '
+			. $post_link_blurb."\n";
 		return $simple_link;
 	}
 
 	static function login_form()
 	{
 		/* begin use TEMPLATE login_main.tpl */
-		$GLOBALS['setup_tpl']->set_var('ConfigLoginMSG',@$GLOBALS['egw_info']['setup']['ConfigLoginMSG']);
-		$GLOBALS['setup_tpl']->set_var('HeaderLoginMSG',@$GLOBALS['egw_info']['setup']['HeaderLoginMSG']);
-		$GLOBALS['setup_tpl']->set_var('lang_header_username',lang('Header Username'));
-		$GLOBALS['setup_tpl']->set_var('lang_header_password',lang('Header Password'));
-		$GLOBALS['setup_tpl']->set_var('lang_header_login',lang('Header Admin Login'));
-		$GLOBALS['setup_tpl']->set_var('lang_config_login',lang('Setup/Config Admin Login'));
-		$GLOBALS['setup_tpl']->set_var('lang_config_username',lang('Config Username'));
-		$GLOBALS['setup_tpl']->set_var('lang_config_password',lang('Config Password'));
-		$GLOBALS['setup_tpl']->set_var('lang_domain',lang('Domain'));
+		$GLOBALS['setup_tpl']->set_var('ConfigLoginMSG', @$GLOBALS['egw_info']['setup']['ConfigLoginMSG']);
+		$GLOBALS['setup_tpl']->set_var('HeaderLoginMSG', @$GLOBALS['egw_info']['setup']['HeaderLoginMSG']);
+		$GLOBALS['setup_tpl']->set_var('lang_header_username', lang('Header Username'));
+		$GLOBALS['setup_tpl']->set_var('lang_header_password', lang('Header Password'));
+		$GLOBALS['setup_tpl']->set_var('lang_header_login', lang('Header Admin Login'));
+		$GLOBALS['setup_tpl']->set_var('lang_config_login', lang('Setup/Config Admin Login'));
+		$GLOBALS['setup_tpl']->set_var('lang_config_username', lang('Config Username'));
+		$GLOBALS['setup_tpl']->set_var('lang_config_password', lang('Config Password'));
+		$GLOBALS['setup_tpl']->set_var('lang_domain', lang('Domain'));
 
-		$GLOBALS['setup_tpl']->set_var('lang_select',self::lang_select());
+		$GLOBALS['setup_tpl']->set_var('lang_select', self::lang_select());
 
 		if ($GLOBALS['egw_info']['setup']['stage']['header'] == '10')
 		{
@@ -248,54 +248,54 @@ 
 			*/
 			if (count($GLOBALS['egw_domain']) > 1)
 			{
-				foreach(array_keys($GLOBALS['egw_domain']) as $domain)
+				foreach (array_keys($GLOBALS['egw_domain']) as $domain)
 				{
 					$domains .= "<option value=\"$domain\" ".($domain == @$GLOBALS['egw_info']['setup']['LastDomain'] ? ' selected="selected"' : '').">$domain</option>\n";
 				}
-				$GLOBALS['setup_tpl']->set_var('domains',$domains);
+				$GLOBALS['setup_tpl']->set_var('domains', $domains);
 
 				// use BLOCK B_multi_domain inside of login_stage_header
-				$GLOBALS['setup_tpl']->parse('V_multi_domain','B_multi_domain');
+				$GLOBALS['setup_tpl']->parse('V_multi_domain', 'B_multi_domain');
 				// in this case, the single domain block needs to be nothing
-				$GLOBALS['setup_tpl']->set_var('V_single_domain','');
+				$GLOBALS['setup_tpl']->set_var('V_single_domain', '');
 			}
 			else
 			{
 				reset($GLOBALS['egw_domain']);
 				$default_domain = each($GLOBALS['egw_domain']);
-				$GLOBALS['setup_tpl']->set_var('default_domain_zero',$default_domain[0]);
+				$GLOBALS['setup_tpl']->set_var('default_domain_zero', $default_domain[0]);
 
 				/* Use BLOCK B_single_domain inside of login_stage_header */
-				$GLOBALS['setup_tpl']->parse('V_single_domain','B_single_domain');
+				$GLOBALS['setup_tpl']->parse('V_single_domain', 'B_single_domain');
 				/* in this case, the multi domain block needs to be nothing */
-				$GLOBALS['setup_tpl']->set_var('V_multi_domain','');
+				$GLOBALS['setup_tpl']->set_var('V_multi_domain', '');
 			}
 			/*
 			 End use SUB-TEMPLATE login_stage_header
 			 put all this into V_login_stage_header for use inside login_main
 			*/
-			$GLOBALS['setup_tpl']->parse('V_login_stage_header','T_login_stage_header');
+			$GLOBALS['setup_tpl']->parse('V_login_stage_header', 'T_login_stage_header');
 		}
 		else
 		{
 			/* begin SKIP SUB-TEMPLATE login_stage_header */
-			$GLOBALS['setup_tpl']->set_var('V_multi_domain','');
-			$GLOBALS['setup_tpl']->set_var('V_single_domain','');
-			$GLOBALS['setup_tpl']->set_var('V_login_stage_header','');
+			$GLOBALS['setup_tpl']->set_var('V_multi_domain', '');
+			$GLOBALS['setup_tpl']->set_var('V_single_domain', '');
+			$GLOBALS['setup_tpl']->set_var('V_login_stage_header', '');
 		}
 		/*
 		 end use TEMPLATE login_main.tpl
 		 now out the login_main template
 		*/
-		$GLOBALS['setup_tpl']->pparse('out','T_login_main');
+		$GLOBALS['setup_tpl']->pparse('out', 'T_login_main');
 	}
 
-	static function lang_select($onChange=False,$ConfigLang='')
+	static function lang_select($onChange = False, $ConfigLang = '')
 	{
 		if (empty($ConfigLang))
 		{
 			$ConfigLang = setup::get_lang();
-			if (empty($ConfigLang)) $ConfigLang = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'],0,2);
+			if (empty($ConfigLang)) $ConfigLang = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);
 		}
 		return Api\Html::select('ConfigLang', $ConfigLang, Api\Translation::get_available_langs(false), true,
 			$onChange ? ' onchange="this.form.submit();"' : '');
@@ -303,19 +303,19 @@ 
 
 	static function get_template_list()
 	{
-		$d = dir(EGW_SERVER_ROOT . '/phpgwapi/templates');
+		$d = dir(EGW_SERVER_ROOT.'/phpgwapi/templates');
 
 		$list = array();
-		while($entry = $d->read())
+		while ($entry = $d->read())
 		{
 			if ($entry != 'CVS' && $entry != '.' && $entry != '..')
 			{
 				$list[$entry]['name'] = $entry;
-				$f = EGW_SERVER_ROOT . '/phpgwapi/templates/' . $entry . '/details.inc.php';
-				if (file_exists ($f))
+				$f = EGW_SERVER_ROOT.'/phpgwapi/templates/'.$entry.'/details.inc.php';
+				if (file_exists($f))
 				{
 					include($f);
-					$list[$entry]['title'] = 'Use ' . $GLOBALS['egw_info']['template'][$entry]['title'] . 'interface';
+					$list[$entry]['title'] = 'Use '.$GLOBALS['egw_info']['template'][$entry]['title'].'interface';
 				}
 				else
 				{
@@ -324,22 +324,22 @@ 
 			}
 		}
 		$d->close();
-		reset ($list);
+		reset($list);
 		return $list;
 	}
 
 	static function list_themes()
 	{
-		$dh = dir(EGW_SERVER_ROOT . '/phpgwapi/themes');
+		$dh = dir(EGW_SERVER_ROOT.'/phpgwapi/themes');
 		while ($file = $dh->read())
 		{
 			if (preg_match('/'."\.theme$".'/i', $file))
 			{
-				$list[] = substr($file,0,strpos($file,'.'));
+				$list[] = substr($file, 0, strpos($file, '.'));
 			}
 		}
 		$dh->close();
-		reset ($list);
+		reset($list);
 		return $list;
 	}
 }

Braces +4 added lines, -1 removed lines

@@ -295,7 +295,10 @@
 		if (empty($ConfigLang))
 		{
 			$ConfigLang = setup::get_lang();
-			if (empty($ConfigLang)) $ConfigLang = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'],0,2);
+			if (empty($ConfigLang))
+			{
+				$ConfigLang = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'],0,2);
+			}
 		}
 		return Api\Html::select('ConfigLang', $ConfigLang, Api\Translation::get_available_langs(false), true,
 			$onChange ? ' onchange="this.form.submit();"' : '');

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

@@ -29,7 +29,7 @@
 
 		$GLOBALS['header_template']->set_file(array('header' => 'header.inc.php.template'));
 		$GLOBALS['header_template']->set_block('header','domain','domain');
-		$var = Array();
+		$var = array();
 
 		$deletedomain = $_POST['deletedomain'];
 		$domains = $_POST['domains'];

setup/db_backup.php

Spacing +65 added lines, -66 removed lines

@@ -41,9 +41,9 @@ 
 if ($_POST['download'])
 {
 	list($file) = each($_POST['download']);
-	$file = $db_backup->backup_dir.'/'.basename($file);	// basename to now allow to change the dir
+	$file = $db_backup->backup_dir.'/'.basename($file); // basename to now allow to change the dir
 	while (@ob_end_clean()) {}      // end all active output buffering
-	ini_set('zlib.output_compression',0);   // switch off zlib.output_compression, as this would limit downloads in size to memory_limit
+	ini_set('zlib.output_compression', 0); // switch off zlib.output_compression, as this would limit downloads in size to memory_limit
 	Api\Header\Content::type(basename($file));
 	readfile($file);
 	exit;
@@ -61,23 +61,23 @@ 
 {
 	Api\Csrf::validate($_POST['csrf_token'], __FILE__);
 }
-$setup_tpl->set_block('T_db_backup','schedule_row','schedule_rows');
-$setup_tpl->set_block('T_db_backup','set_row','set_rows');
+$setup_tpl->set_block('T_db_backup', 'schedule_row', 'schedule_rows');
+$setup_tpl->set_block('T_db_backup', 'set_row', 'set_rows');
 
-$setup_tpl->set_var('stage_title',$stage_title = lang('DB backup and restore'));
-$setup_tpl->set_var('stage_desc',lang('This program lets you backup your database, schedule a backup or restore it.'));
-$setup_tpl->set_var('error_msg','');
+$setup_tpl->set_var('stage_title', $stage_title = lang('DB backup and restore'));
+$setup_tpl->set_var('stage_desc', lang('This program lets you backup your database, schedule a backup or restore it.'));
+$setup_tpl->set_var('error_msg', '');
 
-$bgcolor = array('#DDDDDD','#EEEEEE');
+$bgcolor = array('#DDDDDD', '#EEEEEE');
 
 if (is_object($GLOBALS['egw_setup']->html))
 {
-	$GLOBALS['egw_setup']->html->show_header($stage_title,False,'config',$GLOBALS['egw_setup']->ConfigDomain . '(' . $GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'] . ')');
+	$GLOBALS['egw_setup']->html->show_header($stage_title, False, 'config', $GLOBALS['egw_setup']->ConfigDomain.'('.$GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'].')');
 }
 else
 {
-	$setup_tpl->set_block('T_db_backup','setup_header');
-	$setup_tpl->set_var('setup_header','');
+	$setup_tpl->set_block('T_db_backup', 'setup_header');
+	$setup_tpl->set_var('setup_header', '');
 	$GLOBALS['egw_info']['flags']['app_header'] = $stage_title;
 	echo $GLOBALS['egw']->framework->header();
 	echo $GLOBALS['egw']->framework->navbar();
@@ -93,9 +93,9 @@ 
 	if (empty($minCount))
 	{
 		$minCount = 0;
-		$setup_tpl->set_var('error_msg',htmlspecialchars(lang("'%1' must be integer", lang("backup min count"))));
+		$setup_tpl->set_var('error_msg', htmlspecialchars(lang("'%1' must be integer", lang("backup min count"))));
 	}
-	$db_backup->saveConfig($minCount,$is_setup ? (boolean)$filesBackup : null);
+	$db_backup->saveConfig($minCount, $is_setup ? (boolean)$filesBackup : null);
 
 	if (is_int($minCount) && $minCount > 0)
 	{
@@ -112,22 +112,21 @@ 
 {
 	Vfs::$is_root = true;
 	echo '<div align="center">'.
-		(Vfs::mount('filesystem://default'.$db_backup->backup_dir.'?group=Admins&mode=070','/backup',false) ?
-			lang('Backup directory %1 mounted as %2',$db_backup->backup_dir,'/backup') :
-			lang('Failed to mount Backup directory!')).
+		(Vfs::mount('filesystem://default'.$db_backup->backup_dir.'?group=Admins&mode=070', '/backup', false) ?
+			lang('Backup directory %1 mounted as %2', $db_backup->backup_dir, '/backup') : lang('Failed to mount Backup directory!')).
 		"</div>\n";
 	Vfs::$is_root = false;
 }
 // create a backup now
-if($_POST['backup'])
+if ($_POST['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);
-		if(is_resource($f))
+		if (is_resource($f))
 			fclose($f);
-		$setup_tpl->set_var('error_msg',lang('backup finished'));
+		$setup_tpl->set_var('error_msg', lang('backup finished'));
 
 		/* Remove old backups. */
 		$cleaned_files = array();
@@ -139,38 +138,38 @@ 
 	}
 	else
 	{
-		$setup_tpl->set_var('error_msg',$f);
+		$setup_tpl->set_var('error_msg', $f);
 	}
 }
-$setup_tpl->set_var('backup_now_button','<input type="submit" name="backup" title="'.htmlspecialchars(lang("back's up your DB now, this might take a few minutes")).'" value="'.htmlspecialchars(lang('backup now')).'" />');
-$setup_tpl->set_var('upload','<input type="file" name="uploaded" /> &nbsp;'.
+$setup_tpl->set_var('backup_now_button', '<input type="submit" name="backup" title="'.htmlspecialchars(lang("back's up your DB now, this might take a few minutes")).'" value="'.htmlspecialchars(lang('backup now')).'" />');
+$setup_tpl->set_var('upload', '<input type="file" name="uploaded" /> &nbsp;'.
 	'<input type="submit" name="upload" value="'.htmlspecialchars(lang('upload backup')).'" title="'.htmlspecialchars(lang("uploads a backup to the backup-dir, from where you can restore it")).'" />');
-$setup_tpl->set_var('backup_mincount','<input type="text" name="backup_mincount" value="'.$db_backup->backup_mincount.'" size="3" maxlength="3"/>');
-$setup_tpl->set_var('backup_files','<input type="checkbox" name="backup_files" value="backup_files"'.
-	($db_backup->backup_files ? ' checked="true"':'').
+$setup_tpl->set_var('backup_mincount', '<input type="text" name="backup_mincount" value="'.$db_backup->backup_mincount.'" size="3" maxlength="3"/>');
+$setup_tpl->set_var('backup_files', '<input type="checkbox" name="backup_files" value="backup_files"'.
+	($db_backup->backup_files ? ' checked="true"' : '').
 // do NOT allow to change "backup files" outside of setup
 	($is_setup ? '' : ' disabled="true" title="'.htmlspecialchars(lang('Can only be change via Setup!')).'"').'/>');
-$setup_tpl->set_var('backup_save_settings','<input type="submit" name="save_backup_settings" value="'.htmlspecialchars(lang('save')).'" />');
-$setup_tpl->set_var('backup_mount','<input type="submit" name="mount" value="'.htmlspecialchars(lang('Mount backup directory to %1','/backup')).'" />');
+$setup_tpl->set_var('backup_save_settings', '<input type="submit" name="save_backup_settings" value="'.htmlspecialchars(lang('save')).'" />');
+$setup_tpl->set_var('backup_mount', '<input type="submit" name="mount" value="'.htmlspecialchars(lang('Mount backup directory to %1', '/backup')).'" />');
 
 if ($_POST['upload'] && is_array($_FILES['uploaded']) && !$_FILES['uploaded']['error'] &&
 	is_uploaded_file($_FILES['uploaded']['tmp_name']))
 {
-	move_uploaded_file($_FILES['uploaded']['tmp_name'],$db_backup->backup_dir.'/'.$_FILES['uploaded']['name']);
+	move_uploaded_file($_FILES['uploaded']['tmp_name'], $db_backup->backup_dir.'/'.$_FILES['uploaded']['name']);
 
 	$md5 = ', md5='.md5_file($db_backup->backup_dir.'/'.$_FILES['uploaded']['name']);
 	$md5 .= ', sha1='.sha1_file($db_backup->backup_dir.'/'.$_FILES['uploaded']['name']);
 
-	$setup_tpl->set_var('error_msg',lang("succesfully uploaded file %1",$_FILES['uploaded']['name'].', '.
-		sprintf('%3.1lf MB (%d)',$_FILES['uploaded']['size']/(1024*1024),$_FILES['uploaded']['size']).$md5));
+	$setup_tpl->set_var('error_msg', lang("succesfully uploaded file %1", $_FILES['uploaded']['name'].', '.
+		sprintf('%3.1lf MB (%d)', $_FILES['uploaded']['size'] / (1024 * 1024), $_FILES['uploaded']['size']).$md5));
 }
 // delete a backup
 if ($_POST['delete'])
 {
 	list($file) = each($_POST['delete']);
-	$file = $db_backup->backup_dir.'/'.basename($file);	// basename to not allow to change the dir
+	$file = $db_backup->backup_dir.'/'.basename($file); // basename to not allow to change the dir
 
-	if (unlink($file)) $setup_tpl->set_var('error_msg',lang("backup '%1' deleted",$file));
+	if (unlink($file)) $setup_tpl->set_var('error_msg', lang("backup '%1' deleted", $file));
 }
 // rename a backup
 if ($_POST['rename'])
@@ -181,44 +180,44 @@ 
 	{
 		list($ending) = array_reverse(explode('.', $file));
 		list($new_ending, $has_ending) = array_reverse(explode('.', $new_name));
-		if(!$has_ending || $new_ending != $ending) $new_name .= '.'.$ending;
-		$file = $db_backup->backup_dir.'/'.basename($file);	// basename to not allow to change the dir
-		$ext = preg_match('/(\.gz|\.bz2)+$/i',$file,$matches) ? $matches[1] : '';
-		$new_file = $db_backup->backup_dir.'/'.preg_replace('/(\.gz|\.bz2)+$/i','',basename($new_name)).$ext;
-		if (rename($file,$new_file)) $setup_tpl->set_var('error_msg',lang("backup '%1' renamed to '%2'",basename($file),basename($new_file)));
+		if (!$has_ending || $new_ending != $ending) $new_name .= '.'.$ending;
+		$file = $db_backup->backup_dir.'/'.basename($file); // basename to not allow to change the dir
+		$ext = preg_match('/(\.gz|\.bz2)+$/i', $file, $matches) ? $matches[1] : '';
+		$new_file = $db_backup->backup_dir.'/'.preg_replace('/(\.gz|\.bz2)+$/i', '', basename($new_name)).$ext;
+		if (rename($file, $new_file)) $setup_tpl->set_var('error_msg', lang("backup '%1' renamed to '%2'", basename($file), basename($new_file)));
 	}
 }
 // restore a backup
 if ($_POST['restore'])
 {
 	list($file) = each($_POST['restore']);
-	$file = $db_backup->backup_dir.'/'.basename($file);	// basename to not allow to change the dir
+	$file = $db_backup->backup_dir.'/'.basename($file); // basename to not allow to change the dir
 
-	if (is_resource($f = $db_backup->fopen_backup($file,true)))
+	if (is_resource($f = $db_backup->fopen_backup($file, true)))
 	{
-		echo '<p align="center">'.lang('restore started, this might take a few minutes ...')."</p>\n".str_repeat(' ',4096);
+		echo '<p align="center">'.lang('restore started, this might take a few minutes ...')."</p>\n".str_repeat(' ', 4096);
 		$start = time();
-		$db_backup->restore($f, true, $file);	// allways convert to current system charset on restore
-		$setup_tpl->set_var('error_msg',lang("backup '%1' restored",$file).' ('.(time()-$start).' s)');
+		$db_backup->restore($f, true, $file); // allways convert to current system charset on restore
+		$setup_tpl->set_var('error_msg', lang("backup '%1' restored", $file).' ('.(time() - $start).' s)');
 		if ($run_in_egw)
 		{
 			// updating the backup
 			$cmd = new setup_cmd_update($GLOBALS['egw']->session->account_domain,
-				$GLOBALS['egw_info']['server']['header_admin_user']='admin',
-				$GLOBALS['egw_info']['server']['header_admin_password']=uniqid('pw',true),false,true);
+				$GLOBALS['egw_info']['server']['header_admin_user'] = 'admin',
+				$GLOBALS['egw_info']['server']['header_admin_password'] = uniqid('pw', true), false, true);
 			echo $cmd->run()."\n";
-			echo '<h3>'.lang('You should %1log out%2 and in again, to update your current session!','<a href="'.Egw::link('/logout.php').'" target="_parent">','</a>')."</h3>\n";
+			echo '<h3>'.lang('You should %1log out%2 and in again, to update your current session!', '<a href="'.Egw::link('/logout.php').'" target="_parent">', '</a>')."</h3>\n";
 		}
 	}
 	else
 	{
-		$setup_tpl->set_var('error_msg',$f);
+		$setup_tpl->set_var('error_msg', $f);
 	}
 }
 // create a new scheduled backup
 if ($_POST['schedule'])
 {
-	$asyncservice->set_timer($_POST['times'],'db_backup-'.implode(':',$_POST['times']),'admin.admin_db_backup.do_backup','');
+	$asyncservice->set_timer($_POST['times'], 'db_backup-'.implode(':', $_POST['times']), 'admin.admin_db_backup.do_backup', '');
 }
 // cancel a scheduled backup
 if (is_array($_POST['cancel']))
@@ -229,29 +228,29 @@ 
 // list scheduled backups
 if (($jobs = $asyncservice->read('db_backup-%')))
 {
-	foreach($jobs as $job)
+	foreach ($jobs as $job)
 	{
 		$setup_tpl->set_var($job['times']);
-		$setup_tpl->set_var('next_run',date('Y-m-d H:i',$job['next']));
-		$setup_tpl->set_var('actions','<input type="submit" name="cancel['.$job['id'].']" value="'.htmlspecialchars(lang('delete')).'" />');
-		$setup_tpl->parse('schedule_rows','schedule_row',true);
+		$setup_tpl->set_var('next_run', date('Y-m-d H:i', $job['next']));
+		$setup_tpl->set_var('actions', '<input type="submit" name="cancel['.$job['id'].']" value="'.htmlspecialchars(lang('delete')).'" />');
+		$setup_tpl->parse('schedule_rows', 'schedule_row', true);
 	}
 }
 // input-fields to create a new scheduled backup
-foreach($times=array('year'=>'*','month'=>'*','day'=>'*','dow'=>'2-6','hour'=>3,'min'=>0) as $name => $default)
+foreach ($times = array('year'=>'*', 'month'=>'*', 'day'=>'*', 'dow'=>'2-6', 'hour'=>3, 'min'=>0) as $name => $default)
 {
-	$setup_tpl->set_var($name,'<input name="times['.$name.']" size="5" value="'.$default.'" />');
+	$setup_tpl->set_var($name, '<input name="times['.$name.']" size="5" value="'.$default.'" />');
 }
-$setup_tpl->set_var('next_run','&nbsp;');
-$setup_tpl->set_var('actions','<input type="submit" name="schedule" value="'.htmlspecialchars(lang('schedule')).'" />');
-$setup_tpl->parse('schedule_rows','schedule_row',true);
+$setup_tpl->set_var('next_run', '&nbsp;');
+$setup_tpl->set_var('actions', '<input type="submit" name="schedule" value="'.htmlspecialchars(lang('schedule')).'" />');
+$setup_tpl->parse('schedule_rows', 'schedule_row', true);
 
 // listing the availible backup sets
-$setup_tpl->set_var('backup_dir',$db_backup->backup_dir);
-$setup_tpl->set_var('set_rows','');
+$setup_tpl->set_var('backup_dir', $db_backup->backup_dir);
+$setup_tpl->set_var('set_rows', '');
 $handle = @opendir($db_backup->backup_dir);
 $files = array();
-while($handle && ($file = readdir($handle)))
+while ($handle && ($file = readdir($handle)))
 {
 	if ($file != '.' && $file != '..')
 	{
@@ -261,13 +260,13 @@ 
 if ($handle) closedir($handle);
 
 arsort($files);
-foreach($files as $file => $ctime)
+foreach ($files as $file => $ctime)
 {
 	$size = filesize($db_backup->backup_dir.'/'.$file);
 	$setup_tpl->set_var(array(
 		'filename'	=> $file,
-		'mod'		=> date('Y-m-d H:i',$ctime),
-		'size'		=> sprintf('%3.1lf MB (%d)',$size/(1024*1024),$size),
+		'mod'		=> date('Y-m-d H:i', $ctime),
+		'size'		=> sprintf('%3.1lf MB (%d)', $size / (1024 * 1024), $size),
 		'actions'	=> '<input type="submit" name="download['.$file.']" value="'.htmlspecialchars(lang('download')).'" />&nbsp;'."\n".
 			'<input type="submit" name="delete['.$file.']" value="'.htmlspecialchars(lang('delete')).'" onclick="return confirm(\''.
 				htmlspecialchars(lang('Confirm to delete this backup?')).'\');" />&nbsp;'."\n".
@@ -275,7 +274,7 @@ 
 			'<input type="submit" name="restore['.$file.']" value="'.htmlspecialchars(lang('restore')).'" onclick="return confirm(\''.
 				htmlspecialchars(lang('Restoring a backup will delete/replace all content in your database. Are you sure?')).'\');" />',
 	));
-	$setup_tpl->parse('set_rows','set_row',true);
+	$setup_tpl->parse('set_rows', 'set_row', true);
 }
 
 $setup_tpl->set_var(array(
@@ -299,8 +298,8 @@ 
 	'lang_size'				=> lang('size'),
 ));
 
-$setup_tpl->set_var('self',$self);
-$setup_tpl->pparse('out','T_db_backup');
+$setup_tpl->set_var('self', $self);
+$setup_tpl->pparse('out', 'T_db_backup');
 
 if ($run_in_egw)
 {

Braces +27 added lines, -8 removed lines

@@ -14,9 +14,12 @@ 
 use EGroupware\Api\Egw;
 use EGroupware\Api\Vfs;
 
-if (!is_object(@$GLOBALS['egw']))	// called from outside eGW ==> setup
+if (!is_object(@$GLOBALS['egw']))
+{
+	// called from outside eGW ==> setup
 {
 	include ('./inc/functions.inc.php');
+}
 
 	@set_time_limit(0);
 
@@ -42,7 +45,9 @@ 
 {
 	list($file) = each($_POST['download']);
 	$file = $db_backup->backup_dir.'/'.basename($file);	// basename to now allow to change the dir
-	while (@ob_end_clean()) {}      // end all active output buffering
+	while (@ob_end_clean())
+	{
+}      // end all active output buffering
 	ini_set('zlib.output_compression',0);   // switch off zlib.output_compression, as this would limit downloads in size to memory_limit
 	Api\Header\Content::type(basename($file));
 	readfile($file);
@@ -126,7 +131,9 @@ 
 		echo '<p align="center">'.lang('backup started, this might take a few minutes ...')."</p>\n".str_repeat(' ',4096);
 		$db_backup->backup($f);
 		if(is_resource($f))
-			fclose($f);
+		{
+					fclose($f);
+		}
 		$setup_tpl->set_var('error_msg',lang('backup finished'));
 
 		/* Remove old backups. */
@@ -170,8 +177,11 @@ 
 	list($file) = each($_POST['delete']);
 	$file = $db_backup->backup_dir.'/'.basename($file);	// basename to not allow to change the dir
 
-	if (unlink($file)) $setup_tpl->set_var('error_msg',lang("backup '%1' deleted",$file));
-}
+	if (unlink($file))
+	{
+		$setup_tpl->set_var('error_msg',lang("backup '%1' deleted",$file));
+	}
+	}
 // rename a backup
 if ($_POST['rename'])
 {
@@ -181,11 +191,17 @@ 
 	{
 		list($ending) = array_reverse(explode('.', $file));
 		list($new_ending, $has_ending) = array_reverse(explode('.', $new_name));
-		if(!$has_ending || $new_ending != $ending) $new_name .= '.'.$ending;
+		if(!$has_ending || $new_ending != $ending)
+		{
+			$new_name .= '.'.$ending;
+		}
 		$file = $db_backup->backup_dir.'/'.basename($file);	// basename to not allow to change the dir
 		$ext = preg_match('/(\.gz|\.bz2)+$/i',$file,$matches) ? $matches[1] : '';
 		$new_file = $db_backup->backup_dir.'/'.preg_replace('/(\.gz|\.bz2)+$/i','',basename($new_name)).$ext;
-		if (rename($file,$new_file)) $setup_tpl->set_var('error_msg',lang("backup '%1' renamed to '%2'",basename($file),basename($new_file)));
+		if (rename($file,$new_file))
+		{
+			$setup_tpl->set_var('error_msg',lang("backup '%1' renamed to '%2'",basename($file),basename($new_file)));
+		}
 	}
 }
 // restore a backup
@@ -258,7 +274,10 @@ 
 		$files[$file] = filectime($db_backup->backup_dir.'/'.$file);
 	}
 }
-if ($handle) closedir($handle);
+if ($handle)
+{
+	closedir($handle);
+}
 
 arsort($files);
 foreach($files as $file => $ctime)

setup/admin_account.php

Spacing +48 added lines, -48 removed lines

@@ -13,13 +13,13 @@ 
 use EGroupware\Api;
 use EGroupware\Api\Framework;
 
-if (strpos($_SERVER['PHP_SELF'],'admin_account.php') !== false)
+if (strpos($_SERVER['PHP_SELF'], 'admin_account.php') !== false)
 {
 	include('./inc/functions.inc.php');
 
 	// Authorize the user to use setup app and load the database
 	// Does not return unless user is authorized
-	if(!$GLOBALS['egw_setup']->auth('Config') || $_POST['cancel'])
+	if (!$GLOBALS['egw_setup']->auth('Config') || $_POST['cancel'])
 	{
 		Header('Location: index.php');
 		exit;
@@ -43,16 +43,16 @@ 
 	$lname    = $_POST['lname'];
 	$email    = $_POST['email'];
 
-	if($passwd != $passwd2 || !$username)
+	if ($passwd != $passwd2 || !$username)
 	{
-		$error = '<p>'.lang('Passwords did not match, please re-enter') . ".</p>\n";
+		$error = '<p>'.lang('Passwords did not match, please re-enter').".</p>\n";
 	}
-	if(!$username)
+	if (!$username)
 	{
-		$error = '<p>'.lang('You must enter a username for the admin') . ".</p>\n";
+		$error = '<p>'.lang('You must enter a username for the admin').".</p>\n";
 	}
 }
-if(!$_POST['submit'] || $error)
+if (!$_POST['submit'] || $error)
 {
 	$tpl_root = $GLOBALS['egw_setup']->html->setup_tpl_dir('setup');
 	$setup_tpl = new Framework\Template($tpl_root);
@@ -64,8 +64,8 @@ 
 		'T_login_stage_header' => 'login_stage_header.tpl',
 		'T_admin_account' => 'admin_account.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');
 
 	$GLOBALS['egw_setup']->html->show_header(lang('Create admin account'));
 
@@ -76,27 +76,27 @@ 
 		'lname'    => $lname,
 		'email'    => $email,
 	));
-	$setup_tpl->set_var('action_url','admin_account.php');
-	$setup_tpl->set_var('description',lang('This will create a first user in eGroupWare or reset password and admin rights of an exiting user'));
-	$setup_tpl->set_var('lang_deleteall',lang('Delete all existing SQL accounts, groups, ACLs and preferences (normally not necessary)?'));
-
-	$setup_tpl->set_var('detailadmin',lang('Details for Admin account'));
-	$setup_tpl->set_var('adminusername',lang('Admin username'));
-	$setup_tpl->set_var('adminfirstname',lang('Admin first name'));
-	$setup_tpl->set_var('adminlastname',lang('Admin last name'));
-	$setup_tpl->set_var('adminemail',lang('Admin email address'));
-	$setup_tpl->set_var('adminpassword',lang('Admin password'));
-	$setup_tpl->set_var('adminpassword2',lang('Re-enter password'));
-	$setup_tpl->set_var('admin_all_apps',lang('Give admin access to all installed apps'));
-	$setup_tpl->set_var('all_apps_desc',lang('Usually more annoying.<br />Admins can use Admin >> Manage accounts or groups to give access to further apps.'));
-	$setup_tpl->set_var('create_demo_accounts',lang('Create demo accounts'));
-	$setup_tpl->set_var('demo_desc',lang('The username/passwords are: demo/guest, demo2/guest and demo3/guest.'));
+	$setup_tpl->set_var('action_url', 'admin_account.php');
+	$setup_tpl->set_var('description', lang('This will create a first user in eGroupWare or reset password and admin rights of an exiting user'));
+	$setup_tpl->set_var('lang_deleteall', lang('Delete all existing SQL accounts, groups, ACLs and preferences (normally not necessary)?'));
+
+	$setup_tpl->set_var('detailadmin', lang('Details for Admin account'));
+	$setup_tpl->set_var('adminusername', lang('Admin username'));
+	$setup_tpl->set_var('adminfirstname', lang('Admin first name'));
+	$setup_tpl->set_var('adminlastname', lang('Admin last name'));
+	$setup_tpl->set_var('adminemail', lang('Admin email address'));
+	$setup_tpl->set_var('adminpassword', lang('Admin password'));
+	$setup_tpl->set_var('adminpassword2', lang('Re-enter password'));
+	$setup_tpl->set_var('admin_all_apps', lang('Give admin access to all installed apps'));
+	$setup_tpl->set_var('all_apps_desc', lang('Usually more annoying.<br />Admins can use Admin >> Manage accounts or groups to give access to further apps.'));
+	$setup_tpl->set_var('create_demo_accounts', lang('Create demo accounts'));
+	$setup_tpl->set_var('demo_desc', lang('The username/passwords are: demo/guest, demo2/guest and demo3/guest.'));
 
 	$setup_tpl->set_var('hidden_vars', Api\Html::input_hidden('csrf_token', Api\Csrf::token(__FILE__)));
 
-	$setup_tpl->set_var('lang_submit',lang('Save'));
-	$setup_tpl->set_var('lang_cancel',lang('Cancel'));
-	$setup_tpl->pparse('out','T_admin_account');
+	$setup_tpl->set_var('lang_submit', lang('Save'));
+	$setup_tpl->set_var('lang_cancel', lang('Cancel'));
+	$setup_tpl->pparse('out', 'T_admin_account');
 	$GLOBALS['egw_setup']->html->show_footer();
 }
 else
@@ -104,25 +104,25 @@ 
 	/* Begin transaction for acl, etc */
 	$GLOBALS['egw_setup']->db->transaction_begin();
 
-	if($_POST['delete_all'])
+	if ($_POST['delete_all'])
 	{
 		/* Now, clear out existing tables */
-		foreach(array($GLOBALS['egw_setup']->accounts_table,$GLOBALS['egw_setup']->acl_table,'egw_access_log') as $table)
+		foreach (array($GLOBALS['egw_setup']->accounts_table, $GLOBALS['egw_setup']->acl_table, 'egw_access_log') as $table)
 		{
-			$GLOBALS['egw_setup']->db->delete($table,'1=1',__LINE__,__FILE__);
+			$GLOBALS['egw_setup']->db->delete($table, '1=1', __LINE__, __FILE__);
 		}
 		// keep default and forced prefs from installed apps
-		$GLOBALS['egw_setup']->db->delete($GLOBALS['egw_setup']->prefs_table,'preference_owner NOT IN (-1,-2)',__LINE__,__FILE__);
+		$GLOBALS['egw_setup']->db->delete($GLOBALS['egw_setup']->prefs_table, 'preference_owner NOT IN (-1,-2)', __LINE__, __FILE__);
 		// remove accounts from addressbook
-		$GLOBALS['egw_setup']->db->delete('egw_addressbook','account_id IS NOT NULL',__LINE__,__FILE__);
+		$GLOBALS['egw_setup']->db->delete('egw_addressbook', 'account_id IS NOT NULL', __LINE__, __FILE__);
 	}
 	// create our stock groups: Default (all users) and Admins (administrators)
-	$defaultgroupid = (int)$GLOBALS['egw_setup']->add_account('Default','Default','Group',False,False);
-	$admingroupid   = (int)$GLOBALS['egw_setup']->add_account('Admins','Admin','Group',False,False);
+	$defaultgroupid = (int)$GLOBALS['egw_setup']->add_account('Default', 'Default', 'Group', False, False);
+	$admingroupid   = (int)$GLOBALS['egw_setup']->add_account('Admins', 'Admin', 'Group', False, False);
 
 	if (!$defaultgroupid || !$admingroupid)
 	{
-		if (strpos($_SERVER['PHP_SELF'],'admin_account.php') === false)
+		if (strpos($_SERVER['PHP_SELF'], 'admin_account.php') === false)
 		{
 			return 42; //lang('Error in group-creation !!!');	// dont exit on setup-cli
 		}
@@ -133,11 +133,11 @@ 
 	}
 
 	// Group perms for the default group
-	$default_group_apps = array('addressbook','calendar','infolog','mail','filemanager','preferences','manual','groupdav','notifications','timesheet','importexport','activesync');
-	$GLOBALS['egw_setup']->add_acl($default_group_apps,'run',$defaultgroupid);
+	$default_group_apps = array('addressbook', 'calendar', 'infolog', 'mail', 'filemanager', 'preferences', 'manual', 'groupdav', 'notifications', 'timesheet', 'importexport', 'activesync');
+	$GLOBALS['egw_setup']->add_acl($default_group_apps, 'run', $defaultgroupid);
 
 	$apps = array();
-	foreach($GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->applications_table,'app_name','app_enabled < 3',__LINE__,__FILE__) as $row)
+	foreach ($GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->applications_table, 'app_name', 'app_enabled < 3', __LINE__, __FILE__) as $row)
 	{
 		$apps[] = $row['app_name'];
 	}
@@ -148,24 +148,24 @@ 
 		$apps = array_intersect(
 			// also give Admins apps of all users group Defaults, in case one forgot to add admins to it
 			array_unique(array_merge($default_group_apps,
-				array('admin','bookmarks','emailadmin','news_admin','phpbrain','phpsysinfo','phpfreechat','projectmanager','resources','sitemgr','timesheet','tracker','wiki'))),$apps);
+				array('admin', 'bookmarks', 'emailadmin', 'news_admin', 'phpbrain', 'phpsysinfo', 'phpfreechat', 'projectmanager', 'resources', 'sitemgr', 'timesheet', 'tracker', 'wiki'))), $apps);
 	}
-	$GLOBALS['egw_setup']->add_acl($apps,'run',$admingroupid);
+	$GLOBALS['egw_setup']->add_acl($apps, 'run', $admingroupid);
 
 	/* Creation of the demo accounts is optional - the checkbox is on by default. */
-	if($_POST['create_demo'])
+	if ($_POST['create_demo'])
 	{
 		// Create 3 demo accounts
-		$GLOBALS['egw_setup']->add_account('demo','Demo','Account','guest');
-		$GLOBALS['egw_setup']->add_account('demo2','Demo2','Account','guest');
-		$GLOBALS['egw_setup']->add_account('demo3','Demo3','Account','guest');
+		$GLOBALS['egw_setup']->add_account('demo', 'Demo', 'Account', 'guest');
+		$GLOBALS['egw_setup']->add_account('demo2', 'Demo2', 'Account', 'guest');
+		$GLOBALS['egw_setup']->add_account('demo3', 'Demo3', 'Account', 'guest');
 	}
 
 	/* Create records for administrator account, with Admins as primary and Default as additional group */
-	$accountid = $GLOBALS['egw_setup']->add_account($username,$fname,$lname,$passwd,'Admins',True,$email);
+	$accountid = $GLOBALS['egw_setup']->add_account($username, $fname, $lname, $passwd, 'Admins', True, $email);
 	if (!$accountid)
 	{
-		if (strpos($_SERVER['PHP_SELF'],'admin_account.php') === false)
+		if (strpos($_SERVER['PHP_SELF'], 'admin_account.php') === false)
 		{
 			return 41; //lang('Error in admin-creation !!!');	// dont exit on setup-cli
 		}
@@ -174,11 +174,11 @@ 
 		$GLOBALS['egw_setup']->db->transaction_abort();
 		exit;
 	}
-	$GLOBALS['egw_setup']->set_memberships(array($admingroupid,$defaultgroupid),$accountid);
+	$GLOBALS['egw_setup']->set_memberships(array($admingroupid, $defaultgroupid), $accountid);
 
 	$GLOBALS['egw_setup']->db->transaction_commit();
 
-	if (strpos($_SERVER['PHP_SELF'],'admin_account.php') !== false)
+	if (strpos($_SERVER['PHP_SELF'], 'admin_account.php') !== false)
 	{
 		Header('Location: index.php');
 	}

setup/setup-cli.php

Switch Indentation +81 added lines, -81 removed lines

@@ -68,91 +68,91 @@
 
 switch($action)
 {
-	case '--version':
-	case '--check':
-		setup_cmd::check_installed($arguments[0],0,true);
-		break;
-
-	case '--create-header':
-	case '--edit-header':
-	case '--upgrade-header':
-	case '--update-header':
-		do_header($action == '--create-header',$arguments);
-		break;
-
-	case '--install':
-		do_install($arguments);
-		break;
-
-	case '--config':
-		do_config($arguments);
-		break;
-
-	case '--admin':
-		do_admin($arguments[0]);
-		break;
-
-	case '--update':
-		do_update($arguments[0]);
-		break;
-
-	case '--register-hooks':
-	case '--register-all-hooks':
-		do_hooks($arguments[0]);
-		break;
-
-	case '--backup':
-		do_backup($arguments[0]);
-		break;
-
-	case '--languages':
-		echo html_entity_decode(file_get_contents('lang/languages'),ENT_COMPAT,'utf-8');
-		break;
-
-	case '--charsets':
-		echo html_entity_decode(implode("\n",$GLOBALS['egw_setup']->translation->get_charsets(false)),ENT_COMPAT,'utf-8')."\n";
-		break;
-
-	case '--exit-codes':
-		list_exit_codes();
-		break;
-
-	case '--help':
-	case '--usage':
-		do_usage($arguments[0]);
-		break;
-
-	default:
-		// we allow to call admin_cmd classes directly, if they define the constant SETUP_CLI_CALLABLE
-		if (substr($action,0,2) == '--' && class_exists($class = str_replace('-','_',substr($action,2))) &&
-			is_subclass_of($class,'admin_cmd') && @constant($class.'::SETUP_CLI_CALLABLE'))
-		{
-			$args = array();
-			list($args['domain']) = explode(',', array_shift($arguments));	// domain must be first argument, to ensure right domain get's selected in header-include
-			foreach($arguments as $arg)
+		case '--version':
+		case '--check':
+			setup_cmd::check_installed($arguments[0],0,true);
+			break;
+
+		case '--create-header':
+		case '--edit-header':
+		case '--upgrade-header':
+		case '--update-header':
+			do_header($action == '--create-header',$arguments);
+			break;
+
+		case '--install':
+			do_install($arguments);
+			break;
+
+		case '--config':
+			do_config($arguments);
+			break;
+
+		case '--admin':
+			do_admin($arguments[0]);
+			break;
+
+		case '--update':
+			do_update($arguments[0]);
+			break;
+
+		case '--register-hooks':
+		case '--register-all-hooks':
+			do_hooks($arguments[0]);
+			break;
+
+		case '--backup':
+			do_backup($arguments[0]);
+			break;
+
+		case '--languages':
+			echo html_entity_decode(file_get_contents('lang/languages'),ENT_COMPAT,'utf-8');
+			break;
+
+		case '--charsets':
+			echo html_entity_decode(implode("\n",$GLOBALS['egw_setup']->translation->get_charsets(false)),ENT_COMPAT,'utf-8')."\n";
+			break;
+
+		case '--exit-codes':
+			list_exit_codes();
+			break;
+
+		case '--help':
+		case '--usage':
+			do_usage($arguments[0]);
+			break;
+
+		default:
+			// we allow to call admin_cmd classes directly, if they define the constant SETUP_CLI_CALLABLE
+			if (substr($action,0,2) == '--' && class_exists($class = str_replace('-','_',substr($action,2))) &&
+				is_subclass_of($class,'admin_cmd') && @constant($class.'::SETUP_CLI_CALLABLE'))
 			{
-				list($name,$value) = explode('=',$arg,2);
-				if(property_exists('admin_cmd',$name))		// dont allow to overwrite admin_cmd properties
-				{
-					throw new Api\Exception\WrongUserinput(lang("Invalid argument '%1' !!!",$arg),90);
-				}
-				if (substr($name,-1) == ']')	// allow 1-dim. arrays
+				$args = array();
+				list($args['domain']) = explode(',', array_shift($arguments));	// domain must be first argument, to ensure right domain get's selected in header-include
+				foreach($arguments as $arg)
 				{
-					list($name,$sub) = explode('[',substr($name,0,-1),2);
-					$args[$name][$sub] = $value;
-				}
-				else
-				{
-					$args[$name] = $value;
+					list($name,$value) = explode('=',$arg,2);
+					if(property_exists('admin_cmd',$name))		// dont allow to overwrite admin_cmd properties
+					{
+						throw new Api\Exception\WrongUserinput(lang("Invalid argument '%1' !!!",$arg),90);
+					}
+					if (substr($name,-1) == ']')	// allow 1-dim. arrays
+					{
+						list($name,$sub) = explode('[',substr($name,0,-1),2);
+						$args[$name][$sub] = $value;
+					}
+					else
+					{
+						$args[$name] = $value;
+					}
 				}
+				$cmd = new $class($args);
+				$msg = $cmd->run($time=null, $set_modifier=true, $skip_checks=false, $check_only=$dry_run);
+				if (is_array($msg)) $msg = print_r($msg,true);
+				echo "$msg\n";
+				break;
 			}
-			$cmd = new $class($args);
-			$msg = $cmd->run($time=null, $set_modifier=true, $skip_checks=false, $check_only=$dry_run);
-			if (is_array($msg)) $msg = print_r($msg,true);
-			echo "$msg\n";
-			break;
-		}
-		throw new Api\Exception\WrongUserinput(lang("Unknown option '%1' !!!",$action),90);
+			throw new Api\Exception\WrongUserinput(lang("Unknown option '%1' !!!",$action),90);
 }
 exit(0);
 

Spacing +90 added lines, -90 removed lines

@@ -13,13 +13,13 @@ 
 
 use EGroupware\Api;
 
-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 setup-cli as web-page
 {
 	die('<h1>setup-cli.php must NOT be called as web-page --> exiting !!!</h1>');
 }
-error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT);
+error_reporting(E_ALL&~E_NOTICE&~E_STRICT);
 
 $dry_run = false;
 array_shift($_SERVER['argv']);
@@ -33,7 +33,7 @@ 
 	}
 	$arguments = $_SERVER['argv'];
 	$action = array_shift($arguments);
-	if (isset($arguments[0])) list($_POST['FormDomain']) = explode(',',$arguments[0]);	// header include needs that to detects the right domain
+	if (isset($arguments[0])) list($_POST['FormDomain']) = explode(',', $arguments[0]); // header include needs that to detects the right domain
 }
 else
 {
@@ -42,42 +42,42 @@ 
 
 // setting the language from the enviroment
 $_POST['ConfigLang'] = get_lang($charset);
-create_http_enviroment();	// guessing the docroot etc.
+create_http_enviroment(); // guessing the docroot etc.
 
 if (ini_get('session.save_handler') == 'files' && !is_writable(ini_get('session.save_path')) && is_dir('/tmp') && is_writable('/tmp'))
 {
-	ini_set('session.save_path','/tmp');	// regular users may have no rights to apache's session dir
+	ini_set('session.save_path', '/tmp'); // regular users may have no rights to apache's session dir
 }
 // check if date.timezone is set, report it and set something if not, as it gives tons of errors in install log
 if (!ini_get('date.timezone'))
 {
 	if (!($tz = date_default_timezone_get())) $tz = 'UTC';
 	echo "No default timezone (php.ini date.timezone) set, we temporary set '$tz'. You should fix that permanent!\n";
-	ini_set('date.timezone',$tz);
+	ini_set('date.timezone', $tz);
 }
 
 // setting up the $GLOBALS['egw_setup'] object AND including the header.inc.php if it exists
 include('inc/functions.inc.php');
-$GLOBALS['egw_info']['flags']['no_exception_handler'] = 'cli';	// inc/functions.inc.php does NOT set it
+$GLOBALS['egw_info']['flags']['no_exception_handler'] = 'cli'; // inc/functions.inc.php does NOT set it
 $GLOBALS['egw_setup']->system_charset = $charset;
 
-if ((float) PHP_VERSION < $GLOBALS['egw_setup']->required_php_version)
+if ((float)PHP_VERSION < $GLOBALS['egw_setup']->required_php_version)
 {
-	throw new Api\Exception\WrongUserinput(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),98);
+	throw new Api\Exception\WrongUserinput(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), 98);
 }
 
-switch($action)
+switch ($action)
 {
 	case '--version':
 	case '--check':
-		setup_cmd::check_installed($arguments[0],0,true);
+		setup_cmd::check_installed($arguments[0], 0, true);
 		break;
 
 	case '--create-header':
 	case '--edit-header':
 	case '--upgrade-header':
 	case '--update-header':
-		do_header($action == '--create-header',$arguments);
+		do_header($action == '--create-header', $arguments);
 		break;
 
 	case '--install':
@@ -106,11 +106,11 @@ 
 		break;
 
 	case '--languages':
-		echo html_entity_decode(file_get_contents('lang/languages'),ENT_COMPAT,'utf-8');
+		echo html_entity_decode(file_get_contents('lang/languages'), ENT_COMPAT, 'utf-8');
 		break;
 
 	case '--charsets':
-		echo html_entity_decode(implode("\n",$GLOBALS['egw_setup']->translation->get_charsets(false)),ENT_COMPAT,'utf-8')."\n";
+		echo html_entity_decode(implode("\n", $GLOBALS['egw_setup']->translation->get_charsets(false)), ENT_COMPAT, 'utf-8')."\n";
 		break;
 
 	case '--exit-codes':
@@ -124,21 +124,21 @@ 
 
 	default:
 		// we allow to call admin_cmd classes directly, if they define the constant SETUP_CLI_CALLABLE
-		if (substr($action,0,2) == '--' && class_exists($class = str_replace('-','_',substr($action,2))) &&
-			is_subclass_of($class,'admin_cmd') && @constant($class.'::SETUP_CLI_CALLABLE'))
+		if (substr($action, 0, 2) == '--' && class_exists($class = str_replace('-', '_', substr($action, 2))) &&
+			is_subclass_of($class, 'admin_cmd') && @constant($class.'::SETUP_CLI_CALLABLE'))
 		{
 			$args = array();
-			list($args['domain']) = explode(',', array_shift($arguments));	// domain must be first argument, to ensure right domain get's selected in header-include
-			foreach($arguments as $arg)
+			list($args['domain']) = explode(',', array_shift($arguments)); // domain must be first argument, to ensure right domain get's selected in header-include
+			foreach ($arguments as $arg)
 			{
-				list($name,$value) = explode('=',$arg,2);
-				if(property_exists('admin_cmd',$name))		// dont allow to overwrite admin_cmd properties
+				list($name, $value) = explode('=', $arg, 2);
+				if (property_exists('admin_cmd', $name))		// dont allow to overwrite admin_cmd properties
 				{
-					throw new Api\Exception\WrongUserinput(lang("Invalid argument '%1' !!!",$arg),90);
+					throw new Api\Exception\WrongUserinput(lang("Invalid argument '%1' !!!", $arg), 90);
 				}
-				if (substr($name,-1) == ']')	// allow 1-dim. arrays
+				if (substr($name, -1) == ']')	// allow 1-dim. arrays
 				{
-					list($name,$sub) = explode('[',substr($name,0,-1),2);
+					list($name, $sub) = explode('[', substr($name, 0, -1), 2);
 					$args[$name][$sub] = $value;
 				}
 				else
@@ -147,12 +147,12 @@ 
 				}
 			}
 			$cmd = new $class($args);
-			$msg = $cmd->run($time=null, $set_modifier=true, $skip_checks=false, $check_only=$dry_run);
-			if (is_array($msg)) $msg = print_r($msg,true);
+			$msg = $cmd->run($time = null, $set_modifier = true, $skip_checks = false, $check_only = $dry_run);
+			if (is_array($msg)) $msg = print_r($msg, true);
 			echo "$msg\n";
 			break;
 		}
-		throw new Api\Exception\WrongUserinput(lang("Unknown option '%1' !!!",$action),90);
+		throw new Api\Exception\WrongUserinput(lang("Unknown option '%1' !!!", $action), 90);
 }
 exit(0);
 
@@ -163,19 +163,19 @@ 
  */
 function do_config($args)
 {
-	$arg0 = explode(',',array_shift($args));
+	$arg0 = explode(',', array_shift($args));
 	if (!($domain = @array_shift($arg0))) $domain = 'default';
 	$user = @array_shift($arg0);
 	$password = @array_shift($arg0);
-	_fetch_user_password($user,$password);
+	_fetch_user_password($user, $password);
 
 	if ($arg0)	// direct assignments (name=value,...) left
 	{
-		array_unshift($args,implode(',',$arg0));
-		array_unshift($args,'--config');
+		array_unshift($args, implode(',', $arg0));
+		array_unshift($args, '--config');
 	}
 
-	$cmd = new setup_cmd_config($domain,$user,$password,$args,true);
+	$cmd = new setup_cmd_config($domain, $user, $password, $args, true);
 	echo $cmd->run()."\n\n";
 
 	$cmd->get_config(true);
@@ -188,8 +188,8 @@ 
  */
 function do_hooks($arg)
 {
-	list($domain,$user,$password) = explode(',',$arg);
-	_fetch_user_password($user,$password);
+	list($domain, $user, $password) = explode(',', $arg);
+	_fetch_user_password($user, $password);
 
 	$domains = $GLOBALS['egw_domain'];
 	if ($domain && $domain != 'all')
@@ -197,9 +197,9 @@ 
 		$domains = array($domain => $GLOBALS['egw_domain'][$domain]);
 	}
 
-	foreach(array_keys($domains) as $domain)
+	foreach (array_keys($domains) as $domain)
 	{
-		$cmd = new setup_cmd_hooks($domain,$user,$password);
+		$cmd = new setup_cmd_hooks($domain, $user, $password);
 		echo "$domain: ".$cmd->run()."\n";
 	}
 	echo "\n";
@@ -212,10 +212,10 @@ 
  */
 function do_admin($arg)
 {
-	list($domain,$user,$password,$admin,$pw,$first,$last,$email,$lang) = explode(',',$arg);
-	_fetch_user_password($user,$password);
+	list($domain, $user, $password, $admin, $pw, $first, $last, $email, $lang) = explode(',', $arg);
+	_fetch_user_password($user, $password);
 
-	$cmd = new setup_cmd_admin($domain,$user,$password,$admin,$pw,$first,$last,$email,array(),$lang);
+	$cmd = new setup_cmd_admin($domain, $user, $password, $admin, $pw, $first, $last, $email, array(), $lang);
 	echo $cmd->run()."\n";
 }
 
@@ -225,21 +225,21 @@ 
  * @param string $arg domain(all),[config user(admin)],password,[backup-file, 'no' for no backup or empty for default name]
  * @param boolean $quite_check quiten the call to _check_auth_config
  */
-function do_backup($arg,$quite_check=false)
+function do_backup($arg, $quite_check = false)
 {
-	list($domain,,,$backup) = $options = explode(',',$arg);
+	list($domain,,, $backup) = $options = explode(',', $arg);
 
 	$domains = $GLOBALS['egw_domain'];
 	if ($domain && $domain != 'all')
 	{
 		$domains = array($domain => $GLOBALS['egw_domain'][$domain]);
 	}
-	foreach(array_keys($domains) as $domain)
+	foreach (array_keys($domains) as $domain)
 	{
 		$options[0] = $domain;
 
 		if ($quite_check) ob_start();
-		_check_auth_config(implode(',',$options),14);
+		_check_auth_config(implode(',', $options), 14);
 		if ($quite_check) ob_end_clean();
 
 		if ($backup == 'no')
@@ -257,7 +257,7 @@ 
 			}
 			else	// backup failed ==> dont start the upgrade
 			{
-				throw new Api\Exception\WrongUserinput(lang('Backup failed').': '.$f,50);
+				throw new Api\Exception\WrongUserinput(lang('Backup failed').': '.$f, 50);
 			}
 		}
 	}
@@ -270,31 +270,31 @@ 
  */
 function do_update($arg)
 {
-	list($domain,$user,$password,$backup,$app) = explode(',',$arg);
-	_fetch_user_password($user,$password);
+	list($domain, $user, $password, $backup, $app) = explode(',', $arg);
+	_fetch_user_password($user, $password);
 
 	$domains = $GLOBALS['egw_domain'];
 	if ($domain && $domain != 'all')
 	{
 		$domains = array($domain => $GLOBALS['egw_domain'][$domain]);
 	}
-	foreach($domains as $domain => $data)
+	foreach ($domains as $domain => $data)
 	{
 		$arg = "$domain,$user,$password,$backup";
 
-		_check_auth_config($arg,14);
+		_check_auth_config($arg, 14);
 
 		if ($GLOBALS['egw_info']['setup']['stage']['db'] != 4 &&
 			(!$app || !in_array($app, setup_cmd::$apps_to_install) && !in_array($app, setup_cmd::$apps_to_upgrade)) &&
 			!setup_cmd::check_autoinstall())
 		{
-			echo lang('No update necessary, domain %1(%2) is up to date.',$domain,$data['db_type'])."\n";
+			echo lang('No update necessary, domain %1(%2) is up to date.', $domain, $data['db_type'])."\n";
 		}
 		else
 		{
-			do_backup($arg,true);
+			do_backup($arg, true);
 
-			$cmd = new setup_cmd_update($domain,$user,$password,$backup,false,$app);
+			$cmd = new setup_cmd_update($domain, $user, $password, $backup, false, $app);
 			echo $cmd->run()."\n";
 		}
 	}
@@ -313,20 +313,20 @@ 
  * @param boolean $set_lang =true set our charset, overwriting the charset of the eGW installation, default true
  * @return array with unprocessed arguments from $arg
  */
-function _check_auth_config($arg,$stop,$set_lang=true)
+function _check_auth_config($arg, $stop, $set_lang = true)
 {
-	$options = explode(',',$arg);
+	$options = explode(',', $arg);
 	if (!($domain = array_shift($options))) $domain = 'default';
 	$user = array_shift($options);
 	$password = array_shift($options);
-	_fetch_user_password($user,$password);
+	_fetch_user_password($user, $password);
 
-	setup_cmd::check_installed($domain,$stop,true);
+	setup_cmd::check_installed($domain, $stop, true);
 
 	// reset charset for the output to the charset used by the OS
 	if ($set_lang) $GLOBALS['egw_setup']->system_charset = $GLOBALS['charset'];
 
-	setup_cmd::check_setup_auth($user,$password,$domain);
+	setup_cmd::check_setup_auth($user, $password, $domain);
 
 	return $options;
 }
@@ -338,16 +338,16 @@ 
  */
 function do_install($args)
 {
-	list($domain,$user,$password,$backup,$charset,$lang) = explode(',',array_shift($args));
-	_fetch_user_password($user,$password);
+	list($domain, $user, $password, $backup, $charset, $lang) = explode(',', array_shift($args));
+	_fetch_user_password($user, $password);
 
 	$config = array();
-	foreach($args as $arg)
+	foreach ($args as $arg)
 	{
-		list($name,$value) = explode('=',$arg,2);
+		list($name, $value) = explode('=', $arg, 2);
 		$config[$name] = $value;
 	}
-	$cmd = new setup_cmd_install($domain,$user,$password,$backup,$charset,true,$config,$lang);
+	$cmd = new setup_cmd_install($domain, $user, $password, $backup, $charset, true, $config, $lang);
 	echo $cmd->run()."\n";
 }
 
@@ -357,14 +357,14 @@ 
  * @param string &$user
  * @param string &$password
  */
-function _fetch_user_password(&$user,&$password)
+function _fetch_user_password(&$user, &$password)
 {
 	// read password from enviroment or query it from user, if not given
 	if (!$user) $user = 'admin';
 	if (!$password && !($password = $_SERVER['EGW_CLI_PASSWORD']))
 	{
 		echo lang('Admin password to header manager').' ';
-		$password = trim(fgets($f = fopen('php://stdin','rb')));
+		$password = trim(fgets($f = fopen('php://stdin', 'rb')));
 		fclose($f);
 	}
 }
@@ -376,18 +376,18 @@ 
  * @param array $arguments
  * @return int
  */
-function do_header($create,&$arguments)
+function do_header($create, &$arguments)
 {
 	if (!$create)
 	{
 		// read password from enviroment or query it from user, if not given
-		$options = explode(',',@$arguments[0]);
-		_fetch_user_password($options[1],$options[0]);
-		$arguments[0] = implode(',',$options);
+		$options = explode(',', @$arguments[0]);
+		_fetch_user_password($options[1], $options[0]);
+		$arguments[0] = implode(',', $options);
 	}
-	array_unshift($arguments,$create ? '--create-header' : '--edit-header');
+	array_unshift($arguments, $create ? '--create-header' : '--edit-header');
 
-	$cmd = new setup_cmd_header($create?'create':'edit',$arguments);
+	$cmd = new setup_cmd_header($create ? 'create' : 'edit', $arguments);
 	echo $cmd->run()."\n";
 }
 
@@ -399,11 +399,11 @@ 
  */
 function get_lang(&$charset)
 {
-	@list($lang,$nation,$charset) = preg_split("/[_.]/",strtolower($_SERVER['LANG']));
+	@list($lang, $nation, $charset) = preg_split("/[_.]/", strtolower($_SERVER['LANG']));
 
-	foreach(file('lang/languages') as $line)
+	foreach (file('lang/languages') as $line)
 	{
-		list($code,$language) = explode("\t",$line);
+		list($code, $language) = explode("\t", $line);
 		$languages[$code] = $language;
 	}
 	if (isset($languages[$lang.'-'.$nation])) return $lang.'-'.$nation;
@@ -420,13 +420,13 @@ 
 {
 	$_SERVER['SCRIPT_FILENAME'] = __FILE__;
 
-	foreach(array('httpsdocs','httpdocs','htdocs','html','www') as $docroottop)
+	foreach (array('httpsdocs', 'httpdocs', 'htdocs', 'html', 'www') as $docroottop)
 	{
-		$parts = explode($docroottop,__FILE__);
+		$parts = explode($docroottop, __FILE__);
 		if (count($parts) == 2)
 		{
 			$_SERVER['DOCUMENT_ROOT'] = $parts[0].$docroottop;
-			$_SERVER['PHP_SELF'] = str_replace('\\','/',$parts[1]);
+			$_SERVER['PHP_SELF'] = str_replace('\\', '/', $parts[1]);
 			break;
 		}
 	}
@@ -436,9 +436,9 @@ 
 /**
  * Echos usage message
  */
-function do_usage($what='')
+function do_usage($what = '')
 {
-	echo lang('Usage: %1 command [additional options]',basename($_SERVER['argv'][0]))."\n\n";
+	echo lang('Usage: %1 command [additional options]', basename($_SERVER['argv'][0]))."\n\n";
 
 	if (!$what)
 	{
@@ -453,7 +453,7 @@ 
 	if ($what == 'config')
 	{
 		echo '	--files-dir, --backup-dir, --temp-dir '.lang('path to various directories: have to exist and be writeable by the webserver')."\n";
-		echo '	--webserver-url '.lang('eg. /egroupware or http://domain.com/egroupware, default: %1',str_replace('/setup/setup-cli.php','',$_SERVER['PHP_SELF']))."\n";
+		echo '	--webserver-url '.lang('eg. /egroupware or http://domain.com/egroupware, default: %1', str_replace('/setup/setup-cli.php', '', $_SERVER['PHP_SELF']))."\n";
 		echo '	--mailserver '.lang('host,port(143),[domain],[{standard(default)|vmailmgr = add domain for mailserver login}]').',[starttls|ssl|tls]'."\n";
 		echo '	--smtpserver '.lang('host,[smtp port],[smtp user],[smtp password],[auth session user/pw=yes|no],[starttls|ssl|tls],[account user editable=yes|no],[further identities=yes|no]')."\n";
 		echo '	--smtp '.lang('MTA (with LDAP): [yes(user edit forwarding)],emailadmin_smtp(|_sql|_ldap|_ads|_qmail|_mandriva|_dbmailuser|_suse)')."\n";
@@ -504,13 +504,13 @@ 
 		echo '--charsets '.lang('charsets used by the different languages')."\n";
 		echo '--exit-codes '.lang('all exit codes of the command line interface')."\n";
 	}
-	if (!$what || !in_array($what,array('config','header','list')))
+	if (!$what || !in_array($what, array('config', 'header', 'list')))
 	{
 		echo '--help [config|header|list] '.lang('gives further options')."\n";
 	}
 }
 
-function fail($exit_code,$message)
+function fail($exit_code, $message)
 {
 	echo $message."\n";
 	exit($exit_code);
@@ -526,40 +526,40 @@ 
  */
 function list_exit_codes()
 {
-	error_reporting(error_reporting() & ~E_NOTICE);
+	error_reporting(error_reporting()&~E_NOTICE);
 
 	$codes = array('Ok');
 	$setup_dir = EGW_SERVER_ROOT.'/setup/';
 	//$files = array('setup-cli.php');
-	foreach(scandir($setup_dir.'/inc') as $file)
+	foreach (scandir($setup_dir.'/inc') as $file)
 	{
-		if (substr($file,0,strlen('class.setup_cmd')) == 'class.setup_cmd')
+		if (substr($file, 0, strlen('class.setup_cmd')) == 'class.setup_cmd')
 		{
 			$files[] = 'inc/'.$file;
 		}
 	}
-	foreach($files as $file)
+	foreach ($files as $file)
 	{
 		$content = file_get_contents($setup_dir.'/'.$file);
 
 		$matches = null;
-		if (preg_match_all('/throw new (egw_exception[a-z_]*)\((.*),([0-9]+)\);/m',$content,$matches))
+		if (preg_match_all('/throw new (egw_exception[a-z_]*)\((.*),([0-9]+)\);/m', $content, $matches))
 		{
 			//echo $file.":\n"; print_r($matches);
-			foreach($matches[3] as $key => $code)
+			foreach ($matches[3] as $key => $code)
 			{
 				//if (isset($codes[$code])) echo "$file redifines #$code: {$codes[$code]}\n";
 
-				$src = preg_replace('/self::\$[a-z_>-]+/i', "''", $matches[2][$key]);	// gives fatal error otherwise
-				@eval($src='$codes['.$code.'] = '.$src.';');
+				$src = preg_replace('/self::\$[a-z_>-]+/i', "''", $matches[2][$key]); // gives fatal error otherwise
+				@eval($src = '$codes['.$code.'] = '.$src.';');
 				//echo "- codes[$code] => '{$codes[$code]}'\n";
 			}
 			//echo $file.":\n"; print_r($codes);
 		}
 	}
-	ksort($codes,SORT_NUMERIC);
-	foreach($codes as $num => $msg)
+	ksort($codes, SORT_NUMERIC);
+	foreach ($codes as $num => $msg)
 	{
-		echo $num."\t".str_replace("\n","\n\t",$msg)."\n";
+		echo $num."\t".str_replace("\n", "\n\t", $msg)."\n";
 	}
 }

Braces +69 added lines, -17 removed lines

@@ -15,10 +15,13 @@ 
 
 chdir(dirname(__FILE__));	// to enable our relative pathes to work
 
-if (php_sapi_name() !== 'cli')	// security precaution: forbit calling setup-cli as web-page
+if (php_sapi_name() !== 'cli')
+{
+	// security precaution: forbit calling setup-cli as web-page
 {
 	die('<h1>setup-cli.php must NOT be called as web-page --> exiting !!!</h1>');
 }
+}
 error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT);
 
 $dry_run = false;
@@ -33,7 +36,11 @@ 
 	}
 	$arguments = $_SERVER['argv'];
 	$action = array_shift($arguments);
-	if (isset($arguments[0])) list($_POST['FormDomain']) = explode(',',$arguments[0]);	// header include needs that to detects the right domain
+	if (isset($arguments[0]))
+	{
+		list($_POST['FormDomain']) = explode(',',$arguments[0]);
+	}
+	// header include needs that to detects the right domain
 }
 else
 {
@@ -51,7 +58,10 @@ 
 // check if date.timezone is set, report it and set something if not, as it gives tons of errors in install log
 if (!ini_get('date.timezone'))
 {
-	if (!($tz = date_default_timezone_get())) $tz = 'UTC';
+	if (!($tz = date_default_timezone_get()))
+	{
+		$tz = 'UTC';
+	}
 	echo "No default timezone (php.ini date.timezone) set, we temporary set '$tz'. You should fix that permanent!\n";
 	ini_set('date.timezone',$tz);
 }
@@ -132,13 +142,19 @@ 
 			foreach($arguments as $arg)
 			{
 				list($name,$value) = explode('=',$arg,2);
-				if(property_exists('admin_cmd',$name))		// dont allow to overwrite admin_cmd properties
+				if(property_exists('admin_cmd',$name))
+				{
+					// dont allow to overwrite admin_cmd properties
 				{
 					throw new Api\Exception\WrongUserinput(lang("Invalid argument '%1' !!!",$arg),90);
 				}
-				if (substr($name,-1) == ']')	// allow 1-dim. arrays
+				}
+				if (substr($name,-1) == ']')
+				{
+					// allow 1-dim. arrays
 				{
 					list($name,$sub) = explode('[',substr($name,0,-1),2);
+				}
 					$args[$name][$sub] = $value;
 				}
 				else
@@ -148,7 +164,10 @@ 
 			}
 			$cmd = new $class($args);
 			$msg = $cmd->run($time=null, $set_modifier=true, $skip_checks=false, $check_only=$dry_run);
-			if (is_array($msg)) $msg = print_r($msg,true);
+			if (is_array($msg))
+			{
+				$msg = print_r($msg,true);
+			}
 			echo "$msg\n";
 			break;
 		}
@@ -164,14 +183,20 @@ 
 function do_config($args)
 {
 	$arg0 = explode(',',array_shift($args));
-	if (!($domain = @array_shift($arg0))) $domain = 'default';
+	if (!($domain = @array_shift($arg0)))
+	{
+		$domain = 'default';
+	}
 	$user = @array_shift($arg0);
 	$password = @array_shift($arg0);
 	_fetch_user_password($user,$password);
 
-	if ($arg0)	// direct assignments (name=value,...) left
+	if ($arg0)
+	{
+		// direct assignments (name=value,...) left
 	{
 		array_unshift($args,implode(',',$arg0));
+	}
 		array_unshift($args,'--config');
 	}
 
@@ -238,9 +263,15 @@ 
 	{
 		$options[0] = $domain;
 
-		if ($quite_check) ob_start();
+		if ($quite_check)
+		{
+			ob_start();
+		}
 		_check_auth_config(implode(',',$options),14);
-		if ($quite_check) ob_end_clean();
+		if ($quite_check)
+		{
+			ob_end_clean();
+		}
 
 		if ($backup == 'no')
 		{
@@ -316,7 +347,10 @@ 
 function _check_auth_config($arg,$stop,$set_lang=true)
 {
 	$options = explode(',',$arg);
-	if (!($domain = array_shift($options))) $domain = 'default';
+	if (!($domain = array_shift($options)))
+	{
+		$domain = 'default';
+	}
 	$user = array_shift($options);
 	$password = array_shift($options);
 	_fetch_user_password($user,$password);
@@ -324,7 +358,10 @@ 
 	setup_cmd::check_installed($domain,$stop,true);
 
 	// reset charset for the output to the charset used by the OS
-	if ($set_lang) $GLOBALS['egw_setup']->system_charset = $GLOBALS['charset'];
+	if ($set_lang)
+	{
+		$GLOBALS['egw_setup']->system_charset = $GLOBALS['charset'];
+	}
 
 	setup_cmd::check_setup_auth($user,$password,$domain);
 
@@ -360,7 +397,10 @@ 
 function _fetch_user_password(&$user,&$password)
 {
 	// read password from enviroment or query it from user, if not given
-	if (!$user) $user = 'admin';
+	if (!$user)
+	{
+		$user = 'admin';
+	}
 	if (!$password && !($password = $_SERVER['EGW_CLI_PASSWORD']))
 	{
 		echo lang('Admin password to header manager').' ';
@@ -406,9 +446,15 @@ 
 		list($code,$language) = explode("\t",$line);
 		$languages[$code] = $language;
 	}
-	if (isset($languages[$lang.'-'.$nation])) return $lang.'-'.$nation;
+	if (isset($languages[$lang.'-'.$nation]))
+	{
+		return $lang.'-'.$nation;
+	}
 
-	if (isset($languages[$lang])) return $lang;
+	if (isset($languages[$lang]))
+	{
+		return $lang;
+	}
 
 	return 'en';
 }
@@ -448,7 +494,10 @@ 
 	if (!$what || $what == 'config')
 	{
 		echo '--config '.lang('domain(default),[config user(admin)],password,[name=value,...] sets config values beside:')."\n";
-		if (!$what) echo '	--help config '.lang('gives further options')."\n";
+		if (!$what)
+		{
+			echo '	--help config '.lang('gives further options')."\n";
+		}
 	}
 	if ($what == 'config')
 	{
@@ -477,7 +526,10 @@ 
 		echo lang('Create or edit the EGroupware configuration file: header.inc.php:')."\n";
 		echo '--create-header '.lang('header-password[,header-user(admin)]')."\n";
 		echo '--edit-header '.lang('[header-password],[header-user],[new-password],[new-user]')."\n";
-		if (!$what) echo '	--help header '.lang('gives further options')."\n";
+		if (!$what)
+		{
+			echo '	--help header '.lang('gives further options')."\n";
+		}
 	}
 	if ($what == 'header')
 	{

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:

Switch Indentation +93 added lines, -93 removed lines

@@ -184,17 +184,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':
@@ -227,77 +227,77 @@ 
 				//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', Api\Html::input_hidden('csrf_token', Api\Csrf::token(__FILE__)));
-		$setup_tpl->set_var('oldver',lang('You appear to be running version %1 of eGroupWare',
-			isset($setup_info['api']['currentver']) ? $setup_info['api']['currentver'] : $setup_info['phpgwapi']['currentver']));
-		$setup_tpl->set_var('automatic',lang('We will automatically update your tables/records to %1',$setup_info['api']['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', Api\Html::input_hidden('csrf_token', Api\Csrf::token(__FILE__)));
+			$setup_tpl->set_var('oldver',lang('You appear to be running version %1 of eGroupWare',
+				isset($setup_info['api']['currentver']) ? $setup_info['api']['currentver'] : $setup_info['phpgwapi']['currentver']));
+			$setup_tpl->set_var('automatic',lang('We will automatically update your tables/records to %1',$setup_info['api']['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', Api\Html::input_hidden('csrf_token', Api\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', Api\Html::input_hidden('csrf_token', Api\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']);
@@ -376,7 +376,7 @@ 
 						$GLOBALS['egw_info']['setup']['currentver']['phpgwapi'] = 'oldversion';
 					}
 					break;
-			}
+				}
 		}
 		catch (Api\Db\Exception $e)
 		{
@@ -388,21 +388,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 +180 added lines, -182 removed lines

@@ -20,8 +20,7 @@ 
 
 $tpl_root = $GLOBALS['egw_setup']->html->setup_tpl_dir('setup');
 $setup_tpl = new Framework\Template($tpl_root);
-$setup_tpl->set_file(array
-(
+$setup_tpl->set_file(array(
 	'T_head'       => 'head.tpl',
 	'T_footer'     => 'footer.tpl',
 	'T_alert_msg'  => 'msg_alert_msg.tpl',
@@ -31,19 +30,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();
@@ -59,9 +58,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;
@@ -73,11 +72,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(); */
@@ -91,23 +90,23 @@ 
 		$GLOBALS['egw_setup']->detection->get_versions());
 
 	$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($_POST['action'])
+switch ($_POST['action'])
 {
 	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;
@@ -121,7 +120,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;
@@ -152,17 +151,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;
 }
@@ -171,135 +170,134 @@ 
 
 //$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', Api\Html::input_hidden('csrf_token', Api\Csrf::token(__FILE__)));
-		$setup_tpl->set_var('oldver',lang('You appear to be running version %1 of eGroupWare',
+		$setup_tpl->set_var('oldver', lang('You appear to be running version %1 of eGroupWare',
 			isset($setup_info['api']['currentver']) ? $setup_info['api']['currentver'] : $setup_info['phpgwapi']['currentver']));
-		$setup_tpl->set_var('automatic',lang('We will automatically update your tables/records to %1',$setup_info['api']['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('automatic', lang('We will automatically update your tables/records to %1', $setup_info['api']['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', Api\Html::input_hidden('csrf_token', Api\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':
@@ -315,25 +313,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', '');
 							}
 						}
 					}
@@ -346,7 +344,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($s_info,'new',$_REQUEST['debug'],True);
+						$setup_info = $GLOBALS['egw_setup']->process->pass($s_info, 'new', $_REQUEST['debug'], True);
 						$GLOBALS['egw_info']['setup']['currentver']['phpgwapi'] = 'oldversion';
 					}
 					break;
@@ -358,21 +356,21 @@ 
 						$db_backup = new Api\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;
@@ -382,159 +380,159 @@ 
 		{
 			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;
 }
 
-$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('api','admin','preferences') as $app)
+		foreach (array('api', 'admin', 'preferences') 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();

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 />'),