EGroupware / egroupware

setup/inc/class.setup_cmd_header.inc.php

Braces +32 added lines, -8 removed lines

@@ -79,11 +79,14 @@ 
 		{
 			return true;	// can only check locally
 		}
-		if (!file_exists($this->header_path) || filesize($this->header_path) < 200)	// redirect header in rpms is ~150 byte
+		if (!file_exists($this->header_path) || filesize($this->header_path) < 200)
+		{
+			// redirect header in rpms is ~150 byte
 		{
 			if ($this->sub_command != 'create')
 			{
 				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);
+		}
 			}
 			$this->defaults(false);
 		}
@@ -104,10 +107,13 @@ 
 			$GLOBALS['egw_info']['server']['include_root'] = EGW_INCLUDE_ROOT;
 		}
 
-		if ($this->arguments)	// we have command line arguments
+		if ($this->arguments)
+		{
+			// we have command line arguments
 		{
 			$this->_parse_cli_arguments();
 		}
+		}
 		elseif ($this->sub_command == 'delete')
 		{
 			self::_delete_domain($this->domain);
@@ -138,11 +144,14 @@ 
 			echo $header;	// for cli, we echo the header
 		}
 		if (file_exists($this->header_path) && is_writable($this->header_path) || is_writable(dirname($this->header_path)) ||
-			function_exists('posix_getuid') && !posix_getuid())	// root has all rights
+			function_exists('posix_getuid') && !posix_getuid())
+		{
+			// root has all rights
 		{
 			if (file_exists($this->header_path) && !is_writable($this->header_path))
 			{
 				unlink($this->header_path);
+		}
 			}
 			if (($f = fopen($this->header_path,'wb')) && fwrite($f,$header))
 			{
@@ -278,11 +287,17 @@ 
 
 			$option = self::$options[$arg];
 			$vals = !is_array($option) ? array($values) : explode(',',$values);
-			if (!is_array($option)) $option = array($option => $option);
+			if (!is_array($option))
+			{
+				$option = array($option => $option);
+			}
 			$n = 0;
 			foreach($option as $name => $data)
 			{
-				if ($n >= count($vals)) break;
+				if ($n >= count($vals))
+				{
+					break;
+				}
 
 				$this->_parse_value($arg,$name,$data,$vals[$n++]);
 			}
@@ -315,7 +330,10 @@ 
 	{
 		static $domain=null;
 
-		if (!is_array($data)) $data = array('type' => $data);
+		if (!is_array($data))
+		{
+			$data = array('type' => $data);
+		}
 		$type = $data['type'];
 
 		if (isset($data['allowed']))
@@ -354,13 +372,19 @@ 
 	 */
 	static private function _set_value(&$arr,$index,$name,$value)
 	{
-		if (substr($index,-1) == '/') $index .= $name;
+		if (substr($index,-1) == '/')
+		{
+			$index .= $name;
+		}
 
 		$var =& $arr;
 		foreach(explode('/',$index) as $name)
 		{
 			$var =& $var[$name];
 		}
-		if (true) $var = strpos($name,'passw') !== false ? md5($value) : $value;
+		if (true)
+		{
+			$var = strpos($name,'passw') !== false ? md5($value) : $value;
+		}
 	}
 }

setup/inc/class.setup_cmd_install.inc.php

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

Braces +53 added lines, -16 removed lines

@@ -108,7 +108,9 @@ 
 		while($pass_string != $passing_string)
 		{
 			$passing = array();
-			if($DEBUG) { echo '<br>process->pass(): #' . $i . ' for ' . $method . ' processing' . "\n"; }
+			if($DEBUG)
+			{
+echo '<br>process->pass(): #' . $i . ' for ' . $method . ' processing' . "\n"; }
 
 			// Check current versions and dependencies
 			$setup_info = $GLOBALS['egw_setup']->detection->check_depends(
@@ -143,7 +145,10 @@ 
 					}
 					/* Create tables and insert new records for each app in this list */
 					$passing_c = $this->current($pass,$DEBUG);
-					if (isset($pass['api'])) $this->save_minimal_config($preset_config);
+					if (isset($pass['api']))
+					{
+						$this->save_minimal_config($preset_config);
+					}
 					$passing = $this->default_records($passing_c,$DEBUG);
 					break;
 				case 'upgrade':
@@ -162,29 +167,40 @@ 
 				if($value['status'] == 'C')
 				{
 					$passed[$value['name']] = $passing[$value['name']];
-					if($DEBUG) { echo '<br>process->pass(): '.$passed[$value['name']]['name'] . ' install completed'."\n"; }
+					if($DEBUG)
+					{
+echo '<br>process->pass(): '.$passed[$value['name']]['name'] . ' install completed'."\n"; }
 				}
 				elseif($value['status'] == 'F')
 				{
 					$setup_info[$value['name']] = $passing[$value['name']];
-					if($DEBUG) { echo '<br>process->pass(): '.$setup_info[$value['name']]['name'] . ' install failed'."\n"; }
+					if($DEBUG)
+					{
+echo '<br>process->pass(): '.$setup_info[$value['name']]['name'] . ' install failed'."\n"; }
 				}
 				elseif($value['status'] == 'D')
 				{
 					$pass[$value['name']] = $setup_info[$value['name']];
-					if($DEBUG) { echo '<br>process->pass(): '.$pass[$value['name']]['name'] . ' fails dependency check on this pass'."\n"; }
+					if($DEBUG)
+					{
+echo '<br>process->pass(): '.$pass[$value['name']]['name'] . ' fails dependency check on this pass'."\n"; }
 				}
 				else
 				{
 					$tmp = $passing[$value['name']]['name'];
-					if($DEBUG) { echo '<br>process->pass(): '.$tmp . ' skipped on this pass'."\n"; }
+					if($DEBUG)
+					{
+echo '<br>process->pass(): '.$tmp . ' skipped on this pass'."\n"; }
 				}
 			}
 
 			$i++;
-			if($i == 20) /* Then oops it broke */
+			if($i == 20)
+			{
+				/* Then oops it broke */
 			{
 				echo '<br>Setup failure: excess looping in process->pass():'."\n";
+			}
 				echo '<br>Pass:<br>'."\n";
 				_debug_array($pass);
 				echo '<br>Passed:<br>'."\n";
@@ -376,7 +392,9 @@ 
 					//echo $table;
 					if(in_array($table,$tables))
 					{
-						if($DEBUG){ echo '<br>process->droptables(): Dropping :'. $app_name . ' table: ' . $table; }
+						if($DEBUG)
+						{
+echo '<br>process->droptables(): Dropping :'. $app_name . ' table: ' . $table; }
 						$GLOBALS['egw_setup']->oProc->DropTable($table);
 						// Update the array values for return below
 						$setup_info[$app_name]['status'] = 'U';
@@ -408,13 +426,17 @@ 
 			$enabled = False;
 			$apptitle = $appdata['title'];
 
-			if($DEBUG) { echo '<br>process->current(): Incoming status: ' . $appname . ',status: '. $appdata['status']; }
+			if($DEBUG)
+			{
+echo '<br>process->current(): Incoming status: ' . $appname . ',status: '. $appdata['status']; }
 
 			$appdir  = EGW_SERVER_ROOT . '/' . $appname . '/setup/';
 
 			if($appdata['tables'] && file_exists($appdir.'tables_current.inc.php'))
 			{
-				if($DEBUG) { echo '<br>process->current(): Including: ' . $appdir.'tables_current.inc.php'; }
+				if($DEBUG)
+				{
+echo '<br>process->current(): Including: ' . $appdir.'tables_current.inc.php'; }
 				$phpgw_baseline = null;
 				include ($appdir.'tables_current.inc.php');
 				$ret = $this->post_process($phpgw_baseline,$DEBUG);
@@ -435,13 +457,17 @@ 
 				else
 				{
 					/* script processing failed */
-					if($DEBUG) { echo '<br>process->current(): Failed for ' . $appname . ',status: '. $appdata['status']; }
+					if($DEBUG)
+					{
+echo '<br>process->current(): Failed for ' . $appname . ',status: '. $appdata['status']; }
 					$appdata['status'] = 'F';
 				}
 			}
 			else
 			{
-				if($DEBUG) { echo '<br>process->current(): No current tables for ' . $apptitle . "\n"; }
+				if($DEBUG)
+				{
+echo '<br>process->current(): No current tables for ' . $apptitle . "\n"; }
 				/*
 				 Add the app, but disable it if it has tables defined.
 				 A manual sql script install is needed, but we do add the hooks
@@ -462,7 +488,9 @@ 
 				}
 				$appdata['status'] = 'C';
 			}
-			if($DEBUG) { echo '<br>process->current(): Outgoing status: ' . $appname . ',status: '. $appdata['status']; }
+			if($DEBUG)
+			{
+echo '<br>process->current(): Outgoing status: ' . $appname . ',status: '. $appdata['status']; }
 		}
 
 		// update hooks
@@ -638,9 +666,12 @@ 
 			{
 				echo '<div style="text-align: left; border: thin dashed black; margin-top: 5px;">'."process->upgrade(): Incoming : appname: $appname, version: $appdata[currentver], status: $appdata[status]\n";
 			}
-			if($appdata['status'] == 'U' || $appdata['status'] == 'D' ||$appdata['status'] == 'V' || $appdata['status'] == '') // TODO this is not getting set for api upgrade, sometimes ???
+			if($appdata['status'] == 'U' || $appdata['status'] == 'D' ||$appdata['status'] == 'V' || $appdata['status'] == '')
+			{
+				// TODO this is not getting set for api upgrade, sometimes ???
 			{
 				$currentver = $appdata['currentver'];
+			}
 				$targetver  = $appdata['version'];	// The version we need to match when done
 				$appdir     = EGW_SERVER_ROOT . '/' . $appname . '/setup/';
 
@@ -674,11 +705,14 @@ 
 							}
 						}
 					}
-					if ($currentver == $targetver)	// upgrades succesful
+					if ($currentver == $targetver)
+					{
+						// upgrades succesful
 					{
 						if($DEBUG)
 						{
 							echo "<br>process->upgrade(): Upgrade of $appname to $targetver is completed.\n";
+					}
 						}
 						$appstatus = 'C';
 					}
@@ -700,9 +734,12 @@ 
 					}
 					$appstatus  = 'C';
 				}
-				if ($appstatus == 'C')	// update successful completed
+				if ($appstatus == 'C')
+				{
+					// update successful completed
 				{
 					$appdata['currentver'] = $targetver;
+				}
 
 					if($GLOBALS['egw_setup']->app_registered($appname))
 					{

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

setup/index.php

Braces +15 added lines, -4 removed lines

@@ -49,10 +49,13 @@ 
 $GLOBALS['egw_info']['setup']['stage']['header'] = $GLOBALS['egw_setup']->detection->check_header();
 if ($GLOBALS['egw_info']['setup']['stage']['header'] != '10')
 {
-	if ($GLOBALS['egw_info']['setup']['stage']['header'] == 4)	// header needs update, go there direct
+	if ($GLOBALS['egw_info']['setup']['stage']['header'] == 4)
+	{
+		// header needs update, go there direct
 	{
 		Header('Location: manageheader.php');
 	}
+	}
 	else	// run check-install first
 	{
 		Header('Location: check_install.php?intro=1');
@@ -97,7 +100,9 @@ 
 	}
 }
 
-if ($GLOBALS['DEBUG']) { echo 'Stage: ' . $GLOBALS['egw_info']['setup']['stage']['db']; }
+if ($GLOBALS['DEBUG'])
+{
+echo 'Stage: ' . $GLOBALS['egw_info']['setup']['stage']['db']; }
 // begin DEBUG code
 //$GLOBALS['egw_info']['setup']['stage']['db'] = 0;
 //$action = 'Upgrade';
@@ -501,8 +506,14 @@ 
 		$msg = '';
 		if ($to_upgrade || $to_install)
 		{
-			if ($to_upgrade) $msg = '<b>'.lang('The following applications need to be upgraded:').'</b> '.implode(', ',$to_upgrade);
-			if ($to_install) $msg .= ($msg?'<br />':'').'<b>'.lang('The following applications are required, but NOT installed:').'</b> '.implode(', ',$to_install);
+			if ($to_upgrade)
+			{
+				$msg = '<b>'.lang('The following applications need to be upgraded:').'</b> '.implode(', ',$to_upgrade);
+			}
+			if ($to_install)
+			{
+				$msg .= ($msg?'<br />':'').'<b>'.lang('The following applications are required, but NOT installed:').'</b> '.implode(', ',$to_install);
+			}
 		}
 		$btn_manage_apps = $GLOBALS['egw_setup']->html->make_frm_btn_simple(
 			$msg ? $msg : lang('This stage is completed<br />'),

setup/applications.php

Braces +4 added lines, -1 removed lines

@@ -285,7 +285,10 @@
 				$val = array2string($val);
 				break;
 			default:
-				if (is_array($val)) $val = implode(', ', $val);
+				if (is_array($val))
+				{
+					$val = implode(', ', $val);
+				}
 				break;
 		}
 		$setup_tpl->set_var('bg_color', $bgcolor[++$i & 1]);

setup/doc/chown.php

Braces +11 added lines, -3 removed lines

@@ -13,10 +13,13 @@ 
 
 chdir(dirname(__FILE__));	// to enable our relative pathes to work
 
-if (php_sapi_name() !== 'cli')	// security precaution: forbit calling as web-page
+if (php_sapi_name() !== 'cli')
+{
+	// security precaution: forbit calling as web-page
 {
 	die('<h1>setup/doc/chown.php must NOT be called as web-page --> exiting !!!</h1>');
 }
+}
 
 $recursive = false;
 
@@ -70,7 +73,10 @@ 
 {
 	global $change;
 
-	if (is_null($stat) && !($stat = stat($path))) return false;
+	if (is_null($stat) && !($stat = stat($path)))
+	{
+		return false;
+	}
 
 	if (isset($change[$stat['uid']]) && !chown($path, $uid=$change[$stat['uid']]))
 	{
@@ -86,10 +92,12 @@ 
 		foreach(new DirectoryIterator($path) as $child)
 		{
 			if (!$child->isDot())
-				chown_grp($child->getPathname(), array(
+			{
+							chown_grp($child->getPathname(), array(
 					'uid' => $child->getOwner(),
 					'gid' => $child->getGroup(),
 				), $recursive);
+			}
 		}
 	}
 }

importexport/setup/tables_update.inc.php

Braces +12 added lines, -4 removed lines

@@ -81,18 +81,26 @@
 
 		// step through every source code intstalled app
 		$egwdir = dir(EGW_INCLUDE_ROOT);
-		while (false !== ($appdir = $egwdir->read())) {
+		while (false !== ($appdir = $egwdir->read()))
+		{
 			$defdir = EGW_INCLUDE_ROOT. "/$appdir/setup/";
-			if ( !is_dir( $defdir ) ) continue;
+			if ( !is_dir( $defdir ) )
+			{
+				continue;
+			}
 
 			// step through each file in defdir of app
 			$d = dir($defdir);
-			while (false !== ($entry = $d->read())) {
+			while (false !== ($entry = $d->read()))
+			{
 				try
 				{
 					$file = $defdir. '/'. $entry;
 					list( $filename, $extension) = explode('.',$entry);
-					if ( $extension != 'xml' ) continue;
+					if ( $extension != 'xml' )
+					{
+						continue;
+					}
 					importexport_definitions_bo::import( $file );
 				}
 				catch (Exception $e)