EGroupware / egroupware

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

api/src/Egw/Base.php

Spacing +4 added lines, -4 removed lines

@@ -64,12 +64,12 @@ 
 	 */
 	static $sub_objects = array(
 		'log' => 'errorlog',
-		'link' => 'bolink',		// depricated use static egw_link methods
+		'link' => 'bolink', // depricated use static egw_link methods
 		'datetime' => 'egw_datetime',
 		// classes moved to new api dir
 		'template' => true,
 		'applications' => 'EGroupware\\Api\\Egw\\Applications',
-		'framework' => true,	// special handling in __get()
+		'framework' => true, // special handling in __get()
 		'ldap' => true,
 	);
 
@@ -95,7 +95,7 @@ 
 	{
 		//error_log(__METHOD__."($name)".function_backtrace());
 
-		if ($name == 'js') $name = 'framework';	// javascript class is integrated now into framework
+		if ($name == 'js') $name = 'framework'; // javascript class is integrated now into framework
 
 		if (isset($this->$name))
 		{
@@ -107,7 +107,7 @@ 
 			if ($name != 'ADOdb') error_log(__METHOD__.": There's NO $name object! ".function_backtrace());
 			return null;
 		}
-		switch($name)
+		switch ($name)
 		{
 			case 'framework':
 				return $this->framework = Api\Framework::factory();

Braces +13 added lines, -3 removed lines

@@ -95,7 +95,11 @@ 
 	{
 		//error_log(__METHOD__."($name)".function_backtrace());
 
-		if ($name == 'js') $name = 'framework';	// javascript class is integrated now into framework
+		if ($name == 'js')
+		{
+			$name = 'framework';
+		}
+		// javascript class is integrated now into framework
 
 		if (isset($this->$name))
 		{
@@ -104,7 +108,10 @@ 
 
 		if (!isset(self::$sub_objects[$name]) && !class_exists('EGroupware\\Api\\'.ucfirst($name)) && !class_exists($name))
 		{
-			if ($name != 'ADOdb') error_log(__METHOD__.": There's NO $name object! ".function_backtrace());
+			if ($name != 'ADOdb')
+			{
+				error_log(__METHOD__.": There's NO $name object! ".function_backtrace());
+			}
 			return null;
 		}
 		switch($name)
@@ -121,7 +128,10 @@ 
 				return $this->ldap = Api\Ldap::factory(false);
 			default:
 				$class = isset(self::$sub_objects[$name]) ? self::$sub_objects[$name] : 'EGroupware\\Api\\'.ucfirst($name);
-				if (!class_exists($class)) $class = $name;
+				if (!class_exists($class))
+				{
+					$class = $name;
+				}
 				break;
 		}
 		return $this->$name = new $class();

api/src/Egw/Applications.php

Spacing +5 added lines, -5 removed lines

@@ -58,21 +58,21 @@ 
 	 */
 	function read_repository()
 	{
-		if (!isset($GLOBALS['egw_info']['apps']) ||	!is_array($GLOBALS['egw_info']['apps']))
+		if (!isset($GLOBALS['egw_info']['apps']) || !is_array($GLOBALS['egw_info']['apps']))
 		{
 			$this->read_installed_apps();
 		}
 		$this->data = Array();
-		if(!$this->account_id)
+		if (!$this->account_id)
 		{
 			return False;
 		}
 		$apps = $GLOBALS['egw']->acl->get_user_applications($this->account_id);
-		foreach(array_keys($GLOBALS['egw_info']['apps']) as $app)
+		foreach (array_keys($GLOBALS['egw_info']['apps']) as $app)
 		{
 			if (isset($apps[$app]) && $apps[$app])
 			{
-				$this->data[$app] =& $GLOBALS['egw_info']['apps'][$app];
+				$this->data[$app] = & $GLOBALS['egw_info']['apps'][$app];
 			}
 		}
 		return $this->data;
@@ -84,7 +84,7 @@ 
 	 */
 	function read_installed_apps()
 	{
-		foreach($this->db->select($this->table_name,'*',false,__LINE__,__FILE__,false,'ORDER BY app_order ASC') as $row)
+		foreach ($this->db->select($this->table_name, '*', false, __LINE__, __FILE__, false, 'ORDER BY app_order ASC') as $row)
 		{
 			$title = $app_name = $row['app_name'];
 

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

@@ -19,7 +19,7 @@ 
 class Applications
 {
 	var $account_id;
-	var $data = Array();
+	var $data = array();
 	/**
 	 * Reference to the global db class
 	 *
@@ -62,7 +62,7 @@ 
 		{
 			$this->read_installed_apps();
 		}
-		$this->data = Array();
+		$this->data = array();
 		if(!$this->account_id)
 		{
 			return False;
@@ -92,7 +92,7 @@ 
 			{
 				$title = $t;
 			}
-			$GLOBALS['egw_info']['apps'][$app_name] = Array(
+			$GLOBALS['egw_info']['apps'][$app_name] = array(
 				'title'   => $title,
 				'name'    => $app_name,
 				'enabled' => True,

api/src/Contacts/Tracking.php

Spacing +22 added lines, -22 removed lines

@@ -106,17 +106,17 @@ 
 	 * @param array $old =null old/last state of the entry or null for a new entry
 	 * @return mixed
 	 */
-	function get_config($name,$data,$old=null)
+	function get_config($name, $data, $old = null)
 	{
-		unset($old);	// not used, but required by function signature
+		unset($old); // not used, but required by function signature
 
-		switch($name)
+		switch ($name)
 		{
 			case 'copy':
 				if ($data['is_contactform'])
 				{
-					$copy = preg_split('/, ?/',$data['email_contactform']);
-					if  ($data['email_copytoreceiver']) $copy[] = $data['email'];
+					$copy = preg_split('/, ?/', $data['email_contactform']);
+					if ($data['email_copytoreceiver']) $copy[] = $data['email'];
 					return $copy;
 				}
 				break;
@@ -144,27 +144,27 @@ 
 	 * @param array $changed_fields =null changed fields from ealier call to $this->changed_fields($data,$old), to not compute it again
 	 * @return int number of log-entries made
 	 */
-	protected function save_history(array $data,array $old=null,$deleted=null,array $changed_fields=null)
+	protected function save_history(array $data, array $old = null, $deleted = null, array $changed_fields = null)
 	{
 		if (is_null($changed_fields))
 		{
-			$changed_fields = self::changed_fields($data,$old);
+			$changed_fields = self::changed_fields($data, $old);
 		}
 		if (!$changed_fields) return 0;
 
-		foreach(array('adr_one_countryname' => 'adr_one_countrycode', 'adr_two_countryname' => 'adr_two_countrycode') as $name => $code)
+		foreach (array('adr_one_countryname' => 'adr_one_countrycode', 'adr_two_countryname' => 'adr_two_countrycode') as $name => $code)
 		{
 			// Only codes involved, but old text name is automatically added when loaded
-			if($old[$code] && $data[$code] && ($key = array_search($name, $changed_fields)) !== false)
+			if ($old[$code] && $data[$code] && ($key = array_search($name, $changed_fields)) !== false)
 			{
 				unset($changed_fields[$key]);
 				continue;
 			}
 
 			// Code and a text name
-			if(in_array($name, $changed_fields) && in_array($code, $changed_fields))
+			if (in_array($name, $changed_fields) && in_array($code, $changed_fields))
 			{
-				if($data[$code])
+				if ($data[$code])
 				{
 					$data[$name] = Api\Country::get_full_name($data[$code], true);
 				}
@@ -172,7 +172,7 @@ 
 			}
 		}
 		//error_log(__METHOD__.__LINE__.' ChangedFields:'.array2string($changed_fields));
-		return parent::save_history($data,$old,$deleted,$changed_fields);
+		return parent::save_history($data, $old, $deleted, $changed_fields);
 	}
 
 	/**
@@ -183,9 +183,9 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return string
 	 */
-	protected function get_message($data,$old,$receiver=null)
+	protected function get_message($data, $old, $receiver = null)
 	{
-		unset($receiver);	// not used, but required by function signature
+		unset($receiver); // not used, but required by function signature
 
 		if (!$data['modified'] || !$old)
 		{
@@ -207,9 +207,9 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return string
 	 */
-	protected function get_subject($data,$old,$deleted=null,$receiver=null)
+	protected function get_subject($data, $old, $deleted = null, $receiver = null)
 	{
-		unset($old, $deleted, $receiver);	// not used, but required by function signature
+		unset($old, $deleted, $receiver); // not used, but required by function signature
 
 		if ($data['is_contactform'])
 		{
@@ -225,15 +225,15 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return array of details as array with values for keys 'label','value','type'
 	 */
-	function get_details($data,$receiver=null)
+	function get_details($data, $receiver = null)
 	{
-		unset($receiver);	// not used, but required by function signature
+		unset($receiver); // not used, but required by function signature
 
-		foreach($this->contacts->contact_fields as $name => $label)
+		foreach ($this->contacts->contact_fields as $name => $label)
 		{
 			if (!$data[$name] && $name != 'owner') continue;
 
-			switch($name)
+			switch ($name)
 			{
 				case 'n_prefix': case 'n_given': case 'n_middle': case 'n_family': case 'n_suffix':	// already in n_fn
 				case 'n_fileas': case 'id': case 'tid':
@@ -263,13 +263,13 @@ 
 					if ($data[$name])
 					{
 						$cats = array();
-						foreach(is_array($data[$name]) ? $data[$name] : explode(',',$data[$name]) as $cat_id)
+						foreach (is_array($data[$name]) ? $data[$name] : explode(',', $data[$name]) as $cat_id)
 						{
 							$cats[] = $GLOBALS['egw']->cats->id2name($cat_id);
 						}
 						$details[$name] = array(
 							'label' => $label,
-							'value' => explode(', ',$cats),
+							'value' => explode(', ', $cats),
 						);
 					}
 				case 'note':

Braces +12 added lines, -3 removed lines

@@ -116,7 +116,10 @@ 
 				if ($data['is_contactform'])
 				{
 					$copy = preg_split('/, ?/',$data['email_contactform']);
-					if  ($data['email_copytoreceiver']) $copy[] = $data['email'];
+					if  ($data['email_copytoreceiver'])
+					{
+						$copy[] = $data['email'];
+					}
 					return $copy;
 				}
 				break;
@@ -150,7 +153,10 @@ 
 		{
 			$changed_fields = self::changed_fields($data,$old);
 		}
-		if (!$changed_fields) return 0;
+		if (!$changed_fields)
+		{
+			return 0;
+		}
 
 		foreach(array('adr_one_countryname' => 'adr_one_countrycode', 'adr_two_countryname' => 'adr_two_countrycode') as $name => $code)
 		{
@@ -231,7 +237,10 @@ 
 
 		foreach($this->contacts->contact_fields as $name => $label)
 		{
-			if (!$data[$name] && $name != 'owner') continue;
+			if (!$data[$name] && $name != 'owner')
+			{
+				continue;
+			}
 
 			switch($name)
 			{