EGroupware / egroupware

api/src/Translation.php

Braces +121 added lines, -31 removed lines

@@ -126,17 +126,23 @@ 
 			}
 			return $charsets[$lang];
 		}
-		if (self::$system_charset)	// do we have a system-charset ==> return it
+		if (self::$system_charset)
+		{
+			// do we have a system-charset ==> return it
 		{
 			$charset = self::$system_charset;
 		}
+		}
 		else
 		{
 			// if no translations are loaded (system-startup) use a default, else lang('charset')
 			$charset = !self::$lang_arr ? 'utf-8' : strtolower(self::translate('charset'));
 		}
 		// in case no charset is set, default to utf-8
-		if (empty($charset) || $charset == 'charset') $charset = 'utf-8';
+		if (empty($charset) || $charset == 'charset')
+		{
+			$charset = 'utf-8';
+		}
 
 		// we need to set our charset as mbstring.internal_encoding if mbstring.func_overlaod > 0
 		// else we get problems for a charset is different from the default utf-8
@@ -195,8 +201,14 @@ 
 			}
 			$apps = array('common');
 			// for eTemplate apps, load etemplate before app itself (allowing app to overwrite etemplate translations)
-			if (class_exists('EGroupware\\Api\\Etemplate', false) || class_exists('etemplate', false)) $apps[] = 'etemplate';
-			if ($GLOBALS['egw_info']['flags']['currentapp']) $apps[] = $GLOBALS['egw_info']['flags']['currentapp'];
+			if (class_exists('EGroupware\\Api\\Etemplate', false) || class_exists('etemplate', false))
+			{
+				$apps[] = 'etemplate';
+			}
+			if ($GLOBALS['egw_info']['flags']['currentapp'])
+			{
+				$apps[] = $GLOBALS['egw_info']['flags']['currentapp'];
+			}
 			// load instance specific translations last, so they can overwrite everything
 			$apps[] = 'custom';
 			self::add_app($apps);
@@ -224,7 +236,10 @@ 
 			self::init();
 		}
 		$ret = $key;				// save key if we dont find a translation
-		if ($not_found) $ret .= $not_found;
+		if ($not_found)
+		{
+			$ret .= $not_found;
+		}
 
 		if (isset(self::$lang_arr[$key]))
 		{
@@ -271,9 +286,15 @@ 
 	{
 		//error_log(__METHOD__."(".array2string($apps).", $lang) count(self::\$lang_arr)=".count(self::$lang_arr));
 		//$start = microtime(true);
-		if (!$lang) $lang = self::$userlang;
+		if (!$lang)
+		{
+			$lang = self::$userlang;
+		}
 		$tree_level = $instance_level = array();
-		if (!is_array($apps)) $apps = (array)$apps;
+		if (!is_array($apps))
+		{
+			$apps = (array)$apps;
+		}
 		foreach($apps as $key => $app)
 		{
 			if (!isset(self::$loaded_apps[$app]) || self::$loaded_apps[$app] != $lang && $app != 'common')
@@ -293,8 +314,14 @@ 
 			}
 		}
 		// load all translations from cache at once
-		if ($tree_level) $tree_level = Cache::getTree(__CLASS__, $tree_level);
-		if ($instance_level) $instance_level = Cache::getInstance(__CLASS__, $instance_level);
+		if ($tree_level)
+		{
+			$tree_level = Cache::getTree(__CLASS__, $tree_level);
+		}
+		if ($instance_level)
+		{
+			$instance_level = Cache::getInstance(__CLASS__, $instance_level);
+		}
 
 		// merging loaded translations together
 		$updated_load_via = false;
@@ -361,7 +388,10 @@ 
 	static function &load_app($app,$lang)
 	{
 		//$start = microtime(true);
-		if (is_null(self::$db)) self::init(false);
+		if (is_null(self::$db))
+		{
+			self::init(false);
+		}
 		$loaded = array();
 		foreach(self::$db->select(self::LANG_TABLE,'message_id,content',array(
 			'lang'		=> $lang,
@@ -467,7 +497,10 @@ 
 				$cache['']['en'] = count($en_phrases);
 				foreach(array_keys(self::get_available_langs()) as $lang)
 				{
-					if ($lang == 'en') continue;
+					if ($lang == 'en')
+					{
+						continue;
+					}
 					$lang_phrases = array_keys(self::load_app_files(null, $lang, 'all-apps'));
 					$valid_phrases = array_intersect($lang_phrases, $en_phrases);
 					$cache[''][$lang] = count($valid_phrases);
@@ -484,7 +517,10 @@ 
 						continue;
 					}
 					$en_phrases = array_keys(self::load_app_files(null, 'en', $app));
-					if (count($en_phrases) <= 2) continue;
+					if (count($en_phrases) <= 2)
+					{
+						continue;
+					}
 					$cache['en'][$app] = count($en_phrases);
 					$lang_phrases = array_keys(self::load_app_files(null, $_lang, $app));
 					$valid_phrases = array_intersect($lang_phrases, $en_phrases);
@@ -516,7 +552,10 @@ 
 			// check if cache is NOT invalided by checking if we have a modification time for concerned lang-file
 			$time = Cache::getTree(__CLASS__, $file=self::get_lang_file($_app, $_lang));
 			// if we dont have one, cache has been invalidated and we need to load translations
-			if (!isset($time)) self::add_app($_app, $_lang);
+			if (!isset($time))
+			{
+				self::add_app($_app, $_lang);
+			}
 
 			$etag = self::max_lang_time();
 		}
@@ -568,7 +607,11 @@ 
 		$loaded = array();
 		foreach($load_app == 'all-apps' ? scandir(EGW_SERVER_ROOT) : (array)$load_app as $app_dir)
 		{
-			if ($load_app == 'all-apps' && $app_dir=='..') continue; // do not try to break out of egw server root
+			if ($load_app == 'all-apps' && $app_dir=='..')
+			{
+				continue;
+			}
+			// do not try to break out of egw server root
 			if ($app_dir[0] == '.' || !is_dir(EGW_SERVER_ROOT.'/'.$app_dir) ||
 				!@file_exists($file=self::get_lang_file($app_dir, $lang)) ||
 				!($f = fopen($file, 'r')))
@@ -587,9 +630,15 @@ 
 			{
 				$line = explode("\t", trim($read));
 				++$line_nr;
-				if (count($line) != 4) continue;
+				if (count($line) != 4)
+				{
+					continue;
+				}
 				list($l_id,$l_app,$l_lang,$l_translation) = $line;
-				if ($l_lang != $lang) continue;
+				if ($l_lang != $lang)
+				{
+					continue;
+				}
 				if (!isset($just_app_file) && $l_app != $app)
 				{
 					// check if $l_app contained in file in $app_dir is mentioned in $load_via
@@ -603,8 +652,14 @@ 
 						}
 						// if not update load_via accordingly and store it as config
 						//error_log(__METHOD__."() load_via does not contain $l_app => $app_dir");
-						if (!isset(self::$load_via[$l_app])) self::$load_via[$l_app] = array($l_app);
-						if (!is_array(self::$load_via[$l_app])) self::$load_via[$l_app] = array(self::$load_via[$l_app]);
+						if (!isset(self::$load_via[$l_app]))
+						{
+							self::$load_via[$l_app] = array($l_app);
+						}
+						if (!is_array(self::$load_via[$l_app]))
+						{
+							self::$load_via[$l_app] = array(self::$load_via[$l_app]);
+						}
 						self::$load_via[$l_app][] = $app_dir;
 						$updated_load_via = true;
 					}
@@ -671,7 +726,10 @@ 
 
 			if ($translate)
 			{
-				if (is_null(self::$db)) self::init(false);
+				if (is_null(self::$db))
+				{
+					self::init(false);
+				}
 
 				foreach(self::$langs as $lang => $name)
 				{
@@ -704,10 +762,13 @@ 
 	 */
 	static function lang2language($lang)
 	{
-		if (isset(self::$langs[$lang]))	// no need to query the DB
+		if (isset(self::$langs[$lang]))
+		{
+			// no need to query the DB
 		{
 			return self::$langs[$lang];
 		}
+		}
 		return self::$db->select(self::LANGUAGES_TABLE,'lang_name',array('lang_id' => $lang),__LINE__,__FILE__)->fetchColumn();
 	}
 
@@ -746,7 +807,10 @@ 
 	 */
 	static function get_lang_file($app,$lang)
 	{
-		if ($app == 'common') $app = 'phpgwapi';
+		if ($app == 'common')
+		{
+			$app = 'phpgwapi';
+		}
 		return EGW_SERVER_ROOT.'/'.$app.'/'.self::LANG_DIR.'/'.self::LANGFILE_PREFIX.$lang.self::LANGFILE_EXTENSION;
 	}
 
@@ -809,9 +873,15 @@ 
 	{
 		if ($check_to_from)
 		{
-			if ($from) $from = strtolower($from);
+			if ($from)
+			{
+				$from = strtolower($from);
+			}
 
-			if ($to) $to = strtolower($to);
+			if ($to)
+			{
+				$to = strtolower($to);
+			}
 
 			if (!$from)
 			{
@@ -936,7 +1006,10 @@ 
 	 */
 	static function convert_jsonsafe($_data,$from=False)
 	{
-		if ($from===false) $from = self::detect_encoding($_data);
+		if ($from===false)
+		{
+			$from = self::detect_encoding($_data);
+		}
 
 		$data = self::convert($_data, strtolower($from));
 
@@ -1035,15 +1108,22 @@ 
 	static function get_message_id($translation,$app=null,$lang=null)
 	{
 		$where = array('content '.self::$db->capabilities[Db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.self::$db->quote($translation));
-		if ($app) $where['app_name'] = $app;
-		if ($lang) $where['lang'] = $lang;
+		if ($app)
+		{
+			$where['app_name'] = $app;
+		}
+		if ($lang)
+		{
+			$where['lang'] = $lang;
+		}
 
 		$id = self::$db->select(self::LANG_TABLE,'message_id',$where,__LINE__,__FILE__)->fetchColumn();
 
 		// Check cache, since most things aren't in the DB anymore
 		if(!$id)
 		{
-			$ids = array_filter(array_keys(self::$lang_arr), function($haystack) use($translation) {
+			$ids = array_filter(array_keys(self::$lang_arr), function($haystack) use($translation)
+			{
 				return stripos(self::$lang_arr[$haystack],$translation) !== false;
 			});
 			$id = array_shift($ids);
@@ -1060,10 +1140,17 @@ 
 				}
 
 				// load all translations from cache at once
-				if ($tree_level) $lang_arr = Cache::getTree(__CLASS__, $tree_level);
-				if ($instance_level) $lang_arr = Cache::getInstance(__CLASS__, $instance_level);
+				if ($tree_level)
+				{
+					$lang_arr = Cache::getTree(__CLASS__, $tree_level);
+				}
+				if ($instance_level)
+				{
+					$lang_arr = Cache::getInstance(__CLASS__, $instance_level);
+				}
 				$lang_arr = $lang_arr[$app.':en'];
-				$ids = array_filter(array_keys($lang_arr), function($haystack) use($translation, $lang_arr) {
+				$ids = array_filter(array_keys($lang_arr), function($haystack) use($translation, $lang_arr)
+				{
 					return stripos($lang_arr[$haystack],$translation) !== false;
 				});
 				$id = array_shift($ids);
@@ -1087,7 +1174,10 @@ 
 		{
 			$list = array('utf-8', 'iso-8859-1', 'windows-1251'); // list may be extended
 
-			if ($verify) array_unshift($list, $verify);
+			if ($verify)
+			{
+				array_unshift($list, $verify);
+			}
 
 			foreach ($list as $item)
 			{

api/src/Acl.php

Braces +81 added lines, -20 removed lines

@@ -111,7 +111,10 @@ 
 		else
 		{
 			$acl_acc_list = (array)$GLOBALS['egw']->accounts->memberships($this->account_id, true);
-			if (is_array($no_groups)) $acl_acc_list = array_diff($acl_acc_list,$no_groups);
+			if (is_array($no_groups))
+			{
+				$acl_acc_list = array_diff($acl_acc_list,$no_groups);
+			}
 			array_unshift($acl_acc_list,$this->account_id);
 		}
 
@@ -149,7 +152,10 @@ 
 	 */
 	function add($appname,$location,$rights)
 	{
-		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		$row = array(
 			'appname'  => $appname,
@@ -171,7 +177,10 @@ 
 	 */
 	function delete($appname,$location)
 	{
-		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		foreach($this->data as $idx => $value)
 		{
@@ -209,10 +218,13 @@ 
 			}
 		}
 		if ($this->account_id == $GLOBALS['egw_info']['user']['account_id'] &&
-			method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+			method_exists($GLOBALS['egw'],'invalidate_session_cache'))
+		{
+			// egw object in setup is limited
 		{
 			$GLOBALS['egw']->invalidate_session_cache();
 		}
+		}
 		return $this->data;
 	}
 
@@ -240,7 +252,10 @@ 
 		{
 			$this->read_repository();
 		}
-		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		if (!count($this->data) && $GLOBALS['egw_info']['server']['acl_default'] != 'deny')
 		{
@@ -289,7 +304,10 @@ 
 	 */
 	function get_specific_rights($location, $appname = '', $memberships=array())
 	{
-		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		if (!count($this->data) && $GLOBALS['egw_info']['server']['acl_default'] != 'deny')
 		{
@@ -353,10 +371,13 @@ 
 		),__LINE__,__FILE__);
 
 		if ($account_id == $GLOBALS['egw_info']['user']['account_id'] &&
-			method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+			method_exists($GLOBALS['egw'],'invalidate_session_cache'))
+		{
+			// egw object in setup is limited
 		{
 			$GLOBALS['egw']->invalidate_session_cache();
 		}
+		}
 		return True;
 	}
 
@@ -387,11 +408,17 @@ 
 				$where['acl_account'] = $cache_accountid[$accountid] = get_account_id($accountid,$this->account_id);
 			}
 		}
-		if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+		if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))
+		{
+			// egw object in setup is limited
 		{
 			$GLOBALS['egw']->invalidate_session_cache();
 		}
-		if ($app == '%' || $app == '%%') unset($where['acl_appname']);
+		}
+		if ($app == '%' || $app == '%%')
+		{
+			unset($where['acl_appname']);
+		}
 
 		$this->db->delete(self::TABLE,$where,__LINE__,__FILE__);
 
@@ -408,7 +435,10 @@ 
 	 */
 	function get_specific_rights_for_account($account_id,$location,$appname='')
 	{
-		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		return $this->db->select(self::TABLE,'acl_rights',array(
 			'acl_location' => $location,
@@ -426,7 +456,10 @@ 
 	 */
 	function get_all_rights($location,$appname='')
 	{
-		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		$rights = array();
 		foreach($this->db->select(self::TABLE,'acl_account,acl_rights',array(
@@ -449,7 +482,10 @@ 
 	 */
 	function get_all_location_rights($account_id,$appname='',$use_memberships=true)
 	{
-		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		$accounts = array($account_id);
 		if ($use_memberships && (int)$account_id > 0)
@@ -553,7 +589,10 @@ 
 	 */
 	function get_ids_for_location($location, $required, $app = '')
 	{
-		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$app)
+		{
+			$app = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		$accounts = false;
 		foreach($this->db->select(self::TABLE,array('acl_account','acl_rights'),array(
@@ -577,7 +616,10 @@ 
 	 */
 	function get_locations_for_app($app='')
 	{
-		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$app)
+		{
+			$app = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		$locations = false;
 		foreach($this->db->select(self::TABLE,'DISTINCT '.'acl_location',array(
@@ -613,7 +655,10 @@ 
 			$account_id = get_account_id($accountid,$this->account_id);
 			$cache_accountid[$accountid] = $account_id;
 		}
-		if ($use_memberships && (int)$account_id > 0) $memberships = $GLOBALS['egw']->accounts->memberships($account_id, true);
+		if ($use_memberships && (int)$account_id > 0)
+		{
+			$memberships = $GLOBALS['egw']->accounts->memberships($account_id, true);
+		}
 		$memberships[] = (int)$account_id;
 
 		$apps = array();
@@ -647,15 +692,24 @@ 
 	 */
 	function get_grants($app='',$enum_group_acls=true,$user=null)
 	{
-		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
-		if (!$user) $user = $this->account_id;
+		if (!$app)
+		{
+			$app = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
+		if (!$user)
+		{
+			$user = $this->account_id;
+		}
 
 		static $cache = array();	// some caching withing the request
 
 		$grants =& $cache[$app][$user];
 		if (!isset($grants))
 		{
-			if ((int)$user > 0) $memberships = $GLOBALS['egw']->accounts->memberships($user, true);
+			if ((int)$user > 0)
+			{
+				$memberships = $GLOBALS['egw']->accounts->memberships($user, true);
+			}
 			$memberships[] = $user;
 
 			$grants = $accounts = Array();
@@ -680,7 +734,11 @@ 
 					// return the grant for each member of the group (false = also for no longer active users)
 					foreach((array)$GLOBALS['egw']->accounts->members($grantor, true, false) as $grantor)
 					{
-						if (!$grantor) continue;	// can happen if group has no members
+						if (!$grantor)
+						{
+							continue;
+						}
+						// can happen if group has no members
 
 						// Don't allow to override private with group ACL's!
 						$rights &= ~self::PRIVAT;
@@ -734,7 +792,10 @@ 
 	 */
 	function get_location_grants($location,$app='')
 	{
-		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$app)
+		{
+			$app = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		$locations = array();
 		foreach($this->db->select(self::TABLE,'acl_location,acl_account,acl_rights',array(

api/src/Config.php

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]))
 				{

api/src/DateTime.php

Braces +76 added lines, -18 removed lines

@@ -95,7 +95,11 @@ 
 	 */
 	public function __construct($time='now',DateTimeZone $tz=null,&$type=null)
 	{
-		if (is_null($tz)) $tz = self::$user_timezone;	// default user timezone
+		if (is_null($tz))
+		{
+			$tz = self::$user_timezone;
+		}
+		// default user timezone
 
 		switch(($type = gettype($time)))
 		{
@@ -108,7 +112,11 @@ 
 				if (!(is_numeric($time) && ($time > 21000000 || $time < 19000000)))
 				{
 					$t_str = $time;
-					if (is_numeric($time) && strlen($time) == 8) $t_str .= 'T000000';	// 'Ymd' string used in calendar to represent a date
+					if (is_numeric($time) && strlen($time) == 8)
+					{
+						$t_str .= 'T000000';
+					}
+					// 'Ymd' string used in calendar to represent a date
 					// $time ending in a Z (Zulu or UTC time), is unterstood by DateTime class itself
 					try {
 						parent::__construct($t_str,$tz);
@@ -116,7 +124,10 @@ 
 					}
 					catch(Exception $e) {
 						// if string is nummeric, ignore the exception and treat string as timestamp
-						if (!is_numeric($time)) throw $e;
+						if (!is_numeric($time))
+						{
+							throw $e;
+						}
 					}
 				}
 				$type = 'integer';
@@ -137,7 +148,9 @@ 
 
 			case 'array':
 				parent::__construct('now',$tz);
-				if (isset($time['Y']))	// array format used in eTemplate
+				if (isset($time['Y']))
+				{
+					// array format used in eTemplate
 				{
 					$time = array(
 						'year'   => $time['Y'],
@@ -148,13 +161,17 @@ 
 						'second' => $time['s'],
 					);
 				}
+				}
 				if (!empty($time['full']) && empty($time['year']))
 				{
 					$time['year']  = (int)substr($time['full'],0,4);
 					$time['month'] = (int)substr($time['full'],4,2);
 					$time['day']   = (int)substr($time['full'],6,2);
 				}
-				if (isset($time['year'])) $this->setDate((int)$time['year'],(int)$time['month'],isset($time['day']) ? (int)$time['day'] : (int)$time['mday']);
+				if (isset($time['year']))
+				{
+					$this->setDate((int)$time['year'],(int)$time['month'],isset($time['day']) ? (int)$time['day'] : (int)$time['mday']);
+				}
 				$this->setTime((int)$time['hour'],(int)$time['minute'],(int)$time['second']);
 				break;
 
@@ -178,7 +195,10 @@ 
 	 */
 	public function add($interval)
 	{
-		if (is_string($interval)) $interval = DateInterval::createFromDateString($interval);
+		if (is_string($interval))
+		{
+			$interval = DateInterval::createFromDateString($interval);
+		}
 
 		parent::add($interval);
 	}
@@ -202,7 +222,10 @@ 
 				$wstart = -($wday ? $wday-1 : 6);
 				break;
 		}
-		if ($wstart) $this->add($wstart.'days');
+		if ($wstart)
+		{
+			$this->add($wstart.'days');
+		}
 	}
 
 	/**
@@ -263,15 +286,27 @@ 
 			}
 			elseif ($sday || $eday)
 			{
-				if ($sday) $start->add($sday.'days');
-				if ($eday) $end->add($eday.'days');
+				if ($sday)
+				{
+					$start->add($sday.'days');
+				}
+				if ($eday)
+				{
+					$end->add($eday.'days');
+				}
 			}
 			elseif ($sweek || $eweek)
 			{
 				$start->setWeekstart();
-				if ($sweek) $start->add($sweek.'weeks');
+				if ($sweek)
+				{
+					$start->add($sweek.'weeks');
+				}
 				$end->setWeekstart();
-				if ($eweek) $end->add($eweek.'weeks');
+				if ($eweek)
+				{
+					$end->add($eweek.'weeks');
+				}
 			}
 		}
 		// convert start + end from user to servertime for the filter
@@ -416,7 +451,10 @@ 
 		}
 		$time->setUser();
 
-		if (is_null($type)) $type = $typeof;
+		if (is_null($type))
+		{
+			$type = $typeof;
+		}
 
 		//echo "<p>".__METHOD__."($time,$type) = ".print_r($format->format($type),true)."</p>\n";
 		return $time->format($type);
@@ -446,7 +484,10 @@ 
 		}
 		$time->setServer();
 
-		if (is_null($type)) $type = $typeof;
+		if (is_null($type))
+		{
+			$type = $typeof;
+		}
 
 		//echo "<p>".__METHOD__."($time,$type) = ".print_r($format->format($type),true)."</p>\n";
 		return $time->format($type);
@@ -489,7 +530,10 @@ 
 	public static function setUserPrefs($tz,$dateformat='',$timeformat='')
 	{
 		//echo "<p>".__METHOD__."('$tz','$dateformat','$timeformat') ".function_backtrace()."</p>\n";
-		if (!empty($dateformat)) self::$user_dateformat = $dateformat;
+		if (!empty($dateformat))
+		{
+			self::$user_dateformat = $dateformat;
+		}
 
 		switch($timeformat)
 		{
@@ -527,7 +571,10 @@ 
 	 */
 	public static function tz_offset_s($time='now')
 	{
-		if (!($time instanceof DateTime)) $time = new DateTime($time);
+		if (!($time instanceof DateTime))
+		{
+			$time = new DateTime($time);
+		}
 
 		return self::$user_timezone->getOffset($time) - self::$server_timezone->getOffset($time);
 	}
@@ -635,9 +682,17 @@ 
 		);
 		foreach(DateTimeZone::listIdentifiers() as $name)
 		{
-			if (in_array($name,$no_vtimezone)) continue;	// do NOT allow to set in EGroupware, as we have not VTIMEZONE component for it
+			if (in_array($name,$no_vtimezone))
+			{
+				continue;
+			}
+			// do NOT allow to set in EGroupware, as we have not VTIMEZONE component for it
 			list($continent) = explode('/',$name,2);
-			if (!isset($tzs[$continent])) continue;	// old depricated timezones
+			if (!isset($tzs[$continent]))
+			{
+				continue;
+			}
+			// old depricated timezones
 			$datetime = new DateTime('now',new DateTimeZone($name));
 			$tzs[$continent][$name] = str_replace(array('_','/'),array(' ',' / '),$name)."  ".$datetime->format();
 			unset($datetime);
@@ -676,10 +731,13 @@ 
 		{
 			$user_tzs = array_merge(array($tz),$user_tzs);
 		}
-		if (!$user_tzs)	// if we have no user timezones, eg. user set no pref --> use server default
+		if (!$user_tzs)
+		{
+			// if we have no user timezones, eg. user set no pref --> use server default
 		{
 			$user_tzs = array($GLOBALS['egw_info']['server']['server_timezone']);
 		}
+		}
 		if ($extra && !in_array($extra,$user_tzs))
 		{
 			$user_tzs = array_merge(array($extra),$user_tzs);

api/src/Session.php

Braces +176 added lines, -45 removed lines

@@ -248,7 +248,7 @@ 
 
 		// set session_timeout from global php.ini and default to 14400=4h, if not set
 		if (!($GLOBALS['egw_info']['server']['sessions_timeout'] = ini_get('session.gc_maxlifetime')))
-      	{
+		{
       		ini_set('session.gc_maxlifetime', $GLOBALS['egw_info']['server']['sessions_timeout']=14400);
       	}
 	}
@@ -282,7 +282,10 @@ 
 	 */
 	function commit_session()
 	{
-		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."() sessionid=$this->sessionid, _SESSION[".self::EGW_SESSION_VAR.']='.array2string($_SESSION[self::EGW_SESSION_VAR]).' '.function_backtrace());
+		if (self::ERROR_LOG_DEBUG)
+		{
+			error_log(__METHOD__."() sessionid=$this->sessionid, _SESSION[".self::EGW_SESSION_VAR.']='.array2string($_SESSION[self::EGW_SESSION_VAR]).' '.function_backtrace());
+		}
 		self::encrypt($this->kp3);
 
 		session_write_close();
@@ -344,7 +347,10 @@ 
 	 */
 	static function log_session_usage(&$arr,$label,$recursion=true,$limit=1000)
 	{
-		if (!is_array($arr)) return;
+		if (!is_array($arr))
+		{
+			return;
+		}
 
 		$sizes = array();
 		foreach($arr as $key => &$data)
@@ -359,7 +365,10 @@ 
 			if ($diff > $limit)
 			{
 				error_log("strlen({$label}[$key])=".Vfs::hsize($size).", diff=".Vfs::hsize($diff));
-				if ($recursion) self::log_session_usage($arr[$key],$label.'['.$key.']',$recursion,$limit);
+				if ($recursion)
+				{
+					self::log_session_usage($arr[$key],$label.'['.$key.']',$recursion,$limit);
+				}
 			}
 		}
 	}
@@ -457,7 +466,10 @@ 
 				$this->passwd      = $passwd;
 				$this->passwd_type = $passwd_type;
 			}
-			if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check) starting ...");
+			if (self::ERROR_LOG_DEBUG)
+			{
+				error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check) starting ...");
+			}
 
 			self::split_login_domain($login,$this->account_lid,$this->account_domain);
 			// add domain to the login, if not already there
@@ -501,7 +513,10 @@ 
 				{
 					$this->log_access($this->reason,$login,$user_ip,0);	// log unsuccessfull login
 				}
-				if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check) UNSUCCESSFULL ($this->reason)");
+				if (self::ERROR_LOG_DEBUG)
+				{
+					error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check) UNSUCCESSFULL ($this->reason)");
+				}
 				return false;
 			}
 			if ($fail_on_forced_password_change && Auth::check_password_change($this->reason) === false)
@@ -551,7 +566,10 @@ 
 				$this->reason = 'account is expired';
 				$this->cd_reason = self::CD_ACCOUNT_EXPIRED;
 
-				if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check) UNSUCCESSFULL ($this->reason)");
+				if (self::ERROR_LOG_DEBUG)
+				{
+					error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check) UNSUCCESSFULL ($this->reason)");
+				}
 				return false;
 			}
 
@@ -575,25 +593,34 @@ 
 				'passwd'         => $this->passwd,
 				'account_domain' => $this->account_domain,
 				'user_ip'        => $user_ip,
-			),'',true)))	// true = run hooks from all apps, not just the ones the current user has perms to run
+			),'',true)))
+			{
+				// true = run hooks from all apps, not just the ones the current user has perms to run
 			{
 				foreach($hook_result as $reason)
 				{
 					if ($reason)	// called hook requests to deny the session
 					{
 						$this->reason = $this->cd_reason = $reason;
+			}
 						$this->log_access($this->reason,$login,$user_ip,0);		// log unsuccessfull login
-						if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check) UNSUCCESSFULL ($this->reason)");
+						if (self::ERROR_LOG_DEBUG)
+						{
+							error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check) UNSUCCESSFULL ($this->reason)");
+						}
 						return false;
 					}
 				}
 			}
 			$GLOBALS['egw']->db->transaction_begin();
 			$this->register_session($this->login,$user_ip,$now,$this->session_flags);
-			if ($this->session_flags != 'A')		// dont log anonymous sessions
+			if ($this->session_flags != 'A')
+			{
+				// dont log anonymous sessions
 			{
 				$this->sessionid_access_log = $this->log_access($this->sessionid,$login,$user_ip,$this->account_id);
 			}
+			}
 			Cache::setSession('phpgwapi', 'account_previous_login', $GLOBALS['egw']->auth->previous_login);
 			$GLOBALS['egw']->accounts->update_lastlogin($this->account_id,$user_ip);
 			$GLOBALS['egw']->db->transaction_commit();
@@ -609,7 +636,10 @@ 
 				self::egw_setcookie('last_loginid', $this->account_lid ,$now+1209600); /* For 2 weeks */
 				self::egw_setcookie('last_domain',$this->account_domain,$now+1209600);
 			}
-			if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check) successfull sessionid=$this->sessionid");
+			if (self::ERROR_LOG_DEBUG)
+			{
+				error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check) successfull sessionid=$this->sessionid");
+			}
 
 			return $this->sessionid;
 		}
@@ -763,10 +793,13 @@ 
 		//error_log(__METHOD__."('$login', '$ip') false_ip=$false_ip, false_id=$false_id --> blocked=".array2string($blocked));
 
 		if ($blocked && $GLOBALS['egw_info']['server']['admin_mails'] &&
-			$GLOBALS['egw_info']['server']['login_blocked_mail_time'] < time()-5*60)	// max. one mail every 5mins
+			$GLOBALS['egw_info']['server']['login_blocked_mail_time'] < time()-5*60)
+		{
+			// max. one mail every 5mins
 		{
 			try {
 				$mailer = new Mailer();
+		}
 				// notify admin(s) via email
 				$mailer->setFrom('eGroupWare@'.$GLOBALS['egw_info']['server']['mail_suffix']);
 				$mailer->addHeader('Subject', lang("eGroupWare: login blocked for user '%1', IP %2",$login,$ip));
@@ -844,7 +877,10 @@ 
 		{
 			$sessionid = false;
 		}
-		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."() _SERVER[REQUEST_URI]='$_SERVER[REQUEST_URI]' returning ".print_r($sessionid,true));
+		if (self::ERROR_LOG_DEBUG)
+		{
+			error_log(__METHOD__."() _SERVER[REQUEST_URI]='$_SERVER[REQUEST_URI]' returning ".print_r($sessionid,true));
+		}
 		return $sessionid;
 	}
 
@@ -874,7 +910,10 @@ 
 	 */
 	function verify($sessionid=null,$kp3=null)
 	{
-		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."('$sessionid','$kp3') ".function_backtrace());
+		if (self::ERROR_LOG_DEBUG)
+		{
+			error_log(__METHOD__."('$sessionid','$kp3') ".function_backtrace());
+		}
 
 		$fill_egw_info_and_repositories = !$GLOBALS['egw_info']['flags']['restored_from_session'];
 
@@ -890,7 +929,10 @@ 
 
 		if (!$this->sessionid)
 		{
-			if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."('$sessionid') get_sessionid()='".self::get_sessionid()."' No session ID");
+			if (self::ERROR_LOG_DEBUG)
+			{
+				error_log(__METHOD__."('$sessionid') get_sessionid()='".self::get_sessionid()."' No session ID");
+			}
 			return false;
 		}
 
@@ -902,14 +944,20 @@ 
 		// check if we have a eGroupware session --> return false if not (but dont destroy it!)
 		if (is_null($_SESSION) || !isset($_SESSION[self::EGW_SESSION_VAR]))
 		{
-			if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."('$sessionid') session does NOT exist!");
+			if (self::ERROR_LOG_DEBUG)
+			{
+				error_log(__METHOD__."('$sessionid') session does NOT exist!");
+			}
 			return false;
 		}
 		$session =& $_SESSION[self::EGW_SESSION_VAR];
 
 		if ($session['session_dla'] <= time() - $GLOBALS['egw_info']['server']['sessions_timeout'])
 		{
-			if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."('$sessionid') session timed out!");
+			if (self::ERROR_LOG_DEBUG)
+			{
+				error_log(__METHOD__."('$sessionid') session timed out!");
+			}
 			$this->destroy($sessionid,$kp3);
 			return false;
 		}
@@ -937,7 +985,10 @@ 
 		$this->account_id = $GLOBALS['egw']->accounts->name2id($this->account_lid,'account_lid','u');
 		if (!$this->account_id)
 		{
-			if (self::ERROR_LOG_DEBUG) error_log("*** Session::verify($sessionid) !accounts::name2id('$this->account_lid')");
+			if (self::ERROR_LOG_DEBUG)
+			{
+				error_log("*** Session::verify($sessionid) !accounts::name2id('$this->account_lid')");
+			}
 			return false;
 		}
 
@@ -955,7 +1006,10 @@ 
 
 		if ($GLOBALS['egw']->accounts->is_expired($GLOBALS['egw_info']['user']))
 		{
-			if (self::ERROR_LOG_DEBUG) error_log("*** Session::verify($sessionid) accounts is expired");
+			if (self::ERROR_LOG_DEBUG)
+			{
+				error_log("*** Session::verify($sessionid) accounts is expired");
+			}
 			return false;
 		}
 		$this->passwd = base64_decode(Cache::getSession('phpgwapi', 'password'));
@@ -966,7 +1020,10 @@ 
 		}
 		if ($this->account_domain != $GLOBALS['egw_info']['user']['domain'])
 		{
-			if (self::ERROR_LOG_DEBUG) error_log("*** Session::verify($sessionid) wrong domain");
+			if (self::ERROR_LOG_DEBUG)
+			{
+				error_log("*** Session::verify($sessionid) wrong domain");
+			}
 			return false;
 		}
 
@@ -975,7 +1032,10 @@ 
 			if (strtoupper(substr(PHP_OS,0,3)) != 'WIN' && (!$GLOBALS['egw_info']['user']['session_ip'] ||
 				$GLOBALS['egw_info']['user']['session_ip'] != $this->getuser_ip()))
 			{
-				if (self::ERROR_LOG_DEBUG) error_log("*** Session::verify($sessionid) wrong IP");
+				if (self::ERROR_LOG_DEBUG)
+				{
+					error_log("*** Session::verify($sessionid) wrong IP");
+				}
 				return false;
 			}
 		}
@@ -988,7 +1048,10 @@ 
 		}
 		if (!$this->account_lid)
 		{
-			if (self::ERROR_LOG_DEBUG) error_log("*** Session::verify($sessionid) !account_lid");
+			if (self::ERROR_LOG_DEBUG)
+			{
+				error_log("*** Session::verify($sessionid) !account_lid");
+			}
 			return false;
 		}
 
@@ -1007,13 +1070,19 @@ 
 			$_REQUEST[self::EGW_SESSION_NAME] === $this->sessionid &&
 			(!isset($_COOKIE[self::EGW_SESSION_NAME]) || $_COOKIE[self::EGW_SESSION_NAME] !== $_REQUEST[self::EGW_SESSION_NAME]))
 		{
-			if (self::ERROR_LOG_DEBUG) error_log("--> Session::verify($sessionid) SUCCESS, but NO required cookies set --> setting them now");
+			if (self::ERROR_LOG_DEBUG)
+			{
+				error_log("--> Session::verify($sessionid) SUCCESS, but NO required cookies set --> setting them now");
+			}
 			self::egw_setcookie(self::EGW_SESSION_NAME,$this->sessionid);
 			self::egw_setcookie('kp3',$this->kp3);
 			self::egw_setcookie('domain',$this->account_domain);
 		}
 
-		if (self::ERROR_LOG_DEBUG) error_log("--> Session::verify($sessionid) SUCCESS");
+		if (self::ERROR_LOG_DEBUG)
+		{
+			error_log("--> Session::verify($sessionid) SUCCESS");
+		}
 
 		return true;
 	}
@@ -1033,14 +1102,20 @@ 
 		}
 		$this->log_access($sessionid);	// log logout-time
 
-		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."($sessionid,$kp3)");
+		if (self::ERROR_LOG_DEBUG)
+		{
+			error_log(__METHOD__."($sessionid,$kp3)");
+		}
 
-		if (is_numeric($sessionid))	// do we have a access-log-id --> get PHP session id
+		if (is_numeric($sessionid))
+		{
+			// do we have a access-log-id --> get PHP session id
 		{
 			$sessionid = $GLOBALS['egw']->db->select(self::ACCESS_LOG_TABLE,'session_php',array(
 					'sessionid' => $sessionid,
 				),__LINE__,__FILE__)->fetchColumn();
 		}
+		}
 
 		Hooks::process(array(
 			'location'  => 'session_destroyed',
@@ -1050,7 +1125,10 @@ 
 		// Only do the following, if where working with the current user
 		if (!$GLOBALS['egw_info']['user']['sessionid'] || $sessionid == $GLOBALS['egw_info']['user']['sessionid'])
 		{
-			if (self::ERROR_LOG_DEBUG) error_log(__METHOD__." ********* about to call session_destroy!");
+			if (self::ERROR_LOG_DEBUG)
+			{
+				error_log(__METHOD__." ********* about to call session_destroy!");
+			}
 			session_unset();
 			@session_destroy();
 			// we need to (re-)load the eGW session-handler, as session_destroy unloads custom session-handlers
@@ -1145,7 +1223,10 @@ 
 		}
 		else
 		{
-			if ($othervars) $extravars .= ($extravars?'&':'').$othervars;
+			if ($othervars)
+			{
+				$extravars .= ($extravars?'&':'').$othervars;
+			}
 		}
 
 		// parse extravars string into the vars array
@@ -1154,7 +1235,11 @@ 
 			foreach(explode('&',$extravars) as $expr)
 			{
 				list($var,$val) = explode('=', $expr,2);
-				if (strpos($val,'%26') != false) $val = str_replace('%26','&',$val);	// make sure to not double encode &
+				if (strpos($val,'%26') != false)
+				{
+					$val = str_replace('%26','&',$val);
+				}
+				// make sure to not double encode &
 				if (substr($var,-2) == '[]')
 				{
 					$vars[substr($var,0,-2)][] = $val;
@@ -1235,14 +1320,22 @@ 
 		{
 			self::set_cookiedomain();
 		}
-		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."($cookiename,$cookievalue,$cookietime,$cookiepath,".self::$cookie_domain.")");
+		if (self::ERROR_LOG_DEBUG)
+		{
+			error_log(__METHOD__."($cookiename,$cookievalue,$cookietime,$cookiepath,".self::$cookie_domain.")");
+		}
 
 		// if we are installed in iOS as web-app, we must not set a cookietime==0 (session-cookie),
 		// as every change between apps will cause the cookie to get lost
 		static $is_iOS = null;
-		if (!$cookietime && !isset($is_iOS)) $is_iOS = (bool)preg_match('/^(iPhone|iPad|iPod)/i', Header\UserAgent::mobile());
+		if (!$cookietime && !isset($is_iOS))
+		{
+			$is_iOS = (bool)preg_match('/^(iPhone|iPad|iPod)/i', Header\UserAgent::mobile());
+		}
 
-		if(!headers_sent())	// gives only a warning, but can not send the cookie anyway
+		if(!headers_sent())
+		{
+			// gives only a warning, but can not send the cookie anyway
 		{
 			setcookie($cookiename, $cookievalue,
 				!$cookietime && $is_iOS ? time()+self::IOS_SESSION_COOKIE_LIFETIME : $cookietime,
@@ -1250,6 +1343,7 @@ 
 				// if called via HTTPS, only send cookie for https and only allow cookie access via HTTP (true)
 				empty($GLOBALS['egw_info']['server']['insecure_cookies']) && !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off', true);
 		}
+		}
 	}
 
 	/**
@@ -1301,15 +1395,25 @@ 
 	 */
 	public static function search_instance($login,$domain_requested,&$default_domain,$server_names,array $domains=null)
 	{
-		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."('$login','$domain_requested',".array2string($default_domain).".".array2string($server_names).".".array2string($domains).")");
+		if (self::ERROR_LOG_DEBUG)
+		{
+			error_log(__METHOD__."('$login','$domain_requested',".array2string($default_domain).".".array2string($server_names).".".array2string($domains).")");
+		}
 
-		if (is_null($domains)) $domains = $GLOBALS['egw_domain'];
+		if (is_null($domains))
+		{
+			$domains = $GLOBALS['egw_domain'];
+		}
 
-		if (!isset($default_domain) || !isset($domains[$default_domain]))	// allow to overwrite the default domain
+		if (!isset($default_domain) || !isset($domains[$default_domain]))
+		{
+			// allow to overwrite the default domain
 		{
 			foreach((array)$server_names as $server_name)
 			{
-				list($server_name) = explode(':', $server_name);	// remove port from HTTP_HOST
+				list($server_name) = explode(':', $server_name);
+		}
+		// remove port from HTTP_HOST
 				if(isset($domains[$server_name]))
 				{
 					$default_domain = $server_name;
@@ -1334,11 +1438,14 @@ 
 				}
 			}
 		}
-		if (isset($login))	// on login
+		if (isset($login))
+		{
+			// on login
 		{
 			if (strpos($login,'@') === false || count($domains) == 1)
 			{
 				$login .= '@' . (isset($_POST['logindomain']) ? $_POST['logindomain'] : $default_domain);
+		}
 			}
 			$parts = explode('@',$login);
 			$domain = array_pop($parts);
@@ -1352,7 +1459,10 @@ 
 		{
 			$domain = $default_domain;
 		}
-		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."() default_domain=".array2string($default_domain).', login='.array2string($login)." returning ".array2string($domain));
+		if (self::ERROR_LOG_DEBUG)
+		{
+			error_log(__METHOD__."() default_domain=".array2string($default_domain).', login='.array2string($login)." returning ".array2string($domain));
+		}
 
 		return $domain;
 	}
@@ -1379,7 +1489,10 @@ 
 			$action = $_SERVER['PHP_SELF'];
 			// remove EGroupware path, if not installed in webroot
 			$egw_path = $GLOBALS['egw_info']['server']['webserver_url'];
-			if ($egw_path[0] != '/') $egw_path = parse_url($egw_path,PHP_URL_PATH);
+			if ($egw_path[0] != '/')
+			{
+				$egw_path = parse_url($egw_path,PHP_URL_PATH);
+			}
 			if ($action == '/Microsoft-Server-ActiveSync')
 			{
 				$action .= '?Cmd='.$_GET['Cmd'].'&DeviceId='.$_GET['DeviceId'];
@@ -1404,7 +1517,10 @@ 
 
 		$_SESSION[self::EGW_SESSION_VAR]['session_dla'] = time();
 		$_SESSION[self::EGW_SESSION_VAR]['session_action'] = $action;
-		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__.'() _SESSION['.self::EGW_SESSION_VAR.']='.array2string($_SESSION[self::EGW_SESSION_VAR]));
+		if (self::ERROR_LOG_DEBUG)
+		{
+			error_log(__METHOD__.'() _SESSION['.self::EGW_SESSION_VAR.']='.array2string($_SESSION[self::EGW_SESSION_VAR]));
+		}
 
 		return $action;
 	}
@@ -1530,7 +1646,10 @@ 
 	 */
 	public static function init_handler()
 	{
-		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__.'() session_handler='.self::$session_handler.', egw_info[server][session_handler]='.$GLOBALS['egw_info']['server']['session_handler'].' called from:'.function_backtrace());
+		if (self::ERROR_LOG_DEBUG)
+		{
+			error_log(__METHOD__.'() session_handler='.self::$session_handler.', egw_info[server][session_handler]='.$GLOBALS['egw_info']['server']['session_handler'].' called from:'.function_backtrace());
+		}
 
 		ini_set('session.use_cookies',0);	// disable the automatic use of cookies, as it uses the path / by default
 		session_name(self::EGW_SESSION_NAME);
@@ -1540,10 +1659,16 @@ 
 		 	self::cache_control();
 			$ok = session_start();
 			self::decrypt();
-			if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."() sessionid=$sessionid, _SESSION[".self::EGW_SESSION_VAR.']='.array2string($_SESSION[self::EGW_SESSION_VAR]));
+			if (self::ERROR_LOG_DEBUG)
+			{
+				error_log(__METHOD__."() sessionid=$sessionid, _SESSION[".self::EGW_SESSION_VAR.']='.array2string($_SESSION[self::EGW_SESSION_VAR]));
+			}
 			return $ok;
 		}
-		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."() no active session!");
+		if (self::ERROR_LOG_DEBUG)
+		{
+			error_log(__METHOD__."() no active session!");
+		}
 
 		return false;
 	}
@@ -1601,9 +1726,12 @@ 
 					error_log(__METHOD__."($expire) called, but header already sent in $file: $line");
 					return;
 				}
-				if($expire === true)	// same behavior as session_cache_limiter('private_no_expire')
+				if($expire === true)
+				{
+					// same behavior as session_cache_limiter('private_no_expire')
 				{
 					header('Cache-Control: private, max-age='.(60*session_cache_expire()));
+				}
 					header_remove('Expires');
 				}
 				elseif ($private)
@@ -1617,10 +1745,13 @@ 
 					header('Expires: ' . gmdate('D, d M Y H:i:s', time()+$expire) . ' GMT');
 				}
 				// remove Pragma header, might be set by old header
-				if (function_exists('header_remove'))	// PHP 5.3+
+				if (function_exists('header_remove'))
+				{
+					// PHP 5.3+
 				{
 					header_remove('Pragma');
 				}
+				}
 				else
 				{
 					header('Pragma:');

api/src/Categories.php

Braces +208 added lines, -52 removed lines

@@ -122,7 +122,10 @@ 
 	 */
 	function __construct($accountid='',$app_name = '')
 	{
-		if (!$app_name) $app_name = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$app_name)
+		{
+			$app_name = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		if ($accountid === self::GLOBAL_ACCOUNT ||
 			$accountid < 0 && $GLOBALS['egw']->accounts->exists($accountid) == 2)
@@ -138,10 +141,13 @@ 
 		$this->app_name		= $app_name;
 		$this->db			= $GLOBALS['egw']->db;
 
-		if (is_null(self::$cache))	// should not be necessary, as cache is load and restored by egw object
+		if (is_null(self::$cache))
+		{
+			// should not be necessary, as cache is load and restored by egw object
 		{
 			self::init_cache();
 		}
+		}
 		if (is_null(self::$global_marker))
 		{
 			// as et2 adds options with .text(), it can't be entities, but php knows no string literals with utf-8
@@ -189,7 +195,9 @@ 
 		$cats = array();
 		foreach(self::$cache as $cat)
 		{
-			if ($filter) foreach($filter as $col => $val)
+			if ($filter)
+			{
+				foreach($filter as $col => $val)
 			{
 				if (!is_array($val) && $val[0] === '!')
 				{
@@ -197,10 +205,14 @@ 
 					if (($col == 'name' || $col == 'description') && is_string($cat[$col]))
 					{
 						if ($cat[$col] == substr($val,1) || trim($cat[$col]) == substr($val,1)) continue 2;
+			}
 					}
 					else
 					{
-						if ($cat[$col] == substr($val,1)) continue 2;
+						if ($cat[$col] == substr($val,1))
+						{
+							continue 2;
+						}
 					}
 				}
 				elseif (is_array($val))
@@ -208,11 +220,17 @@ 
 					// also match against trimmed database entry on name and description fields
 					if (($col == 'name' || $col == 'description') && is_string($cat[$col]))
 					{
-						if (!in_array($cat[$col],$val) && !in_array(trim($cat[$col]),$val)) continue 2;
+						if (!in_array($cat[$col],$val) && !in_array(trim($cat[$col]),$val))
+						{
+							continue 2;
+						}
 					}
 					else
 					{
-						if (!in_array($cat[$col],$val)) continue 2;
+						if (!in_array($cat[$col],$val))
+						{
+							continue 2;
+						}
 					}
 				}
 				else
@@ -220,16 +238,25 @@ 
 					// also match against trimmed database entry on name and description fields
 					if (($col == 'name' || $col == 'description') && is_string($cat[$col]))
 					{
-						if ($cat[$col] != $val && trim($cat[$col]) != $val) continue 2;
+						if ($cat[$col] != $val && trim($cat[$col]) != $val)
+						{
+							continue 2;
+						}
 					}
 					else
 					{
-						if ($cat[$col] != $val) continue 2;
+						if ($cat[$col] != $val)
+						{
+							continue 2;
+						}
 					}
 				}
 			}
 			// check if certain parent required
-			if ($parent_id && !in_array($cat['parent'],(array)$parent_id)) continue;
+			if ($parent_id && !in_array($cat['parent'],(array)$parent_id))
+			{
+				continue;
+			}
 
 			// return global categories just if $globals is set
 			if (!$globals && $cat['appname'] == self::GLOBAL_APPNAME)
@@ -247,30 +274,55 @@ 
 			switch ($type)
 			{
 				case 'subs':
-					if (!$cat['parent']) continue 2;	// 2 for switch AND foreach!
+					if (!$cat['parent'])
+					{
+						continue 2;
+					}
+					// 2 for switch AND foreach!
 					break;
 				case 'mains':
-					if ($cat['parent']) continue 2;
+					if ($cat['parent'])
+					{
+						continue 2;
+					}
 					break;
 				case 'appandmains':
-					if ($cat['appname'] != $this->app_name || $cat['parent']) continue 2;
+					if ($cat['appname'] != $this->app_name || $cat['parent'])
+					{
+						continue 2;
+					}
 					break;
 				case 'appandsubs':
-					if ($cat['appname'] != $this->app_name || !$cat['parent']) continue 2;
+					if ($cat['appname'] != $this->app_name || !$cat['parent'])
+					{
+						continue 2;
+					}
 					break;
 				case 'noglobal':
-					if ($cat['appname'] == $this->app_name) continue 2;
+					if ($cat['appname'] == $this->app_name)
+					{
+						continue 2;
+					}
 					break;
 				case 'noglobalapp':
-					if ($cat['appname'] != $this->app_name || $cat['owner'] == (int)$this->account_id) continue 2;
+					if ($cat['appname'] != $this->app_name || $cat['owner'] == (int)$this->account_id)
+					{
+						continue 2;
+					}
 					break;
 			}
 
 			// check name and description for $query
-			if ($query && stristr($cat['name'],$query) === false && stristr($cat['description'],$query) === false) continue;
+			if ($query && stristr($cat['name'],$query) === false && stristr($cat['description'],$query) === false)
+			{
+				continue;
+			}
 
 			// check if last modified since
-			if ($lastmod > 0 && $cat['last_mod'] <= $lastmod) continue;
+			if ($lastmod > 0 && $cat['last_mod'] <= $lastmod)
+			{
+				continue;
+			}
 
 			$cat['data'] = $cat['data'] ? json_php_unserialize($cat['data'], true) : array();
 
@@ -281,13 +333,23 @@ 
 			//error_log(__METHOD__."($type,$start,$limit,$query,$sort,$order,$globals,parent=$parent_id,$lastmod,$column) account_id=$this->account_id, appname=$this->app_name = FALSE");
 			return array();
 		}
-		if (!$sort) $sort = 'ASC';
+		if (!$sort)
+		{
+			$sort = 'ASC';
+		}
 		// order the entries if necessary (cache is already ordered in or default order: cat_main, cat_level, cat_name ASC)
 		if ($this->total_records > 1 && !empty($order) &&
 			preg_match('/^[a-zA-Z_(), ]+$/',$order) && preg_match('/^(ASC|DESC|asc|desc)$/',$sort))
 		{
-			if (strstr($order,'cat_data') !== false) $order = 'cat_data';	// sitemgr orders by round(cat_data)!
-			if (substr($order,0,4) == 'cat_') $order = substr($order,4);
+			if (strstr($order,'cat_data') !== false)
+			{
+				$order = 'cat_data';
+			}
+			// sitemgr orders by round(cat_data)!
+			if (substr($order,0,4) == 'cat_')
+			{
+				$order = substr($order,4);
+			}
 			$sign = strtoupper($sort) == 'DESC' ? -1 : 1;
 			usort($cats, function($a, $b) use ($order, $sign)
 			{
@@ -301,7 +363,10 @@ 
 		// limit the number of returned rows
 		if ($limit)
 		{
-			if (!is_int($limit)) $limit = (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
+			if (!is_int($limit))
+			{
+				$limit = (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
+			}
 			$cats = array_slice($cats,(int)$start,$limit);
 		}
 		// return only a certain column (why not return is as value?)
@@ -334,15 +399,24 @@ 
 	 */
 	function return_sorted_array($start=0,$limit=True,$query='',$sort='ASC',$order='cat_name',$globals=False, $parent_id=0,$unserialize_data=true,$filter=null)
 	{
-		if (!$sort)  $sort = 'ASC';
-		if (!$order) $order = 'cat_name';
+		if (!$sort)
+		{
+			$sort = 'ASC';
+		}
+		if (!$order)
+		{
+			$order = 'cat_name';
+		}
 
 		//error_log(__METHOD__."($start,$limit,$query,$sort,$order,globals=$globals,parent=$parent_id,$unserialize_data) account_id=$this->account_id, appname=$this->app_name: ".function_backtrace());
 
 		$parents = $cats = array();
 
 		// Cast parent_id to array, but only if there is one
-		if($parent_id !== false && $parent_id !== null) $parent_id = (array)$parent_id;
+		if($parent_id !== false && $parent_id !== null)
+		{
+			$parent_id = (array)$parent_id;
+		}
 		if (!($cats = $this->return_array('all',0,false,$query,$sort,$order,$globals,$parent_id,-1,'',$filter,$unserialize_data)))
 		{
 			$cats = array();
@@ -352,7 +426,9 @@ 
 			$parents[] = $cat['id'];
 		}
 
-		if($parent_id || !$cats) // Avoid wiping search results
+		if($parent_id || !$cats)
+		{
+			// Avoid wiping search results
 		{
 			// Go find the children
 			while (count($parents))
@@ -360,6 +436,7 @@ 
 				if (!($subs = $this->return_array('all',0,false,$query,$sort,$order,$globals,$parents,-1,'',$filter,$unserialize_data)))
 				{
 					break;
+		}
 				}
 				$parents = $children = array();
 				foreach($subs as $cat)
@@ -391,7 +468,10 @@ 
 		// limit the number of returned rows
 		if ($limit)
 		{
-			if (!is_int($limit)) $limit = (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
+			if (!is_int($limit))
+			{
+				$limit = (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
+			}
 			$cats = array_slice($cats,(int)$start,$limit);
 		}
 		reset($cats);	// some old code (eg. sitemgr) relies on the array-pointer!
@@ -410,9 +490,15 @@ 
 	 */
 	static function read($id)
 	{
-		if (is_null(self::$cache)) self::init_cache();
+		if (is_null(self::$cache))
+		{
+			self::init_cache();
+		}
 
-		if (!isset(self::$cache[$id])) return false;
+		if (!isset(self::$cache[$id]))
+		{
+			return false;
+		}
 
 		$cat = self::$cache[$id];
 		$cat['data'] = $cat['data'] ? ((($arr=json_php_unserialize($cat['data'], true)) !== false || $cat['data'] === 'b:0;') ?
@@ -475,8 +561,11 @@ 
 	 * @return string truncated commaseparated list of category ids
 	 */
 	function check_list($needed, $cat_list)
- 	{
-		if (empty($cat_list)) return $cat_list;
+	{
+		if (empty($cat_list))
+		{
+			return $cat_list;
+		}
 		if (is_array($cat_list))
 		{
 			$cat_list = implode(',',$cat_list);
@@ -487,10 +576,13 @@ 
 		{
 			foreach($cat_arr as $id=>$cat_id)
 			{
-				if (!$this->check_perms($needed, $cat_id, false, $needed == Acl::READ))	// allow reading all global cats
+				if (!$this->check_perms($needed, $cat_id, false, $needed == Acl::READ))
+				{
+					// allow reading all global cats
 				{
 					unset($cat_arr[$id]);
 				}
+				}
 			}
 			$cat_list = implode(',',$cat_arr);
 		}
@@ -596,9 +688,15 @@ 
 				{
 					$update = array('cat_level' => $cat['level']-1);
 
-					if ($new_main) $update['cat_main'] = $new_main;
+					if ($new_main)
+					{
+						$update['cat_main'] = $new_main;
+					}
 
-					if ($cat['parent'] == $cat_id) $update['cat_parent'] = $new_parent;
+					if ($cat['parent'] == $cat_id)
+					{
+						$update['cat_parent'] = $new_parent;
+					}
 
 					$this->db->update(self::TABLE,$update,array(
 						'cat_id' => $cat['id'],
@@ -624,9 +722,13 @@ 
 			'modify_subs' => $modify_subs,
 			'location'    => 'delete_category'
 		);
-		if($this->is_global($cat_id, true))	// true = application global (otherwise eg. global addressbook categories call all apps)
+		if($this->is_global($cat_id, true))
+		{
+			// true = application global (otherwise eg. global addressbook categories call all apps)
 		{
-			Hooks::process($GLOBALS['hook_values'],False,True);  // called for every app now, not only enabled ones)
+			Hooks::process($GLOBALS['hook_values'],False,True);
+		}
+		// called for every app now, not only enabled ones)
 		}
 		else
 		{
@@ -682,12 +784,22 @@ 
 		// check if we try to move an element down its own subtree, which will fail
 		foreach ($this->return_sorted_array('',False,'','','',False, $values['id']) as $cat)
 		{
-			if ($cat['id'] == $values['parent']) return lang('Cannot set a category as parent, which is part of this categorys subtree!');
+			if ($cat['id'] == $values['parent'])
+			{
+				return lang('Cannot set a category as parent, which is part of this categorys subtree!');
+			}
 		}
 		// check if we try to be our own parent
-		if ($values['parent']==$values['id']) return lang('Cannot set this cat as its own parent!'); // deny to be our own parent
+		if ($values['parent']==$values['id'])
+		{
+			return lang('Cannot set this cat as its own parent!');
+		}
+		// deny to be our own parent
 		// check if parent still exists
-		if ((int)$values['parent']>0 && !$this->read($values['parent'])) return lang('Chosen parent category no longer exists');
+		if ((int)$values['parent']>0 && !$this->read($values['parent']))
+		{
+			return lang('Chosen parent category no longer exists');
+		}
 		return true;
 	}
 
@@ -704,7 +816,10 @@ 
 		if (isset($values['old_parent']) && (int)$values['old_parent'] != (int)$values['parent'])
 		{
 			$ret = $this->check_consistency4update($values);
-			if ($ret !== true) throw new Exception\WrongUserinput($ret);
+			if ($ret !== true)
+			{
+				throw new Exception\WrongUserinput($ret);
+			}
 			// everything seems in order -> proceed
 			$values['level'] = ($values['parent'] ? $this->id2name($values['parent'],'level')+1:0);
 			$this->adapt_level_in_subtree($values);
@@ -717,7 +832,10 @@ 
 			if ($values['parent'] > 0)
 			{
 				$ret = $this->check_consistency4update($values);
-				if ($ret !== true) throw new Exception\WrongUserinput($ret);
+				if ($ret !== true)
+				{
+					throw new Exception\WrongUserinput($ret);
+				}
 
 				// everything seems in order -> proceed
 				$values['main']  = $this->id2name($values['parent'],'main');
@@ -773,7 +891,10 @@ 
 	{
 		static $cache = array();	// a litle bit of caching
 
-		if (isset($cache[$cat_name])) return $cache[$cat_name];
+		if (isset($cache[$cat_name]))
+		{
+			return $cache[$cat_name];
+		}
 
 		if ($strip === true)
 		{
@@ -826,7 +947,11 @@ 
 	 */
 	static function is_global($cat,$application_global=false)
 	{
-		if (!is_array($cat) && !($cat = self::read($cat))) return null;	// cat not found
+		if (!is_array($cat) && !($cat = self::read($cat)))
+		{
+			return null;
+		}
+		// cat not found
 
 		$global_owner = false;
 		foreach(explode(',',$cat['owner']) as $owner)
@@ -848,10 +973,19 @@ 
 	 */
 	static function id2name($cat_id=0, $item='name')
 	{
-		if(!$cat_id) return '--';
-		if (!$item) $item = 'parent';
+		if(!$cat_id)
+		{
+			return '--';
+		}
+		if (!$item)
+		{
+			$item = 'parent';
+		}
 
-		if (is_null(self::$cache)) self::init_cache();
+		if (is_null(self::$cache))
+		{
+			self::init_cache();
+		}
 
 		$cat = self::$cache[$cat_id];
 		if ($item == 'path')
@@ -892,7 +1026,10 @@ 
 		if ($cat_name)
 		{
 			$filter['name'] = $cat_name;
-			if ($cat_id) $filter['id'] = '!'.(int)$cat_id;
+			if ($cat_id)
+			{
+				$filter['id'] = '!'.(int)$cat_id;
+			}
 		}
 		elseif ($cat_id)
 		{
@@ -921,7 +1058,10 @@ 
 	{
 		$where = array('cat_owner' => $owner);
 
-		if ($app) $where['cat_appname'] = $app;
+		if ($app)
+		{
+			$where['cat_appname'] = $app;
+		}
 
 		if ((int)$to)
 		{
@@ -967,7 +1107,11 @@ 
 				false,'ORDER BY cat_main, cat_level, cat_name ASC') as $cat)
 			{
 				$cat = Db::strip_array_keys($cat,'cat_');
-				if ($cat['appname'] == '*update*') continue;	// --> ignore update marker
+				if ($cat['appname'] == '*update*')
+				{
+					continue;
+				}
+				// --> ignore update marker
 				$cat['app_name'] = $cat['appname'];
 				// backlink children to their parent
 				if ($cat['parent'])
@@ -1058,7 +1202,10 @@ 
 		// ACL check
 		$cats = $GLOBALS['egw']->categories->check_list(Acl::READ, $_cats);
 
-		if (!$cats) return null;
+		if (!$cats)
+		{
+			return null;
+		}
 
 		if (isset($cat2color[$cats]))
 		{
@@ -1090,7 +1237,10 @@ 
 	 */
 	public static function delete_account($account_id, $new_owner=null)
 	{
-		if (is_null(self::$cache)) self::init_cache();
+		if (is_null(self::$cache))
+		{
+			self::init_cache();
+		}
 
 		$deleted = 0;
 		$cat = null;
@@ -1110,7 +1260,10 @@ 
 				else
 				{
 					unset($owners[$owner_key]);
-					if ($new_owner && $account_id > 0) $owners[] = $new_owner;
+					if ($new_owner && $account_id > 0)
+					{
+						$owners[] = $new_owner;
+					}
 					$data['owner'] = implode(',', $owners);
 					// app_name have to match cat to update!
 					if (!isset($cat) || $cat->app_name != $data['appname'])
@@ -1132,7 +1285,10 @@ 
 	 */
 	public static function delete_orphans()
 	{
-		if (is_null(self::$cache)) self::init_cache();
+		if (is_null(self::$cache))
+		{
+			self::init_cache();
+		}
 
 		$checked = array();
 		$deleted = 0;

api/src/Db.php

Braces +244 added lines, -61 removed lines

@@ -383,7 +383,10 @@ 
 			if ($state['wsrep_local_state_comment'] == 'Synced' ||
 				// if we have only 2 nodes (2. one starting), we can only use the donor
 				$state['wsrep_local_state_comment'] == 'Donor/Desynced' &&
-					$state['wsrep_cluster_size'] == 2) return;
+					$state['wsrep_cluster_size'] == 2)
+			{
+				return;
+			}
 
 			throw new Db\Exception\Connection('Node is NOT Synced! '.array2string($state));
 		}
@@ -402,7 +405,10 @@ 
 		$hosts = explode(';', $this->Host[0] == '@' ? getenv(substr($this->Host, 1)) : $this->Host);
 		$num_hosts = count($hosts);
 		$n =& Cache::getSession(__CLASS__, $this->Host);
-		if (!isset($n)) $n = 0;
+		if (!isset($n))
+		{
+			$n = 0;
+		}
 
 		if ($next && ++$n >= $num_hosts+2)
 		{
@@ -432,7 +438,10 @@ 
 			foreach(array('Database','User','Password','Port','Type') as $name)
 			{
 				$$name = $this->$name;
-				if (${$name}[0] == '@' && $name != 'Password') $$name = getenv(substr($$name, 1));
+				if (${$name}[0] == '@' && $name != 'Password')
+				{
+					$$name = getenv(substr($$name, 1));
+				}
 			}
 			$this->setupType = $php_extension = $Type;
 
@@ -451,7 +460,10 @@ 
 					$Type = 'mssql';
 					// fall through
 				case 'mssql':
-					if ($Port) $Host .= ','.$Port;
+					if ($Port)
+					{
+						$Host .= ','.$Port;
+					}
 					break;
 
 				case 'odbc_oracle':
@@ -486,7 +498,10 @@ 
 					$this->Type = 'mysql';		// need to be "mysql", so apps can check just for "mysql"!
 					// fall through
 				default:
-					if ($Port) $Host .= ':'.$Port;
+					if ($Port)
+					{
+						$Host .= ':'.$Port;
+					}
 					break;
 			}
 			if (!isset($GLOBALS['egw']->ADOdb) ||	// we have no connection so far
@@ -501,10 +516,13 @@ 
 				{
 					throw new Db\Exception\Connection("Necessary php database support for $this->Type (".PHP_SHLIB_PREFIX.$php_extension.'.'.PHP_SHLIB_SUFFIX.") not loaded and can't be loaded, exiting !!!");
 				}
-				if (!isset($GLOBALS['egw']->ADOdb))	// use the global object to store the connection
+				if (!isset($GLOBALS['egw']->ADOdb))
+				{
+					// use the global object to store the connection
 				{
 					$this->Link_ID =& $GLOBALS['egw']->ADOdb;
 				}
+				}
 				else
 				{
 					$this->privat_Link_ID = True;	// remember that we use a privat Link_ID for disconnect
@@ -600,7 +618,11 @@ 
 	 */
 	function __sleep()
 	{
-		if (!empty($this->setupType)) $this->Type = $this->setupType;	// restore Type eg. to mysqli
+		if (!empty($this->setupType))
+		{
+			$this->Type = $this->setupType;
+		}
+		// restore Type eg. to mysqli
 
 		$vars = get_object_vars($this);
 		unset($vars['Link_ID']);
@@ -663,7 +685,10 @@ 
 		unset($this->Link_ID);
 		$this->Link_ID = 0;
 
-		if (!empty($this->setupType)) $this->Type = $this->setupType;
+		if (!empty($this->setupType))
+		{
+			$this->Type = $this->setupType;
+		}
 	}
 
 	/**
@@ -772,16 +797,22 @@ 
 		}
 		if (!$rs)
 		{
-			if ($reconnect && $this->Type == 'mysql' && $this->Errno == 2006)	// Server has gone away
+			if ($reconnect && $this->Type == 'mysql' && $this->Errno == 2006)
+			{
+				// Server has gone away
 			{
 				$this->disconnect();
+			}
 				return $this->query($Query_String, $line, $file, $offset, $num_rows, $inputarr, $fetchmode, false);
 			}
 			throw new Db\Exception\InvalidSql("Invalid SQL: ".(is_array($Query_String)?$Query_String[0]:$Query_String).
 				"\n$this->Error ($this->Errno)".
 				($inputarr ? "\nParameters: '".implode("','",$inputarr)."'":''), $this->Errno);
 		}
-		elseif(empty($rs->sql)) $rs->sql = $Query_String;
+		elseif(empty($rs->sql))
+		{
+			$rs->sql = $Query_String;
+		}
 		return $rs;
 	}
 
@@ -865,9 +896,12 @@ 
 		}
 		$id = $this->Link_ID->PO_Insert_ID($table,$field);	// simulates Insert_ID with "SELECT MAX($field) FROM $table" if not native availible
 
-		if ($id === False)	// function not supported
+		if ($id === False)
+		{
+			// function not supported
 		{
 			echo "<p>db::get_last_insert_id(table='$table',field='$field') not yet implemented for db-type '$this->Type' OR no insert operation before</p>\n";
+		}
 			echo '<p>'.function_backtrace()."</p>\n";
 			return -1;
 		}
@@ -881,7 +915,10 @@ 
 	*/
 	function affected_rows()
 	{
-		if ($this->log_updates) return 0;
+		if ($this->log_updates)
+		{
+			return 0;
+		}
 
 		if (!$this->Link_ID && !$this->connect())
 		{
@@ -915,9 +952,18 @@ 
 		{
 			// for backwards compatibilty (depreciated)
 			$flags = null;
-			if($column->auto_increment) $flags .= "auto_increment ";
-			if($column->primary_key) $flags .= "primary_key ";
-			if($column->binary) $flags .= "binary ";
+			if($column->auto_increment)
+			{
+				$flags .= "auto_increment ";
+			}
+			if($column->primary_key)
+			{
+				$flags .= "primary_key ";
+			}
+			if($column->binary)
+			{
+				$flags .= "binary ";
+			}
 
 			$metadata[$i] = array(
 				'table' => $table,
@@ -954,7 +1000,10 @@ 
 	 */
 	function table_names($just_name=false)
 	{
-		if (!$this->Link_ID) $this->connect();
+		if (!$this->Link_ID)
+		{
+			$this->connect();
+		}
 		if (!$this->Link_ID)
 		{
 			return False;
@@ -1105,8 +1154,14 @@ 
 		{
 			case 'mysql':
 				$sql = 'GROUP_CONCAT('.$expr;
-				if ($order_by) $sql .= ' ORDER BY '.$order_by;
-				if ($separator != ',') $sql .= ' SEPARATOR '.$this->quote($separator);
+				if ($order_by)
+				{
+					$sql .= ' ORDER BY '.$order_by;
+				}
+				if ($separator != ',')
+				{
+					$sql .= ' SEPARATOR '.$this->quote($separator);
+				}
 				$sql .= ')';
 				break;
 
@@ -1116,7 +1171,10 @@ 
 					return false;
 				}
 				$sql = 'ARRAY_TO_STRING(ARRAY_AGG('.$expr;
-				if ($order_by) $sql .= ' ORDER BY '.$order_by;
+				if ($order_by)
+				{
+					$sql .= ' ORDER BY '.$order_by;
+				}
 				$sql .= '), '.$this->quote($separator).')';
 				break;
 
@@ -1339,12 +1397,18 @@ 
 	*/
 	function quote($value,$type=False,$not_null=true,$length=null,$glue=',')
 	{
-		if ($this->Debug) echo "<p>db::quote(".(is_null($value)?'NULL':"'$value'").",'$type','$not_null')</p>\n";
+		if ($this->Debug)
+		{
+			echo "<p>db::quote(".(is_null($value)?'NULL':"'$value'").",'$type','$not_null')</p>\n";
+		}
 
-		if (!$not_null && is_null($value))	// writing unset php-variables and those set to NULL now as SQL NULL
+		if (!$not_null && is_null($value))
+		{
+			// writing unset php-variables and those set to NULL now as SQL NULL
 		{
 			return 'NULL';
 		}
+		}
 		switch($type)
 		{
 			case 'int':
@@ -1359,10 +1423,13 @@ 
 				// There for we have to keep it as float by using round instead the int cast.
 				return is_float($value) ? round($value) : (int) $value;
 			case 'bool':
-				if ($this->Type == 'mysql')		// maybe it's not longer necessary with mysql5
+				if ($this->Type == 'mysql')
+				{
+					// maybe it's not longer necessary with mysql5
 				{
 					return $value ? 1 : 0;
 				}
+				}
 				return $value ? 'true' : 'false';
 			case 'float':
 			case 'decimal':
@@ -1410,7 +1477,10 @@ 
 		}
 		// casting boolean explicitly to string, as ADODB_postgres64::qstr() has an unwanted special handling
 		// for boolean types, causing it to return "true" or "false" and not a quoted string like "'1'"!
-		if (is_bool($value)) $value = (string)$value;
+		if (is_bool($value))
+		{
+			$value = (string)$value;
+		}
 
 		// need to cast to string, as ADOdb 5.20 would return NULL instead of '' for NULL, causing us to write that into NOT NULL columns
 		return $this->Link_ID->qstr((string)$value);
@@ -1440,15 +1510,21 @@ 
 	*/
 	function column_data_implode($glue,$array,$use_key=True,$only=False,$column_definitions=False)
 	{
-		if (!is_array($array))	// this allows to give an SQL-string for delete or update
+		if (!is_array($array))
+		{
+			// this allows to give an SQL-string for delete or update
 		{
 			return $array;
 		}
+		}
 		if (!$column_definitions)
 		{
 			$column_definitions = $this->column_definitions;
 		}
-		if ($this->Debug) echo "<p>db::column_data_implode('$glue',".print_r($array,True).",'$use_key',".print_r($only,True).",<pre>".print_r($column_definitions,True)."</pre>\n";
+		if ($this->Debug)
+		{
+			echo "<p>db::column_data_implode('$glue',".print_r($array,True).",'$use_key',".print_r($only,True).",<pre>".print_r($column_definitions,True)."</pre>\n";
+		}
 
 		// do we need to truncate varchars to their max length (INSERT and UPDATE on Postgres)
 		$truncate_varchar = $glue == ',' && $this->capabilities[self::CAPABILITY_REQUIRE_TRUNCATE_VARCHAR];
@@ -1465,7 +1541,10 @@ 
 				// fix "table.column" expressions, to not trigger exception, if column alone would work
 				if (!is_int($key) && is_array($column_definitions) && !isset($column_definitions[$key]))
 				{
-					if (strpos($key, '.') !== false) list(, $col) = explode('.', $key);
+					if (strpos($key, '.') !== false)
+					{
+						list(, $col) = explode('.', $key);
+					}
 					if (!isset($column_definitions[$col]))
 					{
 						throw new Db\Exception\InvalidSql("db::column_data_implode('$glue',".print_r($array,True).",'$use_key',".print_r($only,True).",<pre>".print_r($column_definitions,True)."</pre><b>nothing known about column '$key'!</b>");
@@ -1505,7 +1584,11 @@ 
 				}
 				elseif (is_int($key) && $use_key===True)
 				{
-					if (empty($data)) continue;	// would give SQL error
+					if (empty($data))
+					{
+						continue;
+					}
+					// would give SQL error
 					$values[] = $data;
 				}
 				elseif ($glue != ',' && $use_key === True && !$not_null && is_null($data))
@@ -1559,7 +1642,10 @@ 
 	function set_app($app)
 	{
 		// ease the transition to api
-		if ($app == 'phpgwapi') $app = 'api';
+		if ($app == 'phpgwapi')
+		{
+			$app = 'api';
+		}
 
 		if ($this === $GLOBALS['egw']->db && $app != self::API_APPNAME)
 		{
@@ -1584,7 +1670,10 @@ 
 	function get_table_definitions($app=False,$table=False)
 	{
 		// ease the transition to api
-		if ($app === 'phpgwapi') $app = 'api';
+		if ($app === 'phpgwapi')
+		{
+			$app = 'api';
+		}
 
 		static $all_app_data = array();
 		if ($app === true && $table)
@@ -1642,10 +1731,16 @@ 
 		}
 		if ($table && (!$app_data || !isset($app_data[$table])))
 		{
-			if ($this->Debug) echo "<p>!!!get_table_definitions($app,$table) failed!!!</p>\n";
+			if ($this->Debug)
+			{
+				echo "<p>!!!get_table_definitions($app,$table) failed!!!</p>\n";
+			}
 			return False;
 		}
-		if ($this->Debug) echo "<p>get_table_definitions($app,$table) succeeded</p>\n";
+		if ($this->Debug)
+		{
+			echo "<p>get_table_definitions($app,$table) succeeded</p>\n";
+		}
 		return $table ? $app_data[$table] : $app_data;
 	}
 
@@ -1670,7 +1765,10 @@ 
 			$table_def = $db->get_table_definitions($app,$table);
 			$cached_columns = is_array($table_def) ? $table_def['fd'] : false;
 		}
-		if ($cached_columns === false) return null;
+		if ($cached_columns === false)
+		{
+			return null;
+		}
 
 		return is_null($attribute) ? $cached_columns[$column] : $cached_columns[$column][$attribute];
 	}
@@ -1693,9 +1791,15 @@ 
 	*/
 	function insert($table,$data,$where,$line,$file,$app=False,$use_prepared_statement=false,$table_def=False)
 	{
-		if ($this->Debug) echo "<p>db::insert('$table',".print_r($data,True).",".print_r($where,True).",$line,$file,'$app')</p>\n";
+		if ($this->Debug)
+		{
+			echo "<p>db::insert('$table',".print_r($data,True).",".print_r($where,True).",$line,$file,'$app')</p>\n";
+		}
 
-		if (!$table_def) $table_def = $this->get_table_definitions($app,$table);
+		if (!$table_def)
+		{
+			$table_def = $this->get_table_definitions($app,$table);
+		}
 
 		$sql_append = '';
 		$cmd = 'INSERT';
@@ -1737,9 +1841,12 @@ 
 			$table = self::$tablealiases[$table];
 		}
 		$inputarr = false;
-		if (isset($data[0]) && is_array($data[0]))	// multiple data rows
+		if (isset($data[0]) && is_array($data[0]))
+		{
+			// multiple data rows
 		{
 			if ($where) throw new Exception\WrongParameter('Can NOT use $where together with multiple data rows in $data!');
+		}
 
 			$sql = "$cmd INTO $table ";
 			foreach($data as $k => $d)
@@ -1755,15 +1862,22 @@ 
 			}
 			$sql .= $sql_append;
 		}
-		elseif ($use_prepared_statement && $this->Link_ID->_bindInputArray)	// eg. MaxDB
+		elseif ($use_prepared_statement && $this->Link_ID->_bindInputArray)
 		{
-			$this->Link_ID->Param(false);	// reset param-counter
+			// eg. MaxDB
+		{
+			$this->Link_ID->Param(false);
+		}
+		// reset param-counter
 			$cols = array_keys($data);
 			foreach($cols as $k => $col)
 			{
-				if (!isset($table_def['fd'][$col]))	// ignore columns not in this table
+				if (!isset($table_def['fd'][$col]))
+				{
+					// ignore columns not in this table
 				{
 					unset($cols[$k]);
+				}
 					continue;
 				}
 				$params[] = $this->Link_ID->Param($col);
@@ -1781,7 +1895,10 @@ 
 		{
 			$sql = "$cmd INTO $table ".$this->column_data_implode(',',$data,'VALUES',true,$table_def['fd']).$sql_append;
 		}
-		if ($this->Debug) echo "<p>db::insert('$table',".print_r($data,True).",".print_r($where,True).",$line,$file,'$app') sql='$sql'</p>\n";
+		if ($this->Debug)
+		{
+			echo "<p>db::insert('$table',".print_r($data,True).",".print_r($where,True).",$line,$file,'$app') sql='$sql'</p>\n";
+		}
 		return $this->query($sql,$line,$file,0,-1,$inputarr);
 	}
 
@@ -1802,8 +1919,14 @@ 
 	*/
 	function update($table,$data,$where,$line,$file,$app=False,$use_prepared_statement=false,$table_def=False)
 	{
-		if ($this->Debug) echo "<p>db::update('$table',".print_r($data,true).','.print_r($where,true).",$line,$file,'$app')</p>\n";
-		if (!$table_def) $table_def = $this->get_table_definitions($app,$table);
+		if ($this->Debug)
+		{
+			echo "<p>db::update('$table',".print_r($data,true).','.print_r($where,true).",$line,$file,'$app')</p>\n";
+		}
+		if (!$table_def)
+		{
+			$table_def = $this->get_table_definitions($app,$table);
+		}
 
 		$blobs2update = array();
 		// SapDB/MaxDB cant update LONG columns / blob's: if a blob-column is included in the update we remember it in $blobs2update
@@ -1812,7 +1935,10 @@ 
 		{
 			case 'sapdb':
 			case 'maxdb':
-				if ($use_prepared_statement) break;
+				if ($use_prepared_statement)
+				{
+					break;
+				}
 				// check if data contains any LONG columns
 				foreach($data as $col => $val)
 				{
@@ -1837,12 +1963,20 @@ 
 		if (count($data))
 		{
 			$inputarr = false;
-			if ($use_prepared_statement && $this->Link_ID->_bindInputArray)	// eg. MaxDB
+			if ($use_prepared_statement && $this->Link_ID->_bindInputArray)
+			{
+				// eg. MaxDB
 			{
-				$this->Link_ID->Param(false);	// reset param-counter
+				$this->Link_ID->Param(false);
+			}
+			// reset param-counter
 				foreach($data as $col => $val)
 				{
-					if (!isset($table_def['fd'][$col])) continue;	// ignore columns not in this table
+					if (!isset($table_def['fd'][$col]))
+					{
+						continue;
+					}
+					// ignore columns not in this table
 					$params[] = $this->name_quote($col).'='.$this->Link_ID->Param($col);
 				}
 				$sql = "UPDATE $table SET ".implode(',',$params).' WHERE '.$where_str;
@@ -1860,7 +1994,10 @@ 
 					$this->column_data_implode(',',$data,True,true,$table_def['fd']).' WHERE '.$where_str;
 			}
 			$ret = $this->query($sql,$line,$file,0,-1,$inputarr);
-			if ($this->Debug) echo "<p>db::query('$sql',$line,$file)</p>\n";
+			if ($this->Debug)
+			{
+				echo "<p>db::query('$sql',$line,$file)</p>\n";
+			}
 		}
 		// if we have any blobs to update, we do so now
 		if (($ret || !count($data)) && count($blobs2update))
@@ -1868,8 +2005,14 @@ 
 			foreach($blobs2update as $col => $val)
 			{
 				$ret = $this->Link_ID->UpdateBlob($table,$col,$val,$where_str,$table_def['fd'][$col]['type'] == 'blob' ? 'BLOB' : 'CLOB');
-				if ($this->Debug) echo "<p>adodb::UpdateBlob('$table','$col','$val','$where_str') = '$ret'</p>\n";
-				if (!$ret) throw new Db\Exception\InvalidSql("Error in UpdateBlob($table,$col,\$val,$where_str)",$line,$file);
+				if ($this->Debug)
+				{
+					echo "<p>adodb::UpdateBlob('$table','$col','$val','$where_str') = '$ret'</p>\n";
+				}
+				if (!$ret)
+				{
+					throw new Db\Exception\InvalidSql("Error in UpdateBlob($table,$col,\$val,$where_str)",$line,$file);
+				}
 			}
 		}
 		return $ret;
@@ -1890,7 +2033,10 @@ 
 	*/
 	function delete($table,$where,$line,$file,$app=False,$table_def=False)
 	{
-		if (!$table_def) $table_def = $this->get_table_definitions($app,$table);
+		if (!$table_def)
+		{
+			$table_def = $this->get_table_definitions($app,$table);
+		}
 
 		if (self::$tablealiases && isset(self::$tablealiases[$table]))
 		{
@@ -1922,19 +2068,29 @@ 
 	 */
 	function expression($table_def/*,$args, ...*/)
 	{
-		if (!is_array($table_def)) $table_def = $this->get_table_definitions(true,$table_def);
+		if (!is_array($table_def))
+		{
+			$table_def = $this->get_table_definitions(true,$table_def);
+		}
 		$sql = '';
 		$ignore_next = 0;
 		foreach(func_get_args() as $n => $arg)
 		{
-			if ($n < 1) continue;	// table-name
+			if ($n < 1)
+			{
+				continue;
+			}
+			// table-name
 
 			if ($ignore_next)
 			{
 				--$ignore_next;
 				continue;
 			}
-			if (is_null($arg)) $arg = False;
+			if (is_null($arg))
+			{
+				$arg = False;
+			}
 
 			switch(gettype($arg))
 			{
@@ -1974,9 +2130,15 @@ 
 	*/
 	function select($table,$cols,$where,$line,$file,$offset=False,$append='',$app=False,$num_rows=0,$join='',$table_def=False,$fetchmode=self::FETCH_ASSOC)
 	{
-		if ($this->Debug) echo "<p>db::select('$table',".print_r($cols,True).",".print_r($where,True).",$line,$file,$offset,'$app',$num_rows,'$join')</p>\n";
+		if ($this->Debug)
+		{
+			echo "<p>db::select('$table',".print_r($cols,True).",".print_r($where,True).",$line,$file,$offset,'$app',$num_rows,'$join')</p>\n";
+		}
 
-		if (!$table_def) $table_def = $this->get_table_definitions($app,$table);
+		if (!$table_def)
+		{
+			$table_def = $this->get_table_definitions($app,$table);
+		}
 		if (is_array($cols))
 		{
 			$cols = implode(',',$cols);
@@ -1992,16 +2154,28 @@ 
 		$sql = "SELECT $cols FROM $table $join";
 
 		// if we have a where clause, we need to add it together with the WHERE statement, if thats not in the join
-		if ($where) $sql .= (strpos($join,"WHERE")!==false) ? ' AND ('.$where.')' : ' WHERE '.$where;
+		if ($where)
+		{
+			$sql .= (strpos($join,"WHERE")!==false) ? ' AND ('.$where.')' : ' WHERE '.$where;
+		}
 
-		if ($append) $sql .= ' '.$append;
+		if ($append)
+		{
+			$sql .= ' '.$append;
+		}
 
-		if ($this->Debug) echo "<p>sql='$sql'</p>";
+		if ($this->Debug)
+		{
+			echo "<p>sql='$sql'</p>";
+		}
 
-		if ($line === false && $file === false)	// call by union, to return the sql rather then run the query
+		if ($line === false && $file === false)
+		{
+			// call by union, to return the sql rather then run the query
 		{
 			return $sql;
 		}
+		}
 		return $this->query($sql,$line,$file,$offset,$offset===False ? -1 : (int)$num_rows,false,$fetchmode);
 	}
 
@@ -2022,7 +2196,10 @@ 
 	*/
 	function union($selects,$line,$file,$order_by='',$offset=false,$num_rows=0,$fetchmode=self::FETCH_ASSOC)
 	{
-		if ($this->Debug) echo "<p>db::union(".print_r($selects,True).",$line,$file,$order_by,$offset,$num_rows)</p>\n";
+		if ($this->Debug)
+		{
+			echo "<p>db::union(".print_r($selects,True).",$line,$file,$order_by,$offset,$num_rows)</p>\n";
+		}
 
 		$union = array();
 		foreach($selects as $select)
@@ -2043,9 +2220,15 @@ 
 		}
 		$sql = count($union) > 1 ? '(' . implode(")\nUNION\n(",$union).')' : 'SELECT DISTINCT'.substr($union[0],6);
 
-		if ($order_by) $sql .=  (!stristr($order_by,'ORDER BY') ? "\nORDER BY " : '').$order_by;
+		if ($order_by)
+		{
+			$sql .=  (!stristr($order_by,'ORDER BY') ? "\nORDER BY " : '').$order_by;
+		}
 
-		if ($this->Debug) echo "<p>sql='$sql'</p>";
+		if ($this->Debug)
+		{
+			echo "<p>sql='$sql'</p>";
+		}
 
 		return $this->query($sql,$line,$file,$offset,$offset===False ? -1 : (int)$num_rows,false,$fetchmode);
 	}

api/src/Asyncservice.php

Braces +98 added lines, -28 removed lines

@@ -114,7 +114,8 @@ 
 			echo "<p>next_run("; print_r($times); echo ",'$debug', " . date('Y-m-d H:i', $now) . ")</p>\n";
 			$debug = True;	// enable syntax-error messages too
 		}
-		if(is_null($now)) {
+		if(is_null($now))
+		{
 			$now = time();
 		}
 
@@ -179,12 +180,17 @@ 
 		foreach($units as $u => $date_pattern)
 		{
 			++$n;
-			if ($this->debug) { echo "<p>n=$n, $u: isset(times[$u]="; print_r($times[$u]); echo ")=".(isset($times[$u])?'True':'False')."</p>\n"; }
+			if ($this->debug)
+			{
+echo "<p>n=$n, $u: isset(times[$u]="; print_r($times[$u]); echo ")=".(isset($times[$u])?'True':'False')."</p>\n"; }
 			if (isset($times[$u]))
 			{
-				if(is_array($times[$u])) {
+				if(is_array($times[$u]))
+				{
 					$time = array_keys($times[$u]);
-				} else {
+				}
+				else
+				{
 					$time = explode(',',$times[$u]);
 				}
 				$times[$u] = array();
@@ -197,7 +203,10 @@ 
 
 						if (count($arr) != 2 || !is_numeric($min) || !is_numeric($max) || $min > $max)
 						{
-							if ($debug) echo "<p>Syntax error in $u='$t', allowed is 'min-max', min <= max, min='$min', max='$max'</p>\n";
+							if ($debug)
+							{
+								echo "<p>Syntax error in $u='$t', allowed is 'min-max', min <= max, min='$min', max='$max'</p>\n";
+							}
 
 							return False;
 						}
@@ -208,14 +217,20 @@ 
 					}
 					else
 					{
-						if ((string)$t == '*') 	$t = '*/1';
+						if ((string)$t == '*')
+						{
+							$t = '*/1';
+						}
 
 						list($one,$inc) = $arr = explode('/',$t);
 
 						if (!(is_numeric($one) && count($arr) == 1 ||
 									count($arr) == 2 && is_numeric($inc)))
 						{
-							if ($debug) echo "<p>Syntax error in $u='$t', allowed is a number or '{*|range}/inc', inc='$inc'</p>\n";
+							if ($debug)
+							{
+								echo "<p>Syntax error in $u='$t', allowed is a number or '{*|range}/inc', inc='$inc'</p>\n";
+							}
 
 							return False;
 						}
@@ -233,7 +248,10 @@ 
 							}
 							elseif (count($arr) != 2 || $min > $max)
 							{
-								if ($debug) echo "<p>Syntax error in $u='$t', allowed is '{*|min-max}/inc', min='$min',max='$max', inc='$inc'</p>\n";
+								if ($debug)
+								{
+									echo "<p>Syntax error in $u='$t', allowed is '{*|min-max}/inc', min='$min',max='$max', inc='$inc'</p>\n";
+								}
 								return False;
 							}
 							for ($i = $min; $i <= $max; $i += $inc)
@@ -244,9 +262,13 @@ 
 					}
 				}
 			}
-			elseif ($n < $last_set || $u == 'dow')	// before last value set (or dow) => empty gets enumerated
+			elseif ($n < $last_set || $u == 'dow')
+			{
+				// before last value set (or dow) => empty gets enumerated
 			{
-				for ($i = $min_unit[$u]; $i <= $max_unit[$u]; ++$i)
+				for ($i = $min_unit[$u];
+			}
+			$i <= $max_unit[$u]; ++$i)
 				{
 					$times[$u][$i] = True;
 				}
@@ -256,7 +278,9 @@ 
 				$times[$u][$min_unit[$u]] = True;
 			}
 		}
-		if ($this->debug) { echo "enumerated times=<pre>"; print_r($times); echo "</pre>\n"; }
+		if ($this->debug)
+		{
+echo "enumerated times=<pre>"; print_r($times); echo "</pre>\n"; }
 
 		// now we have the times enumerated, lets find the first not expired one
 		//
@@ -274,7 +298,10 @@ 
 				if (isset($found[$u]))
 				{
 					$future = $future || $found[$u] > $unit_now;
-					if ($this->debug) echo "--> already have a $u = ".$found[$u].", future='$future'<br>\n";
+					if ($this->debug)
+					{
+						echo "--> already have a $u = ".$found[$u].", future='$future'<br>\n";
+					}
 					continue;	// already set
 				}
 				foreach(array_keys($times[$u]) as $unit_value)
@@ -292,30 +319,44 @@ 
 							break;
 
 					}
-					if ($valid && ($u != $next || $unit_value > $over))	 // valid and not over
+					if ($valid && ($u != $next || $unit_value > $over))
+					{
+						// valid and not over
 					{
 						$found[$u] = $unit_value;
+					}
 						$future = $future || $unit_value > $unit_now;
 						break;
 					}
 				}
-				if (!isset($found[$u]))		// we have to try the next one, if it exists
+				if (!isset($found[$u]))
+				{
+					// we have to try the next one, if it exists
 				{
 					$nexts = array_keys($units);
+				}
 					if (!isset($nexts[count($found)-1]))
 					{
-						if ($this->debug) echo "<p>Nothing found, exiting !!!</p>\n";
+						if ($this->debug)
+						{
+							echo "<p>Nothing found, exiting !!!</p>\n";
+						}
 						return False;
 					}
 					$next = $nexts[count($found)-1];
 					$over = $found[$next];
 					unset($found[$next]);
-					if ($this->debug) echo "<p>Have to try the next $next, $u's are over for $next=$over !!!</p>\n";
+					if ($this->debug)
+					{
+						echo "<p>Have to try the next $next, $u's are over for $next=$over !!!</p>\n";
+					}
 					break;
 				}
 			}
 		}
-		if ($this->debug) { echo "<p>next="; print_r($found); echo "</p>\n"; }
+		if ($this->debug)
+		{
+echo "<p>next="; print_r($found); echo "</p>\n"; }
 
 		return mktime($found['hour'],$found['min'],0,$found['month'],$found['day'],$found['year']);
 	}
@@ -377,7 +418,10 @@ 
 			);
 			// as the async_next column is used as a semaphore we only update it,
 			// if it is 0 (semaphore released) or older then 10min to recover from failed or crashed attempts
-			if ($exists) $where = array('async_next=0 OR async_next<'.(time()-600));
+			if ($exists)
+			{
+				$where = array('async_next=0 OR async_next<'.(time()-600));
+			}
 		}
 		//echo "last_run=<pre>"; print_r($last_run); echo "</pre>\n";
 		return $this->write($last_run, !!$exists, $where) > 0;
@@ -388,7 +432,10 @@ 
 	 */
 	function check_run($run_by='')
 	{
-		if ($run_by === 'fallback') flush();
+		if ($run_by === 'fallback')
+		{
+			flush();
+		}
 
 		if (!$this->last_check_run(True,False,$run_by))
 		{
@@ -410,7 +457,10 @@ 
 					// unset all objects in $GLOBALS, which are created and used by ExecMethod, as they can contain user-data
 					foreach($GLOBALS as $name => $value)
 					{
-						if ($name !== 'egw' && is_object($value)) unset($GLOBALS[$name]);
+						if ($name !== 'egw' && is_object($value))
+						{
+							unset($GLOBALS[$name]);
+						}
 					}
 					$domain = $GLOBALS['egw_info']['user']['domain'];
 					$lang   = $GLOBALS['egw_info']['user']['preferences']['common']['lang'];
@@ -480,7 +530,10 @@ 
 	 */
 	function read($id=0,$cols='*',$offset=False,$append='ORDER BY async_next',$num_rows=0)
 	{
-		if (!is_a($this->db, 'EGroupware\\Api\\Db')) return false;
+		if (!is_a($this->db, 'EGroupware\\Api\\Db'))
+		{
+			return false;
+		}
 
 		if ($id === '%')
 		{
@@ -533,9 +586,15 @@ 
 	 */
 	function write($job, $exists = False, $where=array())
 	{
-		if (!is_a($this->db, 'EGroupware\\Api\\Db')) return 0;
+		if (!is_a($this->db, 'EGroupware\\Api\\Db'))
+		{
+			return 0;
+		}
 
-		if (is_array($job['data']) && isset($job['data']['next']) && isset($job['next'])) $job['data']['next'] = $job['next'];
+		if (is_array($job['data']) && isset($job['data']['next']) && isset($job['next']))
+		{
+			$job['data']['next'] = $job['next'];
+		}
 		$data = array(
 			'async_next'      => $job['next'],
 			'async_times'     => json_encode($job['times']),
@@ -600,9 +659,12 @@ 
 					{
 						echo '<p>'.lang('%1 is not executable by the webserver !!!',$this->$name)."</p>\n";
 						$perms = fileperms($this->$name);
-						if (!($perms & 0x0001) && ($perms & 0x0008) && function_exists('posix_getuid'))	// only executable by group
+						if (!($perms & 0x0001) && ($perms & 0x0008) && function_exists('posix_getuid'))
+						{
+							// only executable by group
 						{
 							$group = posix_getgrgid(filegroup($this->$name));
+						}
 							$webserver = posix_getpwuid(posix_getuid ());
 							echo '<p>'.lang("You need to add the webserver user '%1' to the group '%2'.",$webserver['name'],$group['name'])."</p>\n";							}
 					}
@@ -622,10 +684,13 @@ 
 				}
 				//echo "<p>$name = '".$this->$name."'</p>\n";
 			}
-			if ($this->php5[0] == '/')	// we found a php5 binary
+			if ($this->php5[0] == '/')
+			{
+				// we found a php5 binary
 			{
 				$this->php = $this->php5;
 			}
+			}
 		}
 	}
 
@@ -637,7 +702,8 @@ 
 	 */
 	function installed()
 	{
-		if ($this->only_fallback) {
+		if ($this->only_fallback)
+		{
 			return 0;
 		}
 		$this->find_binarys();
@@ -654,7 +720,10 @@ 
 			$n = 0;
 			while ($line = fgets($crontab,256))
 			{
-				if ($this->debug) echo 'line '.++$n.": $line<br>\n";
+				if ($this->debug)
+				{
+					echo 'line '.++$n.": $line<br>\n";
+				}
 				$parts = explode(' ',$line,6);
 
 				if ($line{0} == '#' || count($parts) < 6 || ($parts[5]{0} != '/' && substr($parts[5],0,3) != 'php'))
@@ -698,7 +767,8 @@ 
 	 */
 	function install($times)
 	{
-		if ($this->only_fallback && $times !== False) {
+		if ($this->only_fallback && $times !== False)
+		{
 			return 0;
 		}
 		$this->installed();	// find other installed cronlines

api/src/Link/Storage.php

Braces +4 added lines, -1 removed lines

@@ -302,7 +302,10 @@
 			}
 			if ($owner)
 			{
-				if ($app) $where = array($where);
+				if ($app)
+				{
+					$where = array($where);
+				}
 				$where['link_owner'] = $owner;
 			}
 		}