EGroupware / egroupware

setup/inc/class.setup_cmd_database.inc.php

Braces +17 added lines, -4 removed lines

@@ -91,7 +91,11 @@ 
 		{
 			throw new Api\Exception\WrongUserinput(lang("'%1' is no valid domain name!",$this->domain));
 		}
-		if ($this->remote_id && $check_only) return true;	// further checks can only done locally
+		if ($this->remote_id && $check_only)
+		{
+			return true;
+		}
+		// further checks can only done locally
 
 		$this->_merge_defaults();
 		//_debug_array($this->as_array());
@@ -136,9 +140,18 @@ 
 	 */
 	private function connect($user=null,$pass=null,$name=null)
 	{
-		if (is_null($user)) $user = $this->db_user;
-		if (is_null($pass)) $pass = $this->db_pass;
-		if (is_null($name)) $name = $this->db_name;
+		if (is_null($user))
+		{
+			$user = $this->db_user;
+		}
+		if (is_null($pass))
+		{
+			$pass = $this->db_pass;
+		}
+		if (is_null($name))
+		{
+			$name = $this->db_name;
+		}
 
 		$this->test_db = new Api\Db();
 

Doc Comments +9 added lines, -15 removed lines

@@ -39,16 +39,14 @@ 
 	 *
 	 * @param string/array $domain domain-name to customize the defaults or array with all parameters
 	 * @param string $db_type db-type (mysql, pgsql, ...)
-	 * @param string $db_host=null
-	 * @param string $db_port=null
-	 * @param string $db_name=null
-	 * @param string $db_user=null
-	 * @param string $db_pass=null
-	 * @param string $db_root=null
-	 * @param string $db_root_pw=null
-	 * @param string $sub_command='create_db' 'create_db', 'test_db', 'test_db_root'
-	 * @param string $db_grant_host='localhost' host/ip of webserver for grant
-	 * @param boolean $make_db_name_unique=false true: if create fails because db exists,
+	 * @param string $db_host
+	 * @param string $db_port
+	 * @param string $db_name
+	 * @param string $db_user
+	 * @param string $db_pass
+	 * @param string $db_root
+	 * @param string $db_root_pw
+	 * @param boolean $make_db_name_unique true: if create fails because db exists,
 	 * 	try creating a unique name by shortening the name and adding a number to it
 	 */
 	function __construct($domain,$db_type=null,$db_host=null,$db_port=null,$db_name=null,$db_user=null,$db_pass=null,
@@ -78,7 +76,7 @@ 
 	/**
 	 * run the command: test or create database
 	 *
-	 * @param boolean $check_only=false only run the checks (and throw the exceptions), but not the command itself
+	 * @param boolean $check_only only run the checks (and throw the exceptions), but not the command itself
 	 * @return string success message
 	 * @throws Exception(lang('Wrong credentials to access the header.inc.php file!'),2);
 	 * @throws Exception('header.inc.php not found!');
@@ -127,9 +125,6 @@ 
 	/**
 	 * Connect to database
 	 *
-	 * @param string $user=null default $this->db_user
-	 * @param string $pass=null default $this->db_pass
-	 * @param string $name=null default $this->db_name
 	 * @throws egw_exception_wrong_userinput Can not connect to database ...
 	 */
 	private function connect($user=null,$pass=null,$name=null)
@@ -267,7 +262,6 @@ 
 	/**
 	 * Return default database settings for a given domain
 	 *
-	 * @param string $db_type='mysql'
 	 * @return array
 	 */
 	static function defaults($db_type='mysqli')

Spacing +37 added lines, -37 removed lines

@@ -51,8 +51,8 @@ 
 	 * @param boolean $make_db_name_unique=false true: if create fails because db exists,
 	 * 	try creating a unique name by shortening the name and adding a number to it
 	 */
-	function __construct($domain,$db_type=null,$db_host=null,$db_port=null,$db_name=null,$db_user=null,$db_pass=null,
-		$db_root=null,$db_root_pw=null,$sub_command='create_db',$db_grant_host='localhost',$make_db_name_unique=false)
+	function __construct($domain, $db_type = null, $db_host = null, $db_port = null, $db_name = null, $db_user = null, $db_pass = null,
+		$db_root = null, $db_root_pw = null, $sub_command = 'create_db', $db_grant_host = 'localhost', $make_db_name_unique = false)
 	{
 		if (!is_array($domain))
 		{
@@ -83,22 +83,22 @@ 
 	 * @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 (!empty($this->domain) && !preg_match('/^([a-z0-9_-]+\.)*[a-z0-9]+/i',$this->domain))
+		if (!empty($this->domain) && !preg_match('/^([a-z0-9_-]+\.)*[a-z0-9]+/i', $this->domain))
 		{
-			throw new egw_exception_wrong_userinput(lang("'%1' is no valid domain name!",$this->domain));
+			throw new egw_exception_wrong_userinput(lang("'%1' is no valid domain name!", $this->domain));
 		}
-		if ($this->remote_id && $check_only) return true;	// further checks can only done locally
+		if ($this->remote_id && $check_only) return true; // further checks can only done locally
 
 		$this->_merge_defaults();
 		//_debug_array($this->as_array());
 
 		try {
-			switch($this->sub_command)
+			switch ($this->sub_command)
 			{
 				case 'test_db_root':
-					$msg = $this->connect($this->db_root,$this->db_root_pw,$this->db_meta);
+					$msg = $this->connect($this->db_root, $this->db_root_pw, $this->db_meta);
 					break;
 				case 'test_db':
 					$msg = $this->connect();
@@ -132,7 +132,7 @@ 
 	 * @param string $name=null default $this->db_name
 	 * @throws egw_exception_wrong_userinput Can not connect to database ...
 	 */
-	private function connect($user=null,$pass=null,$name=null)
+	private function connect($user = null, $pass = null, $name = null)
 	{
 		if (is_null($user)) $user = $this->db_user;
 		if (is_null($pass)) $pass = $this->db_pass;
@@ -141,9 +141,9 @@ 
 		$this->test_db = new egw_db();
 
 		$error_rep = error_reporting();
-		error_reporting($error_rep & ~E_WARNING);	// switch warnings of, in case they are on
+		error_reporting($error_rep&~E_WARNING); // switch warnings of, in case they are on
 		try {
-			$this->test_db->connect($name,$this->db_host,$this->db_port,$user,$pass,$this->db_type);
+			$this->test_db->connect($name, $this->db_host, $this->db_port, $user, $pass, $this->db_type);
 		}
 		catch (Exception $e) {
 			// just give a nicer error, after switching error_reporting on again
@@ -153,10 +153,10 @@ 
 		if ($e)
 		{
 			throw new egw_exception_wrong_userinput(lang('Can not connect to %1 database %2 on host %3 using user %4!',
-				$this->db_type,$name,$this->db_host.($this->db_port?':'.$this->db_port:''),$user).' ('.$e->getMessage().')');
+				$this->db_type, $name, $this->db_host.($this->db_port ? ':'.$this->db_port : ''), $user).' ('.$e->getMessage().')');
 		}
 		return lang('Successful connected to %1 database %2 on %3 using user %4.',
-				$this->db_type,$name,$this->db_host.($this->db_port?':'.$this->db_port:''),$user);
+				$this->db_type, $name, $this->db_host.($this->db_port ? ':'.$this->db_port : ''), $user);
 	}
 
 	/**
@@ -172,14 +172,14 @@ 
 	 */
 	private function create()
 	{
-		static $try_make_unique = 0;	// to limit trials to create a unique name
+		static $try_make_unique = 0; // to limit trials to create a unique name
 
 		// shorten db-name/-user to self::MAX_DB_NAME_LEN chars
 		if ($this->make_db_name_unique && strlen($this->db_name) > self::MAX_DB_NAME_LEN)
 		{
 			$this->set_defaults['db_name'] = $this->db_name =
 			$this->set_defaults['db_user'] = $this->db_user = // change user too (otherwise existing user/db could not connect any more!)
-				substr(str_replace(array('.', '-'), '_', $this->db_name),0,self::MAX_DB_NAME_LEN);
+				substr(str_replace(array('.', '-'), '_', $this->db_name), 0, self::MAX_DB_NAME_LEN);
 		}
 		try {
 			$msg = $this->connect();
@@ -187,21 +187,21 @@ 
 		catch (egw_exception_wrong_userinput $e) {
 			// db or user not working --> connect as root and create it
 			try {
-				$this->test_db->create_database($this->db_root,$this->db_root_pw,$this->db_charset,$this->db_grant_host);
+				$this->test_db->create_database($this->db_root, $this->db_root_pw, $this->db_charset, $this->db_grant_host);
 				$this->connect();
 			}
-			catch(egw_exception_db $e) {	// catches failed to create database
+			catch (egw_exception_db $e) {	// catches failed to create database
 				// try connect as root to check if wrong root/root_pw is the problem
-				$this->connect($this->db_root,$this->db_root_pw,$this->db_meta);
+				$this->connect($this->db_root, $this->db_root_pw, $this->db_meta);
 
 				// if we should create a db with a unique name (try it only N times, not endless!)
 				if ($this->make_db_name_unique && $try_make_unique++ < 20)
 				{
 					// check if we can connect as root to the db to create --> db exists already
 					try {
-						$this->connect($this->db_root,$this->db_root_pw);
+						$this->connect($this->db_root, $this->db_root_pw);
 						// create new db_name by incrementing an existing numeric postfix
-						if (preg_match('/([0-9]+)$/',$this->db_name,$matches))
+						if (preg_match('/([0-9]+)$/', $this->db_name, $matches))
 						{
 							$num = (string)(++$matches[1]);
 						}
@@ -211,7 +211,7 @@ 
 						}
 						$this->set_defaults['db_name'] = $this->db_name =
 						$this->set_defaults['db_user'] = $this->db_user = // change user too (otherwise existing user/db could not connect any more!)
-							substr($this->db_name,0,self::MAX_DB_NAME_LEN-strlen($num)).$num;
+							substr($this->db_name, 0, self::MAX_DB_NAME_LEN - strlen($num)).$num;
 
 						return $this->create();
 					}
@@ -222,21 +222,21 @@ 
 				}
 				// if not give general error
 				throw new egw_exception_wrong_userinput(lang('Can not create %1 database %2 on %3 for user %4!',
-					$this->db_type,$this->db_name,$this->db_host.($this->db_port?':'.$this->db_port:''),$this->db_user));
+					$this->db_type, $this->db_name, $this->db_host.($this->db_port ? ':'.$this->db_port : ''), $this->db_user));
 			}
 			$msg = lang('Successful connected to %1 on %3 and created database %2 for user %4.',
-					$this->db_type,$this->db_name,$this->db_host.($this->db_port?':'.$this->db_port:''),$this->db_user);
+					$this->db_type, $this->db_name, $this->db_host.($this->db_port ? ':'.$this->db_port : ''), $this->db_user);
 		}
 		// check if it already contains tables
 		if (($tables = $this->test_db->table_names()))
 		{
-			foreach($tables as &$table)
+			foreach ($tables as &$table)
 			{
 				$table = $table['table_name'];
 			}
 			throw new egw_exception_wrong_userinput(lang('%1 database %2 on %3 already contains the following tables:',
-				$this->db_type,$this->db_name,$this->db_host.($this->db_port?':'.$this->db_port:'')).' '.
-				implode(', ',$tables));
+				$this->db_type, $this->db_name, $this->db_host.($this->db_port ? ':'.$this->db_port : '')).' '.
+				implode(', ', $tables));
 		}
 		return $msg;
 	}
@@ -250,12 +250,12 @@ 
 	 */
 	private function drop()
 	{
-		$this->connect($this->db_root,$this->db_root_pw,$this->db_meta);
-		$this->test_db->query('DROP DATABASE '.$this->test_db->name_quote($this->db_name),__LINE__,__FILE__);
-		$msg = lang('Datebase %1 droped.',$this->db_name);
+		$this->connect($this->db_root, $this->db_root_pw, $this->db_meta);
+		$this->test_db->query('DROP DATABASE '.$this->test_db->name_quote($this->db_name), __LINE__, __FILE__);
+		$msg = lang('Datebase %1 droped.', $this->db_name);
 		try {
 			$this->test_db->query('DROP USER '.$this->test_db->quote($this->db_user).'@'.
-				$this->test_db->quote($this->db_grant_host?$this->db_grant_host:'%'),__LINE__,__FILE__);
+				$this->test_db->quote($this->db_grant_host ? $this->db_grant_host : '%'), __LINE__, __FILE__);
 		}
 		catch (egw_db_exception $e) {
 			// we make this no fatal error, as the granthost might be something else ...
@@ -270,9 +270,9 @@ 
 	 * @param string $db_type='mysql'
 	 * @return array
 	 */
-	static function defaults($db_type='mysqli')
+	static function defaults($db_type = 'mysqli')
 	{
-		switch($db_type)
+		switch ($db_type)
 		{
 			case 'mysql':
 			default:
@@ -290,7 +290,7 @@ 
 			'db_user' => 'egw_$domain',
 			'db_pass' => self::randomstring(),
 			'db_root' => 'root',
-			'db_root_pw' => '',	// not really a default
+			'db_root_pw' => '', // not really a default
 			'db_meta' => $meta_db,
 			'db_charset' => 'utf-8',
 			'db_grant_host' => 'localhost',
@@ -302,19 +302,19 @@ 
 	 */
 	private function _merge_defaults()
 	{
-		foreach(self::defaults() as $name => $default)
+		foreach (self::defaults() as $name => $default)
 		{
 			if (!$this->$name)
 			{
 				//echo "<p>setting $name='{$this->$name}' to it's default='$default'</p>\n";
 				$this->set_defaults[$name] = $this->$name = $default;
 			}
-			if (strpos($this->$name,'$domain') !== false)
+			if (strpos($this->$name, '$domain') !== false)
 			{
 				// limit names to 16 chars (16 char is user-name limit in MySQL)
 				$this->set_defaults[$name] = $this->$name =
-					substr(str_replace(array('$domain','.','-'),array($this->domain,'_','_'),$this->$name),
-					0,self::MAX_DB_NAME_LEN);
+					substr(str_replace(array('$domain', '.', '-'), array($this->domain, '_', '_'), $this->$name),
+					0, self::MAX_DB_NAME_LEN);
 			}
 		}
 	}

setup/inc/class.setup_cmd_admin.inc.php

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(

Doc Comments +8 added lines, -10 removed lines

@@ -26,15 +26,13 @@ 
 	 * Constructor
 	 *
 	 * @param string|array $domain domain-name or array with all parameters
-	 * @param string $config_user=null user to config the domain (or header_admin_user)
-	 * @param string $config_passwd=null pw of above user
-	 * @param string $admin_user=null
-	 * @param string $admin_password=null
-	 * @param string $admin_firstname=null
-	 * @param string $admin_lastname=null
-	 * @param string $admin_email=null
-	 * @param array $config=array() extra config for the account object: account_repository, ldap_*
-	 * @param string $lang='en'
+	 * @param string $config_user user to config the domain (or header_admin_user)
+	 * @param string $config_passwd pw of above user
+	 * @param string $admin_user
+	 * @param string $admin_password
+	 * @param string $admin_firstname
+	 * @param string $admin_lastname
+	 * @param string $admin_email
 	 */
 	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')
@@ -61,7 +59,7 @@ 
 	/**
 	 * run the command: create eGW admin and standard groups
 	 *
-	 * @param boolean $check_only=false only run the checks (and throw the exceptions), but not the command itself
+	 * @param boolean $check_only only run the checks (and throw the exceptions), but not the command itself
 	 * @return string success message
 	 * @throws Exception(lang('Wrong credentials to access the header.inc.php file!'),2);
 	 * @throws Exception('header.inc.php not found!');

Spacing +13 added lines, -13 removed lines

@@ -36,8 +36,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))
 		{
@@ -66,21 +66,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;
@@ -97,9 +97,9 @@ 
 		switch ($error)
 		{
 			case 41:
-				throw new egw_exception_wrong_userinput(lang('Error in admin-creation !!!'),41);
+				throw new egw_exception_wrong_userinput(lang('Error in admin-creation !!!'), 41);
 			case 42:
-				throw new egw_exception_wrong_userinput(lang('Error in group-creation !!!'),42);
+				throw new egw_exception_wrong_userinput(lang('Error in group-creation !!!'), 42);
 		}
 		$this->restore_db();
 
@@ -109,13 +109,13 @@ 
 			escapeshellarg($this->admin_user.'@'.$this->domain.','.$this->admin_password.','.$this->admin_user);
 		if (php_sapi_name() !== 'cli' || !file_exists(EGW_SERVER_ROOT.'/stylite') || file_exists(EGW_SERVER_ROOT.'/managementserver'))
 		{
-			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 egw_exception ($output,$ret);
+			throw new egw_exception($output, $ret);
 		}
 		return lang('Admin account successful created.');
 	}

setup/inc/class.setup_cmd.inc.php

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;
 	}

Doc Comments +4 added lines, -4 removed lines

@@ -85,7 +85,7 @@ 
 	/**
 	 * Saving the object to the database, reimplemented to not do it in setup context
 	 *
-	 * @param boolean $set_modifier=true set the current user as modifier or 0 (= run by the system)
+	 * @param boolean $set_modifier set the current user as modifier or 0 (= run by the system)
 	 * @return boolean true on success, false otherwise
 	 */
 	function save($set_modifier=true)
@@ -172,7 +172,7 @@ 
 	 *
 	 * @param string $user
 	 * @param string $pw
-	 * @param string $domain=null if given we also check agains config user/pw
+	 * @param string $domain if given we also check agains config user/pw
 	 * @throws egw_exception_no_permission(lang('Access denied: wrong username or password for manage-header !!!'),21);
 	 * @throws egw_exception_no_permission(lang("Access denied: wrong username or password to configure the domain '%1(%2)' !!!",$domain,$GLOBALS['egw_domain'][$domain]['db_type']),40);
 	 */
@@ -220,8 +220,8 @@ 
 	 * Sets self::$apps_to_update and self::$apps_to_install for the last/only domain only!
 	 *
 	 * @param string $domain='' domain to check, default '' = all
-	 * @param int/array $stop=0 stop checks before given exit-code(s), default 0 = all checks
-	 * @param boolean $verbose=false echo messages as they happen, instead returning them
+	 * @param int/array $stop stop checks before given exit-code(s), default 0 = all checks
+	 * @param boolean $verbose echo messages as they happen, instead returning them
 	 * @return array with translated messages
 	 */
 	static function check_installed($domain='',$stop=0,$verbose=false)

Spacing +47 added lines, -47 removed lines

@@ -32,7 +32,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']);
@@ -41,7 +41,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 egw_exception_no_permission(lang('Wrong credentials to access the header.inc.php file!'),5);
+			throw new egw_exception_no_permission(lang('Wrong credentials to access the header.inc.php file!'), 5);
 		}
 
 	}
@@ -52,15 +52,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!');
 		}
 	}
 
@@ -73,7 +73,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);
 
@@ -88,7 +88,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)
 		{
@@ -109,12 +109,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;
@@ -123,7 +123,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'];
 
@@ -176,26 +176,26 @@ 
 	 * @throws egw_exception_no_permission(lang('Access denied: wrong username or password for manage-header !!!'),21);
 	 * @throws egw_exception_no_permission(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 egw_exception_no_permission(lang('Access denied: wrong username or password for manage-header !!!'),21);
+					throw new egw_exception_no_permission(lang('Access denied: wrong username or password for manage-header !!!'), 21);
 				}
 				else
 				{
-					throw new egw_exception_no_permission(lang("Access denied: wrong username or password to configure the domain '%1(%2)' !!!",$domain,$GLOBALS['egw_domain'][$domain]['db_type']),40);
+					throw new egw_exception_no_permission(lang("Access denied: wrong username or password to configure the domain '%1(%2)' !!!", $domain, $GLOBALS['egw_domain'][$domain]['db_type']), 40);
 				}
 			}
 		}
@@ -206,13 +206,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
@@ -224,66 +224,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['phpgwapi'])
 		{
 			if (!include(EGW_INCLUDE_ROOT.'/phpgwapi/setup/setup.inc.php'))
 			{
-				throw new egw_exception_wrong_userinput(lang("eGroupWare sources in '%1' are not complete, file '%2' missing !!!",realpath('..'),'phpgwapi/setup/setup.inc.php'),99);	// should not happen ;-)
+				throw new egw_exception_wrong_userinput(lang("eGroupWare sources in '%1' are not complete, file '%2' missing !!!", realpath('..'), 'phpgwapi/setup/setup.inc.php'), 99); // should not happen ;-)
 			}
 			$versions['phpgwapi'] = $setup_info['phpgwapi']['version'];
 			unset($setup_info);
 		}
 		if ($header_checks)
 		{
-			$messages[] = self::_echo_message($verbose,lang('eGroupWare API version %1 found.',$versions['phpgwapi']));
+			$messages[] = self::_echo_message($verbose, lang('eGroupWare API version %1 found.', $versions['phpgwapi']));
 		}
 		$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 egw_exception_wrong_userinput(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 egw_exception_wrong_userinput(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 egw_exception_wrong_userinput(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 egw_exception_wrong_userinput(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 egw_exception_wrong_userinput(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 egw_exception_wrong_userinput(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 egw_exception_wrong_userinput(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 egw_exception_wrong_userinput(lang("Domain '%1' does NOT exist !!!",$domain), 92);
+			if (!isset($GLOBALS['egw_domain'][$domain])) throw new egw_exception_wrong_userinput(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
@@ -295,27 +295,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 egw_exception_wrong_userinput(lang('Your Database is not working!')." $db: ".self::$egw_setup->db->Error,11);
+				case 1: throw new egw_exception_wrong_userinput(lang('Your Database is not working!')." $db: ".self::$egw_setup->db->Error, 11);
 
-				case 3: throw new egw_exception_wrong_userinput(lang('Your database is working, but you dont have any applications installed')." ($db). ".lang("Use --install to install eGroupWare."),13);
+				case 3: throw new egw_exception_wrong_userinput(lang('Your database is working, but you dont have any applications installed')." ($db). ".lang("Use --install to install eGroupWare."), 13);
 
-				case 4: throw new egw_exception_wrong_userinput(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 egw_exception_wrong_userinput(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'])
 						{
@@ -329,23 +329,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 egw_exception_wrong_userinput(lang('The following applications need to be upgraded:').' '.implode(', ',self::$apps_to_upgrade).'! '.lang('Use --update to do so.'),14);
+						throw new egw_exception_wrong_userinput(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['phpgwapi']['currentver']));
+			$messages[] = self::_echo_message($verbose, lang("database is version %1 and up to date.", $setup_info['phpgwapi']['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 egw_exception_wrong_userinput(lang('You need to configure eGroupWare:')."\n- ".@implode("\n- ",$GLOBALS['egw_info']['setup']['config_errors']),15);
+				throw new egw_exception_wrong_userinput(lang('You need to configure eGroupWare:')."\n- ".@implode("\n- ", $GLOBALS['egw_info']['setup']['config_errors']), 15);
 			}
 		}
 		return $messages;
@@ -374,7 +374,7 @@ 
 	 * @param string $msg
 	 * @return string $msg
 	 */
-	static function _echo_message($verbose,$msg='')
+	static function _echo_message($verbose, $msg = '')
 	{
 		if ($verbose) echo $msg."\n";
 

setup/inc/functions.inc.php

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;

Spacing +20 added lines, -20 removed lines

@@ -13,10 +13,10 @@ 
  * @version $Id$
  */
 
-error_reporting(error_reporting() & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED);
+error_reporting(error_reporting()&~E_NOTICE&~E_STRICT&~E_DEPRECATED);
 
 // 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 . '/phpgwapi/inc/common_functions.inc.php');
+require_once(EGW_INCLUDE_ROOT.'/phpgwapi/inc/common_functions.inc.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.'/phpgwapi/setup/setup.inc.php'))
+if (file_exists(EGW_SERVER_ROOT.'/phpgwapi/setup/setup.inc.php'))
 {
 	include(EGW_SERVER_ROOT.'/phpgwapi/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";

setup/inc/hook_config_validate.inc.php

Braces +5 added lines, -2 removed lines

@@ -199,5 +199,8 @@
 {
 	$filter =& $settings['ldap_search_filter'];
 
-	if ($filter && $filter{0} != '(') $filter = '('.$filter.')';
-}
+	if ($filter && $filter{0} != '(')
+	{
+		$filter = '('.$filter.')';
+	}
+	}

Spacing +21 added lines, -21 removed lines

@@ -30,12 +30,12 @@ 
  */
 function auth_type($settings)
 {
-	switch($settings['auth_type'])
+	switch ($settings['auth_type'])
 	{
 		case 'mail':
 			if (class_exists('Horde_Imap_Client_Socket') && !in_array($settings['mail_server_type'], array('pop', 'pops')))
 			{
-				return;	// we use Horde code instead of imap extension
+				return; // we use Horde code instead of imap extension
 			}
 			try {
 				check_load_extension('imap', true);
@@ -55,33 +55,33 @@ 
  */
 function vfs_storage_mode($settings)
 {
-	switch($settings['vfs_storage_mode'])
+	switch ($settings['vfs_storage_mode'])
 	{
 		case 'fs':
-			config::save_value('vfs_fstab','','phpgwapi');
+			config::save_value('vfs_fstab', '', 'phpgwapi');
 			break;
 		case 'db':
 			config::save_value('vfs_fstab', array(
 				'/' => 'sqlfs://$host/?storage=db',
 				'/apps' => 'links://$host/apps?storage=db',
-			),'phpgwapi');
+			), 'phpgwapi');
 			break;
 	}
 }
 
 function temp_dir($settings)
 {
-	if (!setup_detection::check_dir($settings['temp_dir'],$error_msg))
+	if (!setup_detection::check_dir($settings['temp_dir'], $error_msg))
 	{
-		$GLOBALS['config_error'] = lang("Your temporary directory '%1' %2",$settings['temp_dir'],$error_msg);
+		$GLOBALS['config_error'] = lang("Your temporary directory '%1' %2", $settings['temp_dir'], $error_msg);
 	}
 }
 
 function files_dir($settings)
 {
-	if (!setup_detection::check_dir($settings['files_dir'],$error_msg,true))
+	if (!setup_detection::check_dir($settings['files_dir'], $error_msg, true))
 	{
-		$GLOBALS['config_error'] = lang("Your files directory '%1' %2",$settings['files_dir'],$error_msg);
+		$GLOBALS['config_error'] = lang("Your files directory '%1' %2", $settings['files_dir'], $error_msg);
 	}
 }
 
@@ -91,20 +91,20 @@ 
 	{
 		$settings['backup_dir'] = $settings['files_dir'].'/db_backup';
 	}
-	if (!setup_detection::check_dir($settings['backup_dir'],$error_msg,true))
+	if (!setup_detection::check_dir($settings['backup_dir'], $error_msg, true))
 	{
-		$GLOBALS['config_error'] = lang("Your backup directory '%1' %2",$settings['backup_dir'],$error_msg);
+		$GLOBALS['config_error'] = lang("Your backup directory '%1' %2", $settings['backup_dir'], $error_msg);
 	}
 }
 
-function _mcrypt_test_module_mode($module,$mode)
+function _mcrypt_test_module_mode($module, $mode)
 {
 	/* Data */
 	$key = 'this is a very long key, even too long for the cipher';
 	$plain_text = 'very important data';
 
 	/* Open module, and create IV */
-	if(!$GLOBALS['td'] = @mcrypt_module_open($module, '',$mode, ''))
+	if (!$GLOBALS['td'] = @mcrypt_module_open($module, '', $mode, ''))
 	{
 		@mcrypt_module_close($GLOBALS['td']);
 		return False;
@@ -114,7 +114,7 @@ 
 	$iv = @mcrypt_create_iv($iv_size, MCRYPT_RAND);
 
 	/* Initialize encryption handle */
-	if(mcrypt_generic_init($GLOBALS['td'], $key, $iv) != -1)
+	if (mcrypt_generic_init($GLOBALS['td'], $key, $iv) != -1)
 	{
 		/* Encrypt data */
 		$c_t = mcrypt_generic($GLOBALS['td'], $plain_text);
@@ -148,14 +148,14 @@ 
 	$modes = mcrypt_list_modes();
 	$algorithms = mcrypt_list_algorithms();
 
-	foreach($algorithms as $cipher)
+	foreach ($algorithms as $cipher)
 	{
-		if(mcrypt_module_self_test($cipher))
+		if (mcrypt_module_self_test($cipher))
 		{
 			$GLOBALS['ciphers'][$cipher] = array();
-			foreach($modes as $mode)
+			foreach ($modes as $mode)
 			{
-				if(_mcrypt_test_module_mode($cipher,$mode))
+				if (_mcrypt_test_module_mode($cipher, $mode))
 				{
 					$result = True;
 				}
@@ -174,10 +174,10 @@ 
 function mcrypt_algo($settings)
 {
 	/* _debug_array($settings);exit; */
-	if(@function_exists('mcrypt_list_modes'))
+	if (@function_exists('mcrypt_list_modes'))
 	{
 		mcrypt_check_sanity();
-		if(!@$GLOBALS['ciphers'][$settings['mcrypt_algo']][$settings['mcrypt_mode']])
+		if (!@$GLOBALS['ciphers'][$settings['mcrypt_algo']][$settings['mcrypt_mode']])
 		{
 			$GLOBALS['config_error'] = lang('Invalid Mcrypt Algorithm/Mode combination');
 		}
@@ -191,7 +191,7 @@ 
  */
 function ldap_search_filter(&$settings)
 {
-	$filter =& $settings['ldap_search_filter'];
+	$filter = & $settings['ldap_search_filter'];
 
 	if ($filter && $filter{0} != '(') $filter = '('.$filter.')';
 }

setup/inc/class.setup_cmd_config.inc.php

Braces +20 added lines, -5 removed lines

@@ -70,10 +70,13 @@ 
 		self::auth_types(true);
 
 		$values = array();
-		if ($this->arguments)	// we have command line arguments
+		if ($this->arguments)
+		{
+			// we have command line arguments
 		{
 			$save_mail_account = $this->_parse_cli_arguments($values);
 		}
+		}
 		else
 		{
 			$save_mail_account = $this->_parse_properties($values);
@@ -82,7 +85,10 @@ 
 		// store the config
 		foreach($values as $name => $value)
 		{
-			if (substr($name, 0, 4) == 'acc_') continue;
+			if (substr($name, 0, 4) == 'acc_')
+			{
+				continue;
+			}
 
 			$app = 'phpgwapi';
 			if (strpos($name, '/') !== false)
@@ -98,7 +104,10 @@ 
 		}
 		if (count($values))
 		{
-			if ($save_mail_account) $this->_save_mail_account($values);
+			if ($save_mail_account)
+			{
+				$this->_save_mail_account($values);
+			}
 
 			// flush instance cache, so above config get read from database not cache
 			Api\Cache::flush();
@@ -322,13 +331,19 @@ 
 	 */
 	private function _parse_value($arg,$n,$data,$value,array &$values)
 	{
-		if ($value === '' && is_array($data) && !isset($data[$n]['default'])) return false;
+		if ($value === '' && is_array($data) && !isset($data[$n]['default']))
+		{
+			return false;
+		}
 
 		$name = is_array($data) || $n ? $data[$n] : $data;
 
 		if (is_array($name))
 		{
-			if (!$value && isset($name['default'])) $value = $name['default'];
+			if (!$value && isset($name['default']))
+			{
+				$value = $name['default'];
+			}
 
 			if (isset($name['allowed']) && !in_array($value,$name['allowed']))
 			{

Spacing +65 added lines, -65 removed lines

@@ -29,7 +29,7 @@ 
 	 * @param string $arguments =null array with command line argruments
 	 * @param boolean $verbose =false if true, echos out some status information during the run
 	 */
-	function __construct($domain,$config_user=null,$config_passwd=null,$arguments=null,$verbose=false)
+	function __construct($domain, $config_user = null, $config_passwd = null, $arguments = null, $verbose = false)
 	{
 		if (!is_array($domain))
 		{
@@ -53,16 +53,16 @@ 
 	 * @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
 		}
 		// instanciate setup object and check authorisation
-		$this->check_setup_auth($this->config_user,$this->config_passwd,$this->domain);
+		$this->check_setup_auth($this->config_user, $this->config_passwd, $this->domain);
 
-		$this->check_installed($this->domain,15,$this->verbose);
+		$this->check_installed($this->domain, 15, $this->verbose);
 
 		// fixing authtypes in self::$options
 		self::auth_types(true);
@@ -78,7 +78,7 @@ 
 		}
 
 		// store the config
-		foreach($values as $name => $value)
+		foreach ($values as $name => $value)
 		{
 			if (substr($name, 0, 4) == 'acc_') continue;
 
@@ -87,12 +87,12 @@ 
 			{
 				list($app, $name) = explode('/', $name);
 			}
-			self::$egw_setup->db->insert(self::$egw_setup->config_table,array(
+			self::$egw_setup->db->insert(self::$egw_setup->config_table, array(
 				'config_value' => $value,
-			),array(
+			), array(
 				'config_app'  => $app,
 				'config_name' => $name,
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 		}
 		if (count($values))
 		{
@@ -116,12 +116,12 @@ 
 	 * @param boolean $echoit =false if true the config is additionally echo'ed out
 	 * @return array with name => value pairs
 	 */
-	static function get_config($echoit=false)
+	static function get_config($echoit = false)
 	{
-		self::$egw_setup->db->select(self::$egw_setup->config_table,'config_name,config_value',array(
+		self::$egw_setup->db->select(self::$egw_setup->config_table, 'config_name,config_value', array(
 			'config_app'  => 'phpgwapi',
 			"(config_name LIKE '%\\_dir' OR (config_name LIKE 'mail%' AND config_name != 'mail_footer') OR config_name LIKE 'smtp\\_%' OR config_name LIKE 'ldap%' OR config_name IN ('webserver_url','system_charset','auth_type','account_repository'))",
-		),__LINE__,__FILE__);
+		), __LINE__, __FILE__);
 
 		$config = array();
 		while (($row = self::$egw_setup->db->row(true)))
@@ -131,9 +131,9 @@ 
 		if ($echoit)
 		{
 			echo lang('Current configuration:')."\n";
-			foreach($config as $name => $value)
+			foreach ($config as $name => $value)
 			{
-				echo str_pad($name.':',22).$value."\n";
+				echo str_pad($name.':', 22).$value."\n";
 			}
 		}
 		return $config;
@@ -145,7 +145,7 @@ 
 	 * @var array
 	 */
 	static $options = array(
-		'--config'     => array(),	// name=value,...
+		'--config'     => array(), // name=value,...
 		'--files-dir'  => 'files_dir',
 		'--vfs-root-user' => 'vfs_root_user',
 		'--backup-dir' => 'backup_dir',
@@ -156,14 +156,14 @@ 
 			'acc_imap_host',
 			'acc_imap_port',
 			'acc_domain',
-			array('name' => 'acc_imap_logintype','allowed'  => array(
+			array('name' => 'acc_imap_logintype', 'allowed'  => array(
 				'username (standard)' => 'standard',
 				'username@domain (virtual mail manager)' => 'vmailmgr',
 				'Username/Password defined by admin' => 'admin',
 				'userId@domain eg. u123@domain' => 'uidNumber',
 				'email (Standard Maildomain should be set)' => 'email',
 			)),
-			array('name' => 'acc_imap_ssl','allowed' => array(0,'no',1,'starttls',3,'ssl',2,'tls')),
+			array('name' => 'acc_imap_ssl', 'allowed' => array(0, 'no', 1, 'starttls', 3, 'ssl', 2, 'tls')),
 		),
 		'--imap' => array(
 			'acc_imap_admin_username',
@@ -171,28 +171,28 @@ 
 			'acc_imap_type',
 		),
 		'--folder' => array(
-			'acc_folder_sent','acc_folder_trash','acc_folder_draft','acc_folder_template','acc_folder_junk',
+			'acc_folder_sent', 'acc_folder_trash', 'acc_folder_draft', 'acc_folder_template', 'acc_folder_junk',
 		),
 		'--sieve' => array(
 			array('name' => 'acc_sieve_host'),
 			'acc_sieve_port',
 			'acc_sieve_enabled',
-			array('name' => 'acc_sieve_ssl','allowed' => array(0,'no',1,'starttls',3,'ssl',2,'tls')),
+			array('name' => 'acc_sieve_ssl', 'allowed' => array(0, 'no', 1, 'starttls', 3, 'ssl', 2, 'tls')),
 		),
 		'--smtp' => array(
-			array('name' => 'editforwardingaddress','allowed' => array('yes',null)),
+			array('name' => 'editforwardingaddress', 'allowed' => array('yes', null)),
 			'acc_smtp_type',
 		),
 		'--smtpserver' => array(	//smtp server,[smtp port],[smtp user],[smtp password],[auth session user/pw],[no|starttls|ssl|tls],[user editable],[further identities]
-			'acc_smtp_host','acc_smtp_port','acc_smtp_username','acc_smtp_passwd','acc_smtp_auth_session',
-			array('name' => 'acc_smtp_ssl','allowed' => array(0,'no',1,'starttls',3,'ssl',2,'tls')),
-			'acc_user_editable','acc_further_identities',
+			'acc_smtp_host', 'acc_smtp_port', 'acc_smtp_username', 'acc_smtp_passwd', 'acc_smtp_auth_session',
+			array('name' => 'acc_smtp_ssl', 'allowed' => array(0, 'no', 1, 'starttls', 3, 'ssl', 2, 'tls')),
+			'acc_user_editable', 'acc_further_identities',
 		),
 		'--account-auth' => array(
-			array('name' => 'account_repository','allowed' => array('sql','ldap','ads'),'default'=>'sql'),
-			array('name' => 'auth_type','allowed' => array('sql','ldap','mail','ads','http','sqlssl','nis','pam'),'default'=>'sql'),
-			array('name' => 'sql_encryption','allowed' => array('blowfish_crypt','sha512_crypt','sha256_crypt','md5_crypt','crypt','ssha','smd5','md5'),'default'=>'blowfish_crypt'),
-			'check_save_password','allow_cookie_auth'),
+			array('name' => 'account_repository', 'allowed' => array('sql', 'ldap', 'ads'), 'default'=>'sql'),
+			array('name' => 'auth_type', 'allowed' => array('sql', 'ldap', 'mail', 'ads', 'http', 'sqlssl', 'nis', 'pam'), 'default'=>'sql'),
+			array('name' => 'sql_encryption', 'allowed' => array('blowfish_crypt', 'sha512_crypt', 'sha256_crypt', 'md5_crypt', 'crypt', 'ssha', 'smd5', 'md5'), 'default'=>'blowfish_crypt'),
+			'check_save_password', 'allow_cookie_auth'),
 		'--ldap-host' => 'ldap_host',
 		'--ldap-root-dn' => 'ldap_root_dn',
 		'--ldap-root-pw' => 'ldap_root_pw',
@@ -204,7 +204,7 @@ 
 		'--install-id' => 'install_id',
 		'--ads-host' => 'ads_host',
 		'--ads-domain' => 'ads_domain',
-		'--ads-admin-user' => 'ads_domain_admin',	// eg. Administrator
+		'--ads-admin-user' => 'ads_domain_admin', // eg. Administrator
 		'--ads-admin-pw' => 'ads_admin_pw',
 		'--ads-connection' => array(
 			array('name' => 'ads_connection', 'allowed' => array('ssl', 'tls'))
@@ -250,9 +250,9 @@ 
 
 		$save_mail_account = false;
 		$values = array();
-		foreach(self::$options as $arg => $option)
+		foreach (self::$options as $arg => $option)
 		{
-			foreach(is_array($option) ? $option : array($option) as $n => $data)
+			foreach (is_array($option) ? $option : array($option) as $n => $data)
 			{
 				$name = is_array($data) ? $data['name'] : $data;
 				$oldname = array_key_exists($name, $this->old2new);
@@ -264,7 +264,7 @@ 
 				}
 				if (isset($this->$name))
 				{
-					$save_mail_account = $this->_parse_value($arg,$n,$option,$this->$name,$values) || $save_mail_account;
+					$save_mail_account = $this->_parse_value($arg, $n, $option, $this->$name, $values) || $save_mail_account;
 				}
 			}
 		}
@@ -282,27 +282,27 @@ 
 		$values = array();
 		$save_mail_account = false;
 		$args = $this->arguments;
-		while(($arg = array_shift($args)))
+		while (($arg = array_shift($args)))
 		{
 			if (!isset(self::$options[$arg]))
 			{
-				throw new egw_exception_wrong_userinput(lang("Unknown option '%1' !!!",$arg),90);
+				throw new egw_exception_wrong_userinput(lang("Unknown option '%1' !!!", $arg), 90);
 			}
-			$options = is_array(self::$options[$arg]) ? explode(',',array_shift($args)) : array(array_shift($args));
+			$options = is_array(self::$options[$arg]) ? explode(',', array_shift($args)) : array(array_shift($args));
 
 			if ($arg == '--config' || $arg == '--setup_cmd_config')
 			{
-				foreach($options as $option)
+				foreach ($options as $option)
 				{
-					list($name,$value) = explode('=',$option,2);
+					list($name, $value) = explode('=', $option, 2);
 					$values[$name] = $value;
 				}
 				continue;
 			}
 			$options[] = ''; $options[] = '';
-			foreach($options as $n => $value)
+			foreach ($options as $n => $value)
 			{
-				$save_mail_account = $this->_parse_value($arg,$n,self::$options[$arg],$value,$values) || $save_mail_account;
+				$save_mail_account = $this->_parse_value($arg, $n, self::$options[$arg], $value, $values) || $save_mail_account;
 			}
 		}
 		return $save_mail_account;
@@ -318,7 +318,7 @@ 
 	 * @param array &$values where the values get set
 	 * @return boolean true if mail-accounts needs to be saved, false if not
 	 */
-	private function _parse_value($arg,$n,$data,$value,array &$values)
+	private function _parse_value($arg, $n, $data, $value, array &$values)
 	{
 		if ($value === '' && is_array($data) && !isset($data[$n]['default'])) return false;
 
@@ -328,15 +328,15 @@ 
 		{
 			if (!$value && isset($name['default'])) $value = $name['default'];
 
-			if (isset($name['allowed']) && !in_array($value,$name['allowed']))
+			if (isset($name['allowed']) && !in_array($value, $name['allowed']))
 			{
-				throw new egw_exception_wrong_userinput(lang("'%1' is not allowed as %2. arguments of option %3 !!!",$value,1+$n,$arg)." ($name[name])",91);
+				throw new egw_exception_wrong_userinput(lang("'%1' is not allowed as %2. arguments of option %3 !!!", $value, 1 + $n, $arg)." ($name[name])", 91);
 			}
 			$name = $name['name'];
 		}
 		$values[$name] = $value;
 
-		return in_array($arg,array('--mailserver','--smtpserver','--imap','--smtp','--sieve','--folder'));
+		return in_array($arg, array('--mailserver', '--smtpserver', '--imap', '--smtp', '--sieve', '--folder'));
 	}
 
 	/**
@@ -347,9 +347,9 @@ 
 	function _save_mail_account(array $data)
 	{
 		// convert ssl textual values to nummerical ones used in emailadmin_account
-		foreach(array('acc_imap_ssl', 'acc_sieve_ssl', 'acc_smtp_ssl') as $name)
+		foreach (array('acc_imap_ssl', 'acc_sieve_ssl', 'acc_smtp_ssl') as $name)
 		{
-			switch(strtolower($data[$name]))
+			switch (strtolower($data[$name]))
 			{
 				case 'no':       $data[$name] = emailadmin_account::SSL_NONE; break;
 				case 'starttls': $data[$name] = emailadmin_account::SSL_STARTTLS; break;
@@ -358,12 +358,12 @@ 
 			}
 		}
 		// convert 'yes', 'no' to boolean
-		foreach(array('acc_sieve_enabled','acc_user_editable','acc_further_identities','acc_smtp_auth_session') as $name)
+		foreach (array('acc_sieve_enabled', 'acc_user_editable', 'acc_further_identities', 'acc_smtp_auth_session') as $name)
 		{
 			$data[$name] = $data[$name] && strtolower($data[$name]) != 'no';
 		}
 		// do NOT write empty usernames
-		foreach(array('acc_imap_username', 'acc_smtp_username') as $name)
+		foreach (array('acc_imap_username', 'acc_smtp_username') as $name)
 		{
 			if (empty($data[$name]))
 			{
@@ -373,16 +373,16 @@ 
 		}
 
 		$data['acc_name'] = 'Created by setup';
-		$data['account_id'] = 0;	// 0 = valid for all users
+		$data['account_id'] = 0; // 0 = valid for all users
 
 		emailadmin_account::write($data);
 
 		if ($this->verbose)
 		{
 			echo "\n".lang('EMailAdmin mail account saved:')."\n";
-			foreach($data as $name => $value)
+			foreach ($data as $name => $value)
 			{
-				echo str_pad($name.':',22).$value."\n";
+				echo str_pad($name.':', 22).$value."\n";
 			}
 		}
 	}
@@ -395,11 +395,11 @@ 
 	static function options()
 	{
 		$options = array();
-		foreach(self::$options as $option)
+		foreach (self::$options as $option)
 		{
 			if (is_array($option))
 			{
-				foreach($option as $data)
+				foreach ($option as $data)
 				{
 					if (is_array($data) && isset($data['allowed']))
 					{
@@ -412,11 +412,11 @@ 
 								$options[$data['name']] = self::account_repositories();
 								continue 2;
 						}
-						foreach($data['allowed'] as $label => $value)
+						foreach ($data['allowed'] as $label => $value)
 						{
 							if (is_int($label))
 							{
-								$label = (string) $value === '' ? 'No' : strtoupper($value);
+								$label = (string)$value === '' ? 'No' : strtoupper($value);
 							}
 							$options[$data['name']][$value] = lang($label);
 						}
@@ -449,7 +449,7 @@ 
 		if (!$scan_done++)
 		{
 			// now add auth backends found in filesystem
-			foreach(scandir(EGW_INCLUDE_ROOT.'/phpgwapi/inc') as $class)
+			foreach (scandir(EGW_INCLUDE_ROOT.'/phpgwapi/inc') as $class)
 			{
 				$matches = null;
 				if (preg_match('/^class\.auth_([a-z]+)\.inc\.php$/', $class, $matches) &&
@@ -458,7 +458,7 @@ 
 					$auth_types[$matches[1]] = ucfirst($matches[1]);
 				}
 			}
-			foreach(self::$options['--account-auth'] as &$param)
+			foreach (self::$options['--account-auth'] as &$param)
 			{
 				if ($param['name'] == 'auth_type')
 				{
@@ -476,7 +476,7 @@ 
 	 * @param string $current =null current value, to allways return it
 	 * @return array
 	 */
-	static function account_repositories($current=null)
+	static function account_repositories($current = null)
 	{
 		static $account_repositories = array(
 			'sql' => 'SQL',
@@ -487,13 +487,13 @@ 
 		if (!$scan_done++)
 		{
 			// now add auth backends found in filesystem
-			foreach(scandir(EGW_INCLUDE_ROOT.'/phpgwapi/inc') as $file)
+			foreach (scandir(EGW_INCLUDE_ROOT.'/phpgwapi/inc') as $file)
 			{
 				$matches = null;
 				if (preg_match('/^class\.accounts_([a-z]+)\.inc\.php$/', $file, $matches) &&
 					!isset($account_repositories[$matches[1]]) &&
-					class_exists($class='accounts_'.$matches[1]) &&
-					($matches[1] == $current || !is_callable($callable=$class.'::available') || call_user_func($callable)))
+					class_exists($class = 'accounts_'.$matches[1]) &&
+					($matches[1] == $current || !is_callable($callable = $class.'::available') || call_user_func($callable)))
 				{
 					$account_repositories[$matches[1]] = ucfirst($matches[1]);
 				}
@@ -511,11 +511,11 @@ 
 	{
 		$defaults = array();
 		// fetch the default from the cli options
-		foreach(self::$options as $option)
+		foreach (self::$options as $option)
 		{
 			if (is_array($option))
 			{
-				foreach($option as $data)
+				foreach ($option as $data)
 				{
 					if (is_array($data) && isset($data['default']))
 					{
@@ -543,20 +543,20 @@ 
 	 */
 	private function _merge_defaults()
 	{
-		foreach(self::defaults() as $name => $default)
+		foreach (self::defaults() as $name => $default)
 		{
 			if (!$this->$name)
 			{
 				//echo "<p>setting $name='{$this->$name}' to it's default='$default'</p>\n";
 				$this->set_defaults[$name] = $this->$name = $default;
 			}
-			if (strpos($this->$name,'$') !== false)
+			if (strpos($this->$name, '$') !== false)
 			{
 				$this->set_defaults[$name] = $this->$name = str_replace(array(
 					'$domain',
-				),array(
+				), array(
 					$this->domain,
-				),$this->$name);
+				), $this->$name);
 			}
 		}
 	}

setup/inc/class.setup_html.inc.php

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();"' : '');

Spacing +89 added lines, -89 removed lines

@@ -26,54 +26,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 = get_var('deletedomain',Array('POST'));
-		$domains = get_var('domains',Array('POST'));
+		$deletedomain = get_var('deletedomain', Array('POST'));
+		$domains = get_var('domains', Array('POST'));
 
-		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);
-			$dom = get_var('setting_'.$variableName,Array('POST'));
-			$GLOBALS['header_template']->set_var('DB_DOMAIN',$v);
-			foreach($dom as $x => $y)
+			$variableName = str_replace('.', '_', $k);
+			$dom = get_var('setting_'.$variableName, Array('POST'));
+			$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 = get_var('setting',Array('POST'));
-		while($setting && list($k,$v) = @each($setting))
+		$setting = get_var('setting', Array('POST'));
+		while ($setting && list($k, $v) = @each($setting))
 		{
-			if(strtoupper($k) == 'HEADER_ADMIN_PASSWORD')
+			if (strtoupper($k) == 'HEADER_ADMIN_PASSWORD')
 			{
 				$var[strtoupper($k)] = md5($v);
 			}
@@ -85,38 +85,38 @@ 
 		/* 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 . SEP . "$app_name" . SEP;
+			$srv_root = EGW_SERVER_ROOT.SEP."$app_name".SEP;
 		}
 		else
 		{
 			$srv_root = '';
 		}
 
-		$tpl_typical = 'templates' . SEP . 'default';
-		$tpl_root = "$srv_root" ."$tpl_typical";
+		$tpl_typical = 'templates'.SEP.'default';
+		$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',
@@ -128,35 +128,35 @@ 
 		$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="../phpgwapi/templates/default/images/bullet.png" />';
 		}
 
-		$GLOBALS['setup_tpl']->set_var('lang_version',lang('version'));
-		$GLOBALS['setup_tpl']->set_var('pgw_ver',@$GLOBALS['egw_info']['server']['versions']['phpgwapi']);
+		$GLOBALS['setup_tpl']->set_var('lang_version', lang('version'));
+		$GLOBALS['setup_tpl']->set_var('pgw_ver', @$GLOBALS['egw_info']['server']['versions']['phpgwapi']);
 		$GLOBALS['setup_tpl']->set_var(array(
 			'logoutbutton'  => $btn_logout,
 			'indexbutton'   => $index_btn,
@@ -169,66 +169,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')
 		{
@@ -238,54 +238,54 @@ 
 			*/
 			if (count($GLOBALS['egw_domain']) > 1)
 			{
-				foreach($GLOBALS['egw_domain'] as $domain => $data)
+				foreach ($GLOBALS['egw_domain'] as $domain => $data)
 				{
 					$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 html::select('ConfigLang', $ConfigLang, translation::get_available_langs(false), true,
 			$onChange ? ' onchange="this.form.submit();"' : '');
@@ -293,18 +293,18 @@ 
 
 	static function get_template_list()
 	{
-		$d = dir(EGW_SERVER_ROOT . '/phpgwapi/templates');
+		$d = dir(EGW_SERVER_ROOT.'/phpgwapi/templates');
 
-		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
 				{
@@ -313,22 +313,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;
 	}
 }

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

@@ -27,10 +27,10 @@ 
 
 		$GLOBALS['header_template']->set_file(array('header' => 'header.inc.php.template'));
 		$GLOBALS['header_template']->set_block('header','domain','domain');
-		$var = Array();
+		$var = array();
 
-		$deletedomain = get_var('deletedomain',Array('POST'));
-		$domains = get_var('domains',Array('POST'));
+		$deletedomain = get_var('deletedomain',array('POST'));
+		$domains = get_var('domains',array('POST'));
 
 		foreach($domains as $k => $v)
 		{
@@ -39,7 +39,7 @@ 
 				continue;
 			}
 			$variableName = str_replace('.','_',$k);
-			$dom = get_var('setting_'.$variableName,Array('POST'));
+			$dom = get_var('setting_'.$variableName,array('POST'));
 			$GLOBALS['header_template']->set_var('DB_DOMAIN',$v);
 			foreach($dom as $x => $y)
 			{
@@ -70,7 +70,7 @@ 
 
 		$GLOBALS['header_template']->set_var('domain','');
 
-		$setting = get_var('setting',Array('POST'));
+		$setting = get_var('setting',array('POST'));
 		while($setting && list($k,$v) = @each($setting))
 		{
 			if(strtoupper($k) == 'HEADER_ADMIN_PASSWORD')

setup/setup-cli.php

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')
 	{

Doc Comments -1 removed lines

@@ -206,7 +206,6 @@
 /**
  * Updates the default EMailAdmin profile
  *
- * @param array $values
  */
 function do_emailadmin()
 {

Switch Indentation +81 added lines, -81 removed lines

@@ -66,91 +66,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 egw_exception_wrong_userinput(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 egw_exception_wrong_userinput(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 egw_exception_wrong_userinput(lang("Unknown option '%1' !!!",$action),90);
+			throw new egw_exception_wrong_userinput(lang("Unknown option '%1' !!!",$action),90);
 }
 exit(0);
 

Spacing +95 added lines, -95 removed lines

@@ -11,13 +11,13 @@ 
  * @version $Id$
  */
 
-chdir(dirname(__FILE__));	// to enable our relative pathes to work
+chdir(dirname(__FILE__)); // to enable our relative pathes to work
 
 if (php_sapi_name() !== 'cli')	// security precaution: forbit calling 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 & ~E_DEPRECATED);
+error_reporting(E_ALL&~E_NOTICE&~E_STRICT&~E_DEPRECATED);
 
 $dry_run = false;
 array_shift($_SERVER['argv']);
@@ -31,7 +31,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
 {
@@ -40,42 +40,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 egw_exception_wrong_userinput(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 egw_exception_wrong_userinput(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':
@@ -104,11 +104,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':
@@ -122,21 +122,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 egw_exception_wrong_userinput(lang("Invalid argument '%1' !!!",$arg),90);
+					throw new egw_exception_wrong_userinput(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
@@ -145,12 +145,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 egw_exception_wrong_userinput(lang("Unknown option '%1' !!!",$action),90);
+		throw new egw_exception_wrong_userinput(lang("Unknown option '%1' !!!", $action), 90);
 }
 exit(0);
 
@@ -161,19 +161,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);
@@ -186,8 +186,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')
@@ -195,9 +195,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";
@@ -210,23 +210,23 @@ 
  */
 function do_emailadmin()
 {
-	$GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->config_table,'config_name,config_value',array(
+	$GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->config_table, 'config_name,config_value', array(
 		'config_app'  => 'phpgwapi',
 		"((config_name LIKE 'mail%' AND config_name != 'mail_footer') OR config_name LIKE 'smtp%' OR config_name LIKE 'imap%' OR config_name='editforwardingaddress')",
-	),__LINE__,__FILE__);
+	), __LINE__, __FILE__);
 	while (($row = $GLOBALS['egw_setup']->db->row(true)))
 	{
 		$config[$row['config_name']] = $row['config_value'];
 	}
 	$config['smtpAuth'] = $config['smtp_auth_user'] ? 'yes' : null;
 
-	$emailadmin = new emailadmin_bo(false,false);	// false=no session stuff
+	$emailadmin = new emailadmin_bo(false, false); // false=no session stuff
 	$emailadmin->setDefaultProfile($config);
 
 	echo "\n".lang('EMailAdmin profile updated:')."\n";
-	foreach($config as $name => $value)
+	foreach ($config as $name => $value)
 	{
-		echo str_pad($name.':',22).$value."\n";
+		echo str_pad($name.':', 22).$value."\n";
 	}
 }
 
@@ -237,10 +237,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";
 }
 
@@ -250,21 +250,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')
@@ -282,7 +282,7 @@ 
 			}
 			else	// backup failed ==> dont start the upgrade
 			{
-				throw new egw_exception_wrong_userinput(lang('Backup failed').': '.$f,50);
+				throw new egw_exception_wrong_userinput(lang('Backup failed').': '.$f, 50);
 			}
 		}
 	}
@@ -295,31 +295,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,true,$app);
+			$cmd = new setup_cmd_update($domain, $user, $password, $backup, true, $app);
 			echo $cmd->run()."\n";
 		}
 	}
@@ -338,20 +338,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;
 }
@@ -363,16 +363,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";
 }
 
@@ -382,14 +382,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);
 	}
 }
@@ -401,18 +401,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";
 }
 
@@ -424,11 +424,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;
@@ -445,13 +445,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;
 		}
 	}
@@ -461,9 +461,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)
 	{
@@ -478,7 +478,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";
@@ -529,13 +529,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);
@@ -551,40 +551,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";
 	}
 }

setup/account_migration.php

Braces +4 added lines, -1 removed lines

@@ -156,7 +156,10 @@
 else	// do the migration
 {
 	$cmd->only = (array)$_POST['users'];
-	if (empty($_POST['passwords2sql'])) $cmd->only = array_merge($cmd->only, (array)$_POST['groups']);
+	if (empty($_POST['passwords2sql']))
+	{
+		$cmd->only = array_merge($cmd->only, (array)$_POST['groups']);
+	}
 	$cmd->verbose = true;
 	echo '<p align="center">'.str_replace("\n","</p>\n<p align='center'>",$cmd->run())."</p>\n";
 

Spacing +43 added lines, -44 removed lines

@@ -22,7 +22,7 @@ 
 // Does not return unless user is authorized
 
 $tpl_root = $GLOBALS['egw_setup']->html->setup_tpl_dir('setup');
-$setup_tpl = CreateObject('phpgwapi.Template',$tpl_root);
+$setup_tpl = CreateObject('phpgwapi.Template', $tpl_root);
 $setup_tpl->set_file(array(
 	'migration' => 'account_migration.tpl',
 	'T_head' => 'head.tpl',
@@ -43,9 +43,9 @@ 
 	$GLOBALS['egw_setup']->loaddb();
 }
 // Load configuration values account_repository and auth_type, as setup has not yet done so
-foreach($GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->config_table,'config_name,config_value',
+foreach ($GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->config_table, 'config_name,config_value',
 	"config_name LIKE 'ldap%' OR config_name LIKE 'account_%' OR config_name LIKE '%encryption%' OR config_name='auth_type' OR config_name='mail_suffix'",
-	__LINE__,__FILE__) as $row)
+	__LINE__, __FILE__) as $row)
 {
 	$GLOBALS['egw_info']['server'][$row['config_name']] = $row['config_value'];
 }
@@ -63,11 +63,11 @@ 
 }
 $direction = strtoupper($from).' --> '.strtoupper($to);
 
-$GLOBALS['egw_setup']->html->show_header($direction,False,'config',$GLOBALS['egw_setup']->ConfigDomain .
-	'(' . $GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'] . ')');
+$GLOBALS['egw_setup']->html->show_header($direction, False, 'config', $GLOBALS['egw_setup']->ConfigDomain.
+	'('.$GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'].')');
 
 // create base one level off ldap_context
-$base_parts = explode(',',$GLOBALS['egw_info']['server']['ldap_context']);
+$base_parts = explode(',', $GLOBALS['egw_info']['server']['ldap_context']);
 array_shift($base_parts);
 
 $cmd = new setup_cmd_ldap(array(
@@ -76,24 +76,24 @@ 
 	// allow to set ldap root DN (ldap_admin) to create instance specific admin DN and structure
 	'ldap_admin' => !empty($_POST['ldap_admin']) ? $_POST['ldap_admin'] : $GLOBALS['egw_info']['server']['ldap_root_dn'],
 	'ldap_admin_pw' => !empty($_POST['ldap_admin']) ? $_POST['ldap_admin_pw'] : $GLOBALS['egw_info']['server']['ldap_root_pw'],
-	'ldap_base' => implode(',',$base_parts),
+	'ldap_base' => implode(',', $base_parts),
 	'truncate_egw_accounts' => !empty($_POST['truncate_egw_accounts']),
-)+$GLOBALS['egw_info']['server']);
+) + $GLOBALS['egw_info']['server']);
 
 if (!$_POST['migrate'] && !$_POST['passwords2sql'])
 {
 	$accounts = $cmd->accounts($from);
 
 	// now outputting the account selection
-	$setup_tpl->set_block('migration','header','header');
-	$setup_tpl->set_block('migration','user_list','user_list');
-	$setup_tpl->set_block('migration','group_list','group_list');
-	$setup_tpl->set_block('migration','ldap_admin','ldap_admin');
-	$setup_tpl->set_block('migration','submit','submit');
-	$setup_tpl->set_block('migration','footer','footer');
-	$setup_tpl->set_block('migration','truncate_egw_accounts','truncate_egw_accounts');
-
-	foreach($accounts as $account_id => $account)
+	$setup_tpl->set_block('migration', 'header', 'header');
+	$setup_tpl->set_block('migration', 'user_list', 'user_list');
+	$setup_tpl->set_block('migration', 'group_list', 'group_list');
+	$setup_tpl->set_block('migration', 'ldap_admin', 'ldap_admin');
+	$setup_tpl->set_block('migration', 'submit', 'submit');
+	$setup_tpl->set_block('migration', 'footer', 'footer');
+	$setup_tpl->set_block('migration', 'truncate_egw_accounts', 'truncate_egw_accounts');
+
+	foreach ($accounts as $account_id => $account)
 	{
 		if ($account['account_type'] == 'g')
 		{
@@ -101,70 +101,69 @@ 
 			{
 				$identical_account_id_warning .= lang('Group %1 uses identical ID %2 as user %3!', $account['account_lid'], abs($account_id), $accounts[abs($account_id)]['account_lid']);
 			}
-			$group_list .= '<option value="' . $account_id . '" selected="1">'. $account['account_lid'] . "</option>\n";
+			$group_list .= '<option value="'.$account_id.'" selected="1">'.$account['account_lid']."</option>\n";
 		}
 		else
 		{
-			$user_list .= '<option value="' . $account_id . '" selected="1">'.
+			$user_list .= '<option value="'.$account_id.'" selected="1">'.
 				common::display_fullname($account['account_lid'],
-				$account['account_firstname'],$account['account_lastname'])	. "</option>\n";
+				$account['account_firstname'], $account['account_lastname'])."</option>\n";
 		}
 	}
-	$setup_tpl->set_var('action_url','account_migration.php');
-	$setup_tpl->set_var('users',$user_list);
-	$setup_tpl->set_var('groups',$group_list);
-
-	$setup_tpl->set_var('description',lang('Migration between EGroupware account repositories').': '.$direction);
-	$setup_tpl->set_var('select_users',lang('Select which user(s) will be exported'));
-	$setup_tpl->set_var('select_groups',lang('Select which group(s) will be exported'));
-	$setup_tpl->set_var('memberships',$identical_account_id_warning ?
-		'<p style="color: red">'.$identical_account_id_warning.'<br/>'.lang('Migration of group will fail, as SQL does NOT allow identical IDs.').'</p>' :
-		lang('Group memberships will be migrated too.'));
+	$setup_tpl->set_var('action_url', 'account_migration.php');
+	$setup_tpl->set_var('users', $user_list);
+	$setup_tpl->set_var('groups', $group_list);
+
+	$setup_tpl->set_var('description', lang('Migration between EGroupware account repositories').': '.$direction);
+	$setup_tpl->set_var('select_users', lang('Select which user(s) will be exported'));
+	$setup_tpl->set_var('select_groups', lang('Select which group(s) will be exported'));
+	$setup_tpl->set_var('memberships', $identical_account_id_warning ?
+		'<p style="color: red">'.$identical_account_id_warning.'<br/>'.lang('Migration of group will fail, as SQL does NOT allow identical IDs.').'</p>' : lang('Group memberships will be migrated too.'));
 	$setup_tpl->set_var('ldap_admin_message', lang('Give LDAP root DN and password, if you need to create an instance specific admin user, user- or group-context'));
 	$setup_tpl->set_var('ldap_admin_label', lang('Root DN'));
 	$setup_tpl->set_var('ldap_admin_pw_label', lang('Root DN password'));
-	$setup_tpl->set_var('migrate',$direction);
-	$setup_tpl->set_var('cancel',lang('Cancel'));
+	$setup_tpl->set_var('migrate', $direction);
+	$setup_tpl->set_var('cancel', lang('Cancel'));
 	if ($from == 'sql' && $GLOBALS['egw_info']['server']['auth_type'] == 'ldap')
 	{
 		$setup_tpl->set_var('extra_button', html::submit_button('passwords2sql', lang('Passwords --> SQL')));
 	}
 
-	$setup_tpl->pfp('out','header');
-	if($user_list)
+	$setup_tpl->pfp('out', 'header');
+	if ($user_list)
 	{
-		$setup_tpl->pfp('out','user_list');
+		$setup_tpl->pfp('out', 'user_list');
 	}
-	if($group_list)
+	if ($group_list)
 	{
-		$setup_tpl->pfp('out','group_list');
+		$setup_tpl->pfp('out', 'group_list');
 	}
 	if ($to == 'ldap')
 	{
-		$setup_tpl->pfp('out','ldap_admin');
+		$setup_tpl->pfp('out', 'ldap_admin');
 	}
 	if ($to == 'sql')
 	{
 		$setup_tpl->set_var('truncate_egw_accounts_message', lang('Delete all existing accounts from SQL database'));
-		$setup_tpl->pfp('out','truncate_egw_accounts');
+		$setup_tpl->pfp('out', 'truncate_egw_accounts');
 	}
-	$setup_tpl->pfp('out','submit');
-	$setup_tpl->pfp('out','footer');
+	$setup_tpl->pfp('out', 'submit');
+	$setup_tpl->pfp('out', 'footer');
 }
 else	// do the migration
 {
 	$cmd->only = (array)$_POST['users'];
 	if (empty($_POST['passwords2sql'])) $cmd->only = array_merge($cmd->only, (array)$_POST['groups']);
 	$cmd->verbose = true;
-	echo '<p align="center">'.str_replace("\n","</p>\n<p align='center'>",$cmd->run())."</p>\n";
+	echo '<p align="center">'.str_replace("\n", "</p>\n<p align='center'>", $cmd->run())."</p>\n";
 
 	// store new repostory (and auth_type), as we are migrated now
 	if ($_POST['migrate'])
 	{
-		config::save_value('account_repository', $GLOBALS['egw_info']['server']['account_repository']=$to, 'phpgwapi');
+		config::save_value('account_repository', $GLOBALS['egw_info']['server']['account_repository'] = $to, 'phpgwapi');
 		if (empty($GLOBALS['egw_info']['server']['auth_type']) || $GLOBALS['egw_info']['server']['auth_type'] == $from)
 		{
-			config::save_value('auth_type', $GLOBALS['egw_info']['server']['auth_type']=$to, 'phpgwapi');
+			config::save_value('auth_type', $GLOBALS['egw_info']['server']['auth_type'] = $to, 'phpgwapi');
 		}
 	}
 	echo '<p align="center">'.lang('Click <a href="index.php">here</a> to return to setup.')."</p>\n";