EGroupware / egroupware

setup/inc/class.setup_cmd_update.inc.php

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_cmd_database.inc.php

Braces +17 added lines, -4 removed lines

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

setup/inc/class.setup_cmd_admin.inc.php

Braces +8 added lines, -2 removed lines

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

setup/inc/class.setup_cmd.inc.php

Braces +48 added lines, -12 removed lines

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

setup/inc/functions.inc.php

Braces +12 added lines, -3 removed lines

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

setup/inc/hook_config_validate.inc.php

Braces +5 added lines, -2 removed lines

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

setup/inc/class.setup_cmd_config.inc.php

Braces +20 added lines, -5 removed lines

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

setup/inc/class.setup_html.inc.php

Braces +4 added lines, -1 removed lines

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

setup/setup-cli.php

Braces +69 added lines, -17 removed lines

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