EGroupware / egroupware

phpgwapi/inc/class.config.inc.php

Doc Comments +4 added lines, -4 removed lines

@@ -118,7 +118,7 @@ 
 	 * @param string $name name of the config-value
 	 * @param mixed $value content, empty or null values are not saved, but deleted
 	 * @param string $app app-name (depreacted to use default of $this->appname set via the constructor!)
-	 * @param boolean $update_cache=true update instance cache and for phpgwapi invalidate session-cache
+	 * @param boolean $update_cache update instance cache and for phpgwapi invalidate session-cache
 	 * @throws egw_exception_wrong_parameter if no $app parameter given for static call
 	 * @return boolean|int true if no change, else number of affected rows
 	 */
@@ -195,7 +195,7 @@ 
 	/**
 	 * sets a single value in the repositry, you need to call save_repository after
 	 *
-	 * @param $variable_name string name of the config
+	 * @param string $variable_name string name of the config
 	 * @param $variable_data mixed the content
 	 */
 	function value($variable_name,$variable_data)
@@ -224,8 +224,8 @@ 
 	 * get customfield array of an application
 	 *
 	 * @param string $app
-	 * @param boolean $all_private_too=false should all the private fields be returned too, default no
-	 * @param string $only_type2=null if given only return fields of type2 == $only_type2
+	 * @param boolean $all_private_too should all the private fields be returned too, default no
+	 * @param string $only_type2 if given only return fields of type2 == $only_type2
 	 * @deprecated use egw_customfields::get()
 	 * @return array with customfields
 	 */

Spacing +27 added lines, -27 removed lines

@@ -85,11 +85,11 @@ 
 		if (is_array($this->config_data))
 		{
 			self::$db->lock(array(config::TABLE));
-			foreach($this->config_data as $name => $value)
+			foreach ($this->config_data as $name => $value)
 			{
 				self::save_value($name, $value, $this->appname, false);
 			}
-			foreach(self::$configs[$this->appname] as $name => $value)
+			foreach (self::$configs[$this->appname] as $name => $value)
 			{
 				if (!isset($this->config_data[$name]))	// has been deleted
 				{
@@ -99,9 +99,9 @@ 
 			}
 			self::$db->unlock();
 
-			if ($this->appname == 'phpgwapi' && method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+			if ($this->appname == 'phpgwapi' && method_exists($GLOBALS['egw'], 'invalidate_session_cache'))	// egw object in setup is limited
 			{
-				$GLOBALS['egw']->invalidate_session_cache();	// in case egw_info is cached in the session (phpgwapi is in egw_info[server])
+				$GLOBALS['egw']->invalidate_session_cache(); // in case egw_info is cached in the session (phpgwapi is in egw_info[server])
 			}
 			self::$configs[$this->appname] = $this->config_data;
 
@@ -122,14 +122,14 @@ 
 	 * @throws egw_exception_wrong_parameter if no $app parameter given for static call
 	 * @return boolean|int true if no change, else number of affected rows
 	 */
-	static function save_value($name, $value, $app, $update_cache=true)
+	static function save_value($name, $value, $app, $update_cache = true)
 	{
-		if (!$app && (!isset($this) || !is_a($this,__CLASS__)))
+		if (!$app && (!isset($this) || !is_a($this, __CLASS__)))
 		{
 			throw new egw_exception_wrong_parameter('$app parameter required for static call of config::save_value($name,$value,$app)!');
 		}
 		//echo "<p>config::save_value('$name','".print_r($value,True)."','$app')</p>\n";
-		if (!$app || isset($this) && is_a($this,__CLASS__) && $app == $this->appname)
+		if (!$app || isset($this) && is_a($this, __CLASS__) && $app == $this->appname)
 		{
 			$app = $this->appname;
 			$this->config_data[$name] = $value;
@@ -141,25 +141,25 @@ 
 		//echo "<p>config::save_value('$name','".print_r($value,True)."','$app')</p>\n";
 		if (isset(self::$configs[$app][$name]) && self::$configs[$app][$name] === $value)
 		{
-			return True;	// no change ==> exit
+			return True; // no change ==> exit
 		}
 
 		if (!isset($value) || $value === '')
 		{
 			if (isset(self::$configs[$app])) unset(self::$configs[$app][$name]);
-			self::$db->delete(config::TABLE,array('config_app'=>$app,'config_name'=>$name),__LINE__,__FILE__);
+			self::$db->delete(config::TABLE, array('config_app'=>$app, 'config_name'=>$name), __LINE__, __FILE__);
 		}
 		else
 		{
 			self::$configs[$app][$name] = $value;
-			if(is_array($value)) $value = json_encode($value);
-			self::$db->insert(config::TABLE,array('config_value'=>$value),array('config_app'=>$app,'config_name'=>$name),__LINE__,__FILE__);
+			if (is_array($value)) $value = json_encode($value);
+			self::$db->insert(config::TABLE, array('config_value'=>$value), array('config_app'=>$app, 'config_name'=>$name), __LINE__, __FILE__);
 		}
 		if ($update_cache)
 		{
-			if ($app == 'phpgwapi' && method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+			if ($app == 'phpgwapi' && method_exists($GLOBALS['egw'], 'invalidate_session_cache'))	// egw object in setup is limited
 			{
-				$GLOBALS['egw']->invalidate_session_cache();	// in case egw_info is cached in the session (phpgwapi is in egw_info[server])
+				$GLOBALS['egw']->invalidate_session_cache(); // in case egw_info is cached in the session (phpgwapi is in egw_info[server])
 			}
 			egw_cache::setInstance(__CLASS__, 'configs', self::$configs);
 		}
@@ -176,7 +176,7 @@ 
 		{
 			self::init_static();
 		}
-		self::$db->delete(config::TABLE,array('config_app' => $this->appname),__LINE__,__FILE__);
+		self::$db->delete(config::TABLE, array('config_app' => $this->appname), __LINE__, __FILE__);
 
 		unset(self::$configs[$this->appname]);
 		egw_cache::setInstance(__CLASS__, 'configs', self::$configs);
@@ -198,7 +198,7 @@ 
 	 * @param $variable_name string name of the config
 	 * @param $variable_data mixed the content
 	 */
-	function value($variable_name,$variable_data)
+	function value($variable_name, $variable_data)
 	{
 		$this->config_data[$variable_name] = $variable_data;
 	}
@@ -229,7 +229,7 @@ 
 	 * @deprecated use egw_customfields::get()
 	 * @return array with customfields
 	 */
-	static function get_customfields($app, $all_private_too=false, $only_type2=null)
+	static function get_customfields($app, $all_private_too = false, $only_type2 = null)
 	{
 		//error_log(__METHOD__."('$app', $all_private_too, $only_type2) deprecated, use egw_customfields::get() in ".  function_backtrace());
 		return egw_customfields::get($app, $all_private_too, $only_type2);
@@ -259,12 +259,12 @@ 
 	{
 		static $white_list = array(
 			'all' => array('customfields', 'types'),
-			'phpgwapi' => array('webserver_url','server_timezone','enforce_ssl','system_charset',
-				'checkfornewversion','checkappversions','email_address_format',	// admin >> site config
-				'site_title','login_logo_file','login_logo_url','login_logo_title','favicon_file',
-				'markuntranslated','link_list_thumbnail','enabled_spellcheck','debug_minify',
-				'call_link','call_popup',	// addressbook
-				'hide_birthdays','egw_tutorial_disable'),	// calendar
+			'phpgwapi' => array('webserver_url', 'server_timezone', 'enforce_ssl', 'system_charset',
+				'checkfornewversion', 'checkappversions', 'email_address_format', // admin >> site config
+				'site_title', 'login_logo_file', 'login_logo_url', 'login_logo_title', 'favicon_file',
+				'markuntranslated', 'link_list_thumbnail', 'enabled_spellcheck', 'debug_minify',
+				'call_link', 'call_popup', // addressbook
+				'hide_birthdays', 'egw_tutorial_disable'), // calendar
 			'projectmanager' => array('hours_per_workday', 'duration_units'),
 			'manual' => array('manual_remote_egw_url'),
 			'infolog' => array('status'),
@@ -275,9 +275,9 @@ 
 			self::init_static();
 		}
 		$client_config = array();
-		foreach(self::$configs as $app => $config)
+		foreach (self::$configs as $app => $config)
 		{
-			foreach($config as $name => $value)
+			foreach ($config as $name => $value)
 			{
 				if (strpos($name, 'pass') !== false) continue;
 
@@ -315,12 +315,12 @@ 
 		}
 		// handling of old PHP serialized config values
 		$data = php_safe_unserialize($str);
-		if($data === false)
+		if ($data === false)
 		{
 			// manually retrieve the string lengths of the serialized array if unserialize failed (iso / utf-8 conversation)
 			$data = php_safe_unserialize(preg_replace_callback('!s:(\d+):"(.*?)";!s', function($matches)
 			{
-				return 's:'.mb_strlen($matches[2],'8bit').':"'.$matches[2].'";';
+				return 's:'.mb_strlen($matches[2], '8bit').':"'.$matches[2].'";';
 			}, $str));
 		}
 		// returning original string, if unserialize failed, eg. for "a:hello"
@@ -345,7 +345,7 @@ 
 		if (!(self::$configs = egw_cache::getInstance(__CLASS__, 'configs')) || !is_array(self::$configs['phpgwapi']))
 		{
 			self::$configs = array();
-			foreach(self::$db->select(config::TABLE,'*',false,__LINE__,__FILE__) as $row)
+			foreach (self::$db->select(config::TABLE, '*', false, __LINE__, __FILE__) as $row)
 			{
 				self::$configs[$row['config_app']][$row['config_name']] = self::unserialize($row['config_value']);
 				//error_log(__METHOD__."() configs[$row[config_app]][$row[config_name]]=".array2string(self::$configs[$row['config_app']][$row['config_name']]));

Braces +28 added lines, -8 removed lines

@@ -92,16 +92,23 @@ 
 			}
 			foreach(self::$configs[$this->appname] as $name => $value)
 			{
-				if (!isset($this->config_data[$name]))	// has been deleted
+				if (!isset($this->config_data[$name]))
+				{
+					// has been deleted
 				{
 					self::save_value($name, null, $this->appname, false);
+				}
 					//self::$db->delete(self::TABLE,array('config_app'=>$this->appname,'config_name'=>$name),__LINE__,__FILE__);
 				}
 			}
 
-			if ($this->appname == 'phpgwapi' && method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+			if ($this->appname == 'phpgwapi' && method_exists($GLOBALS['egw'],'invalidate_session_cache'))
+			{
+				// egw object in setup is limited
 			{
-				$GLOBALS['egw']->invalidate_session_cache();	// in case egw_info is cached in the session (phpgwapi is in egw_info[server])
+				$GLOBALS['egw']->invalidate_session_cache();
+			}
+			// in case egw_info is cached in the session (phpgwapi is in egw_info[server])
 			}
 			self::$configs[$this->appname] = $this->config_data;
 
@@ -145,20 +152,30 @@ 
 
 		if (!isset($value) || $value === '')
 		{
-			if (isset(self::$configs[$app])) unset(self::$configs[$app][$name]);
+			if (isset(self::$configs[$app]))
+			{
+				unset(self::$configs[$app][$name]);
+			}
 			self::$db->delete(self::TABLE,array('config_app'=>$app,'config_name'=>$name),__LINE__,__FILE__);
 		}
 		else
 		{
 			self::$configs[$app][$name] = $value;
-			if(is_array($value)) $value = json_encode($value);
+			if(is_array($value))
+			{
+				$value = json_encode($value);
+			}
 			self::$db->insert(self::TABLE,array('config_value'=>$value),array('config_app'=>$app,'config_name'=>$name),__LINE__,__FILE__);
 		}
 		if ($update_cache)
 		{
-			if ($app == 'phpgwapi' && method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+			if ($app == 'phpgwapi' && method_exists($GLOBALS['egw'],'invalidate_session_cache'))
+			{
+				// egw object in setup is limited
 			{
-				$GLOBALS['egw']->invalidate_session_cache();	// in case egw_info is cached in the session (phpgwapi is in egw_info[server])
+				$GLOBALS['egw']->invalidate_session_cache();
+			}
+			// in case egw_info is cached in the session (phpgwapi is in egw_info[server])
 			}
 			Cache::setInstance(__CLASS__, 'configs', self::$configs);
 		}
@@ -278,7 +295,10 @@ 
 		{
 			foreach($config as $name => $value)
 			{
-				if (strpos($name, 'pass') !== false) continue;
+				if (strpos($name, 'pass') !== false)
+				{
+					continue;
+				}
 
 				if (in_array($name, $white_list['all']) || isset($white_list[$app]) && in_array($name, $white_list[$app]))
 				{

phpgwapi/inc/class.contacts.inc.php

Doc Comments +8 added lines, -10 removed lines

@@ -67,14 +67,14 @@ 
 	 * This method was named read in eGW 1.0 and 1.2
 	 *
 	 * @deprecated since 1.3 use search() instead
-	 * @param int $start=0 starting number of the range, if $limit != 0
-	 * @param int $limit=0 max. number of entries to return, 0=all
-	 * @param array $fields=null fields to return or null for all stock fields, fields are either in the keys or values
+	 * @param int $start starting number of the range, if $limit != 0
+	 * @param int $limit max. number of entries to return, 0=all
+	 * @param array $fields fields to return or null for all stock fields, fields are either in the keys or values
 	 * @param string $query='' search pattern or '' for none
 	 * @param string $filter='' filters with syntax like <name>=<value>,<name2>=<value2>,<name3>=!'' for not empty
 	 * @param string $sort='' sorting: ASC or DESC
 	 * @param string $order='' column to order, default ('') n_family,n_given,email ASC
-	 * @param int $lastmod=-1 return only values modified after given timestamp, default (-1) return all
+	 * @param int $lastmod return only values modified after given timestamp, default (-1) return all
 	 * @param string $cquery='' return only entries starting with given character, default ('') all
 	 * @return array of contacts
 	 */
@@ -182,9 +182,8 @@ 
 	 * @deprecated since 1.3 use save() instead
 	 * @param int $owner owner of the entry
 	 * @param array $fields contains access, cat_id and tif if their param is null
-	 * @param string $access=null 'private' or 'public'
-	 * @param int $cat_id=null
-	 * @param string $tid=null 'n'
+	 * @param string $access 'private' or 'public'
+	 * @param int $cat_id
 	 * @return array/boolean contact or false on failure
 	 */
 	function add($owner,$fields,$access=NULL,$cat_id=NULL,$tid=NULL)
@@ -214,9 +213,8 @@ 
 	 * @param int $id id of the entry
 	 * @param int $owner owner of the entry
 	 * @param array $fields contains access, cat_id and tif if their param is null
-	 * @param string $access=null 'private' or 'public'
-	 * @param int $cat_id=null
-	 * @param string $tid=null 'n'
+	 * @param string $access 'private' or 'public'
+	 * @param int $cat_id
 	 * @return array/boolean contact or false on failure
 	 */
 	function update($id,$owner,$fields,$access=NULL,$cat_id=NULL,$tid=NULL)

Indentation +7 added lines, -7 removed lines

@@ -38,13 +38,13 @@
 	}
 
 	/**
-	* reads contacts matched by key and puts all cols in the data array
-	*
-	* reimplemented from bocontacts to call the old read function, if more then one param
-	*
-	* @param int/string $contact_id
-	* @return array/boolean contact data or false on error
-	*/
+	 * reads contacts matched by key and puts all cols in the data array
+	 *
+	 * reimplemented from bocontacts to call the old read function, if more then one param
+	 *
+	 * @param int/string $contact_id
+	 * @return array/boolean contact data or false on error
+	 */
 	function read($contact_id)
 	{
 		if (func_num_args() > 1)	// calling the old / depricated read function

Spacing +37 added lines, -37 removed lines

@@ -29,11 +29,11 @@ 
 	/**
 	 * constructor calling the constructor of the extended class
 	 */
-	function __construct($contact_app='addressbook')
+	function __construct($contact_app = 'addressbook')
 	{
 		parent::__construct($contact_app);
 
-		$this->total_records =& $this->total;
+		$this->total_records = & $this->total;
 		$this->stock_contact_fields = array_keys($this->contact_fields);
 	}
 
@@ -50,7 +50,7 @@ 
 		if (func_num_args() > 1)	// calling the old / depricated read function
 		{
 			$args = func_get_args();
-			return call_user_func_array(array(&$this,'old_read'),$args);
+			return call_user_func_array(array(&$this, 'old_read'), $args);
 		}
 		return parent::read($contact_id);
 	}
@@ -78,16 +78,16 @@ 
 	 * @param string $cquery='' return only entries starting with given character, default ('') all
 	 * @return array of contacts
 	 */
-	function old_read($start=0,$limit=0,$fields=null,$query='',$filter='',$sort='',$order='', $lastmod=-1,$cquery='')
+	function old_read($start = 0, $limit = 0, $fields = null, $query = '', $filter = '', $sort = '', $order = '', $lastmod = -1, $cquery = '')
 	{
 		//error_log("contacts::old_read($start,$limit,".print_r($fields,true).",$query,'$filter','$sort','$order',$lastmod,$cquery)");
 		//echo "<p>contacts::old_read($start,$limit,".print_r($fields,true).",$query,'$filter','$sort','$order',$lastmod,$cquery)</p>\n";
 		$sfilter = array();
 		if ($filter)
 		{
-			foreach(explode(',',$filter) as $expr)
+			foreach (explode(',', $filter) as $expr)
 			{
-				list($col,$value) = explode('=',$expr);
+				list($col, $value) = explode('=', $expr);
 
 				if ($col == 'access')	// text field access is renamed to private and using boolean 0/1
 				{
@@ -101,7 +101,7 @@ 
 		{
 			$sfilter[] = 'contact_modified > '.(int)$lastmod;
 		}
-		static $old2new = array('fn' => 'n_fn','bday' => 'bday');
+		static $old2new = array('fn' => 'n_fn', 'bday' => 'bday');
 
 		if (is_array($fields))
 		{
@@ -110,9 +110,9 @@ 
 			$fields = $fields2[0] === true || $fields2[0] === 1 ? array_keys($fields) : $fields2;
 
 
-			foreach($old2new as $old => $new)
+			foreach ($old2new as $old => $new)
 			{
-				if (($key = array_search($old,$fields)) !== false)
+				if (($key = array_search($old, $fields)) !== false)
 				{
 					$fields[$key] = $new;
 				}
@@ -120,41 +120,41 @@ 
 		}
 		elseif (is_string($fields))
 		{
-			$fields = explode(',',$fields);
+			$fields = explode(',', $fields);
 		}
 		if (!$order) $order = $fields ? $fields[0] : 'org_name,n_family,n_given';
-		if ($order && strpos($order,'_') === false) $order = 'contact_'.$order;
+		if ($order && strpos($order, '_') === false) $order = 'contact_'.$order;
 
 		//echo '<p>contacts::search('.($cquery ? $cquery.'*' : $query).','.print_r($fields,true).",'$order $sort','','".($cquery ? '' : '%')."',false,'OR',".(!$limit ? 'false' : "array($start,$limit)").",".print_r($sfilter,true).");</p>\n";
-		$rows =& $this->search($cquery ? $cquery.'*' : $query,$fields,$order.($sort ? ' '.$sort : ''),'',
-			$cquery ? '' : '%',false,'OR',!$limit ? false : array((int)$start,(int)$limit),$sfilter);
+		$rows = & $this->search($cquery ? $cquery.'*' : $query, $fields, $order.($sort ? ' '.$sort : ''), '',
+			$cquery ? '' : '%', false, 'OR', !$limit ? false : array((int)$start, (int)$limit), $sfilter);
 
 		// return the old birthday format
-		if ($rows && (is_null($fields) || array_intersect($old2new,$fields)))
+		if ($rows && (is_null($fields) || array_intersect($old2new, $fields)))
 		{
-			foreach($rows as $n => $row)
+			foreach ($rows as $n => $row)
 			{
-				foreach($old2new as $old => $new)
+				foreach ($old2new as $old => $new)
 				{
 					if (isset($row[$new])) $rows[$n][$old] = $row[$new];
 
 					if (isset($row['bday']) || isset($row['contact_bday']))
 					{
-						$bdayset=true;
-						if (isset($row['bday']) && ($row['bday']=='0000-00-00 0' || $row['bday']=='0000-00-00' || $row['bday']=='0.0.00'))
+						$bdayset = true;
+						if (isset($row['bday']) && ($row['bday'] == '0000-00-00 0' || $row['bday'] == '0000-00-00' || $row['bday'] == '0.0.00'))
 						{
-							$rows[$n]['bday'] = $row['bday']=null;
-							$bdayset=false;
+							$rows[$n]['bday'] = $row['bday'] = null;
+							$bdayset = false;
 						}
-						if (isset($row['contact_bday']) && ($row['contact_bday']=='0000-00-00 0' || $row['contact_bday']=='0000-00-00' || $row['contact_bday']=='0.0.00'))
+						if (isset($row['contact_bday']) && ($row['contact_bday'] == '0000-00-00 0' || $row['contact_bday'] == '0000-00-00' || $row['contact_bday'] == '0.0.00'))
 						{
-							$rows[$n]['contact_bday'] = $row['contact_bday']=null;
-							$bdayset=false;
+							$rows[$n]['contact_bday'] = $row['contact_bday'] = null;
+							$bdayset = false;
 						}
-						if ($bdayset==false) continue; // dont try to make a date out of that
-						$row['bday'] = egw_time::to((isset($row['bday'])?$row['bday']:$row['contact_bday']),"Y-m-d");
-						list($y,$m,$d) = explode('-',$row['bday']);
-						$rows[$n]['bday'] = sprintf('%d/%d/%04d',$m,$d,$y);
+						if ($bdayset == false) continue; // dont try to make a date out of that
+						$row['bday'] = egw_time::to((isset($row['bday']) ? $row['bday'] : $row['contact_bday']), "Y-m-d");
+						list($y, $m, $d) = explode('-', $row['bday']);
+						$rows[$n]['bday'] = sprintf('%d/%d/%04d', $m, $d, $y);
 						
 					}
 				}
@@ -171,7 +171,7 @@ 
 	 * @param string $fields='' we always return all fields now
 	 * @return array/boolean contact or false on failure
 	 */
-	function read_single_entry($id,$fields='')
+	function read_single_entry($id, $fields = '')
 	{
 		return $this->read($id);
 	}
@@ -187,22 +187,22 @@ 
 	 * @param string $tid=null 'n'
 	 * @return array/boolean contact or false on failure
 	 */
-	function add($owner,$fields,$access=NULL,$cat_id=NULL,$tid=NULL)
+	function add($owner, $fields, $access = NULL, $cat_id = NULL, $tid = NULL)
 	{
 		// access, cat_id and tid can be in $fields now or as extra params
-		foreach(array('access','cat_id','tid') as $extra)
+		foreach (array('access', 'cat_id', 'tid') as $extra)
 		{
 			if (!is_null($$extra))
 			{
 				$fields[$extra] = $$extra;
 			}
 		}
-		if(empty($fields['tid']))
+		if (empty($fields['tid']))
 		{
 			$fields['tid'] = 'n';
 		}
-		$fields['private'] = (int) $fields['access'] == 'private';
-		unset($fields['id']);	// in case it's set
+		$fields['private'] = (int)$fields['access'] == 'private';
+		unset($fields['id']); // in case it's set
 
 		return !$this->save($fields) ? $fields['id'] : false;
 	}
@@ -219,21 +219,21 @@ 
 	 * @param string $tid=null 'n'
 	 * @return array/boolean contact or false on failure
 	 */
-	function update($id,$owner,$fields,$access=NULL,$cat_id=NULL,$tid=NULL)
+	function update($id, $owner, $fields, $access = NULL, $cat_id = NULL, $tid = NULL)
 	{
 		// access, cat_id and tid can be in $fields now or as extra params
-		foreach(array('access','cat_id','tid') as $extra)
+		foreach (array('access', 'cat_id', 'tid') as $extra)
 		{
 			if (!is_null($$extra))
 			{
 				$fields[$extra] = $$extra;
 			}
 		}
-		if(empty($fields['tid']))
+		if (empty($fields['tid']))
 		{
 			$fields['tid'] = 'n';
 		}
-		$fields['private'] = (int) $fields['access'] == 'private';
+		$fields['private'] = (int)$fields['access'] == 'private';
 		$fields['id'] = $id;
 
 		return $id && !$this->save($fields);

Braces +25 added lines, -6 removed lines

@@ -47,9 +47,12 @@ 
 	*/
 	function read($contact_id)
 	{
-		if (func_num_args() > 1)	// calling the old / depricated read function
+		if (func_num_args() > 1)
+		{
+			// calling the old / depricated read function
 		{
 			$args = func_get_args();
+		}
 			return call_user_func_array(array(&$this,'old_read'),$args);
 		}
 		return parent::read($contact_id);
@@ -89,9 +92,12 @@ 
 			{
 				list($col,$value) = explode('=',$expr);
 
-				if ($col == 'access')	// text field access is renamed to private and using boolean 0/1
+				if ($col == 'access')
+				{
+					// text field access is renamed to private and using boolean 0/1
 				{
 					$col = 'private';
+				}
 					$value = $value == 'private';
 				}
 				$sfilter[$col] = $value;
@@ -122,8 +128,14 @@ 
 		{
 			$fields = explode(',',$fields);
 		}
-		if (!$order) $order = $fields ? $fields[0] : 'org_name,n_family,n_given';
-		if ($order && strpos($order,'_') === false) $order = 'contact_'.$order;
+		if (!$order)
+		{
+			$order = $fields ? $fields[0] : 'org_name,n_family,n_given';
+		}
+		if ($order && strpos($order,'_') === false)
+		{
+			$order = 'contact_'.$order;
+		}
 
 		//echo '<p>contacts::search('.($cquery ? $cquery.'*' : $query).','.print_r($fields,true).",'$order $sort','','".($cquery ? '' : '%')."',false,'OR',".(!$limit ? 'false' : "array($start,$limit)").",".print_r($sfilter,true).");</p>\n";
 		$rows =& $this->search($cquery ? $cquery.'*' : $query,$fields,$order.($sort ? ' '.$sort : ''),'',
@@ -136,7 +148,10 @@ 
 			{
 				foreach($old2new as $old => $new)
 				{
-					if (isset($row[$new])) $rows[$n][$old] = $row[$new];
+					if (isset($row[$new]))
+					{
+						$rows[$n][$old] = $row[$new];
+					}
 
 					if (isset($row['bday']) || isset($row['contact_bday']))
 					{
@@ -151,7 +166,11 @@ 
 							$rows[$n]['contact_bday'] = $row['contact_bday']=null;
 							$bdayset=false;
 						}
-						if ($bdayset==false) continue; // dont try to make a date out of that
+						if ($bdayset==false)
+						{
+							continue;
+						}
+						// dont try to make a date out of that
 						$row['bday'] = egw_time::to((isset($row['bday'])?$row['bday']:$row['contact_bday']),"Y-m-d");
 						list($y,$m,$d) = explode('-',$row['bday']);
 						$rows[$n]['bday'] = sprintf('%d/%d/%04d',$m,$d,$y);

phpgwapi/inc/class.country.inc.php

Doc Comments +2 added lines, -5 removed lines

@@ -350,8 +350,6 @@ 
 	 * Selectbox for country-selection
 	 *
 	 * @deprecated use html::select with country_array
-	 * @param string $selected 2-letter iso country-code
-	 * @param string $name='country'
 	 * @return string
 	 */
 	function form_select($code,$name='country')
@@ -362,8 +360,7 @@ 
 	/**
 	 * Get country-name from the 2-letter iso code
 	 *
-	 * @param string $selected 2-letter iso country-code
-	 * @param boolean $translated=true use translated name or english
+	 * @param boolean $translated use translated name or english
 	 * @return string
 	 */
 	function get_full_name($code,$translated=true)
@@ -424,7 +421,7 @@ 
 	/**
 	 * Get list of country names
 	 *
-	 * @param boolean $translated=true use translated names or english
+	 * @param boolean $translated use translated names or english
 	 * @return array with 2-letter code => name pairs
 	 */
 	function countries($translated=true)

Spacing +13 added lines, -13 removed lines

@@ -354,9 +354,9 @@ 
 	 * @param string $name='country'
 	 * @return string
 	 */
-	function form_select($code,$name='country')
+	function form_select($code, $name = 'country')
 	{
-		return html::select($name,strtoupper($code),$this->country_array);
+		return html::select($name, strtoupper($code), $this->country_array);
 	}
 
 	/**
@@ -366,7 +366,7 @@ 
 	 * @param boolean $translated=true use translated name or english
 	 * @return string
 	 */
-	function get_full_name($code,$translated=true)
+	function get_full_name($code, $translated = true)
 	{
 		if ($translated)
 		{
@@ -385,36 +385,36 @@ 
 	 */
 	function country_code($name)
 	{
-		if (!$name) return '';	// nothing to do
+		if (!$name) return ''; // nothing to do
 
 		if (strlen($name) == 2 && isset($this->country_array[$name]))
 		{
-			return $name;	// $name is already a country-code
+			return $name; // $name is already a country-code
 		}
 
-		if (($code = array_search(strtoupper($name),$this->country_array)) !== false)
+		if (($code = array_search(strtoupper($name), $this->country_array)) !== false)
 		{
 			return $code;
 		}
 		if (!$this->countries_translated) $this->_translate_countries();
 
-		if (($code = array_search(strtoupper($name),$this->countries_translated)) !== false ||
-			($code = array_search($name,$this->countries_translated)) !== false)
+		if (($code = array_search(strtoupper($name), $this->countries_translated)) !== false ||
+			($code = array_search($name, $this->countries_translated)) !== false)
 		{
 			return $code;
 		}
 		// search case-insensitive all translations for the english phrase of given country $name
 		// we do that to catch all possible cases of translations
-		static $en_names = array();	// we do some caching to minimize db-accesses
+		static $en_names = array(); // we do some caching to minimize db-accesses
 		if (isset($en_names[$name]))
 		{
 			$name = $en_names[$name];
 		}
-		elseif (($name_en = $GLOBALS['egw']->translation->get_message_id($name,'common')))
+		elseif (($name_en = $GLOBALS['egw']->translation->get_message_id($name, 'common')))
 		{
 			$name = $en_names[$name] = strtoupper($name_en);
 		}
-		if (($code = array_search(strtoupper($name),$this->country_array)) !== false)
+		if (($code = array_search(strtoupper($name), $this->country_array)) !== false)
 		{
 			return $code;
 		}
@@ -427,7 +427,7 @@ 
 	 * @param boolean $translated=true use translated names or english
 	 * @return array with 2-letter code => name pairs
 	 */
-	function countries($translated=true)
+	function countries($translated = true)
 	{
 		if ($translated)
 		{
@@ -449,7 +449,7 @@ 
 
 		$this->countries_translated = $this->country_array;
 		// try to translate them and sort alphabetic
-		foreach($this->countries_translated as $k => $name)
+		foreach ($this->countries_translated as $k => $name)
 		{
 			if (($translated = lang($name)) != $name.'*')
 			{

Braces +17 added lines, -4 removed lines

@@ -370,7 +370,10 @@ 
 	{
 		if ($translated)
 		{
-			if (!$this->countries_translated) $this->_translate_countries();
+			if (!$this->countries_translated)
+			{
+				$this->_translate_countries();
+			}
 
 			return $this->countries_translated[strtoupper($code)];
 		}
@@ -385,7 +388,11 @@ 
 	 */
 	function country_code($name)
 	{
-		if (!$name) return '';	// nothing to do
+		if (!$name)
+		{
+			return '';
+		}
+		// nothing to do
 
 		if (strlen($name) == 2 && isset($this->country_array[$name]))
 		{
@@ -396,7 +403,10 @@ 
 		{
 			return $code;
 		}
-		if (!$this->countries_translated) $this->_translate_countries();
+		if (!$this->countries_translated)
+		{
+			$this->_translate_countries();
+		}
 
 		if (($code = array_search(strtoupper($name),$this->countries_translated)) !== false ||
 			($code = array_search($name,$this->countries_translated)) !== false)
@@ -445,7 +455,10 @@ 
 	 */
 	function _translate_countries()
 	{
-		if ($this->countries_translated) return;
+		if ($this->countries_translated)
+		{
+			return;
+		}
 
 		$this->countries_translated = $this->country_array;
 		// try to translate them and sort alphabetic

phpgwapi/inc/class.db_backup.inc.php

Doc Comments +3 added lines, -2 removed lines

@@ -496,7 +496,7 @@ 
 	 * Restore data from a (compressed) csv file
 	 *
 	 * @param resource $f file opened with fopen for reading
-	 * @param int|string $insert_n_rows =10 how many rows to insert in one sql statement, or string with column-name used as unique key for insert
+	 * @param integer $insert_n_rows =10 how many rows to insert in one sql statement, or string with column-name used as unique key for insert
 	 * @returns int number of rows read from csv file
 	 */
 	function db_restore($f, $insert_n_rows=10)
@@ -1044,7 +1044,7 @@ 
 	/**
 	 * Backup all schemas in the form of a setup/tables_current.inc.php file
 	 *
-	 * @param resource|boolean $f
+	 * @param resource $f
 	 */
 	function schema_backup($f=False)
 	{
@@ -1089,6 +1089,7 @@ 
 	 * Dump an array as php source
 	 *
 	 * copied from etemplate/inc/class.db_tools.inc.php
+	 * @param integer $depth
 	 */
 	private static function write_array($arr,$depth,$parent='')
 	{

Indentation +5 added lines, -5 removed lines

@@ -381,7 +381,7 @@ 
 		$zip = NULL;
 		$_f = NULL;
 		if($type == 'zip')
-	    {
+		{
 			// has already been verified to be available in fopen_backup
 			$zip = new ZipArchive;
 			if(($zip->open($filename)) !== TRUE)
@@ -719,9 +719,9 @@ 
 		while($file = $list[0])
 		{
 			if(is_dir($file) && $file != '.' && $file != '..')
-			    self::remove_dir_content($dir.'/'.$file);
+				self::remove_dir_content($dir.'/'.$file);
 			if(is_file($file) && $file != '.' && $file != '..')
-			    unlink($dir.'/'.$file);
+				unlink($dir.'/'.$file);
 			array_shift($list);
 		}
 		//rmdir($dir);  // dont remove own dir
@@ -967,8 +967,8 @@ 
 				echo '<center>'.lang("Cant open %1, needs ZipArchive", $name)."<br>\n".'</center>';
 			}
 
-		    fclose($f);
-		    if (file_exists($name)) unlink($name);
+			fclose($f);
+			if (file_exists($name)) unlink($name);
 			return TRUE;
 		}
 		// save files ....

Spacing +157 added lines, -157 removed lines

@@ -46,9 +46,9 @@ 
 	 * @var array
 	 */
 	var $exclude_tables = array(
-		'egw_sessions','egw_app_sessions','phpgw_sessions','phpgw_app_sessions',	// eGW's session-tables
-		'phpgw_anglemail',	// email's cache
-		'egw_felamimail_cache','egw_felamimail_folderstatus','phpgw_felamimail_cache','phpgw_felamimail_folderstatus',	// felamimail's cache
+		'egw_sessions', 'egw_app_sessions', 'phpgw_sessions', 'phpgw_app_sessions', // eGW's session-tables
+		'phpgw_anglemail', // email's cache
+		'egw_felamimail_cache', 'egw_felamimail_folderstatus', 'phpgw_felamimail_cache', 'phpgw_felamimail_folderstatus', // felamimail's cache
 		'egw_phpfreechat', // as of the fieldnames of the table a restore would fail within egroupware, and chatcontent is of no particular intrest
 	);
 	/**
@@ -80,7 +80,7 @@ 
 	 *
 	 * @var boolean
 	 */
-	var $backup_files = false ;
+	var $backup_files = false;
 	/**
 	 * Reference to schema_proc's egw_db object
 	 *
@@ -95,7 +95,7 @@ 
 	{
 		if (isset($GLOBALS['egw_setup']) && is_object($GLOBALS['egw_setup']) && !isset($GLOBALS['egw_setup']->db))
 		{
-			$GLOBALS['egw_setup']->loaddb();	// we run inside setup, but db object is not loaded
+			$GLOBALS['egw_setup']->loaddb(); // we run inside setup, but db object is not loaded
 		}
 		if (isset($GLOBALS['egw_setup']->oProc) && is_object($GLOBALS['egw_setup']->oProc))	// schema_proc already instanciated, use it
 		{
@@ -113,37 +113,37 @@ 
 		{
 			if ($GLOBALS['egw_setup']->config_table && $GLOBALS['egw_setup']->table_exist(array($GLOBALS['egw_setup']->config_table)))
 			{
-				$this->db->query("SELECT config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_app='phpgwapi' AND config_name='backup_dir'",__LINE__,__FILE__);
+				$this->db->query("SELECT config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_app='phpgwapi' AND config_name='backup_dir'", __LINE__, __FILE__);
 				$this->db->next_record();
 				if (!($this->backup_dir = $this->db->f(0)))
 				{
-					$this->db->query("SELECT config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_app='phpgwapi' AND config_name='files_dir'",__LINE__,__FILE__);
+					$this->db->query("SELECT config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_app='phpgwapi' AND config_name='files_dir'", __LINE__, __FILE__);
 					$this->db->next_record();
 					$this->backup_dir = $this->db->f(0).'/db_backup';
 				}
-				$this->db->query("SELECT config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_app='phpgwapi' AND config_name='files_dir'",__LINE__,__FILE__);
+				$this->db->query("SELECT config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_app='phpgwapi' AND config_name='files_dir'", __LINE__, __FILE__);
 				$this->db->next_record();
 				if (!($this->files_dir = $this->db->f(0)))
 				{
 					error_log(__METHOD__."->"."No files Directory set/found");
 				}
-				$this->db->query("SELECT config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_app='phpgwapi' AND config_name='system_charset'",__LINE__,__FILE__);
+				$this->db->query("SELECT config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_app='phpgwapi' AND config_name='system_charset'", __LINE__, __FILE__);
 				$this->db->next_record();
 				$this->charset = $this->db->f(0);
 				if (!$this->charset)
 				{
-					$this->db->query("SELECT content FROM {$GLOBALS['egw_setup']->lang_table} WHERE message_id='charset' AND app_name='common' AND lang!='en'",__LINE__,__FILE__);
+					$this->db->query("SELECT content FROM {$GLOBALS['egw_setup']->lang_table} WHERE message_id='charset' AND app_name='common' AND lang!='en'", __LINE__, __FILE__);
 					$this->db->next_record();
 					$this->charset = $this->db->f(0);
 				}
-				$this->db->select($GLOBALS['egw_setup']->applications_table,'app_version',array('app_name'=>'phpgwapi'),__LINE__,__FILE__);
+				$this->db->select($GLOBALS['egw_setup']->applications_table, 'app_version', array('app_name'=>'phpgwapi'), __LINE__, __FILE__);
 				$this->api_version = $this->db->next_record() ? $this->db->f(0) : false;
 				/* Backup settings */
-				$this->db->query("SELECT config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_app='phpgwapi' AND config_name='backup_mincount'",__LINE__,__FILE__);
+				$this->db->query("SELECT config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_app='phpgwapi' AND config_name='backup_mincount'", __LINE__, __FILE__);
 				$this->db->next_record();
 				$this->backup_mincount = $this->db->f(0);
 				// backup files too
-				$this->db->query("SELECT config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_app='phpgwapi' AND config_name='backup_files'",__LINE__,__FILE__);
+				$this->db->query("SELECT config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_app='phpgwapi' AND config_name='backup_files'", __LINE__, __FILE__);
 				$this->db->next_record();
 				$this->backup_files = (bool)$this->db->f(0);
 			}
@@ -177,7 +177,7 @@ 
 		{
 			mkdir($this->backup_dir);
 		}
-		switch($this->db->Type)
+		switch ($this->db->Type)
 		{
 			case 'sapdb':
 			case 'maxdb':
@@ -194,7 +194,7 @@ 
 	 * @param $reading =false opening for reading ('rb') or writing ('wb')
 	 * @return string/resource/zip error-msg of file-handle
 	 */
-	function fopen_backup($name=false,$reading=false)
+	function fopen_backup($name = false, $reading = false)
 	{
 		//echo "function fopen_backup($name,$reading)<br>";	// !
 		if (!$name)
@@ -203,27 +203,27 @@ 
 			if (!$this->backup_dir || !is_writable($this->backup_dir))
 			{
 				//echo '   -> !$this->backup_dir || !is_writable($this->backup_dir)<br>';	// !
-				return lang("backupdir '%1' is not writeable by the webserver",$this->backup_dir);
+				return lang("backupdir '%1' is not writeable by the webserver", $this->backup_dir);
 			}
 			$name = $this->backup_dir.'/db_backup-'.date('YmdHi');
 		}
 		else	// remove the extension, to use the correct wrapper based on the extension
 		{
 			//echo '-> else<br>';	// !
-			$name = preg_replace('/\.(bz2|gz)$/i','',$name);
+			$name = preg_replace('/\.(bz2|gz)$/i', '', $name);
 		}
 		$mode = $reading ? 'rb' : 'wb';
-		list( , $type) = explode('.', basename($name));
-		if($type == 'zip' && $reading && $this->backup_files)
+		list(, $type) = explode('.', basename($name));
+		if ($type == 'zip' && $reading && $this->backup_files)
 		{
 			//echo '-> $type == "zip" && $reading<br>';	// !
-			if(!class_exists('ZipArchive', false))
+			if (!class_exists('ZipArchive', false))
 			{
 				$this->backup_files = false;
 				//echo '   -> (new ZipArchive) == NULL<br>';	// !
 				return lang("Cant open %1, needs ZipArchive", $name)."<br>\n";
 			}
-			if(!($f = fopen($name, $mode)))
+			if (!($f = fopen($name, $mode)))
 			{
 				//echo '   -> !($f = fopen($name, $mode))<br>';	// !
 				$lang_mode = $reading ? lang("reading") : lang("writing");
@@ -231,10 +231,10 @@ 
 			}
 			return $f;
 		}
-		if(class_exists('ZipArchive', false) && !$reading && $this->backup_files)
+		if (class_exists('ZipArchive', false) && !$reading && $this->backup_files)
 		{
 			//echo '-> (new ZipArchive) != NULL && !$reading; '.$name.'<br>';	// !
-			if(!($f = fopen($name, $mode)))
+			if (!($f = fopen($name, $mode)))
 			{
 				//echo '   -> !($f = fopen($name, $mode))<br>';	// !
 				$lang_mode = $reading ? lang("reading") : lang("writing");
@@ -242,9 +242,9 @@ 
 			}
 			return $f;
 		}
-		if(!($f = fopen("compress.bzip2://$name.bz2", $mode)) &&
-	 		!($f = fopen("compress.zlib://$name.gz",$mode)) &&
- 		 	!($f = fopen($name,$mode))
+		if (!($f = fopen("compress.bzip2://$name.bz2", $mode)) &&
+	 		!($f = fopen("compress.zlib://$name.gz", $mode)) &&
+ 		 	!($f = fopen($name, $mode))
 		)
 		{
 			//echo '-> !($f = fopen("compress.bzip2://$name.bz2", $mode))<br>';	// !
@@ -271,13 +271,13 @@ 
 		/* Search the backup directory for matching files. */
 		$handle = @opendir($this->backup_dir);
 		$files = array();
-		while($handle && ($file = readdir($handle)))
+		while ($handle && ($file = readdir($handle)))
 		{
 			/* Filter for only the files with the regular name (un-renamed).
 			 * Leave special backup files (renamed) in place.
 			 * Note that this also excludes "." and "..".
 			 */
-			if (preg_match("/^db_backup-[0-9]{12}(\.bz2|\.gz|\.zip|)$/",$file))
+			if (preg_match("/^db_backup-[0-9]{12}(\.bz2|\.gz|\.zip|)$/", $file))
 			{
 				$files[filectime($this->backup_dir.'/'.$file)] = $file;
 			}
@@ -287,7 +287,7 @@ 
 		/* Sort the files by ctime. */
 		krsort($files);
 		$count = 0;
-		foreach($files as $file)
+		foreach ($files as $file)
 		{
 			if ($count >= $this->backup_mincount)//
 			{
@@ -297,7 +297,7 @@ 
 					array_push($files_return, $file);
 				}
 			}
-			$count ++;
+			$count++;
 		}
 	}
 
@@ -307,13 +307,13 @@ 
 	 * @param int $minCount Minimum number of backups to keep.
 	 * @param boolean $backupFiles include files in backup or not, default dont change!
 	 */
-	function saveConfig($minCount,$backupFiles=null)
+	function saveConfig($minCount, $backupFiles = null)
 	{
-		config::save_value('backup_mincount',$this->backup_mincount=(int)$minCount,'phpgwapi');
+		config::save_value('backup_mincount', $this->backup_mincount = (int)$minCount, 'phpgwapi');
 
 		if (!is_null($backupFiles))
 		{
-			config::save_value('backup_files',$this->backup_files=(boolean)$backupFiles,'phpgwapi');
+			config::save_value('backup_files', $this->backup_files = (boolean)$backupFiles, 'phpgwapi');
 		}
 	}
 
@@ -336,7 +336,7 @@ 
 		'httpproxy_server_password',
 		'system_charset',
 		'usecookies',
-		'install_id',	// do not restore install_id, as that would give two systems with identical install_id
+		'install_id', // do not restore install_id, as that would give two systems with identical install_id
 	);
 
 	/**
@@ -350,38 +350,38 @@ 
 	 *
 	 * @returns An empty string or an error message in case of failure.
 	 */
-	function restore($f,$convert_to_system_charset=true,$filename='',$protect_system_config=true, $insert_n_rows=10)
+	function restore($f, $convert_to_system_charset = true, $filename = '', $protect_system_config = true, $insert_n_rows = 10)
 	{
 		@set_time_limit(0);
-		ini_set('auto_detect_line_endings',true);
+		ini_set('auto_detect_line_endings', true);
 
-		if (true) $convert_to_system_charset = true;	// enforce now utf-8 as system charset restores of old backups
+		if (true) $convert_to_system_charset = true; // enforce now utf-8 as system charset restores of old backups
 
 		if ($protect_system_config)
 		{
 			$system_config = array();
-			foreach($this->db->select(self::TABLE,'*',array(
+			foreach ($this->db->select(self::TABLE, '*', array(
 				'config_app' => 'phpgwapi',
 				'config_name' => self::$system_config,
-			),__LINE__,__FILE__) as $row)
+			), __LINE__, __FILE__) as $row)
 			{
 				$system_config[] = $row;
 			}
 		}
-		if (substr($this->db->Type,0,5) != 'mysql') $this->db->transaction_begin();
+		if (substr($this->db->Type, 0, 5) != 'mysql') $this->db->transaction_begin();
 
 		// drop all existing tables
-		foreach($this->adodb->MetaTables('TABLES') as $table)
+		foreach ($this->adodb->MetaTables('TABLES') as $table)
 		{
-			if ($this->system_tables && preg_match($this->system_tables,$table) ||
-				$this->egw_tables && !preg_match($this->egw_tables,$table))
+			if ($this->system_tables && preg_match($this->system_tables, $table) ||
+				$this->egw_tables && !preg_match($this->egw_tables, $table))
 			{
 				 continue;
 			}
 			$this->schema_proc->DropTable($table);
 		}
 		// it could be an old backup
-		list( , $type) = explode('.', basename($filename));
+		list(, $type) = explode('.', basename($filename));
 		$dir = $this->files_dir; // $GLOBALS['egw_info']['server']['files_dir'];
 		// we may have to clean up old backup - left overs
 		if (is_dir($dir.'/database_backup'))
@@ -394,20 +394,20 @@ 
 		$name = "";
 		$zip = NULL;
 		$_f = NULL;
-		if($type == 'zip')
+		if ($type == 'zip')
 	    {
 			// has already been verified to be available in fopen_backup
 			$zip = new ZipArchive;
-			if(($zip->open($filename)) !== TRUE)
+			if (($zip->open($filename)) !== TRUE)
 			{
 				return lang("Cant open '%1' for %2", $filename, lang("reading"))."<br>\n";
 			}
-			self::remove_dir_content($dir);  // removes the files-dir
+			self::remove_dir_content($dir); // removes the files-dir
 			$zip->extractTo($dir);
 			$_f = $f;
 			$list = $this->get_file_list($dir.'/database_backup/');
 			$name = $dir.'/database_backup/'.basename($list[0]);
-			if(!($f = fopen($name, 'rb')))
+			if (!($f = fopen($name, 'rb')))
 			{
 				return lang("Cant open '%1' for %2", $filename, lang("reading"))."<br>\n";
 			}
@@ -424,46 +424,46 @@ 
 		{
 			$this->db->insert(config::TABLE, array(
 				'config_value' => $this->schema_proc->system_charset,
-			),array(
+			), array(
 				'config_app' => 'phpgwapi',
 				'config_name' => 'system_charset',
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 		}
 		// restore protected system config
 		if ($protect_system_config)
 		{
-			foreach($system_config as $row)
+			foreach ($system_config as $row)
 			{
-				$this->db->insert(self::TABLE,array('config_value'=>$row['config_value']),array(
+				$this->db->insert(self::TABLE, array('config_value'=>$row['config_value']), array(
 					'config_name' => $row['config_name'],
 					'config_app'  => $row['config_app'],
-				),__LINE__,__FILE__);
+				), __LINE__, __FILE__);
 			}
 			// check and reset cookie configuration, if it does not match current enviroment
 			// if $_SERVER[HTTP_HOST] does not end with cookiedomain --> delete cookiedomain
-			if (($cookiedomain = $this->db->select(self::TABLE,'config_value',array(
+			if (($cookiedomain = $this->db->select(self::TABLE, 'config_value', array(
 					'config_app' => 'phpgwapi',
 					'config_name' => 'cookiedomain',
-				),__LINE__,__FILE__)->fetchColumn()) && isset($_SERVER['HTTP_HOST']) &&
-				(list($hostname) = explode(':',$_SERVER['HTTP_HOST'])) &&
-				substr($hostname,-strlen($cookiedomain) !== $cookiedomain))
+				), __LINE__, __FILE__)->fetchColumn()) && isset($_SERVER['HTTP_HOST']) &&
+				(list($hostname) = explode(':', $_SERVER['HTTP_HOST'])) &&
+				substr($hostname, -strlen($cookiedomain) !== $cookiedomain))
 			{
-				$this->db->delete(self::TABLE,array(
+				$this->db->delete(self::TABLE, array(
 					'config_app' => 'phpgwapi',
 					'config_name' => 'cookiedomain',
-				),__LINE__,__FILE__);
+				), __LINE__, __FILE__);
 			}
 			// if configured webserver_url does NOT start with cookiepath --> delete cookiepath
-			if (($cookiepath = $this->db->select(self::TABLE,'config_value',array(
+			if (($cookiepath = $this->db->select(self::TABLE, 'config_value', array(
 					'config_app' => 'phpgwapi',
 					'config_name' => 'cookiepath',
-				),__LINE__,__FILE__)->fetchColumn()) &&
-				substr(parse_url($system_config['webserver_url'], PHP_URL_PATH),0,strlen($cookiepath) !== $cookiepath))
+				), __LINE__, __FILE__)->fetchColumn()) &&
+				substr(parse_url($system_config['webserver_url'], PHP_URL_PATH), 0, strlen($cookiepath) !== $cookiepath))
 			{
-				$this->db->delete(self::TABLE,array(
+				$this->db->delete(self::TABLE, array(
 					'config_app' => 'phpgwapi',
 					'config_name' => 'cookiepath',
-				),__LINE__,__FILE__);
+				), __LINE__, __FILE__);
 			}
 		}
 		// restore original Halt_On_Error state (if changed)
@@ -472,13 +472,13 @@ 
 			$this->db->Halt_On_Error = $backup_db_halt_on_error;
 		}
 		// zip?
-		if($type == 'zip')
+		if ($type == 'zip')
 		{
 			fclose($f);
 			unlink($name);
 			rmdir($dir.'/database_backup');
 		}
-		if (substr($this->db->Type,0,5) != 'mysql')
+		if (substr($this->db->Type, 0, 5) != 'mysql')
 		{
 			if (!$this->db->transaction_commit())
 			{
@@ -513,26 +513,26 @@ 
 	 * @param int|string $insert_n_rows =10 how many rows to insert in one sql statement, or string with column-name used as unique key for insert
 	 * @returns int number of rows read from csv file
 	 */
-	function db_restore($f, $insert_n_rows=10)
+	function db_restore($f, $insert_n_rows = 10)
 	{
 		$convert_to_system_charset = true;
 		$table = False;
 		$n = 0;
 		$rows = array();
-		while(!feof($f))
+		while (!feof($f))
 		{
 			$line = trim(fgets($f)); ++$n;
 
 			if (empty($line)) continue;
 
-			if (substr($line,0,9) == 'version: ')
+			if (substr($line, 0, 9) == 'version: ')
 			{
-				$api_version = trim(substr($line,9));
+				$api_version = trim(substr($line, 9));
 				continue;
 			}
-			if (substr($line,0,9) == 'charset: ')
+			if (substr($line, 0, 9) == 'charset: ')
 			{
-				$charset = trim(substr($line,9));
+				$charset = trim(substr($line, 9));
 				// needed if mbstring.func_overload > 0, else eg. substr does not work with non ascii chars
 				$ini_default_charset = version_compare(PHP_VERSION, '5.6', '<') ? 'mbstring.internal_encoding' : 'default_charset';
 				@ini_set($ini_default_charset, $charset);
@@ -540,29 +540,29 @@ 
 				// check if we really need to convert the charset, as it's not perfect and can do some damage
 				if ($convert_to_system_charset && !strcasecmp($this->schema_proc->system_charset, $charset))
 				{
-					$convert_to_system_charset = false;	// no conversation necessary
+					$convert_to_system_charset = false; // no conversation necessary
 				}
 				// set the DB's client encoding (for mysql only if api_version >= 1.0.1.019)
 				if ((!$convert_to_system_charset || $this->db->capabilities['client_encoding']) &&
-					(substr($this->db->Type,0,5) != 'mysql' || !is_object($GLOBALS['egw_setup']) ||
-					$api_version && !$GLOBALS['egw_setup']->alessthanb($api_version,'1.0.1.019')))
+					(substr($this->db->Type, 0, 5) != 'mysql' || !is_object($GLOBALS['egw_setup']) ||
+					$api_version && !$GLOBALS['egw_setup']->alessthanb($api_version, '1.0.1.019')))
 				{
 					$this->db->Link_ID->SetCharSet($charset);
 					if (!$convert_to_system_charset)
 					{
-						$this->schema_proc->system_charset = $charset;	// so schema_proc uses it for the creation of the tables
+						$this->schema_proc->system_charset = $charset; // so schema_proc uses it for the creation of the tables
 					}
 				}
 				continue;
 			}
-			if (substr($line,0,8) == 'schema: ')
+			if (substr($line, 0, 8) == 'schema: ')
 			{
 				// create the tables in the backup set
-				$this->schemas = json_php_unserialize(trim(substr($line,8)));
-				foreach($this->schemas as $table_name => $schema)
+				$this->schemas = json_php_unserialize(trim(substr($line, 8)));
+				foreach ($this->schemas as $table_name => $schema)
 				{
 					// if column is longtext in current schema, convert text to longtext, in case user already updated column
-					foreach($schema['fd'] as $col => &$def)
+					foreach ($schema['fd'] as $col => &$def)
 					{
 						if ($def['type'] == 'text' && $this->db->get_column_attribute($col, $table_name, true, 'type') == 'longtext')
 						{
@@ -574,27 +574,27 @@ 
 				}
 				continue;
 			}
-			if (substr($line,0,7) == 'table: ')
+			if (substr($line, 0, 7) == 'table: ')
 			{
 				if ($rows)	// flush pending rows of last table
 				{
 					$this->insert_multiple($table, $rows, $this->schemas[$table]);
 				}
 				$rows = array();
-				$table = substr($line,7);
+				$table = substr($line, 7);
 				if (!isset($this->schemas[$table])) $this->schemas[$table] = $this->db->get_table_definitions(true, $table);
 				$auto_id = count($this->schemas[$table]['pk']) == 1 ? $this->schemas[$table]['pk'][0] : null;
 
-				$cols = self::csv_split($line=fgets($f)); ++$n;
+				$cols = self::csv_split($line = fgets($f)); ++$n;
 				$blobs = array();
-				foreach($this->schemas[$table]['fd'] as $col => $data)
+				foreach ($this->schemas[$table]['fd'] as $col => $data)
 				{
 					if ($data['type'] == 'blob') $blobs[] = $col;
 				}
 				// check if we have an old PostgreSQL backup useing 't'/'f' for bool values
 				// --> convert them to MySQL and our new PostgreSQL format of 1/0
 				$bools = array();
-				foreach($this->schemas[$table]['fd'] as $col => $def)
+				foreach ($this->schemas[$table]['fd'] as $col => $def)
 				{
 					if ($def['type'] === 'bool') $bools[] = $col;
 				}
@@ -618,15 +618,15 @@ 
 				$import = true;
 				$data = self::csv_split($line, $cols, $blobs, $bools);
 
-				if ($table == 'egw_async' && in_array('##last-check-run##',$data))
+				if ($table == 'egw_async' && in_array('##last-check-run##', $data))
 				{
 					//echo '<p>'.lang("Line %1: '%2'<br><b>csv data does contain ##last-check-run## of table %3 ==> ignored</b>",$n,$line,$table)."</p>\n";
 					//echo 'data=<pre>'.print_r($data,true)."</pre>\n";
 					$import = false;
 				}
-				if (in_array($table,$this->exclude_tables))
+				if (in_array($table, $this->exclude_tables))
 				{
-					echo '<p><b>'.lang("Table %1 is excluded from backup and restore. Data will not be restored.",$table)."</b></p>\n";
+					echo '<p><b>'.lang("Table %1 is excluded from backup and restore. Data will not be restored.", $table)."</b></p>\n";
 					$import = false; // dont restore data of excluded tables
 				}
 				if ($import)
@@ -635,7 +635,7 @@ 
 					{
 						if ($convert_to_system_charset && !$this->db->capabilities['client_encoding'])
 						{
-							$data = translation::convert($data,$charset);
+							$data = translation::convert($data, $charset);
 						}
 						if ($insert_n_rows > 1)
 						{
@@ -647,27 +647,27 @@ 
 							}
 						}
 						// update existing table using given unique key in $insert_n_rows (also removing auto-id/sequence)
-						elseif(!is_numeric($insert_n_rows))
+						elseif (!is_numeric($insert_n_rows))
 						{
 							$where = array($insert_n_rows => $data[$insert_n_rows]);
 							unset($data[$insert_n_rows]);
 							if ($auto_id) unset($data[$auto_id]);
-							$this->db->insert($table,$data,$where,__LINE__,__FILE__,false,false,$this->schemas[$table]);
+							$this->db->insert($table, $data, $where, __LINE__, __FILE__, false, false, $this->schemas[$table]);
 						}
 						else
 						{
 							try {
-								$this->db->insert($table,$data,False,__LINE__,__FILE__,false,false,$this->schemas[$table]);
+								$this->db->insert($table, $data, False, __LINE__, __FILE__, false, false, $this->schemas[$table]);
 							}
-							catch(egw_exception_db_invalid_sql $e) {
+							catch (egw_exception_db_invalid_sql $e) {
 								echo "<p>".$e->getMessage()."</p>\n";
 							}
 						}
 					}
 					else
 					{
-						echo '<p>'.lang("Line %1: '%2'<br><b>csv data does not match column-count of table %3 ==> ignored</b>",$n,$line,$table)."</p>\n";
-						echo 'data=<pre>'.print_r($data,true)."</pre>\n";
+						echo '<p>'.lang("Line %1: '%2'<br><b>csv data does not match column-count of table %3 ==> ignored</b>", $n, $line, $table)."</p>\n";
+						echo 'data=<pre>'.print_r($data, true)."</pre>\n";
 					}
 				}
 			}
@@ -677,14 +677,14 @@ 
 			$this->insert_multiple($table, $rows, $this->schemas[$table]);
 		}
 		// updated the sequences, if the DB uses them
-		foreach($this->schemas as $table => $schema)
+		foreach ($this->schemas as $table => $schema)
 		{
-			foreach($schema['fd'] as $column => $definition)
+			foreach ($schema['fd'] as $column => $definition)
 			{
 				if ($definition['type'] == 'auto')
 				{
-					$this->schema_proc->UpdateSequence($table,$column);
-					break;	// max. one per table
+					$this->schema_proc->UpdateSequence($table, $column);
+					break; // max. one per table
 				}
 			}
 		}
@@ -707,15 +707,15 @@ 
 		try {
 			$this->db->insert($table, $rows, False, __LINE__, __FILE__, false, false, $schema);
 		}
-		catch(egw_exception_db_invalid_sql $e)
+		catch (egw_exception_db_invalid_sql $e)
 		{
 			// try inserting them one by one, ignoring doublicates
-			foreach($rows as $data)
+			foreach ($rows as $data)
 			{
 				try {
 					$this->db->insert($table, $data, False, __LINE__, __FILE__, false, false, $schema);
 				}
-				catch(egw_exception_db_invalid_sql $e) {
+				catch (egw_exception_db_invalid_sql $e) {
 					echo "<p>".$e->getMessage()."</p>\n";
 				}
 			}
@@ -730,11 +730,11 @@ 
 	private static function remove_dir_content($dir)
 	{
 		$list = scandir($dir);
-		while($file = $list[0])
+		while ($file = $list[0])
 		{
-			if(is_dir($file) && $file != '.' && $file != '..')
+			if (is_dir($file) && $file != '.' && $file != '..')
 			    self::remove_dir_content($dir.'/'.$file);
-			if(is_file($file) && $file != '.' && $file != '..')
+			if (is_file($file) && $file != '.' && $file != '..')
 			    unlink($dir.'/'.$file);
 			array_shift($list);
 		}
@@ -759,7 +759,7 @@ 
 	 * @param array $bools =array() bool columns, values might be 't'/'f' for old PostgreSQL backups
 	 * @return array
 	 */
-	public static function csv_split($line, $keys=null, $blobs=array(), $bools=array())
+	public static function csv_split($line, $keys = null, $blobs = array(), $bools = array())
 	{
 		if (function_exists('str_getcsv'))	// php5.3+
 		{
@@ -772,9 +772,9 @@ 
 				'\\n'    => "\n",
 				'\\r'    => "\r")), ',', '"', '\0');
 			// replace NULL-token again with 'NULL', 'NULL' with null and BACKSLASH-token with a backslash
-			foreach($fields as &$field)
+			foreach ($fields as &$field)
 			{
-				switch($field)
+				switch ($field)
 				{
 					case self::NULL_TOKEN:
 						$field = 'NULL';
@@ -791,7 +791,7 @@ 
 			{
 				$fields = array_combine($keys, $fields);
 				// base64-decode blob columns, if they are base64 encoded
-				foreach($blobs as $key)
+				foreach ($blobs as $key)
 				{
 					if (!is_null($fields[$key]) && ($tmp = base64_decode($fields[$key], true)) !== false)
 					{
@@ -799,7 +799,7 @@ 
 					}
 				}
 				// decode bool columns, they might be 't'/'f' for old PostgreSQL backups
-				foreach($bools as $key)
+				foreach ($bools as $key)
 				{
 					$fields[$key] = egw_db::from_bool($fields[$key]);
 				}
@@ -807,11 +807,11 @@ 
 			return $fields;
 		}
 		// pre 5.3 implementation
-		$fields = explode(',',trim($line));
+		$fields = explode(',', trim($line));
 
 		$str_pending = False;
 		$n = 0;
-		foreach($fields as $field)
+		foreach ($fields as $field)
 		{
 			if ($str_pending !== False)
 			{
@@ -822,12 +822,12 @@ 
 
 			if ($field[0] == '"')
 			{
-				if (substr($field,-1) !== '"' || $field === '"' || !preg_match('/[^\\\\]+(\\\\\\\\)*"$/',$field))
+				if (substr($field, -1) !== '"' || $field === '"' || !preg_match('/[^\\\\]+(\\\\\\\\)*"$/', $field))
 				{
 					$str_pending = $field;
 					continue;
 				}
-				$arr[$key] = str_replace(self::BACKSLASH_TOKEN,'\\',str_replace(array('\\\\','\\n','\\r','\\"'),array(self::BACKSLASH_TOKEN,"\n","\r",'"'),substr($field,1,-1)));
+				$arr[$key] = str_replace(self::BACKSLASH_TOKEN, '\\', str_replace(array('\\\\', '\\n', '\\r', '\\"'), array(self::BACKSLASH_TOKEN, "\n", "\r", '"'), substr($field, 1, -1)));
 			}
 			elseif ($keys && strlen($field) > 26)
 			{
@@ -849,7 +849,7 @@ 
 	/**
 	 * escape data for csv
 	 */
-	public static function escape_data(&$data,$col,$defs)
+	public static function escape_data(&$data, $col, $defs)
 	{
 		if (is_null($data))
 		{
@@ -857,7 +857,7 @@ 
 		}
 		else
 		{
-			switch($defs[$col]['type'])
+			switch ($defs[$col]['type'])
 			{
 				case 'int':
 				case 'auto':
@@ -872,7 +872,7 @@ 
 					$data = (int)egw_db::from_bool($data);
 					break;
 				default:
-					$data = '"'.str_replace(array('\\',"\n","\r",'"'),array('\\\\','\\n','\\r','\\"'),$data).'"';
+					$data = '"'.str_replace(array('\\', "\n", "\r", '"'), array('\\\\', '\\n', '\\r', '\\"'), $data).'"';
 					break;
 			}
 		}
@@ -904,15 +904,15 @@ 
 		$name = $this->backup_dir.'/db_backup-'.date('YmdHi');
 		$filename = $name.'.zip';
 		$zippresent = false;
-		if(class_exists('ZipArchive') && $this->backup_files)
+		if (class_exists('ZipArchive') && $this->backup_files)
 		{
 			$zip = new ZipArchive;
-			if(is_object($zip))
+			if (is_object($zip))
 			{
 				$zippresent = true;
 				//echo '-> is_object($zip); '.$filename.'<br>';	// !
 				$res = $zip->open($filename, ZIPARCHIVE::CREATE);
-				if($res !== TRUE)
+				if ($res !== TRUE)
 				{
 					//echo '   -> !$res<br>';	// !
 					return lang("Cant open '%1' for %2", $filename, lang("writing"))."<br>\n";
@@ -920,19 +920,19 @@ 
 				$file_list = $this->get_file_list($dir);
 			}
 		}
-		fwrite($f,"EGroupware backup from ".date('Y-m-d H:i:s')."\n\n");
+		fwrite($f, "EGroupware backup from ".date('Y-m-d H:i:s')."\n\n");
 
-		fwrite($f,"version: $this->api_version\n\n");
+		fwrite($f, "version: $this->api_version\n\n");
 
-		fwrite($f,"charset: $this->charset\n\n");
+		fwrite($f, "charset: $this->charset\n\n");
 
-		$this->schema_backup($f);	// add the schema in a human readable form too
+		$this->schema_backup($f); // add the schema in a human readable form too
 
-		fwrite($f,"\nschema: ".json_encode($this->schemas)."\n");
+		fwrite($f, "\nschema: ".json_encode($this->schemas)."\n");
 
-		foreach($this->schemas as $table => $schema)
+		foreach ($this->schemas as $table => $schema)
 		{
-			if (in_array($table,$this->exclude_tables)) continue;	// dont backup
+			if (in_array($table, $this->exclude_tables)) continue; // dont backup
 
 			// do we have a primary key?
 			// --> use it to order and limit rows, to kope with rows being added during backup
@@ -944,26 +944,26 @@ 
 			do {
 				$num_rows = 0;
 				// querying only chunks for 10000 rows, to not run into memory limit on huge tables
-				foreach($this->db->select($table, '*',
+				foreach ($this->db->select($table, '*',
 					// limit by maximum primary key already received
 					empty($pk) || !$max ? false : $pk.' > '.$this->db->quote($max, $schema['fd'][$pk]['type']),
 					__LINE__, __FILE__,
-					empty($pk) ? false : 0,					// if no primary key, query all rows
-					empty($pk) ? '' : 'ORDER BY '.$this->db->name_quote($pk).' ASC',	// order by primary key
+					empty($pk) ? false : 0, // if no primary key, query all rows
+					empty($pk) ? '' : 'ORDER BY '.$this->db->name_quote($pk).' ASC', // order by primary key
 					false, self::ROW_CHUNK) as $row)
 				{
 					if (!empty($pk)) $max = $row[$pk];
-					if ($total === 0) fwrite($f,"\ntable: $table\n".implode(',',array_keys($row))."\n");
+					if ($total === 0) fwrite($f, "\ntable: $table\n".implode(',', array_keys($row))."\n");
 
-					array_walk($row,array('db_backup','escape_data'),$schema['fd']);
-					fwrite($f,implode(',',$row)."\n");
+					array_walk($row, array('db_backup', 'escape_data'), $schema['fd']);
+					fwrite($f, implode(',', $row)."\n");
 					++$total;
 					++$num_rows;
 				}
 			}
-			while(!empty($pk) && !($total % self::ROW_CHUNK) && $num_rows);
+			while (!empty($pk) && !($total % self::ROW_CHUNK) && $num_rows);
 		}
-		if(!$zippresent)  // save without files
+		if (!$zippresent)  // save without files
 		{
 			if ($this->backup_files)
 			{
@@ -978,16 +978,16 @@ 
 		//echo $name.'<br>';
 		$zip->addFile($name, 'database_backup/'.basename($name));
 		$count = 1;
-		foreach($file_list as $file)
+		foreach ($file_list as $file)
 		{
 			//echo substr($file,strlen($dir)+1).'<br>';
 			//echo $file.'<br>';
-			$zip->addFile($file,substr($file,strlen($dir)+1));//,substr($file);
-			if(($count++) == 100) { // the file descriptor limit
+			$zip->addFile($file, substr($file, strlen($dir) + 1)); //,substr($file);
+			if (($count++) == 100) { // the file descriptor limit
 				$zip->close();
-				if(($zip = new ZipArchive())) {
+				if (($zip = new ZipArchive())) {
 					$zip->open($filename);
-					$count =0;
+					$count = 0;
 				}
 			}
 		}
@@ -1010,17 +1010,17 @@ 
 	{
 		//chdir($f);
 		//echo "Processing $f <br>";
-		if ($path_name =='') $path_name = $f;
+		if ($path_name == '') $path_name = $f;
 		$tlist = scandir($f);
 		$list = array();
 		$i = $cnt;
-		while($file = $tlist[0]) // remove all '.' and '..' and transfer to $list
+		while ($file = $tlist[0]) // remove all '.' and '..' and transfer to $list
 		{
-			if($file == '.' || $file == '..')
+			if ($file == '.' || $file == '..')
 			{
 				array_shift($tlist);
 			}
-			elseif ($file == 'debug.txt' && stripos($f,'activesync')!==false)
+			elseif ($file == 'debug.txt' && stripos($f, 'activesync') !== false)
 			{
 				// skip activesync debug.txt on backupFiles
 				//error_log(__METHOD__.__LINE__.'->'.$f.'/'.$file);
@@ -1028,7 +1028,7 @@ 
 			}
 			else
 			{
-				if(is_dir($f.'/'.$file))
+				if (is_dir($f.'/'.$file))
 				{
 					$nlist = $this->get_file_list($f.'/'.$file, $i);
 					$list += $nlist;
@@ -1049,12 +1049,12 @@ 
 	 *
 	 * @param resource|boolean $f
 	 */
-	function schema_backup($f=False)
+	function schema_backup($f = False)
 	{
-		foreach($this->adodb->MetaTables('TABLES') as $table)
+		foreach ($this->adodb->MetaTables('TABLES') as $table)
 		{
-			if ($this->system_tables && preg_match($this->system_tables,$table) ||
-				$this->egw_tables && !preg_match($this->egw_tables,$table))
+			if ($this->system_tables && preg_match($this->system_tables, $table) ||
+				$this->egw_tables && !preg_match($this->egw_tables, $table))
 			{
 				continue;
 			}
@@ -1073,17 +1073,17 @@ 
 			}
 		}
 		$def = "\t\$phpgw_baseline = ";
-		$def .= self::write_array($this->schemas,1);
+		$def .= self::write_array($this->schemas, 1);
 		$def .= ";\n";
 
 		if ($f)
 		{
-			fwrite($f,$def);
+			fwrite($f, $def);
 		}
 		else
 		{
 			$def = "<?php\n\t/* EGroupware schema-backup from ".date('Y-m-d H:i:s')." */\n\n".$def;
-			html::content_header('schema-backup-'.date('YmdHi').'.inc.php','text/plain',bytes($def));
+			html::content_header('schema-backup-'.date('YmdHi').'.inc.php', 'text/plain', bytes($def));
 			echo $def;
 		}
 	}
@@ -1093,9 +1093,9 @@ 
 	 *
 	 * copied from etemplate/inc/class.db_tools.inc.php
 	 */
-	private static function write_array($arr,$depth,$parent='')
+	private static function write_array($arr, $depth, $parent = '')
 	{
-		if (in_array($parent,array('pk','fk','ix','uc')))
+		if (in_array($parent, array('pk', 'fk', 'ix', 'uc')))
 		{
 			$depth = 0;
 		}
@@ -1111,7 +1111,7 @@ 
 		$def = "array($tabs".($tabs ? "\t" : '');
 
 		$n = 0;
-		foreach($arr as $key => $val)
+		foreach ($arr as $key => $val)
 		{
 			if (!is_int($key))
 			{
@@ -1119,7 +1119,7 @@ 
 			}
 			if (is_array($val))
 			{
-				$def .= self::write_array($val,$parent == 'fd' ? 0 : $depth,$key);
+				$def .= self::write_array($val, $parent == 'fd' ? 0 : $depth, $key);
 			}
 			else
 			{
@@ -1132,7 +1132,7 @@ 
 					$def .= "'$val'";
 				}
 			}
-			if ($n < count($arr)-1)
+			if ($n < count($arr) - 1)
 			{
 				$def .= ",$tabs".($tabs ? "\t" : '');
 			}

Braces +127 added lines, -35 removed lines

@@ -97,23 +97,32 @@ 
 		{
 			$GLOBALS['egw_setup']->loaddb();	// we run inside setup, but db object is not loaded
 		}
-		if (isset($GLOBALS['egw_setup']->oProc) && is_object($GLOBALS['egw_setup']->oProc))	// schema_proc already instanciated, use it
+		if (isset($GLOBALS['egw_setup']->oProc) && is_object($GLOBALS['egw_setup']->oProc))
+		{
+			// schema_proc already instanciated, use it
 		{
 			$this->schema_proc = $GLOBALS['egw_setup']->oProc;
 		}
+		}
 		else
 		{
 			$this->schema_proc = new schema_proc();
 		}
 
 		$this->db = $this->schema_proc->m_odb;
-		if (!$this->db->Link_ID) $this->db->connect();
+		if (!$this->db->Link_ID)
+		{
+			$this->db->connect();
+		}
 		$this->adodb = $this->db->Link_ID;
-		if (isset($GLOBALS['egw_setup']) && is_object($GLOBALS['egw_setup']))		// called from setup
+		if (isset($GLOBALS['egw_setup']) && is_object($GLOBALS['egw_setup']))
+		{
+			// called from setup
 		{
 			if ($GLOBALS['egw_setup']->config_table && $GLOBALS['egw_setup']->table_exist(array($GLOBALS['egw_setup']->config_table)))
 			{
 				$this->db->query("SELECT config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_app='phpgwapi' AND config_name='backup_dir'",__LINE__,__FILE__);
+		}
 				$this->db->next_record();
 				if (!($this->backup_dir = $this->db->f(0)))
 				{
@@ -147,7 +156,10 @@ 
 				$this->db->next_record();
 				$this->backup_files = (bool)$this->db->f(0);
 			}
-			if (!$this->charset) $this->charset = 'iso-8859-1';
+			if (!$this->charset)
+			{
+				$this->charset = 'iso-8859-1';
+			}
 		}
 		else	// called from eGW
 		{
@@ -245,8 +257,7 @@ 
 		if(!($f = fopen("compress.bzip2://$name.bz2", $mode)) &&
 	 		!($f = fopen("compress.zlib://$name.gz",$mode)) &&
  		 	!($f = fopen($name,$mode))
-		)
-		{
+		) {
 			//echo '-> !($f = fopen("compress.bzip2://$name.bz2", $mode))<br>';	// !
 			$lang_mode = $reading ? lang("reading") : lang("writing");
 			return lang("Cant open '%1' for %2", $name, $lang_mode)."<br>";
@@ -282,16 +293,22 @@ 
 				$files[filectime($this->backup_dir.'/'.$file)] = $file;
 			}
 		}
-		if ($handle) closedir($handle);
+		if ($handle)
+		{
+			closedir($handle);
+		}
 
 		/* Sort the files by ctime. */
 		krsort($files);
 		$count = 0;
 		foreach($files as $file)
 		{
-			if ($count >= $this->backup_mincount)//
+			if ($count >= $this->backup_mincount)
+			{
+				//
 			{
 				$ret = unlink($this->backup_dir.'/'.$file);
+			}
 				if (($ret) && (is_array($files_return)))
 				{
 					array_push($files_return, $file);
@@ -355,7 +372,11 @@ 
 		@set_time_limit(0);
 		ini_set('auto_detect_line_endings',true);
 
-		if (true) $convert_to_system_charset = true;	// enforce now utf-8 as system charset restores of old backups
+		if (true)
+		{
+			$convert_to_system_charset = true;
+		}
+		// enforce now utf-8 as system charset restores of old backups
 
 		if ($protect_system_config)
 		{
@@ -368,7 +389,10 @@ 
 				$system_config[] = $row;
 			}
 		}
-		if (substr($this->db->Type,0,5) != 'mysql') $this->db->transaction_begin();
+		if (substr($this->db->Type,0,5) != 'mysql')
+		{
+			$this->db->transaction_begin();
+		}
 
 		// drop all existing tables
 		foreach($this->adodb->MetaTables('TABLES') as $table)
@@ -395,7 +419,7 @@ 
 		$zip = NULL;
 		$_f = NULL;
 		if($type == 'zip')
-	    {
+		{
 			// has already been verified to be available in fopen_backup
 			$zip = new ZipArchive;
 			if(($zip->open($filename)) !== TRUE)
@@ -420,7 +444,9 @@ 
 		}
 		$this->db_restore($f, $insert_n_rows);
 
-		if ($convert_to_system_charset)	// store the changed charset
+		if ($convert_to_system_charset)
+		{
+			// store the changed charset
 		{
 			$this->db->insert(config::TABLE, array(
 				'config_value' => $this->schema_proc->system_charset,
@@ -429,6 +455,7 @@ 
 				'config_name' => 'system_charset',
 			),__LINE__,__FILE__);
 		}
+		}
 		// restore protected system config
 		if ($protect_system_config)
 		{
@@ -523,7 +550,10 @@ 
 		{
 			$line = trim(fgets($f)); ++$n;
 
-			if (empty($line)) continue;
+			if (empty($line))
+			{
+				continue;
+			}
 
 			if (substr($line,0,9) == 'version: ')
 			{
@@ -576,31 +606,49 @@ 
 			}
 			if (substr($line,0,7) == 'table: ')
 			{
-				if ($rows)	// flush pending rows of last table
+				if ($rows)
+				{
+					// flush pending rows of last table
 				{
 					$this->insert_multiple($table, $rows, $this->schemas[$table]);
 				}
+				}
 				$rows = array();
 				$table = substr($line,7);
-				if (!isset($this->schemas[$table])) $this->schemas[$table] = $this->db->get_table_definitions(true, $table);
+				if (!isset($this->schemas[$table]))
+				{
+					$this->schemas[$table] = $this->db->get_table_definitions(true, $table);
+				}
 				$auto_id = count($this->schemas[$table]['pk']) == 1 ? $this->schemas[$table]['pk'][0] : null;
 
 				$cols = self::csv_split($line=fgets($f)); ++$n;
 				$blobs = array();
 				foreach($this->schemas[$table]['fd'] as $col => $data)
 				{
-					if ($data['type'] == 'blob') $blobs[] = $col;
+					if ($data['type'] == 'blob')
+					{
+						$blobs[] = $col;
+					}
 				}
 				// check if we have an old PostgreSQL backup useing 't'/'f' for bool values
 				// --> convert them to MySQL and our new PostgreSQL format of 1/0
 				$bools = array();
 				foreach($this->schemas[$table]['fd'] as $col => $def)
 				{
-					if ($def['type'] === 'bool') $bools[] = $col;
+					if ($def['type'] === 'bool')
+					{
+						$bools[] = $col;
+					}
+				}
+				if ($table == 'egw_cal_dates')
+				{
+					error_log(__METHOD__."() $table: bools=".array2string($bools).", schema[fd]=".array2string($this->schemas[$table]['fd']));
 				}
-				if ($table == 'egw_cal_dates') error_log(__METHOD__."() $table: bools=".array2string($bools).", schema[fd]=".array2string($this->schemas[$table]['fd']));
 
-				if (feof($f)) break;
+				if (feof($f))
+				{
+					break;
+				}
 				continue;
 			}
 			if ($convert_to_system_charset && !$this->db->capabilities['client_encoding'])
@@ -613,9 +661,12 @@ 
 					}
 				}
 			}
-			if ($table)	// do we already reached the data part
+			if ($table)
+			{
+				// do we already reached the data part
 			{
 				$import = true;
+			}
 				$data = self::csv_split($line, $cols, $blobs, $bools);
 
 				if ($table == 'egw_async' && in_array('##last-check-run##',$data))
@@ -651,7 +702,10 @@ 
 						{
 							$where = array($insert_n_rows => $data[$insert_n_rows]);
 							unset($data[$insert_n_rows]);
-							if ($auto_id) unset($data[$auto_id]);
+							if ($auto_id)
+							{
+								unset($data[$auto_id]);
+							}
 							$this->db->insert($table,$data,$where,__LINE__,__FILE__,false,false,$this->schemas[$table]);
 						}
 						else
@@ -672,10 +726,13 @@ 
 				}
 			}
 		}
-		if ($rows)	// flush pending rows
+		if ($rows)
+		{
+			// flush pending rows
 		{
 			$this->insert_multiple($table, $rows, $this->schemas[$table]);
 		}
+		}
 		// updated the sequences, if the DB uses them
 		foreach($this->schemas as $table => $schema)
 		{
@@ -733,9 +790,13 @@ 
 		while($file = $list[0])
 		{
 			if(is_dir($file) && $file != '.' && $file != '..')
-			    self::remove_dir_content($dir.'/'.$file);
+			{
+						    self::remove_dir_content($dir.'/'.$file);
+			}
 			if(is_file($file) && $file != '.' && $file != '..')
-			    unlink($dir.'/'.$file);
+			{
+						    unlink($dir.'/'.$file);
+			}
 			array_shift($list);
 		}
 		//rmdir($dir);  // dont remove own dir
@@ -761,7 +822,9 @@ 
 	 */
 	public static function csv_split($line, $keys=null, $blobs=array(), $bools=array())
 	{
-		if (function_exists('str_getcsv'))	// php5.3+
+		if (function_exists('str_getcsv'))
+		{
+			// php5.3+
 		{
 			// we need to take care of literal "NULL" values, replacing them we a special token as str_getcsv removes enclosures around strings
 			// str_getcsv uses '""' for '"' instead of '\\"' and does not unescape '\\n', '\\r' or '\\\\' (two backslashes)
@@ -771,6 +834,7 @@ 
 				'\\"'    => '""',
 				'\\n'    => "\n",
 				'\\r'    => "\r")), ',', '"', '\0');
+		}
 			// replace NULL-token again with 'NULL', 'NULL' with null and BACKSLASH-token with a backslash
 			foreach($fields as &$field)
 			{
@@ -787,9 +851,12 @@ 
 						break;
 				}
 			}
-			if ($keys)	// if string keys are to be used --> combine keys and values
+			if ($keys)
+			{
+				// if string keys are to be used --> combine keys and values
 			{
 				$fields = array_combine($keys, $fields);
+			}
 				// base64-decode blob columns, if they are base64 encoded
 				foreach($blobs as $key)
 				{
@@ -932,7 +999,11 @@ 
 
 		foreach($this->schemas as $table => $schema)
 		{
-			if (in_array($table,$this->exclude_tables)) continue;	// dont backup
+			if (in_array($table,$this->exclude_tables))
+			{
+				continue;
+			}
+			// dont backup
 
 			// do we have a primary key?
 			// --> use it to order and limit rows, to kope with rows being added during backup
@@ -952,8 +1023,14 @@ 
 					empty($pk) ? '' : 'ORDER BY '.$this->db->name_quote($pk).' ASC',	// order by primary key
 					false, self::ROW_CHUNK) as $row)
 				{
-					if (!empty($pk)) $max = $row[$pk];
-					if ($total === 0) fwrite($f,"\ntable: $table\n".implode(',',array_keys($row))."\n");
+					if (!empty($pk))
+					{
+						$max = $row[$pk];
+					}
+					if ($total === 0)
+					{
+						fwrite($f,"\ntable: $table\n".implode(',',array_keys($row))."\n");
+					}
 
 					array_walk($row,array('db_backup','escape_data'),$schema['fd']);
 					fwrite($f,implode(',',$row)."\n");
@@ -963,15 +1040,21 @@ 
 			}
 			while(!empty($pk) && !($total % self::ROW_CHUNK) && $num_rows);
 		}
-		if(!$zippresent)  // save without files
+		if(!$zippresent)
+		{
+			// save without files
 		{
 			if ($this->backup_files)
 			{
 				echo '<center>'.lang("Cant open %1, needs ZipArchive", $name)."<br>\n".'</center>';
+		}
 			}
 
 		    fclose($f);
-		    if (file_exists($name)) unlink($name);
+		    if (file_exists($name))
+		    {
+		    	unlink($name);
+		    }
 			return TRUE;
 		}
 		// save files ....
@@ -983,9 +1066,12 @@ 
 			//echo substr($file,strlen($dir)+1).'<br>';
 			//echo $file.'<br>';
 			$zip->addFile($file,substr($file,strlen($dir)+1));//,substr($file);
-			if(($count++) == 100) { // the file descriptor limit
+			if(($count++) == 100)
+			{
+// the file descriptor limit
 				$zip->close();
-				if(($zip = new ZipArchive())) {
+				if(($zip = new ZipArchive()))
+				{
 					$zip->open($filename);
 					$count =0;
 				}
@@ -1010,15 +1096,21 @@ 
 	{
 		//chdir($f);
 		//echo "Processing $f <br>";
-		if ($path_name =='') $path_name = $f;
+		if ($path_name =='')
+		{
+			$path_name = $f;
+		}
 		$tlist = scandir($f);
 		$list = array();
 		$i = $cnt;
-		while($file = $tlist[0]) // remove all '.' and '..' and transfer to $list
+		while($file = $tlist[0])
+		{
+			// remove all '.' and '..' and transfer to $list
 		{
 			if($file == '.' || $file == '..')
 			{
 				array_shift($tlist);
+		}
 			}
 			elseif ($file == 'debug.txt' && stripos($f,'activesync')!==false)
 			{

phpgwapi/inc/class.egw_cache.inc.php

Doc Comments +21 added lines, -24 removed lines

@@ -103,7 +103,7 @@ 
 	 * @param string $app application storing data
 	 * @param string $location location name for data
 	 * @param mixed $data
-	 * @param int $expiration=0 expiration time in seconds, default 0 = never
+	 * @param int $expiration expiration time in seconds, default 0 = never
 	 * @return boolean true if data could be stored, false otherwise
 	 */
 	static public function setCache($level,$app,$location,$data,$expiration=0)
@@ -138,9 +138,9 @@ 
 	 * @param string $level use egw_cache::(TREE|INSTANCE|SESSION|REQUEST)
 	 * @param string $app application storing data
 	 * @param string|array $location location(s) name for data
-	 * @param callback $callback=null callback to get/create the value, if it's not cache
+	 * @param callback $callback callback to get/create the value, if it's not cache
 	 * @param array $callback_params=array() array with parameters for the callback
-	 * @param int $expiration=0 expiration time in seconds, default 0 = never
+	 * @param int $expiration expiration time in seconds, default 0 = never
 	 * @return mixed NULL if data not found in cache (and no callback specified) or
 	 * 	if $location is an array: location => data pairs for existing location-data, non-existing is not returned
 	 */
@@ -242,7 +242,7 @@ 
 	 * @param string $app application storing data
 	 * @param string $location location name for data
 	 * @param mixed $data
-	 * @param int $expiration=0 expiration time in seconds, default 0 = never
+	 * @param int $expiration expiration time in seconds, default 0 = never
 	 * @return boolean true if data could be stored, false otherwise
 	 */
 	static public function setTree($app,$location,$data,$expiration=0)
@@ -256,9 +256,9 @@ 
 	 *
 	 * @param string $app application storing data
 	 * @param string $location location name for data
-	 * @param callback $callback=null callback to get/create the value, if it's not cache
+	 * @param callback $callback callback to get/create the value, if it's not cache
 	 * @param array $callback_params=array() array with parameters for the callback
-	 * @param int $expiration=0 expiration time in seconds, default 0 = never
+	 * @param int $expiration expiration time in seconds, default 0 = never
 	 * @return mixed NULL if data not found in cache (and no callback specified)
 	 */
 	static public function getTree($app,$location,$callback=null,array $callback_params=array(),$expiration=0)
@@ -284,7 +284,7 @@ 
 	 * @param string $app application storing data
 	 * @param string $location location name for data
 	 * @param mixed $data
-	 * @param int $expiration=0 expiration time in seconds, default 0 = never
+	 * @param int $expiration expiration time in seconds, default 0 = never
 	 * @return boolean true if data could be stored, false otherwise
 	 */
 	static public function setInstance($app,$location,$data,$expiration=0)
@@ -297,9 +297,9 @@ 
 	 *
 	 * @param string $app application storing data
 	 * @param string $location location name for data
-	 * @param callback $callback=null callback to get/create the value, if it's not cache
+	 * @param string[] $callback callback to get/create the value, if it's not cache
 	 * @param array $callback_params=array() array with parameters for the callback
-	 * @param int $expiration=0 expiration time in seconds, default 0 = never
+	 * @param int $expiration expiration time in seconds, default 0 = never
 	 * @return mixed NULL if data not found in cache (and no callback specified)
 	 */
 	static public function getInstance($app,$location,$callback=null,array $callback_params=array(),$expiration=0)
@@ -325,7 +325,7 @@ 
 	 * @param string $app application storing data
 	 * @param string $location location name for data
 	 * @param mixed $data
-	 * @param int $expiration=0 expiration time in seconds, default 0 = never
+	 * @param int $expiration expiration time in seconds, default 0 = never
 	 * @return boolean true if data could be stored, false otherwise
 	 */
 	static public function setSession($app,$location,$data,$expiration=0)
@@ -348,9 +348,9 @@ 
 	 *
 	 * @param string $app application storing data
 	 * @param string $location location name for data
-	 * @param callback $callback=null callback to get/create the value, if it's not cache
+	 * @param callback $callback callback to get/create the value, if it's not cache
 	 * @param array $callback_params=array() array with parameters for the callback
-	 * @param int $expiration=0 expiration time in seconds, default 0 = never
+	 * @param int $expiration expiration time in seconds, default 0 = never
 	 * @return mixed NULL if data not found in cache (and no callback specified)
 	 */
 	static public function &getSession($app,$location,$callback=null,array $callback_params=array(),$expiration=0)
@@ -404,7 +404,7 @@ 
 	 * @param string $app application storing data
 	 * @param string $location location name for data
 	 * @param mixed $data
-	 * @param int $expiration=0 expiration time is NOT used for REQUEST!
+	 * @param int $expiration expiration time is NOT used for REQUEST!
 	 * @return boolean true if data could be stored, false otherwise
 	 */
 	static public function setRequest($app,$location,$data,$expiration=0)
@@ -420,9 +420,9 @@ 
 	 *
 	 * @param string $app application storing data
 	 * @param string $location location name for data
-	 * @param callback $callback=null callback to get/create the value, if it's not cache
+	 * @param callback $callback callback to get/create the value, if it's not cache
 	 * @param array $callback_params=array() array with parameters for the callback
-	 * @param int $expiration=0 expiration time is NOT used for REQUEST!
+	 * @param int $expiration expiration time is NOT used for REQUEST!
 	 * @return mixed NULL if data not found in cache (and no callback specified)
 	 */
 	static public function getRequest($app,$location,$callback=null,array $callback_params=array(),$expiration=0)
@@ -459,7 +459,7 @@ 
 	 * The returned provider already has an opened connection
 	 *
 	 * @param string $level egw_cache::(TREE|INSTANCE) or install_id
-	 * @param boolean $log_not_found=true false do not log if no provider found, used eg. to supress error via unsetCache during installation
+	 * @param boolean $log_not_found false do not log if no provider found, used eg. to supress error via unsetCache during installation
 	 * @return egw_cache_provider
 	 */
 	static protected function get_provider($level, $log_not_found=true)
@@ -525,7 +525,6 @@ 
 	 * Get a system configuration, even if in setup and it's not read
 	 *
 	 * @param string $name
-	 * @param boolean $throw=true throw an exception, if we can't retriev the value
 	 * @return string|boolean string with config or false if not found and !$throw
 	 */
 	static public function get_system_config($name,$throw=true)
@@ -565,8 +564,7 @@ 
 	/**
 	 * Flush (delete) whole (instance) cache or application/class specific part of it
 	 *
-	 * @param $string $level=self::INSTANCE
-	 * @param string $app=null
+	 * @param string $app
 	 */
 	static public function flush($level=self::INSTANCE, $app=null)
 	{
@@ -612,7 +610,7 @@ 
 	/**
 	 * Generate a new instance key and by doing so effectivly flushes whole instance cache
 	 *
-	 * @param string $install_id=null default use install_id of current instance
+	 * @param string $install_id default use install_id of current instance
 	 * @return string new key also stored in self::$instance_key
 	 */
 	static public function generate_instance_key($install_id=null)
@@ -633,8 +631,7 @@ 
 	 * Get keys array from $level, $app and $location
 	 *
 	 * @param string $level egw_cache::(TREE|INSTANCE) or instance_id
-	 * @param string $app=null
-	 * @param string $location=null
+	 * @param string $location
 	 * @return array
 	 */
 	static public function keys($level, $app=null, $location=null)
@@ -714,7 +711,7 @@ 
 	 *
 	 * @param array $keys eg. array($level,$app,$location)
 	 * @param mixed $data
-	 * @param int $expiration=0
+	 * @param int $expiration
 	 * @return boolean true on success, false on error
 	 */
 	function set(array $keys,$data,$expiration=0);
@@ -769,7 +766,7 @@ 
 	/**
 	 * Run several checks on a caching provider
 	 *
-	 * @param boolean $verbose=false true: echo failed checks
+	 * @param boolean $verbose true: echo failed checks
 	 * @return int number of failed checks
 	 */
 	function check($verbose=false)

Spacing +83 added lines, -83 removed lines

@@ -80,7 +80,7 @@ 
 	 *
 	 * @var array
 	 */
-	static $default_provider;	// = array('egw_cache_files');// array('egw_cache_memcache','localhost');
+	static $default_provider; // = array('egw_cache_files');// array('egw_cache_memcache','localhost');
 
 	/**
 	 * Maximum expiration time, if set unlimited expiration (=0) or bigger expiration times are replaced with that time
@@ -106,14 +106,14 @@ 
 	 * @param int $expiration=0 expiration time in seconds, default 0 = never
 	 * @return boolean true if data could be stored, false otherwise
 	 */
-	static public function setCache($level,$app,$location,$data,$expiration=0)
+	static public function setCache($level, $app, $location, $data, $expiration = 0)
 	{
 		//error_log(__METHOD__."('$level','$app','$location',".array2string($data).",$expiration)");
-		switch($level)
+		switch ($level)
 		{
 			case self::SESSION:
 			case self::REQUEST:
-				return call_user_func(array(__CLASS__,'set'.$level),$app,$location,$data,$expiration);
+				return call_user_func(array(__CLASS__, 'set'.$level), $app, $location, $data, $expiration);
 
 			case self::INSTANCE:
 			case self::TREE:
@@ -127,7 +127,7 @@ 
 				{
 					$expiration = self::$max_expiration;
 				}
-				return $provider->set(self::keys($level,$app,$location),$data,$expiration);
+				return $provider->set(self::keys($level, $app, $location), $data, $expiration);
 		}
 		throw new egw_exception_wrong_parameter(__METHOD__."() unknown level '$level'!");
 	}
@@ -144,15 +144,15 @@ 
 	 * @return mixed NULL if data not found in cache (and no callback specified) or
 	 * 	if $location is an array: location => data pairs for existing location-data, non-existing is not returned
 	 */
-	static public function getCache($level,$app,$location,$callback=null,array $callback_params=array(),$expiration=0)
+	static public function getCache($level, $app, $location, $callback = null, array $callback_params = array(), $expiration = 0)
 	{
-		switch($level)
+		switch ($level)
 		{
 			case self::SESSION:
 			case self::REQUEST:
-				foreach((array)$location as $l)
+				foreach ((array)$location as $l)
 				{
-					$data[$l] = call_user_func(array(__CLASS__,'get'.$level),$app,$l,$callback,$callback_params,$expiration);
+					$data[$l] = call_user_func(array(__CLASS__, 'get'.$level), $app, $l, $callback, $callback_params, $expiration);
 				}
 				return is_array($location) ? $data : $data[$l];
 
@@ -172,34 +172,34 @@ 
 						}
 						if (is_a($provider, 'egw_cache_provider_multiple'))
 						{
-							$data = $provider->mget($keys=self::keys($level,$app,$location));
+							$data = $provider->mget($keys = self::keys($level, $app, $location));
 						}
 						else	// default implementation calls get multiple times
 						{
 							$data = array();
-							foreach($location as $l)
+							foreach ($location as $l)
 							{
-								$data[$l] = $provider->get($keys=self::keys($level,$app,$l));
+								$data[$l] = $provider->get($keys = self::keys($level, $app, $l));
 								if (!isset($data[$l])) unset($data[$l]);
 							}
 						}
 					}
 					else
 					{
-						$data = $provider->get($keys=self::keys($level,$app,$location));
+						$data = $provider->get($keys = self::keys($level, $app, $location));
 						if (is_null($data) && !is_null($callback))
 						{
-							$data = call_user_func_array($callback,$callback_params);
+							$data = call_user_func_array($callback, $callback_params);
 							// limit expiration to configured maximum time
 							if (isset(self::$max_expiration) && (!$expiration || $expiration > self::$max_expiration))
 							{
 								$expiration = self::$max_expiration;
 							}
-							$provider->set($keys,$data,$expiration);
+							$provider->set($keys, $data, $expiration);
 						}
 					}
 				}
-				catch(Exception $e) {
+				catch (Exception $e) {
 					unset($e);
 					$data = null;
 				}
@@ -216,13 +216,13 @@ 
 	 * @param string $location location name for data
 	 * @return boolean true if data was set, false if not (like isset())
 	 */
-	static public function unsetCache($level,$app,$location)
+	static public function unsetCache($level, $app, $location)
 	{
-		switch($level)
+		switch ($level)
 		{
 			case self::SESSION:
 			case self::REQUEST:
-				return call_user_func(array(__CLASS__,'unset'.$level),$app,$location);
+				return call_user_func(array(__CLASS__, 'unset'.$level), $app, $location);
 
 			case self::INSTANCE:
 			case self::TREE:
@@ -231,7 +231,7 @@ 
 				{
 					return false;
 				}
-				return $provider->delete(self::keys($level,$app,$location));
+				return $provider->delete(self::keys($level, $app, $location));
 		}
 		throw new egw_exception_wrong_parameter(__METHOD__."() unknown level '$level'!");
 	}
@@ -245,10 +245,10 @@ 
 	 * @param int $expiration=0 expiration time in seconds, default 0 = never
 	 * @return boolean true if data could be stored, false otherwise
 	 */
-	static public function setTree($app,$location,$data,$expiration=0)
+	static public function setTree($app, $location, $data, $expiration = 0)
 	{
 		//error_log(__METHOD__."('$app','$location',".array2string($data).",$expiration)");
-		return self::setCache(self::TREE,$app,$location,$data,$expiration);
+		return self::setCache(self::TREE, $app, $location, $data, $expiration);
 	}
 
 	/**
@@ -261,9 +261,9 @@ 
 	 * @param int $expiration=0 expiration time in seconds, default 0 = never
 	 * @return mixed NULL if data not found in cache (and no callback specified)
 	 */
-	static public function getTree($app,$location,$callback=null,array $callback_params=array(),$expiration=0)
+	static public function getTree($app, $location, $callback = null, array $callback_params = array(), $expiration = 0)
 	{
-		return self::getCache(self::TREE,$app,$location,$callback,$callback_params,$expiration);
+		return self::getCache(self::TREE, $app, $location, $callback, $callback_params, $expiration);
 	}
 
 	/**
@@ -273,9 +273,9 @@ 
 	 * @param string $location location name for data
 	 * @return boolean true if data was set, false if not (like isset())
 	 */
-	static public function unsetTree($app,$location)
+	static public function unsetTree($app, $location)
 	{
-		return self::unsetCache(self::TREE,$app,$location);
+		return self::unsetCache(self::TREE, $app, $location);
 	}
 
 	/**
@@ -287,9 +287,9 @@ 
 	 * @param int $expiration=0 expiration time in seconds, default 0 = never
 	 * @return boolean true if data could be stored, false otherwise
 	 */
-	static public function setInstance($app,$location,$data,$expiration=0)
+	static public function setInstance($app, $location, $data, $expiration = 0)
 	{
-		return self::setCache(self::INSTANCE,$app,$location,$data,$expiration);
+		return self::setCache(self::INSTANCE, $app, $location, $data, $expiration);
 	}
 
 	/**
@@ -302,9 +302,9 @@ 
 	 * @param int $expiration=0 expiration time in seconds, default 0 = never
 	 * @return mixed NULL if data not found in cache (and no callback specified)
 	 */
-	static public function getInstance($app,$location,$callback=null,array $callback_params=array(),$expiration=0)
+	static public function getInstance($app, $location, $callback = null, array $callback_params = array(), $expiration = 0)
 	{
-		return self::getCache(self::INSTANCE,$app,$location,$callback,$callback_params,$expiration);
+		return self::getCache(self::INSTANCE, $app, $location, $callback, $callback_params, $expiration);
 	}
 
 	/**
@@ -314,9 +314,9 @@ 
 	 * @param string $location location name for data
 	 * @return boolean true if data was set, false if not (like isset())
 	 */
-	static public function unsetInstance($app,$location)
+	static public function unsetInstance($app, $location)
 	{
-		return self::unsetCache(self::INSTANCE,$app,$location);
+		return self::unsetCache(self::INSTANCE, $app, $location);
 	}
 
 	/**
@@ -328,13 +328,13 @@ 
 	 * @param int $expiration=0 expiration time in seconds, default 0 = never
 	 * @return boolean true if data could be stored, false otherwise
 	 */
-	static public function setSession($app,$location,$data,$expiration=0)
+	static public function setSession($app, $location, $data, $expiration = 0)
 	{
-		unset($expiration);	// not used, but required by function signature
+		unset($expiration); // not used, but required by function signature
 		if (isset($_SESSION[egw_session::EGW_SESSION_ENCRYPTED]))
 		{
 			if (egw_session::ERROR_LOG_DEBUG) error_log(__METHOD__.' called after session was encrypted --> ignored!');
-			return false;	// can no longer store something in the session, eg. because commit_session() was called
+			return false; // can no longer store something in the session, eg. because commit_session() was called
 		}
 		$_SESSION[egw_session::EGW_APPSESSION_VAR][$app][$location] = $data;
 
@@ -353,17 +353,17 @@ 
 	 * @param int $expiration=0 expiration time in seconds, default 0 = never
 	 * @return mixed NULL if data not found in cache (and no callback specified)
 	 */
-	static public function &getSession($app,$location,$callback=null,array $callback_params=array(),$expiration=0)
+	static public function &getSession($app, $location, $callback = null, array $callback_params = array(), $expiration = 0)
 	{
-		unset($expiration);	// not used, but required by function signature
+		unset($expiration); // not used, but required by function signature
 		if (isset($_SESSION[egw_session::EGW_SESSION_ENCRYPTED]))
 		{
 			if (egw_session::ERROR_LOG_DEBUG) error_log(__METHOD__.' called after session was encrypted --> ignored!');
-			return null;	// can no longer store something in the session, eg. because commit_session() was called
+			return null; // can no longer store something in the session, eg. because commit_session() was called
 		}
 		if (!isset($_SESSION[egw_session::EGW_APPSESSION_VAR][$app][$location]) && !is_null($callback))
 		{
-			$_SESSION[egw_session::EGW_APPSESSION_VAR][$app][$location] = call_user_func_array($callback,$callback_params);
+			$_SESSION[egw_session::EGW_APPSESSION_VAR][$app][$location] = call_user_func_array($callback, $callback_params);
 		}
 		return $_SESSION[egw_session::EGW_APPSESSION_VAR][$app][$location];
 	}
@@ -375,12 +375,12 @@ 
 	 * @param string $location location name for data
 	 * @return boolean true if data was set, false if not (like isset())
 	 */
-	static public function unsetSession($app,$location)
+	static public function unsetSession($app, $location)
 	{
 		if (isset($_SESSION[egw_session::EGW_SESSION_ENCRYPTED]))
 		{
 			if (egw_session::ERROR_LOG_DEBUG) error_log(__METHOD__.' called after session was encrypted --> ignored!');
-			return false;	// can no longer store something in the session, eg. because commit_session() was called
+			return false; // can no longer store something in the session, eg. because commit_session() was called
 		}
 		if (!isset($_SESSION[egw_session::EGW_APPSESSION_VAR][$app][$location]))
 		{
@@ -407,9 +407,9 @@ 
 	 * @param int $expiration=0 expiration time is NOT used for REQUEST!
 	 * @return boolean true if data could be stored, false otherwise
 	 */
-	static public function setRequest($app,$location,$data,$expiration=0)
+	static public function setRequest($app, $location, $data, $expiration = 0)
 	{
-		unset($expiration);	// not used, but required by function signature
+		unset($expiration); // not used, but required by function signature
 		self::$request_cache[$app][$location] = $data;
 
 		return true;
@@ -425,12 +425,12 @@ 
 	 * @param int $expiration=0 expiration time is NOT used for REQUEST!
 	 * @return mixed NULL if data not found in cache (and no callback specified)
 	 */
-	static public function getRequest($app,$location,$callback=null,array $callback_params=array(),$expiration=0)
+	static public function getRequest($app, $location, $callback = null, array $callback_params = array(), $expiration = 0)
 	{
-		unset($expiration);	// not used, but required by function signature
+		unset($expiration); // not used, but required by function signature
 		if (!isset(self::$request_cache[$app][$location]) && !is_null($callback))
 		{
-			self::$request_cache[$app][$location] = call_user_func_array($callback,$callback_params);
+			self::$request_cache[$app][$location] = call_user_func_array($callback, $callback_params);
 		}
 		return self::$request_cache[$app][$location];
 	}
@@ -442,7 +442,7 @@ 
 	 * @param string $location location name for data
 	 * @return boolean true if data was set, false if not (like isset())
 	 */
-	static public function unsetRequest($app,$location)
+	static public function unsetRequest($app, $location)
 	{
 		if (!isset(self::$request_cache[$app][$location]))
 		{
@@ -462,7 +462,7 @@ 
 	 * @param boolean $log_not_found=true false do not log if no provider found, used eg. to supress error via unsetCache during installation
 	 * @return egw_cache_provider
 	 */
-	static protected function get_provider($level, $log_not_found=true)
+	static protected function get_provider($level, $log_not_found = true)
 	{
 		static $providers = array();
 
@@ -483,13 +483,13 @@ 
 				}
 				else
 				{
-					$providers[$level] = false;	// no provider specified
+					$providers[$level] = false; // no provider specified
 					$reason = 'no provider specified';
 				}
 			}
 			elseif (!$params)
 			{
-					$providers[$level] = false;	// cache for $level disabled
+					$providers[$level] = false; // cache for $level disabled
 					$reason = "cache for $level disabled";
 			}
 			else
@@ -499,7 +499,7 @@ 
 				$class = array_shift($params);
 				if (!class_exists($class))
 				{
-					$providers[$level] = false;	// provider class not found
+					$providers[$level] = false; // provider class not found
 					$reason = "provider $class not found";
 				}
 				else
@@ -508,9 +508,9 @@ 
 					{
 						$providers[$level] = new $class($params);
 					}
-					catch(Exception $e)
+					catch (Exception $e)
 					{
-						$providers[$level] = false;	// eg. could not open connection to backend
+						$providers[$level] = false; // eg. could not open connection to backend
 						$reason = "error instanciating provider $class: ".$e->getMessage();
 					}
 				}
@@ -528,35 +528,35 @@ 
 	 * @param boolean $throw=true throw an exception, if we can't retriev the value
 	 * @return string|boolean string with config or false if not found and !$throw
 	 */
-	static public function get_system_config($name,$throw=true)
+	static public function get_system_config($name, $throw = true)
 	{
-		if(!isset($GLOBALS['egw_info']['server'][$name]))
+		if (!isset($GLOBALS['egw_info']['server'][$name]))
 		{
 			if (isset($GLOBALS['egw_setup']) && isset($GLOBALS['egw_setup']->db) || $GLOBALS['egw']->db)
 			{
 				$db = $GLOBALS['egw']->db ? $GLOBALS['egw']->db : $GLOBALS['egw_setup']->db;
 
 				try {
-					if (($rs = $db->select(config::TABLE,'config_value',array(
+					if (($rs = $db->select(config::TABLE, 'config_value', array(
 						'config_app'	=> 'phpgwapi',
 						'config_name'	=> $name,
-					),__LINE__,__FILE__)))
+					), __LINE__, __FILE__)))
 					{
 						$GLOBALS['egw_info']['server'][$name] = $rs->fetchColumn();
 					}
 					else
 					{
-						error_log(__METHOD__."('$name', $throw) config value NOT found!");//.function_backtrace());
+						error_log(__METHOD__."('$name', $throw) config value NOT found!"); //.function_backtrace());
 					}
 				}
-				catch(egw_exception_db $e)
+				catch (egw_exception_db $e)
 				{
-					if ($throw) error_log(__METHOD__."('$name', $throw) cound NOT query value: ".$e->getMessage());//.function_backtrace());
+					if ($throw) error_log(__METHOD__."('$name', $throw) cound NOT query value: ".$e->getMessage()); //.function_backtrace());
 				}
 			}
 			if (!$GLOBALS['egw_info']['server'][$name] && $throw)
 			{
-				throw new Exception (__METHOD__."($name) \$GLOBALS['egw_info']['server']['$name'] is NOT set!");
+				throw new Exception(__METHOD__."($name) \$GLOBALS['egw_info']['server']['$name'] is NOT set!");
 			}
 		}
 		return $GLOBALS['egw_info']['server'][$name];
@@ -568,7 +568,7 @@ 
 	 * @param $string $level=self::INSTANCE
 	 * @param string $app=null
 	 */
-	static public function flush($level=self::INSTANCE, $app=null)
+	static public function flush($level = self::INSTANCE, $app = null)
 	{
 		$ret = true;
 		if (!($provider = self::get_provider($level)))
@@ -615,7 +615,7 @@ 
 	 * @param string $install_id=null default use install_id of current instance
 	 * @return string new key also stored in self::$instance_key
 	 */
-	static public function generate_instance_key($install_id=null)
+	static public function generate_instance_key($install_id = null)
 	{
 		if (!isset($install_id))
 		{
@@ -637,18 +637,18 @@ 
 	 * @param string $location=null
 	 * @return array
 	 */
-	static public function keys($level, $app=null, $location=null)
+	static public function keys($level, $app = null, $location = null)
 	{
 		static $tree_key = null;
 
-		switch($level)
+		switch ($level)
 		{
 			case self::TREE:
 				if (!isset($tree_key))
 				{
-					$tree_key = $level.'-'.str_replace(array(':','/','\\'),'-', self::$egw_server_root);
+					$tree_key = $level.'-'.str_replace(array(':', '/', '\\'), '-', self::$egw_server_root);
 					// add charset to key, if not utf-8 (as everything we store depends on charset!)
-					if (($charset = self::get_system_config('system_charset',false)) && $charset != 'utf-8')
+					if (($charset = self::get_system_config('system_charset', false)) && $charset != 'utf-8')
 					{
 						$tree_key .= '-'.$charset;
 					}
@@ -717,7 +717,7 @@ 
 	 * @param int $expiration=0
 	 * @return boolean true on success, false on error
 	 */
-	function set(array $keys,$data,$expiration=0);
+	function set(array $keys, $data, $expiration = 0);
 
 	/**
 	 * Get some data from the cache
@@ -772,34 +772,34 @@ 
 	 * @param boolean $verbose=false true: echo failed checks
 	 * @return int number of failed checks
 	 */
-	function check($verbose=false)
+	function check($verbose = false)
 	{
 		// set us up as provider for egw_cache class
 		$GLOBALS['egw_info']['server']['install_id'] = md5(microtime(true));
 		egw_cache::$default_provider = $this;
 
 		$failed = 0;
-		foreach(array(
+		foreach (array(
 			egw_cache::TREE => 'tree',
 			egw_cache::INSTANCE => 'instance',
 		) as $level => $label)
 		{
 			$locations = array();
-			foreach(array('string',123,true,false,null,array(),array(1,2,3)) as $data)
+			foreach (array('string', 123, true, false, null, array(), array(1, 2, 3)) as $data)
 			{
 				$location = md5(microtime(true).$label.serialize($data));
-				$get_before_set = $this->get(array($level,__CLASS__,$location));
+				$get_before_set = $this->get(array($level, __CLASS__, $location));
 				if (!is_null($get_before_set))
 				{
 					if ($verbose) echo "$label: get_before_set=".array2string($get_before_set)." != NULL\n";
 					++$failed;
 				}
-				if (($set = $this->set(array($level,__CLASS__,$location), $data, 10)) !== true)
+				if (($set = $this->set(array($level, __CLASS__, $location), $data, 10)) !== true)
 				{
 					if ($verbose) echo "$label: set returned ".array2string($set)." !== TRUE\n";
 					++$failed;
 				}
-				$get_after_set = $this->get(array($level,__CLASS__,$location));
+				$get_after_set = $this->get(array($level, __CLASS__, $location));
 				if ($get_after_set !== $data)
 				{
 					if ($verbose) echo "$label: get_after_set=".array2string($get_after_set)." !== ".array2string($data)."\n";
@@ -807,19 +807,19 @@ 
 				}
 				if (is_a($this, 'egw_cache_provider_multiple'))
 				{
-					$mget_after_set = $this->mget(array($level,__CLASS__,array($location)));
+					$mget_after_set = $this->mget(array($level, __CLASS__, array($location)));
 					if ($mget_after_set[$location] !== $data)
 					{
 						if ($verbose) echo "$label: mget_after_set['$location']=".array2string($mget_after_set[$location])." !== ".array2string($data)."\n";
 						++$failed;
 					}
 				}
-				if (($delete = $this->delete(array($level,__CLASS__,$location))) !== true)
+				if (($delete = $this->delete(array($level, __CLASS__, $location))) !== true)
 				{
 					if ($verbose) echo "$label: delete returned ".array2string($delete)." !== TRUE\n";
 					++$failed;
 				}
-				$get_after_delete = $this->get(array($level,__CLASS__,$location));
+				$get_after_delete = $this->get(array($level, __CLASS__, $location));
 				if (!is_null($get_after_delete))
 				{
 					if ($verbose) echo "$label: get_after_delete=".array2string($get_after_delete)." != NULL\n";
@@ -829,13 +829,13 @@ 
 				if (is_a($this, 'egw_cache_provider_multiple'))
 				{
 					$locations[$location] = $data;
-					$mget_after_delete = $this->mget(array($level,__CLASS__,array($location)));
+					$mget_after_delete = $this->mget(array($level, __CLASS__, array($location)));
 					if (isset($mget_after_delete[$location]))
 					{
 						if ($verbose) echo "$label: mget_after_delete['$location']=".array2string($mget_after_delete[$location])." != NULL\n";
 						++$failed;
 					}
-					$this->set(array($level,__CLASS__,$location), $data, 10);
+					$this->set(array($level, __CLASS__, $location), $data, 10);
 				}
 				elseif (!is_null($data))	// emulation can NOT distinquish between null and not set
 				{
@@ -845,11 +845,11 @@ 
 			}
 			// get all above in one request
 			$keys = array_keys($locations);
-			$keys_bogus = array_merge(array('not-set'),array_keys($locations),array('not-set-too'));
+			$keys_bogus = array_merge(array('not-set'), array_keys($locations), array('not-set-too'));
 			if (is_a($this, 'egw_cache_provider_multiple'))
 			{
-				$mget = $this->mget(array($level,__CLASS__,$keys));
-				$mget_bogus = $this->mget(array($level,__CLASS__,$keys_bogus));
+				$mget = $this->mget(array($level, __CLASS__, $keys));
+				$mget_bogus = $this->mget(array($level, __CLASS__, $keys_bogus));
 			}
 			else
 			{
@@ -881,7 +881,7 @@ 
 	 */
 	function flush(array $keys)
 	{
-		unset($keys);	// required by function signature
+		unset($keys); // required by function signature
 		return false;
 	}
 }

Braces +89 added lines, -22 removed lines

@@ -180,7 +180,10 @@ 
 							foreach($location as $l)
 							{
 								$data[$l] = $provider->get($keys=self::keys($level,$app,$l));
-								if (!isset($data[$l])) unset($data[$l]);
+								if (!isset($data[$l]))
+								{
+									unset($data[$l]);
+								}
 							}
 						}
 					}
@@ -333,7 +336,10 @@ 
 		unset($expiration);	// not used, but required by function signature
 		if (isset($_SESSION[egw_session::EGW_SESSION_ENCRYPTED]))
 		{
-			if (egw_session::ERROR_LOG_DEBUG) error_log(__METHOD__.' called after session was encrypted --> ignored!');
+			if (egw_session::ERROR_LOG_DEBUG)
+			{
+				error_log(__METHOD__.' called after session was encrypted --> ignored!');
+			}
 			return false;	// can no longer store something in the session, eg. because commit_session() was called
 		}
 		$_SESSION[egw_session::EGW_APPSESSION_VAR][$app][$location] = $data;
@@ -358,7 +364,10 @@ 
 		unset($expiration);	// not used, but required by function signature
 		if (isset($_SESSION[egw_session::EGW_SESSION_ENCRYPTED]))
 		{
-			if (egw_session::ERROR_LOG_DEBUG) error_log(__METHOD__.' called after session was encrypted --> ignored!');
+			if (egw_session::ERROR_LOG_DEBUG)
+			{
+				error_log(__METHOD__.' called after session was encrypted --> ignored!');
+			}
 			return null;	// can no longer store something in the session, eg. because commit_session() was called
 		}
 		if (!isset($_SESSION[egw_session::EGW_APPSESSION_VAR][$app][$location]) && !is_null($callback))
@@ -379,7 +388,10 @@ 
 	{
 		if (isset($_SESSION[egw_session::EGW_SESSION_ENCRYPTED]))
 		{
-			if (egw_session::ERROR_LOG_DEBUG) error_log(__METHOD__.' called after session was encrypted --> ignored!');
+			if (egw_session::ERROR_LOG_DEBUG)
+			{
+				error_log(__METHOD__.' called after session was encrypted --> ignored!');
+			}
 			return false;	// can no longer store something in the session, eg. because commit_session() was called
 		}
 		if (!isset($_SESSION[egw_session::EGW_APPSESSION_VAR][$app][$location]))
@@ -466,7 +478,10 @@ 
 	{
 		static $providers = array();
 
-		if ($level != self::TREE) $level = self::INSTANCE;
+		if ($level != self::TREE)
+		{
+			$level = self::INSTANCE;
+		}
 
 		if (!isset($providers[$level]))
 		{
@@ -477,10 +492,13 @@ 
 			}
 			if (!isset($params))
 			{
-				if ($level == self::TREE)	// if no tree level provider use the instance level one
+				if ($level == self::TREE)
+				{
+					// if no tree level provider use the instance level one
 				{
 					$providers[$level] = self::get_provider(self::INSTANCE);
 				}
+				}
 				else
 				{
 					$providers[$level] = false;	// no provider specified
@@ -494,7 +512,10 @@ 
 			}
 			else
 			{
-				if (!is_array($params)) $params = (array)$params;
+				if (!is_array($params))
+				{
+					$params = (array)$params;
+				}
 
 				$class = array_shift($params);
 				if (!class_exists($class))
@@ -515,7 +536,10 @@ 
 					}
 				}
 			}
-			if (!$providers[$level] && $log_not_found) error_log(__METHOD__."($level) no provider found ($reason)!".function_backtrace());
+			if (!$providers[$level] && $log_not_found)
+			{
+				error_log(__METHOD__."($level) no provider found ($reason)!".function_backtrace());
+			}
 		}
 		//error_log(__METHOD__."($level) = ".array2string($providers[$level]).', cache_provider='.array2string($GLOBALS['egw_info']['server']['cache_provider_'.strtolower($level)]));
 		return $providers[$level];
@@ -551,7 +575,11 @@ 
 				}
 				catch(egw_exception_db $e)
 				{
-					if ($throw) error_log(__METHOD__."('$name', $throw) cound NOT query value: ".$e->getMessage());//.function_backtrace());
+					if ($throw)
+					{
+						error_log(__METHOD__."('$name', $throw) cound NOT query value: ".$e->getMessage());
+					}
+					//.function_backtrace());
 				}
 			}
 			if (!$GLOBALS['egw_info']['server'][$name] && $throw)
@@ -659,7 +687,10 @@ 
 				if ($level !== $GLOBALS['egw_info']['server']['install_id'])
 				{
 					$level_key = self::getTree(__CLASS__, $level);
-					if (!isset($level_key)) $level_key = self::generate_instance_key($level);
+					if (!isset($level_key))
+					{
+						$level_key = self::generate_instance_key($level);
+					}
 					break;
 				}
 				// fall-through for current instance
@@ -668,7 +699,10 @@ 
 				{
 					self::$instance_key = self::getTree(__CLASS__, self::get_system_config('install_id'));
 					//error_log(__METHOD__."('$level',...) instance_key read from tree-cache=".array2string(self::$instance_key));
-					if (!isset(self::$instance_key)) self::$instance_key = self::generate_instance_key();
+					if (!isset(self::$instance_key))
+					{
+						self::$instance_key = self::generate_instance_key();
+					}
 				}
 				$level_key = self::$instance_key;
 				break;
@@ -677,7 +711,10 @@ 
 		if (isset($app))
 		{
 			$keys[] = $app;
-			if (isset($location)) $keys[] = $location;
+			if (isset($location))
+			{
+				$keys[] = $location;
+			}
 		}
 		return $keys;
 	}
@@ -791,18 +828,27 @@ 
 				$get_before_set = $this->get(array($level,__CLASS__,$location));
 				if (!is_null($get_before_set))
 				{
-					if ($verbose) echo "$label: get_before_set=".array2string($get_before_set)." != NULL\n";
+					if ($verbose)
+					{
+						echo "$label: get_before_set=".array2string($get_before_set)." != NULL\n";
+					}
 					++$failed;
 				}
 				if (($set = $this->set(array($level,__CLASS__,$location), $data, 10)) !== true)
 				{
-					if ($verbose) echo "$label: set returned ".array2string($set)." !== TRUE\n";
+					if ($verbose)
+					{
+						echo "$label: set returned ".array2string($set)." !== TRUE\n";
+					}
 					++$failed;
 				}
 				$get_after_set = $this->get(array($level,__CLASS__,$location));
 				if ($get_after_set !== $data)
 				{
-					if ($verbose) echo "$label: get_after_set=".array2string($get_after_set)." !== ".array2string($data)."\n";
+					if ($verbose)
+					{
+						echo "$label: get_after_set=".array2string($get_after_set)." !== ".array2string($data)."\n";
+					}
 					++$failed;
 				}
 				if (is_a($this, 'egw_cache_provider_multiple'))
@@ -810,19 +856,28 @@ 
 					$mget_after_set = $this->mget(array($level,__CLASS__,array($location)));
 					if ($mget_after_set[$location] !== $data)
 					{
-						if ($verbose) echo "$label: mget_after_set['$location']=".array2string($mget_after_set[$location])." !== ".array2string($data)."\n";
+						if ($verbose)
+						{
+							echo "$label: mget_after_set['$location']=".array2string($mget_after_set[$location])." !== ".array2string($data)."\n";
+						}
 						++$failed;
 					}
 				}
 				if (($delete = $this->delete(array($level,__CLASS__,$location))) !== true)
 				{
-					if ($verbose) echo "$label: delete returned ".array2string($delete)." !== TRUE\n";
+					if ($verbose)
+					{
+						echo "$label: delete returned ".array2string($delete)." !== TRUE\n";
+					}
 					++$failed;
 				}
 				$get_after_delete = $this->get(array($level,__CLASS__,$location));
 				if (!is_null($get_after_delete))
 				{
-					if ($verbose) echo "$label: get_after_delete=".array2string($get_after_delete)." != NULL\n";
+					if ($verbose)
+					{
+						echo "$label: get_after_delete=".array2string($get_after_delete)." != NULL\n";
+					}
 					++$failed;
 				}
 				// prepare for mget of everything
@@ -832,14 +887,20 @@ 
 					$mget_after_delete = $this->mget(array($level,__CLASS__,array($location)));
 					if (isset($mget_after_delete[$location]))
 					{
-						if ($verbose) echo "$label: mget_after_delete['$location']=".array2string($mget_after_delete[$location])." != NULL\n";
+						if ($verbose)
+						{
+							echo "$label: mget_after_delete['$location']=".array2string($mget_after_delete[$location])." != NULL\n";
+						}
 						++$failed;
 					}
 					$this->set(array($level,__CLASS__,$location), $data, 10);
 				}
-				elseif (!is_null($data))	// emulation can NOT distinquish between null and not set
+				elseif (!is_null($data))
+				{
+					// emulation can NOT distinquish between null and not set
 				{
 					$locations[$location] = $data;
+				}
 					egw_cache::setCache($level, __CLASS__, $location, $data);
 				}
 			}
@@ -858,12 +919,18 @@ 
 			}
 			if ($mget !== $locations)
 			{
-				if ($verbose) echo "$label: mget=<br/>".array2string($mget)." !==<br/>".array2string($locations)."\n";
+				if ($verbose)
+				{
+					echo "$label: mget=<br/>".array2string($mget)." !==<br/>".array2string($locations)."\n";
+				}
 				++$failed;
 			}
 			if ($mget_bogus !== $locations)
 			{
-				if ($verbose) echo "$label: mget(".array2string($keys_bogus).")=<br/>".array2string($mget_bogus)." !==<br/>".array2string($locations)."\n";
+				if ($verbose)
+				{
+					echo "$label: mget(".array2string($keys_bogus).")=<br/>".array2string($mget_bogus)." !==<br/>".array2string($locations)."\n";
+				}
 				++$failed;
 			}
 		}

phpgwapi/inc/class.egw_cache_files.inc.php

Doc Comments +1 added lines, -2 removed lines

@@ -59,7 +59,7 @@ 
 	 *
 	 * @param array $keys eg. array($level,$app,$location)
 	 * @param mixed $data
-	 * @param int $expiration=0
+	 * @param int $expiration
 	 * @return boolean true on success, false on error
 	 */
 	function set(array $keys,$data,$expiration=0)
@@ -162,7 +162,6 @@ 
 	 * Create a path from $keys and $basepath
 	 *
 	 * @param array $keys
-	 * @param boolean $mkdir=false should we create the directory
 	 * @return string
 	 */
 	function filename(array $keys,$mkdir=false)

Spacing +13 added lines, -13 removed lines

@@ -48,9 +48,9 @@ 
 			$this->base_path = egw_cache::get_system_config('temp_dir', false);
 			if (isset($this->base_path)) $this->base_path .= '/egw_cache';
 		}
-		if (!isset($this->base_path) || !file_exists($this->base_path) && !mkdir($this->base_path,0700,true))
+		if (!isset($this->base_path) || !file_exists($this->base_path) && !mkdir($this->base_path, 0700, true))
 		{
-			throw new Exception (__METHOD__."() can't create basepath $this->base_path!");
+			throw new Exception(__METHOD__."() can't create basepath $this->base_path!");
 		}
 	}
 
@@ -62,11 +62,11 @@ 
 	 * @param int $expiration=0
 	 * @return boolean true on success, false on error
 	 */
-	function set(array $keys,$data,$expiration=0)
+	function set(array $keys, $data, $expiration = 0)
 	{
-		if (($ret = @file_put_contents($fname=$this->filename($keys,true),serialize($data),LOCK_EX) > 0))
+		if (($ret = @file_put_contents($fname = $this->filename($keys, true), serialize($data), LOCK_EX) > 0))
 		{
-			if ((int)$expiration > 0) file_put_contents($fname.self::EXPIRATION_EXTENSION,(string)$expiration);
+			if ((int)$expiration > 0) file_put_contents($fname.self::EXPIRATION_EXTENSION, (string)$expiration);
 		}
 		return $ret;
 	}
@@ -83,9 +83,9 @@ 
 		{
 			return null;
 		}
-		if (file_exists($fname_expiration=$fname.self::EXPIRATION_EXTENSION) &&
+		if (file_exists($fname_expiration = $fname.self::EXPIRATION_EXTENSION) &&
 			($expiration = (int)file_get_contents($fname_expiration)) &&
-			filemtime($fname) < time()-$expiration)
+			filemtime($fname) < time() - $expiration)
 		{
 			unlink($fname);
 			unlink($fname_expiration);
@@ -107,7 +107,7 @@ 
 			//error_log(__METHOD__.'('.array2string($keys).") file_exists('$fname') == FALSE!");
 			return false;
 		}
-		if (file_exists($fname_expiration=$fname.self::EXPIRATION_EXTENSION))
+		if (file_exists($fname_expiration = $fname.self::EXPIRATION_EXTENSION))
 		{
 			unlink($fname_expiration);
 		}
@@ -140,7 +140,7 @@ 
 		{
 			return unlink($path);
 		}
-		foreach(scandir($path) as $file)
+		foreach (scandir($path) as $file)
 		{
 			if ($file == '.' || $file == '..') continue;
 
@@ -165,13 +165,13 @@ 
 	 * @param boolean $mkdir=false should we create the directory
 	 * @return string
 	 */
-	function filename(array $keys,$mkdir=false)
+	function filename(array $keys, $mkdir = false)
 	{
-		$fname = $this->base_path.'/'.str_replace(array(':','*'),'-',implode('/',$keys));
+		$fname = $this->base_path.'/'.str_replace(array(':', '*'), '-', implode('/', $keys));
 
-		if ($mkdir && !file_exists($dirname=dirname($fname)))
+		if ($mkdir && !file_exists($dirname = dirname($fname)))
 		{
-			@mkdir($dirname,0700,true);
+			@mkdir($dirname, 0700, true);
 		}
 		return $fname;
 	}

Braces +20 added lines, -5 removed lines

@@ -46,7 +46,10 @@ 
 		else
 		{
 			$this->base_path = egw_cache::get_system_config('temp_dir', false);
-			if (isset($this->base_path)) $this->base_path .= '/egw_cache';
+			if (isset($this->base_path))
+			{
+				$this->base_path .= '/egw_cache';
+			}
 		}
 		if (!isset($this->base_path) || !file_exists($this->base_path) && !mkdir($this->base_path,0700,true))
 		{
@@ -66,7 +69,10 @@ 
 	{
 		if (($ret = @file_put_contents($fname=$this->filename($keys,true),serialize($data),LOCK_EX) > 0))
 		{
-			if ((int)$expiration > 0) file_put_contents($fname.self::EXPIRATION_EXTENSION,(string)$expiration);
+			if ((int)$expiration > 0)
+			{
+				file_put_contents($fname.self::EXPIRATION_EXTENSION,(string)$expiration);
+			}
 		}
 		return $ret;
 	}
@@ -142,17 +148,26 @@ 
 		}
 		foreach(scandir($path) as $file)
 		{
-			if ($file == '.' || $file == '..') continue;
+			if ($file == '.' || $file == '..')
+			{
+				continue;
+			}
 
 			$file = $path.'/'.$file;
 
 			if (is_dir($file))
 			{
-				if (!self::rm_recursive($file)) return false;
+				if (!self::rm_recursive($file))
+				{
+					return false;
+				}
 			}
 			else
 			{
-				if (!unlink($file)) return false;
+				if (!unlink($file))
+				{
+					return false;
+				}
 			}
 		}
 		return rmdir($path);

phpgwapi/inc/class.egw_cache_memcache.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
 	 *
 	 * @param array $keys eg. array($level,$app,$location)
 	 * @param mixed $data
-	 * @param int $expiration=0
+	 * @param int $expiration
 	 * @return boolean true on success, false on error
 	 */
 	function set(array $keys,$data,$expiration=0)

Spacing +15 added lines, -15 removed lines

@@ -45,23 +45,23 @@ 
 	 */
 	function __construct(array $params)
 	{
-		check_load_extension('memcache',true);
+		check_load_extension('memcache', true);
 		$this->memcache = new Memcache();
 
-		if (!$params) $params = array('localhost');	// some reasonable default
+		if (!$params) $params = array('localhost'); // some reasonable default
 
 		$ok = false;
-		foreach($params as $host_port)
+		foreach ($params as $host_port)
 		{
-			list($host,$port) = explode(':',$host_port);
-			if (!$port) $port = 11211;	// default port
+			list($host, $port) = explode(':', $host_port);
+			if (!$port) $port = 11211; // default port
 
-			$ok = $this->memcache->addServer($host,$port) || $ok;
+			$ok = $this->memcache->addServer($host, $port) || $ok;
 			//error_log(__METHOD__."(".array2string($params).") memcache->addServer('$host',$port) = ".(int)$ok);
 		}
 		if (!$ok)
 		{
-			throw new Exception (__METHOD__.'('.array2string($params).") Can't open connection to any memcached server!");
+			throw new Exception(__METHOD__.'('.array2string($params).") Can't open connection to any memcached server!");
 		}
 	}
 
@@ -73,9 +73,9 @@ 
 	 * @param int $expiration=0
 	 * @return boolean true on success, false on error
 	 */
-	function set(array $keys,$data,$expiration=0)
+	function set(array $keys, $data, $expiration = 0)
 	{
-		return $this->memcache->set(self::key($keys),serialize($data),self::STORE_FLAGS,$expiration);
+		return $this->memcache->set(self::key($keys), serialize($data), self::STORE_FLAGS, $expiration);
 	}
 
 	/**
@@ -86,7 +86,7 @@ 
 	 */
 	function get(array $keys)
 	{
-		if (($data = $this->memcache->get($key=self::key($keys))) === false)
+		if (($data = $this->memcache->get($key = self::key($keys))) === false)
 		{
 			//error_log(__METHOD__."(".array2string($keys).") key='$key' NOT found!");
 			return null;
@@ -105,7 +105,7 @@ 
 	{
 		$locations = array_pop($keys);
 		$prefix = self::key($keys);
-		foreach($locations as &$location)
+		foreach ($locations as &$location)
 		{
 			$location = $prefix.'::'.$location;
 		}
@@ -114,10 +114,10 @@ 
 			return array();
 		}
 		$ret = array();
-		$prefix_len = strlen($prefix)+2;
-		foreach($multiple as $location => $data)
+		$prefix_len = strlen($prefix) + 2;
+		foreach ($multiple as $location => $data)
 		{
-			$key = substr($location,$prefix_len);
+			$key = substr($location, $prefix_len);
 			//error_log(__METHOD__."(".array2string($locations).") key='$key' found ".bytes($data)." bytes).");
 			$ret[$key] = unserialize($data);
 		}
@@ -145,6 +145,6 @@ 
 	 */
 	private function key(array $keys)
 	{
-		return implode('::',$keys);
+		return implode('::', $keys);
 	}
 }

Braces +10 added lines, -2 removed lines

@@ -48,13 +48,21 @@
 		check_load_extension('memcache',true);
 		$this->memcache = new Memcache();
 
-		if (!$params) $params = array('localhost');	// some reasonable default
+		if (!$params)
+		{
+			$params = array('localhost');
+		}
+		// some reasonable default
 
 		$ok = false;
 		foreach($params as $host_port)
 		{
 			list($host,$port) = explode(':',$host_port);
-			if (!$port) $port = 11211;	// default port
+			if (!$port)
+			{
+				$port = 11211;
+			}
+			// default port
 
 			$ok = $this->memcache->addServer($host,$port) || $ok;
 			//error_log(__METHOD__."(".array2string($params).") memcache->addServer('$host',$port) = ".(int)$ok);

phpgwapi/inc/class.egw_ckeditor_config.inc.php

Doc Comments +3 added lines, -3 removed lines

@@ -65,7 +65,7 @@ 
 	 *
 	 * Only return skins existing in filesystem, as we disable / remove them if not compatible with supported browsers.
 	 *
-	 * @return array skin => label pairs alphabetical sorted with default moono first
+	 * @return string skin => label pairs alphabetical sorted with default moono first
 	 */
 	public static function getAvailableCKEditorSkins()
 	{
@@ -259,7 +259,7 @@ 
 	 * Adds all "easy to write" options to the configuration
 	 *
 	 * @param array& $config array were config get's added to
-	 * @param int|string $height integer height in pixel or string with css unit
+	 * @param integer $height integer height in pixel or string with css unit
 	 * @param boolean|string $expanded_toolbar show toolbar expanded, boolean value, string "false", or string casted to boolean
 	 * @param string $start_path start path for file browser
 	 */
@@ -451,7 +451,7 @@ 
 	/**
 	 * Adds extra
 	 * @param array $config
-	 * @param array $plugins plugins name which needs to be appended into extraPlugins
+	 * @param string[] $plugins plugins name which needs to be appended into extraPlugins
 	 */
 	public static function append_extraPlugins_config_array (&$config, $plugins)
 	{

Spacing +44 added lines, -46 removed lines

@@ -71,7 +71,7 @@ 
 		);
 		$skins = array();
 
-		foreach(scandir(EGW_SERVER_ROOT.'/phpgwapi/js/ckeditor/skins') as $skin)
+		foreach (scandir(EGW_SERVER_ROOT.'/phpgwapi/js/ckeditor/skins') as $skin)
 		{
 			if ($skin[0] == '.') continue;
 
@@ -87,7 +87,7 @@ 
 		uasort($skins, 'strcasecmp');
 
 		// return our default "moono" first
-		return isset($skins['moono']) ? array('moono' => $skins['moono'])+$skins : $skins;
+		return isset($skins['moono']) ? array('moono' => $skins['moono']) + $skins : $skins;
 	}
 
 	/**
@@ -98,7 +98,7 @@ 
 	 * @param string &$unit =null on return just unit
 	 * @return string font-size including unit
 	 */
-	public static function font_size_from_prefs(array $prefs=null, &$size=null, &$unit=null)
+	public static function font_size_from_prefs(array $prefs = null, &$size = null, &$unit = null)
 	{
 		if (is_null($prefs)) $prefs = $GLOBALS['egw_info']['user']['preferences'];
 
@@ -109,7 +109,7 @@ 
 			$unit = 'px';
 			$size = (string)(int)$size;
 		}
-		return $size.($size?$unit:'');
+		return $size.($size ? $unit : '');
 	}
 
 	/**
@@ -120,12 +120,11 @@ 
 	{
 		//use the lang and country information to construct a possible lang info for CKEditor UI and scayt_slang
 		self::$lang = ($GLOBALS['egw_info']['user']['preferences']['common']['spellchecker_lang'] ?
-			$GLOBALS['egw_info']['user']['preferences']['common']['spellchecker_lang']:
-			$GLOBALS['egw_info']['user']['preferences']['common']['lang']);
+			$GLOBALS['egw_info']['user']['preferences']['common']['spellchecker_lang'] : $GLOBALS['egw_info']['user']['preferences']['common']['lang']);
 
 		self::$country = $GLOBALS['egw_info']['user']['preferences']['common']['country'];
 
-		if (!(strpos(self::$lang, '-')===false))
+		if (!(strpos(self::$lang, '-') === false))
 			list(self::$lang, self::$country) = explode('-', self::$lang);
 	}
 
@@ -270,8 +269,7 @@ 
 		$config['removePlugins'] = 'elementspath';
 
 		$config['toolbarCanCollapse'] = true;
-		$config['toolbarStartupExpanded'] = is_bool($expanded_toolbar) ? $expanded_toolbar :
-			($expanded_toolbar === 'false' ? false : (boolean)$expanded_toolbar);
+		$config['toolbarStartupExpanded'] = is_bool($expanded_toolbar) ? $expanded_toolbar : ($expanded_toolbar === 'false' ? false : (boolean)$expanded_toolbar);
 
 		$config['filebrowserBrowseUrl'] = self::get_filebrowserBrowseUrl($start_path);
 		$config['filebrowserWindowHeight'] = 640;
@@ -284,7 +282,7 @@ 
 		$config['fontSize_sizes'] = '';
 		$unit = $GLOBALS['egw_info']['user']['preferences']['common']['rte_font_unit'];
 		if (empty($unit)) $unit = 'px';
-		foreach(self::$font_size_options as $k => $v)
+		foreach (self::$font_size_options as $k => $v)
 		{
 			$config['fontSize_sizes'] .= $v.$unit.'/'.$k.$unit.';';
 		}
@@ -302,22 +300,22 @@ 
 			// enable browsers native spellchecker as default, if e.g.: aspell fails
 			// to use browsers native spellchecker, you have to hold CMD/CTRL button on rightclick to
 			// access the browsers spell correction options
-			if ($GLOBALS['egw_info']['server']['enabled_spellcheck']!='YesNoSCAYT') $config['disableNativeSpellChecker'] = false;
+			if ($GLOBALS['egw_info']['server']['enabled_spellcheck'] != 'YesNoSCAYT') $config['disableNativeSpellChecker'] = false;
 
 			if (!empty($GLOBALS['egw_info']['server']['aspell_path']) &&
 				is_executable($GLOBALS['egw_info']['server']['aspell_path']) &&
-				($GLOBALS['egw_info']['server']['enabled_spellcheck']!='YesUseWebSpellCheck' &&
-				 $GLOBALS['egw_info']['server']['enabled_spellcheck']!='YesBrowserBased')
+				($GLOBALS['egw_info']['server']['enabled_spellcheck'] != 'YesUseWebSpellCheck' &&
+				 $GLOBALS['egw_info']['server']['enabled_spellcheck'] != 'YesBrowserBased')
 			)
 			{
 				$spellchecker_button = 'SpellCheck';
 				self::append_extraPlugins_config_array($config, array("aspell"));
 			}
-			if ($GLOBALS['egw_info']['server']['enabled_spellcheck']!='YesNoSCAYT' &&
-				$GLOBALS['egw_info']['server']['enabled_spellcheck']!='YesBrowserBased'
+			if ($GLOBALS['egw_info']['server']['enabled_spellcheck'] != 'YesNoSCAYT' &&
+				$GLOBALS['egw_info']['server']['enabled_spellcheck'] != 'YesBrowserBased'
 			)
 			{
-				$scayt_button='Scayt';
+				$scayt_button = 'Scayt';
 				$config['scayt_autoStartup'] = true;
 				$config['scayt_sLang'] = self::get_lang().'_'.self::get_country();
 				$config['disableNativeSpellChecker'] = true; // only one spell as you type
@@ -333,48 +331,48 @@ 
 	 * Writes the toolbar configuration to the options which depends on the chosen
 	 * mode and the spellchecker_button written by the add_spellchecker_options button
 	 */
-	private static function add_toolbar_options(&$config, $mode, $spellchecker_button, $scayt_button=false)
+	private static function add_toolbar_options(&$config, $mode, $spellchecker_button, $scayt_button = false)
 	{
 		$config['toolbar'] = array();
 		switch ($mode)
 		{
 			case 'advanced':
-				$config['toolbar'][] = array('name' => 'document', 'items' => array('Source','DocProps','-','Preview','-','Templates'));
-				$config['toolbar'][] = array('name' => 'clipboard', 'items' => array('Cut','Copy','Paste','PasteText','PasteFromWord','-','Print'));
-				if ($spellchecker_button||$scayt_button)
+				$config['toolbar'][] = array('name' => 'document', 'items' => array('Source', 'DocProps', '-', 'Preview', '-', 'Templates'));
+				$config['toolbar'][] = array('name' => 'clipboard', 'items' => array('Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord', '-', 'Print'));
+				if ($spellchecker_button || $scayt_button)
 				{
 					$configArray = array();
 					if ($spellchecker_button) $configArray[] = $spellchecker_button;
 					if ($scayt_button) $configArray[] = $scayt_button;
 					$config['toolbar'][] = array('name' => 'tools', 'items' => $configArray);
 				}
-				$config['toolbar'][] = array('name' => 'edit', 'items' => array('Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'));
+				$config['toolbar'][] = array('name' => 'edit', 'items' => array('Undo', 'Redo', '-', 'Find', 'Replace', '-', 'SelectAll', 'RemoveFormat'));
 
 				$config['toolbar'][] = '/';
 
-				$config['toolbar'][] = array('name' => 'basicstyles', 'items' => array('Bold','Italic','Underline','Strike','-','Subscript','Superscript'));
-				$config['toolbar'][] = array('name' => 'justify', 'items' => array('JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'));
-				$config['toolbar'][] = array('name' => 'paragraph', 'items' => array('BulletedList','NumberedList','-','Outdent','Indent'));
-				$config['toolbar'][] = array('name' => 'links', 'items' => array('Link','Unlink','Anchor'));
-				$config['toolbar'][] = array('name' => 'insert', 'items' => array('Maximize','Image','Table','HorizontalRule','SpecialChar'/*,'Smiley'*/));
+				$config['toolbar'][] = array('name' => 'basicstyles', 'items' => array('Bold', 'Italic', 'Underline', 'Strike', '-', 'Subscript', 'Superscript'));
+				$config['toolbar'][] = array('name' => 'justify', 'items' => array('JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock'));
+				$config['toolbar'][] = array('name' => 'paragraph', 'items' => array('BulletedList', 'NumberedList', '-', 'Outdent', 'Indent'));
+				$config['toolbar'][] = array('name' => 'links', 'items' => array('Link', 'Unlink', 'Anchor'));
+				$config['toolbar'][] = array('name' => 'insert', 'items' => array('Maximize', 'Image', 'Table', 'HorizontalRule', 'SpecialChar'/*,'Smiley'*/));
 
 				$config['toolbar'][] = '/';
 
-				$config['toolbar'][] = array('name' => 'styles', 'items' => array('Style','Format','Font','FontSize'));
-				$config['toolbar'][] = array('name' => 'colors', 'items' => array('TextColor','BGColor'));
-				$config['toolbar'][] = array('name' => 'tools', 'items' => array('ShowBlocks','-','About'));
+				$config['toolbar'][] = array('name' => 'styles', 'items' => array('Style', 'Format', 'Font', 'FontSize'));
+				$config['toolbar'][] = array('name' => 'colors', 'items' => array('TextColor', 'BGColor'));
+				$config['toolbar'][] = array('name' => 'tools', 'items' => array('ShowBlocks', '-', 'About'));
 				break;
 
 			case 'extended': default:
-				$config['toolbar'][] = array('name' => 'clipboard', 'items' => array('Bold','Italic','Underline'));
-				$config['toolbar'][] = array('name' => 'justify', 'items' => array('JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'));
-				$config['toolbar'][] = array('name' => 'paragraph', 'items' => array('BulletedList','NumberedList'/*,'Smiley'*/,'Outdent','Indent','Undo','Redo'));
-				$config['toolbar'][] = array('name' => 'clipboard', 'items' => array('Cut','Copy','Paste','PasteText','PasteFromWord','-','Print'));
+				$config['toolbar'][] = array('name' => 'clipboard', 'items' => array('Bold', 'Italic', 'Underline'));
+				$config['toolbar'][] = array('name' => 'justify', 'items' => array('JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock'));
+				$config['toolbar'][] = array('name' => 'paragraph', 'items' => array('BulletedList', 'NumberedList'/*,'Smiley'*/, 'Outdent', 'Indent', 'Undo', 'Redo'));
+				$config['toolbar'][] = array('name' => 'clipboard', 'items' => array('Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord', '-', 'Print'));
 
 				if ($mode == 'extended')
 				{
-					$config['toolbar'][] = array('name' => 'insert', 'items' => array('Image','Link','Unlink','Anchor'));
-					if ($spellchecker_button||$scayt_button)
+					$config['toolbar'][] = array('name' => 'insert', 'items' => array('Image', 'Link', 'Unlink', 'Anchor'));
+					if ($spellchecker_button || $scayt_button)
 					{
 						$configArray = array('Maximize');
 						if ($spellchecker_button) $configArray[] = $spellchecker_button;
@@ -382,13 +380,13 @@ 
 						$config['toolbar'][] = array('name' => 'tools', 'items' => $configArray);
 					}
 					else
-						$config['toolbar'][] = array('name' => 'insert', 'items' => array('Maximize'));//, 'Image', 'Table');
+						$config['toolbar'][] = array('name' => 'insert', 'items' => array('Maximize')); //, 'Image', 'Table');
 
 					$config['toolbar'][count($config['toolbar']) - 1][] = array('name' => 'insert', 'items' => array('Image', 'Table'));
 				}
 				else
 				{
-					if ($spellchecker_button||$scayt_button)
+					if ($spellchecker_button || $scayt_button)
 					{
 						$configArray = array('Maximize');
 						if ($spellchecker_button) $configArray[] = $spellchecker_button;
@@ -400,11 +398,11 @@ 
 				}
 
 				$config['toolbar'][] = '/';
-				$config['toolbar'][] = array('name' => 'edit', 'items' => array('Find','Replace','-','SelectAll','RemoveFormat'));
-				if ($mode == 'simple-withimage') $config['toolbar'][] = array('name' => 'links', 'items' => array('Image','Link','Unlink'));
-				$config['toolbar'][] = array('name' => 'styles', 'items' => array('Format','Font','FontSize'));
-				$config['toolbar'][] = array('name' => 'colors', 'items' => array('TextColor','BGColor'));
-				$config['toolbar'][] = array('name' => 'tools', 'items' => array('ShowBlocks','-','About'));
+				$config['toolbar'][] = array('name' => 'edit', 'items' => array('Find', 'Replace', '-', 'SelectAll', 'RemoveFormat'));
+				if ($mode == 'simple-withimage') $config['toolbar'][] = array('name' => 'links', 'items' => array('Image', 'Link', 'Unlink'));
+				$config['toolbar'][] = array('name' => 'styles', 'items' => array('Format', 'Font', 'FontSize'));
+				$config['toolbar'][] = array('name' => 'colors', 'items' => array('TextColor', 'BGColor'));
+				$config['toolbar'][] = array('name' => 'tools', 'items' => array('ShowBlocks', '-', 'About'));
 		}
 	}
 
@@ -417,7 +415,7 @@ 
 		self::set_csp_script_src_attrs();
 
 		// If not explicitly set, use preference for toolbar mode
-		if(!$mode || trim($mode) == '') $mode = $GLOBALS['egw_info']['user']['preferences']['common']['rte_features'];
+		if (!$mode || trim($mode) == '') $mode = $GLOBALS['egw_info']['user']['preferences']['common']['rte_features'];
 		$config = array();
 		$spellchecker_button = null;
 
@@ -427,7 +425,7 @@ 
 		self::add_toolbar_options($config, $mode, $spellchecker_button, $scayt_button);
 		//error_log(__METHOD__."('$mode', $height, ".array2string($expanded_toolbar).") returning ".array2string($config));
 		// Add extra plugins
-		self::append_extraPlugins_config_array($config, array('uploadimage','uploadwidget','widget','notification','notificationaggregator','lineutils'));
+		self::append_extraPlugins_config_array($config, array('uploadimage', 'uploadwidget', 'widget', 'notification', 'notificationaggregator', 'lineutils'));
 		return $config;
 	}
 
@@ -436,7 +434,7 @@ 
 	 * @param array $config
 	 * @param array $plugins plugins name which needs to be appended into extraPlugins
 	 */
-	public static function append_extraPlugins_config_array (&$config, $plugins)
+	public static function append_extraPlugins_config_array(&$config, $plugins)
 	{
 		if (is_array($plugins))
 		{
@@ -444,7 +442,7 @@ 
 			{
 				if (!empty($config['extraPlugins']) && $config['extraPlugins'] !== '')
 				{
-					$config['extraPlugins'] .= ',' . $plugin;
+					$config['extraPlugins'] .= ','.$plugin;
 				}
 				else
 				{

Braces +66 added lines, -23 removed lines

@@ -73,7 +73,10 @@ 
 
 		foreach(scandir(EGW_SERVER_ROOT.'/phpgwapi/js/ckeditor/skins') as $skin)
 		{
-			if ($skin[0] == '.') continue;
+			if ($skin[0] == '.')
+			{
+				continue;
+			}
 
 			if (isset($labels[$skin]))
 			{
@@ -100,7 +103,10 @@ 
 	 */
 	public static function font_size_from_prefs(array $prefs=null, &$size=null, &$unit=null)
 	{
-		if (is_null($prefs)) $prefs = $GLOBALS['egw_info']['user']['preferences'];
+		if (is_null($prefs))
+		{
+			$prefs = $GLOBALS['egw_info']['user']['preferences'];
+		}
 
 		$size = $prefs['common']['rte_font_size'];
 		$unit = $prefs['common']['rte_font_unit'];
@@ -126,7 +132,9 @@ 
 		self::$country = $GLOBALS['egw_info']['user']['preferences']['common']['country'];
 
 		if (!(strpos(self::$lang, '-')===false))
-			list(self::$lang, self::$country) = explode('-', self::$lang);
+		{
+					list(self::$lang, self::$country) = explode('-', self::$lang);
+		}
 	}
 
 	/**
@@ -135,7 +143,9 @@ 
 	private static function get_lang()
 	{
 		if (self::$lang == null || self::$country == null)
-			self::read_lang_country();
+		{
+					self::read_lang_country();
+		}
 
 		return self::$lang;
 	}
@@ -146,7 +156,9 @@ 
 	private static function get_country()
 	{
 		if (self::$lang == null || self::$country == null)
-			self::read_lang_country();
+		{
+					self::read_lang_country();
+		}
 
 		return strtoupper(self::$country);
 	}
@@ -283,7 +295,10 @@ 
 
 		$config['fontSize_sizes'] = '';
 		$unit = $GLOBALS['egw_info']['user']['preferences']['common']['rte_font_unit'];
-		if (empty($unit)) $unit = 'px';
+		if (empty($unit))
+		{
+			$unit = 'px';
+		}
 		foreach(self::$font_size_options as $k => $v)
 		{
 			$config['fontSize_sizes'] .= $v.$unit.'/'.$k.$unit.';';
@@ -302,21 +317,22 @@ 
 			// enable browsers native spellchecker as default, if e.g.: aspell fails
 			// to use browsers native spellchecker, you have to hold CMD/CTRL button on rightclick to
 			// access the browsers spell correction options
-			if ($GLOBALS['egw_info']['server']['enabled_spellcheck']!='YesNoSCAYT') $config['disableNativeSpellChecker'] = false;
+			if ($GLOBALS['egw_info']['server']['enabled_spellcheck']!='YesNoSCAYT')
+			{
+				$config['disableNativeSpellChecker'] = false;
+			}
 
 			if (!empty($GLOBALS['egw_info']['server']['aspell_path']) &&
 				is_executable($GLOBALS['egw_info']['server']['aspell_path']) &&
 				($GLOBALS['egw_info']['server']['enabled_spellcheck']!='YesUseWebSpellCheck' &&
 				 $GLOBALS['egw_info']['server']['enabled_spellcheck']!='YesBrowserBased')
-			)
-			{
+			) {
 				$spellchecker_button = 'SpellCheck';
 				self::append_extraPlugins_config_array($config, array("aspell"));
 			}
 			if ($GLOBALS['egw_info']['server']['enabled_spellcheck']!='YesNoSCAYT' &&
 				$GLOBALS['egw_info']['server']['enabled_spellcheck']!='YesBrowserBased'
-			)
-			{
+			) {
 				$scayt_button='Scayt';
 				$config['scayt_autoStartup'] = true;
 				$config['scayt_sLang'] = self::get_lang().'_'.self::get_country();
@@ -344,8 +360,14 @@ 
 				if ($spellchecker_button||$scayt_button)
 				{
 					$configArray = array();
-					if ($spellchecker_button) $configArray[] = $spellchecker_button;
-					if ($scayt_button) $configArray[] = $scayt_button;
+					if ($spellchecker_button)
+					{
+						$configArray[] = $spellchecker_button;
+					}
+					if ($scayt_button)
+					{
+						$configArray[] = $scayt_button;
+					}
 					$config['toolbar'][] = array('name' => 'tools', 'items' => $configArray);
 				}
 				$config['toolbar'][] = array('name' => 'edit', 'items' => array('Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'));
@@ -377,12 +399,20 @@ 
 					if ($spellchecker_button||$scayt_button)
 					{
 						$configArray = array('Maximize');
-						if ($spellchecker_button) $configArray[] = $spellchecker_button;
-						if ($scayt_button) $configArray[] = $scayt_button;
+						if ($spellchecker_button)
+						{
+							$configArray[] = $spellchecker_button;
+						}
+						if ($scayt_button)
+						{
+							$configArray[] = $scayt_button;
+						}
 						$config['toolbar'][] = array('name' => 'tools', 'items' => $configArray);
 					}
-					else
-						$config['toolbar'][] = array('name' => 'insert', 'items' => array('Maximize'));//, 'Image', 'Table');
+					else {
+											$config['toolbar'][] = array('name' => 'insert', 'items' => array('Maximize'));
+					}
+					//, 'Image', 'Table');
 
 					$config['toolbar'][count($config['toolbar']) - 1][] = array('name' => 'insert', 'items' => array('Image', 'Table'));
 				}
@@ -391,17 +421,27 @@ 
 					if ($spellchecker_button||$scayt_button)
 					{
 						$configArray = array('Maximize');
-						if ($spellchecker_button) $configArray[] = $spellchecker_button;
-						if ($scayt_button) $configArray[] = $scayt_button;
+						if ($spellchecker_button)
+						{
+							$configArray[] = $spellchecker_button;
+						}
+						if ($scayt_button)
+						{
+							$configArray[] = $scayt_button;
+						}
 						$config['toolbar'][] = array('name' => 'tools', 'items' => $configArray);
 					}
-					else
-						$config['toolbar'][] = array('name' => 'tools', 'items' => array('Maximize'));
+					else {
+											$config['toolbar'][] = array('name' => 'tools', 'items' => array('Maximize'));
+					}
 				}
 
 				$config['toolbar'][] = '/';
 				$config['toolbar'][] = array('name' => 'edit', 'items' => array('Find','Replace','-','SelectAll','RemoveFormat'));
-				if ($mode == 'simple-withimage') $config['toolbar'][] = array('name' => 'links', 'items' => array('Image','Link','Unlink'));
+				if ($mode == 'simple-withimage')
+				{
+					$config['toolbar'][] = array('name' => 'links', 'items' => array('Image','Link','Unlink'));
+				}
 				$config['toolbar'][] = array('name' => 'styles', 'items' => array('Format','Font','FontSize'));
 				$config['toolbar'][] = array('name' => 'colors', 'items' => array('TextColor','BGColor'));
 				$config['toolbar'][] = array('name' => 'tools', 'items' => array('ShowBlocks','-','About'));
@@ -417,7 +457,10 @@ 
 		self::set_csp_script_src_attrs();
 
 		// If not explicitly set, use preference for toolbar mode
-		if(!$mode || trim($mode) == '') $mode = $GLOBALS['egw_info']['user']['preferences']['common']['rte_features'];
+		if(!$mode || trim($mode) == '')
+		{
+			$mode = $GLOBALS['egw_info']['user']['preferences']['common']['rte_features'];
+		}
 		$config = array();
 		$spellchecker_button = null;
 

phpgwapi/inc/class.egw_csrf.inc.php

Doc Comments +3 added lines, -3 removed lines

@@ -27,7 +27,7 @@ 
 	/**
 	 * Get a CSRF token for an optional $purpose, which can be validated
 	 *
-	 * @param mixed $_purpose=true if given it need to be used in validate too! (It must NOT be NULL)
+	 * @param mixed $_purpose if given it need to be used in validate too! (It must NOT be NULL)
 	 * @return string CSRF token
 	 */
 	public static function token($_purpose=true)
@@ -51,8 +51,8 @@ 
 	 * Validate a CSRF token or teminate the request
 	 *
 	 * @param string $_token CSRF token generated with egw_csfr::token()
-	 * @param string $_purpose=true optional purpose string passed to token method
-	 * @param boolean $_delete_token=true true if token should be deleted after validation, it will validate no second time
+	 * @param string $_purpose optional purpose string passed to token method
+	 * @param boolean $_delete_token true if token should be deleted after validation, it will validate no second time
 	 */
 	public static function validate($_token, $_purpose=true, $_delete_token=true)
 	{

Spacing +4 added lines, -5 removed lines

@@ -30,7 +30,7 @@ 
 	 * @param mixed $_purpose=true if given it need to be used in validate too! (It must NOT be NULL)
 	 * @return string CSRF token
 	 */
-	public static function token($_purpose=true)
+	public static function token($_purpose = true)
 	{
 		if (is_null($_purpose))
 		{
@@ -38,8 +38,7 @@ 
 		}
 		// generate random token (using oppenssl if available otherwise mt_rand based auth::randomstring)
 		$token = function_exists('openssl_random_pseudo_bytes') ?
-			base64_encode(openssl_random_pseudo_bytes(64)) :
-			auth::randomstring(64);
+			base64_encode(openssl_random_pseudo_bytes(64)) : auth::randomstring(64);
 
 		// store it in session for later validation
 		egw_cache::setSession(__CLASS__, $token, $_purpose);
@@ -54,7 +53,7 @@ 
 	 * @param string $_purpose=true optional purpose string passed to token method
 	 * @param boolean $_delete_token=true true if token should be deleted after validation, it will validate no second time
 	 */
-	public static function validate($_token, $_purpose=true, $_delete_token=true)
+	public static function validate($_token, $_purpose = true, $_delete_token = true)
 	{
 		$stored_purpose = egw_cache::getSession(__CLASS__, $_token);
 
@@ -66,6 +65,6 @@ 
 			// we are not throwing an exception here, but die, to not allow catching it!
 			die("CSRF detected, request terminated!");
 		}
-		if ($_delete_token) egw_cache::unsetTree (__CLASS__, $_token);
+		if ($_delete_token) egw_cache::unsetTree(__CLASS__, $_token);
 	}
 }
\ No newline at end of file

Braces +8 added lines, -2 removed lines

@@ -62,10 +62,16 @@
 		if (!isset($stored_purpose) || $stored_purpose !== $_purpose)
 		{
 			error_log('CSRF detected from IP '.$_SERVER['REMOTE_ADDR'].' to '.$_SERVER['REQUEST_METHOD'].' '.$_SERVER['REQUEST_URI']);
-			if ($_POST) error_log(array2string($_POST));
+			if ($_POST)
+			{
+				error_log(array2string($_POST));
+			}
 			// we are not throwing an exception here, but die, to not allow catching it!
 			die("CSRF detected, request terminated!");
 		}
-		if ($_delete_token) egw_cache::unsetTree (__CLASS__, $_token);
+		if ($_delete_token)
+		{
+			egw_cache::unsetTree (__CLASS__, $_token);
+		}
 	}
 }
\ No newline at end of file