EGroupware / egroupware

api/src/loader/exception.php

Spacing +18 added lines, -18 removed lines

@@ -23,16 +23,16 @@ 
  * @param string $vars =null multiple values to replace the placeholders
  * @return string translated message with placeholders replaced
  */
-function try_lang($key,$vars=null)
+function try_lang($key, $vars = null)
 {
-	static $varnames = array('%1','%2','%3','%4');
+	static $varnames = array('%1', '%2', '%3', '%4');
 
-	if(!is_array($vars))
+	if (!is_array($vars))
 	{
 		$vars = func_get_args();
-		array_shift($vars);	// remove $key
+		array_shift($vars); // remove $key
 	}
-	return class_exists('EGroupware\Api\Translations',false) ? Api\Translation::translate($key,$vars) : str_replace($varnames,$vars,$key);
+	return class_exists('EGroupware\Api\Translations', false) ? Api\Translation::translate($key, $vars) : str_replace($varnames, $vars, $key);
 }
 
 /**
@@ -41,7 +41,7 @@ 
  * @param Exception|Error $e
  * @param string &$headline
  */
-function _egw_log_exception($e,&$headline=null)
+function _egw_log_exception($e, &$headline = null)
 {
 	$trace = explode("\n", $e->getTraceAsString());
 	if ($e instanceof Api\Exception\NoPermission)
@@ -54,7 +54,7 @@ 
 	}
 	elseif ($e instanceof Api\Exception\WrongUserinput)
 	{
-		$headline = '';	// message contains the whole message, it's usually no real error but some input validation
+		$headline = ''; // message contains the whole message, it's usually no real error but some input validation
 	}
 	elseif ($e instanceof egw_exception_warning)
 	{
@@ -67,15 +67,15 @@ 
 	}
 	// log exception to error log, if not running as cli,
 	// which outputs the error_log to stderr and therefore output it twice to the user
-	if(isset($_SERVER['HTTP_HOST']) || $GLOBALS['egw_info']['flags']['no_exception_handler'] !== 'cli')
+	if (isset($_SERVER['HTTP_HOST']) || $GLOBALS['egw_info']['flags']['no_exception_handler'] !== 'cli')
 	{
 		error_log($headline.($e instanceof egw_exception_warning ? ': ' : ' ('.get_class($e).'): ').$e->getMessage());
-		foreach($trace as $line)
+		foreach ($trace as $line)
 		{
 			error_log($line);
 		}
 		error_log('# Instance='.$GLOBALS['egw_info']['user']['domain'].', User='.$GLOBALS['egw_info']['user']['account_lid'].
-			', Request='.$_SERVER['REQUEST_METHOD'].' '.($_SERVER['HTTPS']?'https://':'http://').$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'].
+			', Request='.$_SERVER['REQUEST_METHOD'].' '.($_SERVER['HTTPS'] ? 'https://' : 'http://').$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'].
 			', User-agent='.$_SERVER['HTTP_USER_AGENT']);
 	}
 }
@@ -96,17 +96,17 @@ 
 	}
 	// logging all exceptions to the error_log (if not cli) and get headline
 	$headline = null;
-	_egw_log_exception($e,$headline);
+	_egw_log_exception($e, $headline);
 
 	// exception handler for cli (command line interface) clients, no html, no logging
-	if(!isset($_SERVER['HTTP_HOST']) || $GLOBALS['egw_info']['flags']['no_exception_handler'] == 'cli')
+	if (!isset($_SERVER['HTTP_HOST']) || $GLOBALS['egw_info']['flags']['no_exception_handler'] == 'cli')
 	{
 		echo ($headline ? $headline.': ' : '').$e->getMessage()."\n";
 		if ($GLOBALS['egw_info']['server']['exception_show_trace'])
 		{
 			echo $e->getTraceAsString()."\n";
 		}
-		exit($e->getCode() ? $e->getCode() : 9999);		// allways give a non-zero exit code
+		exit($e->getCode() ? $e->getCode() : 9999); // allways give a non-zero exit code
 	}
 	// regular GUI exception
 	if (!isset($GLOBALS['egw_info']['flags']['no_exception_handler']))
@@ -123,16 +123,16 @@ 
 		$message .= "</pre>\n";
 		if (is_a($e, 'EGroupware\Api\Db\Exception\Setup'))
 		{
-			$setup_dir = str_replace(array('home/index.php','index.php'),'setup/',$_SERVER['PHP_SELF']);
+			$setup_dir = str_replace(array('home/index.php', 'index.php'), 'setup/', $_SERVER['PHP_SELF']);
 			$message .= '<a href="'.$setup_dir.'">Run setup to install or configure EGroupware.</a>';
 		}
-		elseif (is_object($GLOBALS['egw']) && isset($GLOBALS['egw']->session) && method_exists($GLOBALS['egw'],'link'))
+		elseif (is_object($GLOBALS['egw']) && isset($GLOBALS['egw']->session) && method_exists($GLOBALS['egw'], 'link'))
 		{
 			$message .= '<p><a href="'.$GLOBALS['egw']->link('/index.php').'">'.try_lang('Click here to resume your eGroupWare Session.').'</a></p>';
 		}
 		if (is_object($GLOBALS['egw']) && isset($GLOBALS['egw']->framework))
 		{
-			$GLOBALS['egw']->framework->render($message,$headline);
+			$GLOBALS['egw']->framework->render($message, $headline);
 		}
 		else
 		{
@@ -140,7 +140,7 @@ 
 		}
 	}
 	// exception handler sending message back to the client as basic auth message
-	elseif($GLOBALS['egw_info']['flags']['no_exception_handler'] == 'basic_auth')
+	elseif ($GLOBALS['egw_info']['flags']['no_exception_handler'] == 'basic_auth')
 	{
 		$error = str_replace(array("\r", "\n"), array('', ' | '), $e->getMessage());
 		header('WWW-Authenticate: Basic realm="'.$headline.' '.$error.'"');
@@ -165,7 +165,7 @@ 
  * @link http://www.php.net/manual/en/function.set-error-handler.php
  * @throws ErrorException
  */
-function egw_error_handler ($errno, $errstr, $errfile, $errline)
+function egw_error_handler($errno, $errstr, $errfile, $errline)
 {
 	switch ($errno)
 	{

Braces +3 added lines, -1 removed lines

@@ -188,7 +188,9 @@
 /**
  * Used internally to trace warnings
  */
-class egw_exception_warning extends Exception {}
+class egw_exception_warning extends Exception
+{
+}
 
 // install our error-handler only for catchable fatal errors and warnings
 // following error types cannot be handled with a user defined function: E_ERROR, E_PARSE, E_CORE_ERROR, E_CORE_WARNING, E_COMPILE_ERROR, E_COMPILE_WARNING

api/src/loader/security.php

Spacing +18 added lines, -18 removed lines

@@ -20,9 +20,9 @@ 
  * @param array &$var reference of array to check
  * @param string $name ='' name of the array
  */
-function _check_script_tag(&$var,$name='')
+function _check_script_tag(&$var, $name = '')
 {
-	static $preg=null;
+	static $preg = null;
 	//old: '/<\/?[^>]*\b(iframe|script|javascript|on(before)?(abort|blur|change|click|dblclick|error|focus|keydown|keypress|keyup|load|mousedown|mousemove|mouseout|mouseover|mouseup|reset|select|submit|unload))\b[^>]*>/i';
 	if (!isset($preg)) $preg =
 		// forbidden tags like iframe or script
@@ -35,15 +35,15 @@ 
 		'<[^>]+style\s*=\s*("|\')[^>]*(behavior\s*:\s*url|expression)\s*\()/i';
 	if (is_array($var))
 	{
-		foreach($var as $key => $val)
+		foreach ($var as $key => $val)
 		{
 			if (is_array($val))
 			{
-				_check_script_tag($var[$key],$name.'['.$key.']');
+				_check_script_tag($var[$key], $name.'['.$key.']');
 			}
-			elseif(strpos($val, '<') !== false)	// speedup: ignore everything without <
+			elseif (strpos($val, '<') !== false)	// speedup: ignore everything without <
 			{
-				if (preg_match($preg,$val))
+				if (preg_match($preg, $val))
 				{
 					// special handling for $_POST[json_data], to decend into it's decoded content, fixing json direct might break json syntax
 					if ($name == '_POST' && $key == 'json_data' && ($json_data = json_decode($val, true)))
@@ -57,7 +57,7 @@ 
 					// attempt to clean the thing
 					$var[$key] = $val = Api\Html\HtmLawed::purify($val);
 					// check if we succeeded, if not drop the var anyway, keep the egw_unset_var in any case
-					if (preg_match($preg,$val))
+					if (preg_match($preg, $val))
 					{
 						error_log("*** _check_script_tag($name): unset(${name}[$key]) with value $val***");
 						unset($var[$key]);
@@ -169,15 +169,15 @@ 
 	die("<p style='color: ".($num_failed?'red':'black')."'>Tests finished: $num_failed / $total failed</p>");
 }*/
 
-foreach(array('_GET','_POST','_REQUEST','HTTP_GET_VARS','HTTP_POST_VARS') as $n => $where)
+foreach (array('_GET', '_POST', '_REQUEST', 'HTTP_GET_VARS', 'HTTP_POST_VARS') as $n => $where)
 {
 	$pregs = array(
 		'order' => '/^[a-zA-Z0-9_,]*$/',
 		'sort'  => '/^(ASC|DESC|asc|desc|0|1|2|3|4|5|6|7){0,1}$/',
 	);
-	foreach(array('order','sort') as $name)
+	foreach (array('order', 'sort') as $name)
 	{
-		if (isset($GLOBALS[$where][$name]) && !is_array($GLOBALS[$where][$name]) && !preg_match($pregs[$name],$GLOBALS[$where][$name]))
+		if (isset($GLOBALS[$where][$name]) && !is_array($GLOBALS[$where][$name]) && !preg_match($pregs[$name], $GLOBALS[$where][$name]))
 		{
 			$GLOBALS[$where][$name] = '';
 		}
@@ -186,14 +186,14 @@ 
 	// speeds up the execusion a bit
 	if (isset($GLOBALS[$where]) && is_array($GLOBALS[$where]) && ($n < 2 || isset($GLOBALS['egw_unset_vars'])))
 	{
-		_check_script_tag($GLOBALS[$where],$where);
+		_check_script_tag($GLOBALS[$where], $where);
 	}
 }
 //if (is_array($GLOBALS['egw_unset_vars'])) { echo "egw_unset_vars=<pre>".htmlspecialchars(print_r($GLOBALS['egw_unset_vars'],true))."</pre>"; exit; }
 
 // $GLOBALS[egw_info][flags][currentapp] and die  if it contains something nasty or unexpected
 if (isset($GLOBALS['egw_info']) && isset($GLOBALS['egw_info']['flags']) &&
-	isset($GLOBALS['egw_info']['flags']['currentapp']) && !preg_match('/^[A-Za-z0-9_-]+$/',$GLOBALS['egw_info']['flags']['currentapp']))
+	isset($GLOBALS['egw_info']['flags']['currentapp']) && !preg_match('/^[A-Za-z0-9_-]+$/', $GLOBALS['egw_info']['flags']['currentapp']))
 {
 	error_log(__FILE__.': '.__LINE__.' Invalid $GLOBALS[egw_info][flags][currentapp]='.array2string($GLOBALS['egw_info']['flags']['currentapp']).', $_SERVER[REQUEST_URI]='.array2string($_SERVER[REQUEST_URI]));
 	die('Invalid $GLOBALS[egw_info][flags][currentapp]!');
@@ -211,12 +211,12 @@ 
 			die('GLOBALS overwrite detected!!!');
 		}
 		// unregister all globals
-		$noUnset = array('GLOBALS','_GET','_POST','_COOKIE','_SERVER','_ENV','_FILES','xajax');
-		foreach(array_unique(array_merge(
-			array_keys($_GET),array_keys($_POST),array_keys($_COOKIE),array_keys($_SERVER),array_keys($_ENV),array_keys($_FILES),
+		$noUnset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_SERVER', '_ENV', '_FILES', 'xajax');
+		foreach (array_unique(array_merge(
+			array_keys($_GET), array_keys($_POST), array_keys($_COOKIE), array_keys($_SERVER), array_keys($_ENV), array_keys($_FILES),
 			isset($_SESSION) && is_array($_SESSION) ? array_keys($_SESSION) : array())) as $k)
 		{
-			if (!in_array($k,$noUnset) && isset($GLOBALS[$k]))
+			if (!in_array($k, $noUnset) && isset($GLOBALS[$k]))
 			{
 				unset($GLOBALS[$k]);
 			}
@@ -246,7 +246,7 @@ 
 		preg_match('/(^|;|{)[OC]:\d+:"/', $str))
 	{
 		error_log(__METHOD__."('$str') contains objects --> return NULL");
-		return null;	// null, not false, to not trigger behavior of returning string itself to app code
+		return null; // null, not false, to not trigger behavior of returning string itself to app code
 	}
 	return unserialize($str);
 }
@@ -317,7 +317,7 @@ 
  * @param boolean $allow_not_serialized =false true: return $str as is, if it is no serialized array
  * @return array|str|false
  */
-function json_php_unserialize($str, $allow_not_serialized=false)
+function json_php_unserialize($str, $allow_not_serialized = false)
 {
 	if ((in_array($str[0], array('a', 'i', 's', 'b', 'O', 'C')) && $str[1] == ':' || $str === 'N;') &&
 		($arr = php_safe_unserialize($str)) !== false || $str === 'b:0;')

Braces +8 added lines, -2 removed lines

@@ -24,7 +24,9 @@ 
 {
 	static $preg=null;
 	//old: '/<\/?[^>]*\b(iframe|script|javascript|on(before)?(abort|blur|change|click|dblclick|error|focus|keydown|keypress|keyup|load|mousedown|mousemove|mouseout|mouseover|mouseup|reset|select|submit|unload))\b[^>]*>/i';
-	if (!isset($preg)) $preg =
+	if (!isset($preg))
+	{
+		$preg =
 		// forbidden tags like iframe or script
 		'/(<(\s*\/)?\s*(iframe|script|object|embed|math|meta)[^a-z0-9]|'.
 		// on* attributes
@@ -33,6 +35,7 @@ 
 		'<[^>]+(href|src|dynsrc|lowsrc|background|style|poster|action)\s*=\s*("|\')?[^"\']*javascript|'.
 		// benavior:url and expression in style attribute
 		'<[^>]+style\s*=\s*("|\')[^>]*(behavior\s*:\s*url|expression)\s*\()/i';
+	}
 	if (is_array($var))
 	{
 		foreach($var as $key => $val)
@@ -41,7 +44,9 @@ 
 			{
 				_check_script_tag($var[$key],$name.'['.$key.']');
 			}
-			elseif(strpos($val, '<') !== false)	// speedup: ignore everything without <
+			elseif(strpos($val, '<') !== false)
+			{
+				// speedup: ignore everything without <
 			{
 				if (preg_match($preg,$val))
 				{
@@ -49,6 +54,7 @@ 
 					if ($name == '_POST' && $key == 'json_data' && ($json_data = json_decode($val, true)))
 					{
 						_check_script_tag($json_data, $name.'[json_data]');
+			}
 						$_REQUEST[$key] = $var[$key] = json_encode($json_data);
 						continue;
 					}

api/src/Storage/Db2DataIterator.php

Spacing +8 added lines, -8 removed lines

@@ -46,13 +46,13 @@ 
 	 * @param Base $storage
 	 * @param \Traversable $rs
 	 */
-	public function __construct(Base $storage, \Traversable $rs=null)
+	public function __construct(Base $storage, \Traversable $rs = null)
 	{
 		$this->storage = $storage;
 
 		$this->total = $storage->total;
 
-		if (is_a($rs,'IteratorAggregate'))
+		if (is_a($rs, 'IteratorAggregate'))
 		{
 			$this->rs = $rs->getIterator();
 		}
@@ -69,7 +69,7 @@ 
 	 */
 	public function current()
 	{
-		if (is_a($this->rs,'iterator'))
+		if (is_a($this->rs, 'iterator'))
 		{
 			$data = $this->rs->current();
 
@@ -85,7 +85,7 @@ 
 	 */
 	public function key()
 	{
-		if (is_a($this->rs,'iterator'))
+		if (is_a($this->rs, 'iterator'))
 		{
 			return $this->rs->key();
 		}
@@ -97,7 +97,7 @@ 
 	 */
 	public function next()
 	{
-		if (is_a($this->rs,'iterator'))
+		if (is_a($this->rs, 'iterator'))
 		{
 			return $this->rs->next();
 		}
@@ -108,7 +108,7 @@ 
 	 */
 	public function rewind()
 	{
-		if (is_a($this->rs,'iterator'))
+		if (is_a($this->rs, 'iterator'))
 		{
 			return $this->rs->rewind();
 		}
@@ -119,9 +119,9 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function valid ()
+	public function valid()
 	{
-		if (is_a($this->rs,'iterator'))
+		if (is_a($this->rs, 'iterator'))
 		{
 			return $this->rs->valid();
 		}

api/src/Storage/Base2.php

Spacing +7 added lines, -7 removed lines

@@ -53,9 +53,9 @@ 
 	 *
 	 * @return so_sql2
 	 */
-	function __construct($app='',$table='',Api\Db $db=null,$column_prefix='',$no_clone=false)
+	function __construct($app = '', $table = '', Api\Db $db = null, $column_prefix = '', $no_clone = false)
 	{
-		parent::__construct($app,$table,$db,$column_prefix,$no_clone);
+		parent::__construct($app, $table, $db, $column_prefix, $no_clone);
 	}
 
 	/**
@@ -68,13 +68,13 @@ 
 	 */
 	function __get($property)
 	{
-		switch($property)
+		switch ($property)
 		{
 			case 'id':
 				$property = $this->autoinc_id;
 				break;
 		}
-		if (in_array($property,$this->db_cols) || in_array($property,$this->non_db_cols))
+		if (in_array($property, $this->db_cols) || in_array($property, $this->non_db_cols))
 		{
 			return $this->data[$property];
 		}
@@ -88,15 +88,15 @@ 
 	 * @param string $property
 	 * @param mixed $value
 	 */
-	function __set($property,$value)
+	function __set($property, $value)
 	{
-		switch($property)
+		switch ($property)
 		{
 			case 'id':
 				$property = $this->autoinc_id;
 				break;
 		}
-		if (in_array($property,$this->db_cols) || in_array($property,$this->non_db_cols))
+		if (in_array($property, $this->db_cols) || in_array($property, $this->non_db_cols))
 		{
 			$this->data[$property] = $value;
 		}

api/src/Exception/NoPermission/App.php

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
  */
 class App extends Exception\NoPermission
 {
-	function __construct($msg=null,$code=101)
+	function __construct($msg = null, $code = 101)
 	{
 		if (isset($GLOBALS['egw_info']['apps'][$msg]))
 		{
@@ -39,6 +39,6 @@ 
 						'"'.$app.'"');
 			}
 		}
-		parent::__construct($msg,$code);
+		parent::__construct($msg, $code);
 	}
 }

api/src/Exception/NotFound.php

Spacing +2 added lines, -2 removed lines

@@ -26,10 +26,10 @@
 	 * @param string $msg =null message, default "Entry not found!"
 	 * @param int $code =99 numerical code, default 2
 	 */
-	function __construct($msg=null,$code=2)
+	function __construct($msg = null, $code = 2)
 	{
 		if (is_null($msg)) $msg = lang('Entry not found!');
 
-		parent::__construct($msg,$code);
+		parent::__construct($msg, $code);
 	}
 }

Braces +4 added lines, -1 removed lines

@@ -28,7 +28,10 @@
 	 */
 	function __construct($msg=null,$code=2)
 	{
-		if (is_null($msg)) $msg = lang('Entry not found!');
+		if (is_null($msg))
+		{
+			$msg = lang('Entry not found!');
+		}
 
 		parent::__construct($msg,$code);
 	}

api/src/Exception/Redirect.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 	 * @param string $msg
 	 * @param int $code
 	 */
-	function __construct($url,$app=null,$msg=null,$code=301)
+	function __construct($url, $app = null, $msg = null, $code = 301)
 	{
 		$this->url = $url;
 		$this->app = $app;

api/src/loader.php

Spacing +11 added lines, -11 removed lines

@@ -24,19 +24,19 @@ 
 // Only variables should be assigned by reference, eg. soetemplate::tree_walk()
 // Declaration of <extended method> should be compatible with <parent method>, varios places where method parameters change
 // --> switching it off for now, as it makes error-log unusable
-error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT);
+error_reporting(E_ALL&~E_NOTICE&~E_STRICT);
 if (function_exists('get_magic_quotes_runtime') && get_magic_quotes_runtime())
 {
 	set_magic_quotes_runtime(false);
 }
 
 $egw_min_php_version = '5.4';
-if (!function_exists('version_compare') || version_compare(PHP_VERSION,$egw_min_php_version) < 0)
+if (!function_exists('version_compare') || version_compare(PHP_VERSION, $egw_min_php_version) < 0)
 {
 	die("EGroupware requires PHP $egw_min_php_version or greater.<br />Please contact your System Administrator to upgrade PHP!");
 }
 
-if (!defined('EGW_API_INC')) define('EGW_API_INC',PHPGW_API_INC);	// this is to support the header upgrade
+if (!defined('EGW_API_INC')) define('EGW_API_INC', PHPGW_API_INC); // this is to support the header upgrade
 
 /* Make sure the header.inc.php is current. */
 if (!isset($GLOBALS['egw_domain']) || $GLOBALS['egw_info']['server']['versions']['header'] < $GLOBALS['egw_info']['server']['versions']['current_header'])
@@ -67,12 +67,12 @@ 
 			$GLOBALS['egw_info']['flags']['restored_from_session'] = true;
 
 			// restoring the egw_info-array
-			$GLOBALS['egw_info'] = array_merge($_SESSION[Session::EGW_INFO_CACHE],array('flags' => $GLOBALS['egw_info']['flags']));
+			$GLOBALS['egw_info'] = array_merge($_SESSION[Session::EGW_INFO_CACHE], array('flags' => $GLOBALS['egw_info']['flags']));
 
 			// include required class-definitions
 			if (is_array($_SESSION[Session::EGW_REQUIRED_FILES]))	// all classes, which can not be autoloaded
 			{
-				foreach($_SESSION[Session::EGW_REQUIRED_FILES] as $file)
+				foreach ($_SESSION[Session::EGW_REQUIRED_FILES] as $file)
 				{
 					require_once($file);
 				}
@@ -81,10 +81,10 @@ 
 
 			if (is_object($GLOBALS['egw']) && ($GLOBALS['egw'] instanceof Egw))	// only egw object has wakeup2, setups egw_minimal eg. has not!
 			{
-				$GLOBALS['egw']->wakeup2();	// adapt the restored egw-object/enviroment to this request (eg. changed current app)
+				$GLOBALS['egw']->wakeup2(); // adapt the restored egw-object/enviroment to this request (eg. changed current app)
 
 				$GLOBALS['egw_info']['flags']['session_restore_time'] = microtime(true) - $GLOBALS['egw_info']['flags']['page_start_time'];
-				if (is_object($GLOBALS['egw']->translation)) return;	// exit this file, as the rest of the file creates a new egw-object and -enviroment
+				if (is_object($GLOBALS['egw']->translation)) return; // exit this file, as the rest of the file creates a new egw-object and -enviroment
 			}
 			// egw object could NOT be restored from the session, create a new one
 			unset($GLOBALS['egw']);
@@ -109,8 +109,8 @@ 
 
 $GLOBALS['egw_info']['user']['domain'] = Session::search_instance(
 	isset($_POST['login']) ? $_POST['login'] : (isset($_SERVER['PHP_AUTH_USER']) ? $_SERVER['PHP_AUTH_USER'] : $_SERVER['REMOTE_USER']),
-	Session::get_request('domain'),$GLOBALS['egw_info']['server']['default_domain'],
-	array($_SERVER['HTTP_HOST'], $_SERVER['SERVER_NAME']),$GLOBALS['egw_domain']);
+	Session::get_request('domain'), $GLOBALS['egw_info']['server']['default_domain'],
+	array($_SERVER['HTTP_HOST'], $_SERVER['SERVER_NAME']), $GLOBALS['egw_domain']);
 
 $GLOBALS['egw_info']['server']['db_host'] = $GLOBALS['egw_domain'][$GLOBALS['egw_info']['user']['domain']]['db_host'];
 $GLOBALS['egw_info']['server']['db_port'] = $GLOBALS['egw_domain'][$GLOBALS['egw_info']['user']['domain']]['db_port'];
@@ -124,7 +124,7 @@ 
 
 // store domain config user&pw as a hash (originals get unset)
 $GLOBALS['egw_info']['server']['config_hash'] = Session::user_pw_hash($GLOBALS['egw_domain'][$GLOBALS['egw_info']['user']['domain']]['config_user'],
-	$GLOBALS['egw_domain'][$GLOBALS['egw_info']['user']['domain']]['config_passwd'],true);
+	$GLOBALS['egw_domain'][$GLOBALS['egw_info']['user']['domain']]['config_passwd'], true);
 
 if ($GLOBALS['egw_info']['flags']['currentapp'] != 'login' && !$GLOBALS['egw_info']['server']['show_domain_selectbox'])
 {
@@ -137,7 +137,7 @@ 
 if ($GLOBALS['egw_info']['flags']['currentapp'] != 'login')
 {
 	$_SESSION[Session::EGW_INFO_CACHE] = $GLOBALS['egw_info'];
-	unset($_SESSION[Session::EGW_INFO_CACHE]['flags']);	// dont save the flags, they change on each request
+	unset($_SESSION[Session::EGW_INFO_CACHE]['flags']); // dont save the flags, they change on each request
 
 	$_SESSION[Session::EGW_OBJECT_CACHE] = serialize($GLOBALS['egw']);
 }

Braces +20 added lines, -5 removed lines

@@ -36,7 +36,11 @@ 
 	die("EGroupware requires PHP $egw_min_php_version or greater.<br />Please contact your System Administrator to upgrade PHP!");
 }
 
-if (!defined('EGW_API_INC')) define('EGW_API_INC',PHPGW_API_INC);	// this is to support the header upgrade
+if (!defined('EGW_API_INC'))
+{
+	define('EGW_API_INC',PHPGW_API_INC);
+}
+// this is to support the header upgrade
 
 /* Make sure the header.inc.php is current. */
 if (!isset($GLOBALS['egw_domain']) || $GLOBALS['egw_info']['server']['versions']['header'] < $GLOBALS['egw_info']['server']['versions']['current_header'])
@@ -70,21 +74,32 @@ 
 			$GLOBALS['egw_info'] = array_merge($_SESSION[Session::EGW_INFO_CACHE],array('flags' => $GLOBALS['egw_info']['flags']));
 
 			// include required class-definitions
-			if (is_array($_SESSION[Session::EGW_REQUIRED_FILES]))	// all classes, which can not be autoloaded
+			if (is_array($_SESSION[Session::EGW_REQUIRED_FILES]))
+			{
+				// all classes, which can not be autoloaded
 			{
 				foreach($_SESSION[Session::EGW_REQUIRED_FILES] as $file)
 				{
 					require_once($file);
+			}
 				}
 			}
 			$GLOBALS['egw'] = unserialize($_SESSION[Session::EGW_OBJECT_CACHE]);
 
-			if (is_object($GLOBALS['egw']) && ($GLOBALS['egw'] instanceof Egw))	// only egw object has wakeup2, setups egw_minimal eg. has not!
+			if (is_object($GLOBALS['egw']) && ($GLOBALS['egw'] instanceof Egw))
 			{
-				$GLOBALS['egw']->wakeup2();	// adapt the restored egw-object/enviroment to this request (eg. changed current app)
+				// only egw object has wakeup2, setups egw_minimal eg. has not!
+			{
+				$GLOBALS['egw']->wakeup2();
+			}
+			// adapt the restored egw-object/enviroment to this request (eg. changed current app)
 
 				$GLOBALS['egw_info']['flags']['session_restore_time'] = microtime(true) - $GLOBALS['egw_info']['flags']['page_start_time'];
-				if (is_object($GLOBALS['egw']->translation)) return;	// exit this file, as the rest of the file creates a new egw-object and -enviroment
+				if (is_object($GLOBALS['egw']->translation))
+				{
+					return;
+				}
+				// exit this file, as the rest of the file creates a new egw-object and -enviroment
 			}
 			// egw object could NOT be restored from the session, create a new one
 			unset($GLOBALS['egw']);

api/src/Db/Exception.php

Spacing +2 added lines, -2 removed lines

@@ -27,10 +27,10 @@
 	 * @param string $msg =null message, default "Database error!"
 	 * @param int $code =100
 	 */
-	function __construct($msg=null,$code=100)
+	function __construct($msg = null, $code = 100)
 	{
 		if (is_null($msg)) $msg = lang('Database error!');
 
-		parent::__construct($msg,$code);
+		parent::__construct($msg, $code);
 	}
 }

Braces +4 added lines, -1 removed lines

@@ -29,7 +29,10 @@
 	 */
 	function __construct($msg=null,$code=100)
 	{
-		if (is_null($msg)) $msg = lang('Database error!');
+		if (is_null($msg))
+		{
+			$msg = lang('Database error!');
+		}
 
 		parent::__construct($msg,$code);
 	}