EGroupware / egroupware

setup/inc/class.setup_cmd_update.inc.php

Spacing +12 added lines, -12 removed lines

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

Braces +8 added lines, -2 removed lines

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

setup/inc/class.setup_header.inc.php

Spacing +41 added lines, -41 removed lines

@@ -63,12 +63,12 @@ 
 	 *
 	 * @param string $domain ='default' domain to set
 	 */
-	function defaults($domain='default')
+	function defaults($domain = 'default')
 	{
 		$egw_root = realpath(__DIR__.'/../..');
 		$GLOBALS['egw_info']['server']['server_root'] = $GLOBALS['egw_info']['server']['include_root'] = $egw_root;
-		define('EGW_SERVER_ROOT',$egw_root);	// this is usally already defined by setup and cant be changed
-		define('EGW_INCLUDE_ROOT',$egw_root);
+		define('EGW_SERVER_ROOT', $egw_root); // this is usally already defined by setup and cant be changed
+		define('EGW_INCLUDE_ROOT', $egw_root);
 
 		$GLOBALS['egw_info']['server']['header_admin_user'] = 'admin';
 		$GLOBALS['egw_info']['server']['header_admin_password'] = '';
@@ -84,7 +84,7 @@ 
 		$GLOBALS['egw_info']['server']['mcrypt_iv'] = $this->generate_mcyrpt_iv();
 	}
 
-	function domain_defaults($user='admin',$passwd='',$supported_db=null)
+	function domain_defaults($user = 'admin', $passwd = '', $supported_db = null)
 	{
 		$null = null;
 		if (is_null($supported_db)) $supported_db = $this->check_db_support($null);
@@ -109,19 +109,19 @@ 
 	 *
 	 * @return array with errors or null if no errors
 	 */
-	function validation_errors($path=EGW_SERVER_ROOT)
+	function validation_errors($path = EGW_SERVER_ROOT)
 	{
 		$errors = null;
 
 		if (!is_dir($path) || !is_readable($path) || !is_dir($path.'/api'))
 		{
-			$errors[] = lang("%1 '%2' does NOT exist, is not readable by the webserver or contains no EGroupware installation!",lang('Server root'),$path);
+			$errors[] = lang("%1 '%2' does NOT exist, is not readable by the webserver or contains no EGroupware installation!", lang('Server root'), $path);
 		}
-		if(!$GLOBALS['egw_info']['server']['header_admin_password'])
+		if (!$GLOBALS['egw_info']['server']['header_admin_password'])
 		{
 			$errors[] = lang("You didn't enter a header admin password");
 		}
-		if(!$GLOBALS['egw_info']['server']['header_admin_user'])
+		if (!$GLOBALS['egw_info']['server']['header_admin_user'])
 		{
 			$errors[] = lang("You didn't enter a header admin username");
 		}
@@ -131,15 +131,15 @@ 
 		}
 		else
 		{
-			foreach($GLOBALS['egw_domain'] as $domain => $data)
+			foreach ($GLOBALS['egw_domain'] as $domain => $data)
 			{
 				if (!$data['config_passwd'])
 				{
-					$errors[] = lang("You didn't enter a config password for domain %1",$domain);
+					$errors[] = lang("You didn't enter a config password for domain %1", $domain);
 				}
-				if(!$data['config_user'])
+				if (!$data['config_user'])
 				{
-					$errors[] = lang("You didn't enter a config username for domain %1",$domain);
+					$errors[] = lang("You didn't enter a config username for domain %1", $domain);
 				}
 			}
 		}
@@ -156,19 +156,19 @@ 
 	 * @param array $egw_domain info about the existing eGW domains / DB instances
 	 * @return string content of header.inc.php
 	 */
-	function generate($egw_info,$egw_domain)
+	function generate($egw_info, $egw_domain)
 	{
-		$tpl = new Framework\Template('../', 'keep');	// 'keep' to not loose '{hash}' prefix of password-hashes!
+		$tpl = new Framework\Template('../', 'keep'); // 'keep' to not loose '{hash}' prefix of password-hashes!
 		$tpl->set_file(array('header' => 'header.inc.php.template'));
-		$tpl->set_block('header','domain','domain');
+		$tpl->set_block('header', 'domain', 'domain');
 
 		$most_secure_pw_hash = null;
 		Api\Auth::passwdhashes($most_secure_pw_hash);
 
-		foreach($egw_domain as $domain => $data)
+		foreach ($egw_domain as $domain => $data)
 		{
 			$var = array('DB_DOMAIN' => $domain);
-			foreach($data as $name => $value)
+			foreach ($data as $name => $value)
 			{
 				if ($name == 'db_port' && !$value) $value = $this->default_db_ports[$data['db_type']];
 				if ($name == 'config_passwd')
@@ -181,12 +181,12 @@ 
 				}
 			}
 			$tpl->set_var($var);
-			$tpl->parse('domains','domain',True);
+			$tpl->parse('domains', 'domain', True);
 		}
-		$tpl->set_var('domain','');
+		$tpl->set_var('domain', '');
 
 		$var = Array();
-		foreach($egw_info['server'] as $name => $value)
+		foreach ($egw_info['server'] as $name => $value)
 		{
 			if ($name == 'header_admin_password' && $value && !self::is_hashed($value)) $value = Api\Auth::encrypt_sql($value, $most_secure_pw_hash);
 			if ($name == 'versions')
@@ -208,7 +208,7 @@ 
 		}
 		$tpl->set_var($var);
 
-		return $tpl->parse('out','header');
+		return $tpl->parse('out', 'header');
 	}
 
 	/**
@@ -227,18 +227,18 @@ 
 			return $iv;
 		}*/
 		$size = 30;
-		srand((double)microtime()*1000000);
+		srand((double)microtime() * 1000000);
 		$random_char = array(
-			'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f',
-			'g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v',
-			'w','x','y','z','A','B','C','D','E','F','G','H','I','J','K','L',
-			'M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z'
+			'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f',
+			'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
+			'w', 'x', 'y', 'z', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L',
+			'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'
 		);
 
 		$iv = '';
-		for($i=0; $i < $size; $i++)
+		for ($i = 0; $i < $size; $i++)
 		{
-			$iv .= $random_char[rand(1,count($random_char))];
+			$iv .= $random_char[rand(1, count($random_char))];
 		}
 		//error_log(__METHOD__."() size=$size returning ".array2string($iv));
 		return $iv;
@@ -247,15 +247,15 @@ 
 	function check_db_support(&$detected)
 	{
 		$supported_db = $detected = array();
-		foreach(array(
+		foreach (array(
 			// short => array(extension,func_to_check,supported_db(s))
-			'mysqli' => array('mysql','mysqli_connect','mysqli'),
-			'mysql'  => array('mysql','mysql_connect','mysql'),
-			'mysqlt' => array('mysql','mysql_connect','mysqlt'),
-			'pgsql'  => array('pgsql','pg_connect','pgsql'),
-			'mssql'  => array('mssql','mssql_connect','mssql'),
-			'odbc'   => array('odbc',false,'sapdb','odbc_mssql','odbc_oracle'),
-			'oracle' => array('oci8',false,'oracle'),
+			'mysqli' => array('mysql', 'mysqli_connect', 'mysqli'),
+			'mysql'  => array('mysql', 'mysql_connect', 'mysql'),
+			'mysqlt' => array('mysql', 'mysql_connect', 'mysqlt'),
+			'pgsql'  => array('pgsql', 'pg_connect', 'pgsql'),
+			'mssql'  => array('mssql', 'mssql_connect', 'mssql'),
+			'odbc'   => array('odbc', false, 'sapdb', 'odbc_mssql', 'odbc_oracle'),
+			'oracle' => array('oci8', false, 'oracle'),
 		) as $db => $data)
 		{
 			$ext = array_shift($data);
@@ -263,12 +263,12 @@ 
 			$name = isset($this->db_fullnames[$db]) ? $this->db_fullnames[$db] : strtoupper($db);
 			if (check_load_extension($ext) || $func_to_check && function_exists($func_to_check))
 			{
-				$detected[] = lang('You appear to have %1 support.',$name);
-				$supported_db = array_merge($supported_db,$data);
+				$detected[] = lang('You appear to have %1 support.', $name);
+				$supported_db = array_merge($supported_db, $data);
 			}
 			else
 			{
-				$detected[] .= lang('No %1 support found. Disabling',$name);
+				$detected[] .= lang('No %1 support found. Disabling', $name);
 			}
 		}
 		return $supported_db;
@@ -291,9 +291,9 @@ 
 // some constanst for pre php4.3
 if (!defined('PHP_SHLIB_SUFFIX'))
 {
-	define('PHP_SHLIB_SUFFIX',strtoupper(substr(PHP_OS, 0,3)) == 'WIN' ? 'dll' : 'so');
+	define('PHP_SHLIB_SUFFIX', strtoupper(substr(PHP_OS, 0, 3)) == 'WIN' ? 'dll' : 'so');
 }
 if (!defined('PHP_SHLIB_PREFIX'))
 {
-	define('PHP_SHLIB_PREFIX',PHP_SHLIB_SUFFIX == 'dll' ? 'php_' : '');
+	define('PHP_SHLIB_PREFIX', PHP_SHLIB_SUFFIX == 'dll' ? 'php_' : '');
 }

Braces +16 added lines, -4 removed lines

@@ -74,7 +74,10 @@ 
 		$GLOBALS['egw_info']['server']['header_admin_password'] = '';
 		$GLOBALS['egw_info']['server']['setup_acl'] = '';
 
-		if ($domain) $GLOBALS['egw_domain'][$domain] = $this->domain_defaults();
+		if ($domain)
+		{
+			$GLOBALS['egw_domain'][$domain] = $this->domain_defaults();
+		}
 
 		$GLOBALS['egw_info']['server']['show_domain_selectbox'] = false;
 		$GLOBALS['egw_info']['server']['db_persistent'] = True;
@@ -87,7 +90,10 @@ 
 	function domain_defaults($user='admin',$passwd='',$supported_db=null)
 	{
 		$null = null;
-		if (is_null($supported_db)) $supported_db = $this->check_db_support($null);
+		if (is_null($supported_db))
+		{
+			$supported_db = $this->check_db_support($null);
+		}
 		$default_db = count($supported_db) ? $supported_db[0] : 'mysqli';
 
 		return array(
@@ -170,7 +176,10 @@ 
 			$var = array('DB_DOMAIN' => $domain);
 			foreach($data as $name => $value)
 			{
-				if ($name == 'db_port' && !$value) $value = $this->default_db_ports[$data['db_type']];
+				if ($name == 'db_port' && !$value)
+				{
+					$value = $this->default_db_ports[$data['db_type']];
+				}
 				if ($name == 'config_passwd')
 				{
 					$var['CONFIG_PASS'] = self::is_hashed($value) ? $value : Api\Auth::encrypt_sql($value, $most_secure_pw_hash);
@@ -188,7 +197,10 @@ 
 		$var = Array();
 		foreach($egw_info['server'] as $name => $value)
 		{
-			if ($name == 'header_admin_password' && $value && !self::is_hashed($value)) $value = Api\Auth::encrypt_sql($value, $most_secure_pw_hash);
+			if ($name == 'header_admin_password' && $value && !self::is_hashed($value))
+			{
+				$value = Api\Auth::encrypt_sql($value, $most_secure_pw_hash);
+			}
 			if ($name == 'versions')
 			{
 				$name = 'mcrypt_version';

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

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

setup/inc/class.setup_cmd_database.inc.php

Spacing +37 added lines, -37 removed lines

@@ -53,8 +53,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))
 		{
@@ -85,22 +85,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 Api\Exception\WrongUserinput(lang("'%1' is no valid domain name!",$this->domain));
+			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());
 
 		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();
@@ -134,7 +134,7 @@ 
 	 * @param string $name =null default $this->db_name
 	 * @throws Api\Exception\WrongUserinput 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;
@@ -143,9 +143,9 @@ 
 		$this->test_db = new Api\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
@@ -155,10 +155,10 @@ 
 		if ($e)
 		{
 			throw new Api\Exception\WrongUserinput(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);
 	}
 
 	/**
@@ -174,14 +174,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();
@@ -189,22 +189,22 @@ 
 		catch (Api\Exception\WrongUserinput $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(Api\Db\Exception $e) {	// catches failed to create database
+			catch (Api\Db\Exception $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
 						$matches = null;
-						if (preg_match('/([0-9]+)$/',$this->db_name,$matches))
+						if (preg_match('/([0-9]+)$/', $this->db_name, $matches))
 						{
 							$num = (string)(++$matches[1]);
 						}
@@ -214,7 +214,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();
 					}
@@ -225,21 +225,21 @@ 
 				}
 				// if not give general error
 				throw new Api\Exception\WrongUserinput(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 Api\Exception\WrongUserinput(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;
 	}
@@ -253,12 +253,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 (Api\Db\Exception $e) {
 			unset($e);
@@ -274,9 +274,9 @@ 
 	 * @param string $db_type ='mysqli'
 	 * @return array
 	 */
-	static function defaults($db_type='mysqli')
+	static function defaults($db_type = 'mysqli')
 	{
-		switch($db_type)
+		switch ($db_type)
 		{
 			case 'mysql':
 			default:
@@ -294,7 +294,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',
@@ -306,19 +306,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);
 			}
 		}
 	}

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();
 

setup/inc/class.setup_cmd_admin.inc.php

Spacing +13 added lines, -13 removed lines

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

Braces +8 added lines, -2 removed lines

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

setup/inc/class.setup_cmd.inc.php

Spacing +47 added lines, -47 removed lines

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

Braces +48 added lines, -12 removed lines

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

setup/inc/functions.inc.php

Spacing +20 added lines, -20 removed lines

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

Braces +12 added lines, -3 removed lines

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

setup/inc/hook_config_validate.inc.php

Spacing +21 added lines, -21 removed lines

@@ -32,12 +32,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);
@@ -57,16 +57,16 @@ 
  */
 function vfs_storage_mode($settings)
 {
-	switch($settings['vfs_storage_mode'])
+	switch ($settings['vfs_storage_mode'])
 	{
 		case 'fs':
-			Api\Config::save_value('vfs_fstab','','phpgwapi');
+			Api\Config::save_value('vfs_fstab', '', 'phpgwapi');
 			break;
 		case 'db':
 			Api\Config::save_value('vfs_fstab', array(
 				'/' => 'sqlfs://$host/?storage=db',
 				'/apps' => 'links://$host/apps?storage=db',
-			),'phpgwapi');
+			), 'phpgwapi');
 			break;
 	}
 }
@@ -74,9 +74,9 @@ 
 function temp_dir($settings)
 {
 	$error_msg = null;
-	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);
 	}
 }
 
@@ -84,9 +84,9 @@ 
 {
 	$error_msg = null;
 	if ($settings['file_repository'] == 'sql' && $settings['file_store_contents'] == 'filesystem' &&
-		!setup_detection::check_dir($settings['files_dir'],$error_msg,true))
+		!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);
 	}
 }
 
@@ -97,20 +97,20 @@ 
 		$settings['backup_dir'] = $settings['files_dir'].'/db_backup';
 	}
 	$error_msg = null;
-	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_in = '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;
@@ -120,7 +120,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);
@@ -154,14 +154,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;
 				}
@@ -180,10 +180,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');
 		}
@@ -197,7 +197,7 @@ 
  */
 function ldap_search_filter(&$settings)
 {
-	$filter =& $settings['ldap_search_filter'];
+	$filter = & $settings['ldap_search_filter'];
 
 	if ($filter && $filter{0} != '(') $filter = '('.$filter.')';
 }

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.')';
+	}
+	}

setup/inc/class.setup_cmd_install.inc.php

Spacing +12 added lines, -12 removed lines

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

Braces +8 added lines, -2 removed lines

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

setup/inc/class.setup_cmd_config.inc.php

Spacing +65 added lines, -65 removed lines

@@ -31,7 +31,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))
 		{
@@ -55,16 +55,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);
@@ -80,7 +80,7 @@ 
 		}
 
 		// store the config
-		foreach($values as $name => $value)
+		foreach ($values as $name => $value)
 		{
 			if (substr($name, 0, 4) == 'acc_') continue;
 
@@ -89,12 +89,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))
 		{
@@ -118,12 +118,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)))
@@ -133,9 +133,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;
@@ -147,7 +147,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',
@@ -158,14 +158,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',
@@ -173,28 +173,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',
@@ -206,7 +206,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'))
@@ -252,9 +252,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);
@@ -266,7 +266,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;
 				}
 			}
 		}
@@ -284,27 +284,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 Api\Exception\WrongUserinput(lang("Unknown option '%1' !!!",$arg),90);
+				throw new Api\Exception\WrongUserinput(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;
@@ -320,7 +320,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;
 
@@ -330,15 +330,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 Api\Exception\WrongUserinput(lang("'%1' is not allowed as %2. arguments of option %3 !!!",$value,1+$n,$arg)." ($name[name])",91);
+				throw new Api\Exception\WrongUserinput(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'));
 	}
 
 	/**
@@ -349,9 +349,9 @@ 
 	function _save_mail_account(array $data)
 	{
 		// convert ssl textual values to nummerical ones used in Api\Mail\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] = Api\Mail\Account::SSL_NONE; break;
 				case 'starttls': $data[$name] = Api\Mail\Account::SSL_STARTTLS; break;
@@ -360,12 +360,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]))
 			{
@@ -375,16 +375,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
 
 		Api\Mail\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";
 			}
 		}
 	}
@@ -397,11 +397,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']))
 					{
@@ -414,11 +414,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);
 						}
@@ -451,7 +451,7 @@ 
 		if (!$scan_done++)
 		{
 			// now add auth backends found in filesystem
-			foreach(scandir(EGW_INCLUDE_ROOT.'/api/src/Auth') as $file)
+			foreach (scandir(EGW_INCLUDE_ROOT.'/api/src/Auth') as $file)
 			{
 				$matches = null;
 				if (preg_match('/^([a-z0-9]+)\.php$/', $file, $matches) &&
@@ -460,7 +460,7 @@ 
 					$auth_types[strtolower($matches[1])] = $matches[1];
 				}
 			}
-			foreach(self::$options['--account-auth'] as &$param)
+			foreach (self::$options['--account-auth'] as &$param)
 			{
 				if ($param['name'] == 'auth_type')
 				{
@@ -478,7 +478,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',
@@ -489,13 +489,13 @@ 
 		if (!$scan_done++)
 		{
 			// now add auth backends found in filesystem
-			foreach(scandir(EGW_INCLUDE_ROOT.'/api/src/Accounts') as $file)
+			foreach (scandir(EGW_INCLUDE_ROOT.'/api/src/Accounts') as $file)
 			{
 				$matches = null;
 				if (preg_match('/^([a-z0-9]+)\.php$/', $file, $matches) &&
 					!isset($account_repositories[strtolower($matches[1])]) &&
-					class_exists($class='EGroupware\\Api\\Accounts\\'.$matches[1]) &&
-					(strtolower($matches[1]) == $current || !is_callable($callable=$class.'::available') || call_user_func($callable)))
+					class_exists($class = 'EGroupware\\Api\\Accounts\\'.$matches[1]) &&
+					(strtolower($matches[1]) == $current || !is_callable($callable = $class.'::available') || call_user_func($callable)))
 				{
 					$account_repositories[strtolower($matches[1])] = $matches[1];
 				}
@@ -513,11 +513,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']))
 					{
@@ -545,20 +545,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);
 			}
 		}
 	}

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