EGroupware / egroupware

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_archive','acc_folder_ham'
+			'acc_folder_sent', 'acc_folder_trash', 'acc_folder_draft', 'acc_folder_template', 'acc_folder_junk', 'acc_folder_archive', 'acc_folder_ham'
 		),
 		'--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$/i', $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);
 			}
 		}
 	}

doc/rpm-build/post_install.php

Braces +86 added lines, -22 removed lines

@@ -9,10 +9,13 @@ 
  * @version $Id$
  */
 
-if (php_sapi_name() !== 'cli')	// security precaution: forbit calling post_install as web-page
+if (php_sapi_name() !== 'cli')
+{
+	// security precaution: forbit calling post_install as web-page
 {
 	die('<h1>post_install.php must NOT be called as web-page --> exiting !!!</h1>');
 }
+}
 $verbose = false;
 $config = array(
 	'php'         => PHP_BINARY,
@@ -100,7 +103,10 @@ 
 	{
 		case 'suse':
 			// openSUSE 12.1+ no longer uses php5
-			if (file_exists('/usr/bin/php5')) $config['php'] = '/usr/bin/php5';
+			if (file_exists('/usr/bin/php5'))
+			{
+				$config['php'] = '/usr/bin/php5';
+			}
 			$config['start_db'] = '/sbin/service mysql';
 			$config['autostart_db'] = '/sbin/chkconfig --level 345 mysql on';
 			$config['start_webserver'] = '/sbin/service apache2';
@@ -145,9 +151,12 @@ 
 			// fall through
 		case 'rh':
 			// some MySQL packages (mysql.com, MariaDB, ...) use "mysql" as service name instead of RH default "mysqld"
-			if (file_exists('/usr/bin/systemctl'))	// RHEL 7
+			if (file_exists('/usr/bin/systemctl'))
+			{
+				// RHEL 7
 			{
 				$config['start_db'] = '/usr/bin/systemctl %s mariadb';
+			}
 				$config['autostart_db'] = build_cmd('start_db', 'enable');
 				$config['start_webserver'] = '/usr/bin/systemctl %s httpd';
 				$config['autostart_webserver'] = build_cmd('start_webserver', 'enable');
@@ -176,11 +185,14 @@ 
 	while($config_set)
 	{
 		$val = array_shift($config_set);
-		if (($quote = $val[0]) == "'" || $quote == '"')	// arguments might be quoted with ' or "
+		if (($quote = $val[0]) == "'" || $quote == '"')
+		{
+			// arguments might be quoted with ' or "
 		{
 			while (substr($val,-1) != $quote)
 			{
 				if (!$config_set) throw new Exception('Invalid EGW_POST_INSTALL enviroment variable!');
+		}
 				$val .= ' '.array_shift($config_set);
 			}
 			$val = substr($val,1,-1);
@@ -245,8 +257,11 @@ 
 // basic config checks
 foreach(array('php','source_dir','data_dir','setup-cli') as $name)
 {
-	if (!file_exists($config[$name])) bail_out(1,$config[$name].' not found!');
-}
+	if (!file_exists($config[$name]))
+	{
+		bail_out(1,$config[$name].' not found!');
+	}
+	}
 
 // fix important php.ini and conf.d/*.ini settings
 check_fix_php_apc_ini();
@@ -255,7 +270,9 @@ 
 $setup_cli = $config['php'].' -d memory_limit=-1 '.$config['setup-cli'];
 
 // if we have a header, include it
-if (file_exists($config['header']) && filesize($config['header']) >= 200)	// default header redirecting to setup is 147 bytes
+if (file_exists($config['header']) && filesize($config['header']) >= 200)
+{
+	// default header redirecting to setup is 147 bytes
 {
 	$GLOBALS['egw_info'] = array(
 		'flags' => array(
@@ -263,6 +280,7 @@ 
 			'currentapp' => 'login',	// stop PHP Notice: Undefined index "currentapp" in pre 16.1 header
 		)
 	);
+}
 	include $config['header'];
 
 	// get user from header and replace password, as we dont know it
@@ -286,7 +304,10 @@ 
 		if ($ret)
 		{
 			system(build_cmd('start_db', 'start'));
-			if (!empty($config['autostart_db'])) system($config['autostart_db']);
+			if (!empty($config['autostart_db']))
+			{
+				system($config['autostart_db']);
+			}
 		}
 	}
 	// create database
@@ -302,7 +323,10 @@ 
 	@list($config['account_repository'],$config['auth_type'],$rest) = explode(',',$config['account-auth'],3);
 	$extra_config .= ' '.escapeshellarg('account_repository='.$config['account_repository']);
 	$extra_config .= ' '.escapeshellarg('auth_type='.(empty($config['auth_type']) ? $config['account_repository'] : $config['auth_type']));
-	if (empty($rest)) unset($config['account-auth']);
+	if (empty($rest))
+	{
+		unset($config['account-auth']);
+	}
 	if ($config['account_repository'] == 'ldap' || $config['auth_type'] == 'ldap')
 	{
 		// set account_min_id to 1100 if not specified to NOT clash with system accounts
@@ -362,7 +386,10 @@ 
 	$setup_mailserver = $setup_cli.' --config '.escapeshellarg($config['domain'].','.$config['config_user'].','.$config['config_passwd']);
 	foreach(array('account-auth','smtpserver','smtp','postfix','mailserver','imap','cyrus','sieve','folder') as $name)
 	{
-		if (!empty($config[$name])) $setup_mailserver .= ' --'.$name.' '.escapeshellarg($config[$name]);
+		if (!empty($config[$name]))
+		{
+			$setup_mailserver .= ' --'.$name.' '.escapeshellarg($config[$name]);
+		}
 	}
 	run_cmd($setup_mailserver);
 
@@ -378,7 +405,10 @@ 
 		if ($ret)
 		{
 			system(build_cmd('start_webserver', 'start'));
-			if (!empty($config['autostart_webserver'])) system($config['autostart_webserver']);
+			if (!empty($config['autostart_webserver']))
+			{
+				system($config['autostart_webserver']);
+			}
 		}
 		else
 		{
@@ -424,10 +454,16 @@ 
 			$header_update = $setup_cli.' --update-header '.escapeshellarg($config['config_passwd'].','.$config['config_user']);
 			run_cmd($header_update);
 			$ret = run_cmd($setup_update,$output,15);
-			if ($ret != 15) break;
+			if ($ret != 15)
+			{
+				break;
+			}
 			// fall through
 		case 15:	// missing configuration (eg. mailserver)
-			if (!$verbose) echo implode("\n",(array)$output)."\n";
+			if (!$verbose)
+			{
+				echo implode("\n",(array)$output)."\n";
+			}
 			break;
 
 		case 0:
@@ -457,9 +493,15 @@ 
 {
 	global $config;
 
-	if (isset($config[$cmd])) $cmd = $config[$cmd];
+	if (isset($config[$cmd]))
+	{
+		$cmd = $config[$cmd];
+	}
 
-	if (strpos($cmd, '%s')) return str_replace('%s', $arg, $cmd);
+	if (strpos($cmd, '%s'))
+	{
+		return str_replace('%s', $arg, $cmd);
+	}
 
 	return $cmd.' '.$arg;
 }
@@ -528,7 +570,10 @@ 
  */
 function bail_out($ret=1,$output=null)
 {
-	if ($output) echo implode("\n",(array)$output);
+	if ($output)
+	{
+		echo implode("\n",(array)$output);
+	}
 	echo "\n\nInstallation failed --> exiting!\n\n";
 	exit($ret);
 }
@@ -574,7 +619,11 @@ 
 	echo "options and their defaults:\n";
 	foreach($config as $name => $default)
 	{
-		if (in_array($name, array('postfix','cyrus'))) continue;	// do NOT report deprecated options
+		if (in_array($name, array('postfix','cyrus')))
+		{
+			continue;
+		}
+		// do NOT report deprecated options
 		if (in_array($name,array('config_passwd','db_pass','admin_passwd','ldap_root_pw')) && strlen($config[$name]) == 16)
 		{
 			$default = '<16 char random string>';
@@ -667,7 +716,10 @@ 
 			// only set on host mailserver app is installed: _ucr_get('mail/cyrus/imap') == 'yes' &&
 			($domains=_ucr_get('mail/hosteddomains')))
 		{
-			if (!is_array($domains)) $domains = explode("\n", $domains);
+			if (!is_array($domains))
+			{
+				$domains = explode("\n", $domains);
+			}
 			$domain = array_shift($domains);
 			// set "use auth with session credentials",tls,"not user editable","further identities"
 			$config['smtpserver'] = "$mailserver,465,,,yes,tls,no,yes";
@@ -686,13 +738,19 @@ 
 					$config['imap'] = ',,Imap\\Dovecot';
 				}
 				// default with sieve port to 4190, as config is only available on host mailserver app is installed
-				if (!($sieve_port = _ucr_get('mail/dovecot/sieve/port'))) $sieve_port = 4190;
+				if (!($sieve_port = _ucr_get('mail/dovecot/sieve/port')))
+				{
+					$sieve_port = 4190;
+				}
 			}
 			else
 			{
 				$config['imap'] = /*'cyrus,'._ucr_secret('cyrus')*/','.',Imap\\Cyrus';
 				// default with sieve port to 4190, as config is only available on host mailserver app is installed
-				if (!($sieve_port = _ucr_get('mail/cyrus/sieve/port'))) $sieve_port = 4190;
+				if (!($sieve_port = _ucr_get('mail/cyrus/sieve/port')))
+				{
+					$sieve_port = 4190;
+				}
 			}
 			// set folders so mail creates them on first login, UCS does not automatic
 			$config['folder'] = 'INBOX/Sent,INBOX/Trash,INBOX/Drafts,INBOX/Templates,Spam,,Ham';
@@ -757,7 +815,10 @@ 
 		$shm_size = ini_get('apc.shm_size');
 		$shm_segments = ini_get('apc.shm_segments');
 		// ancent APC (3.1.3) in Debian 6/Squezze has size in MB without a unit
-		if (($numeric_size = is_numeric($shm_size) && $shm_size <= 1048576)) $shm_size .= 'M';
+		if (($numeric_size = is_numeric($shm_size) && $shm_size <= 1048576))
+		{
+			$shm_size .= 'M';
+		}
 
 		$size = _size_with_unit($shm_size) * $shm_segments;
 		//echo "shm_size=$shm_size, shm_segments=$shm_segments --> $size, numeric_size=$numeric_size\n";
@@ -773,7 +834,10 @@ 
 				file_exists($path = $matches[1]) && ($apc_ini = file_get_contents($path)))
 			{
 				$new_shm_size = 128 / $shm_segments;
-				if (!$numeric_size) $new_shm_size .= 'M';
+				if (!$numeric_size)
+				{
+					$new_shm_size .= 'M';
+				}
 				if (preg_match('|^apc.shm_size\s*=\s*(\d+[KMG]?)$|m', $apc_ini))
 				{
 					file_put_contents($path, preg_replace('|^apc.shm_size\s*=\s*(\d+[KMG]?)$|m', 'apc.shm_size='.$new_shm_size, $apc_ini));