EGroupware / egroupware

api/src/Mail/Sieve.php

Doc Comments +2 added lines, -2 removed lines

@@ -82,7 +82,7 @@ 
 	/**
 	 * Constructor
 	 *
-	 * @param array|Imap $params =array()
+	 * @param Imap $params =array()
 	 */
 	function __construct($params=array())
 	{
@@ -165,7 +165,7 @@ 
 	 *
 	 * @param array $_emailNotification
 	 * @param string $_scriptName
-	 * @return Script
+	 * @return boolean
 	 */
 	function setEmailNotification(array $_emailNotification, $_scriptName=null)
 	{

Indentation +14 added lines, -14 removed lines

@@ -37,28 +37,28 @@ 
 	var $icServer;
 
 	/**
-	* @var string name of active script queried from Sieve server
-	*/
+	 * @var string name of active script queried from Sieve server
+	 */
 	var $scriptName;
 
 	/**
-	* @var $rules containing the rules
-	*/
+	 * @var $rules containing the rules
+	 */
 	var $rules;
 
 	/**
-	* @var $vacation containing the vacation
-	*/
+	 * @var $vacation containing the vacation
+	 */
 	var $vacation;
 
 	/**
-	* @var $emailNotification containing the emailNotification
-	*/
+	 * @var $emailNotification containing the emailNotification
+	 */
 	var $emailNotification;
 
 	/**
-	* @var object $error the last PEAR error object
-	*/
+	 * @var object $error the last PEAR error object
+	 */
 	var $error;
 
 	/**
@@ -170,11 +170,11 @@ 
 	function setEmailNotification(array $_emailNotification, $_scriptName=null)
 	{
 		if ($_emailNotification['externalEmail'] == '' || !preg_match("/\@/",$_emailNotification['externalEmail'])) {
-    		$_emailNotification['status'] = 'off';
-    		$_emailNotification['externalEmail'] = '';
-    	}
+			$_emailNotification['status'] = 'off';
+			$_emailNotification['externalEmail'] = '';
+		}
 
-    	$script = $this->retrieveRules($_scriptName);
+		$script = $this->retrieveRules($_scriptName);
    		$script->emailNotification = $_emailNotification;
 		$ret = $script->updateScript($this);
 		$this->error = $script->errstr;

Spacing +14 added lines, -14 removed lines

@@ -84,7 +84,7 @@ 
 	 *
 	 * @param array|Imap $params =array()
 	 */
-	function __construct($params=array())
+	function __construct($params = array())
 	{
 		if (is_a($params, __NAMESPACE__.'\\Imap'))
 		{
@@ -99,7 +99,7 @@ 
 		}
 		parent::__construct($params);
 
-		$this->displayCharset	= Translation::charset();
+		$this->displayCharset = Translation::charset();
 	}
 
 	function getRules()
@@ -130,7 +130,7 @@ 
 	 * @param string $_scriptName
 	 * @param boolean $utf7imap_fileinto =false true: encode foldernames with utf7imap, default utf8
 	 */
-	function setRules(array $_rules, $_scriptName=null, $utf7imap_fileinto=false)
+	function setRules(array $_rules, $_scriptName = null, $utf7imap_fileinto = false)
 	{
 		$script = $this->retrieveRules($_scriptName);
 		$script->debug = $this->debug;
@@ -146,11 +146,11 @@ 
 	 * @param array $_vacation
 	 * @param string $_scriptName
 	 */
-	function setVacation(array $_vacation, $_scriptName=null)
+	function setVacation(array $_vacation, $_scriptName = null)
 	{
 		if ($this->debug)
 		{
-			error_log(__METHOD__ . "($_scriptName," . print_r($_vacation, true) . ')');
+			error_log(__METHOD__."($_scriptName,".print_r($_vacation, true).')');
 		}
 		$script = $this->retrieveRules($_scriptName);
 		$script->debug = $this->debug;
@@ -167,9 +167,9 @@ 
 	 * @param string $_scriptName
 	 * @return Script
 	 */
-	function setEmailNotification(array $_emailNotification, $_scriptName=null)
+	function setEmailNotification(array $_emailNotification, $_scriptName = null)
 	{
-		if ($_emailNotification['externalEmail'] == '' || !preg_match("/\@/",$_emailNotification['externalEmail'])) {
+		if ($_emailNotification['externalEmail'] == '' || !preg_match("/\@/", $_emailNotification['externalEmail'])) {
     		$_emailNotification['status'] = 'off';
     		$_emailNotification['externalEmail'] = '';
     	}
@@ -187,7 +187,7 @@ 
 	 * @param string $_scriptName
 	 * @return Script
 	 */
-	function retrieveRules($_scriptName=null)
+	function retrieveRules($_scriptName = null)
 	{
 		if (!$_scriptName)
 		{
@@ -197,8 +197,8 @@ 
 				try {
 					$this->scriptName = $this->getActive();
 				}
-				catch(Exception $e) {
-					unset($e);	// ignore NOTEXISTS exception
+				catch (Exception $e) {
+					unset($e); // ignore NOTEXISTS exception
 				}
 				if (empty($this->scriptName))
 				{
@@ -213,11 +213,11 @@ 
 			$script->retrieveRules($this);
 		}
 		catch (\Exception $e) {
-			unset($e);	// ignore not found script exception
+			unset($e); // ignore not found script exception
 		}
-		$this->rules =& $script->rules;
-		$this->vacation =& $script->vacation;
-		$this->emailNotification =& $script->emailNotification; // Added email notifications
+		$this->rules = & $script->rules;
+		$this->vacation = & $script->vacation;
+		$this->emailNotification = & $script->emailNotification; // Added email notifications
 
 		return $script;
 	}

Braces +14 added lines, -4 removed lines

@@ -104,21 +104,30 @@ 
 
 	function getRules()
 	{
-		if (!isset($this->rules)) $this->retrieveRules();
+		if (!isset($this->rules))
+		{
+			$this->retrieveRules();
+		}
 
 		return $this->rules;
 	}
 
 	function getVacation()
 	{
-		if (!isset($this->rules)) $this->retrieveRules();
+		if (!isset($this->rules))
+		{
+			$this->retrieveRules();
+		}
 
 		return $this->vacation;
 	}
 
 	function getEmailNotification()
 	{
-		if (!isset($this->rules)) $this->retrieveRules();
+		if (!isset($this->rules))
+		{
+			$this->retrieveRules();
+		}
 
 		return $this->emailNotification;
 	}
@@ -169,7 +178,8 @@ 
 	 */
 	function setEmailNotification(array $_emailNotification, $_scriptName=null)
 	{
-		if ($_emailNotification['externalEmail'] == '' || !preg_match("/\@/",$_emailNotification['externalEmail'])) {
+		if ($_emailNotification['externalEmail'] == '' || !preg_match("/\@/",$_emailNotification['externalEmail']))
+		{
     		$_emailNotification['status'] = 'off';
     		$_emailNotification['externalEmail'] = '';
     	}

api/src/Mail/Smtp.php

Doc Comments +1 added lines, -1 removed lines

@@ -156,7 +156,7 @@
 	/**
 	 * Get the data of a given user
 	 *
-	 * @param int|string $user numerical account-id, account-name or email address
+	 * @param integer $user numerical account-id, account-name or email address
 	 * @param boolean $match_uid_at_domain =true true: uid@domain matches, false only an email or alias address matches
 	 * @return array with values for keys 'mailLocalAddress', 'mailAlternateAddress' (array), 'mailForwardingAddress' (array),
 	 * 	'accountStatus' ("active"), 'quotaLimit' and 'deliveryMode' ("forwardOnly")

Spacing +16 added lines, -18 removed lines

@@ -79,7 +79,7 @@ 
 	 *
 	 * @param string $defaultDomain =null
 	 */
-	function __construct($defaultDomain=null)
+	function __construct($defaultDomain = null)
 	{
 		$this->defaultDomain = $defaultDomain ? $defaultDomain : $GLOBALS['egw_info']['server']['mail_suffix'];
 
@@ -104,12 +104,10 @@ 
 	 */
 	function addAccount($_hookValues)
 	{
-		$mailLocalAddress = $_hookValues['account_email'] ? $_hookValues['account_email'] :
-			Api\Accounts::email($_hookValues['account_firstname'],
-				$_hookValues['account_lastname'],$_hookValues['account_lid'],$this->defaultDomain);
+		$mailLocalAddress = $_hookValues['account_email'] ? $_hookValues['account_email'] : Api\Accounts::email($_hookValues['account_firstname'],
+				$_hookValues['account_lastname'], $_hookValues['account_lid'], $this->defaultDomain);
 
-		$account_id = !empty($_hookValues['account_id']) ? $_hookValues['account_id'] :
-			$this->accounts->name2id($_hookValues['account_lid'], 'account_lid', 'u');
+		$account_id = !empty($_hookValues['account_id']) ? $_hookValues['account_id'] : $this->accounts->name2id($_hookValues['account_lid'], 'account_lid', 'u');
 
 		if ($this->accounts->exists($account_id) != 1)
 		{
@@ -126,7 +124,7 @@ 
 	 */
 	function deleteAccount($_hookValues)
 	{
-		unset($_hookValues);	// not used, but required by function signature
+		unset($_hookValues); // not used, but required by function signature
 
 		return true;
 	}
@@ -139,12 +137,12 @@ 
 	 */
 	function getAccountEmailAddress($_accountName)
 	{
-		$emailAddresses	= array();
+		$emailAddresses = array();
 
 		if (($account_id = $this->accounts->name2id($_accountName, 'account_lid', 'u')))
 		{
-			$realName = trim($GLOBALS['egw_info']['user']['account_firstname'] . (!empty($GLOBALS['egw_info']['user']['account_firstname']) ? ' ' : '') . $GLOBALS['egw_info']['user']['account_lastname']);
-			$emailAddresses[] = array (
+			$realName = trim($GLOBALS['egw_info']['user']['account_firstname'].(!empty($GLOBALS['egw_info']['user']['account_firstname']) ? ' ' : '').$GLOBALS['egw_info']['user']['account_lastname']);
+			$emailAddresses[] = array(
 				'name'		=> $realName,
 				'address'	=> $this->accounts->id2name($account_id, 'account_email'),
 				'type'		=> 'default',
@@ -161,9 +159,9 @@ 
 	 * @return array with values for keys 'mailLocalAddress', 'mailAlternateAddress' (array), 'mailForwardingAddress' (array),
 	 * 	'accountStatus' ("active"), 'quotaLimit' and 'deliveryMode' ("forwardOnly")
 	 */
-	function getUserData($user, $match_uid_at_domain=false)
+	function getUserData($user, $match_uid_at_domain = false)
 	{
-		unset($user, $match_uid_at_domain);	// not used, but required by function signature
+		unset($user, $match_uid_at_domain); // not used, but required by function signature
 
 		$userData = array();
 
@@ -201,9 +199,9 @@ 
 	 * @return boolean true on success, false on error writing to ldap
 	 */
 	function setUserData($_uidnumber, array $_mailAlternateAddress, array $_mailForwardingAddress, $_deliveryMode,
-		$_accountStatus, $_mailLocalAddress, $_quota, $_forwarding_only=false, $_setMailbox=null)
+		$_accountStatus, $_mailLocalAddress, $_quota, $_forwarding_only = false, $_setMailbox = null)
 	{
-		unset($_uidnumber, $_mailAlternateAddress, $_mailForwardingAddress,	// not used, but require by function signature
+		unset($_uidnumber, $_mailAlternateAddress, $_mailForwardingAddress, // not used, but require by function signature
 			$_deliveryMode, $_accountStatus, $_mailLocalAddress, $_quota, $_forwarding_only, $_setMailbox);
 
 		return true;
@@ -217,7 +215,7 @@ 
 	 */
 	function updateAccount($_hookValues)
 	{
-		unset($_hookValues);	// not used, but required by function signature
+		unset($_hookValues); // not used, but required by function signature
 
 		return true;
 	}
@@ -233,15 +231,15 @@ 
 	 * 	default use $this->loginType
 	 * @return string
 	 */
-	/*static*/ public function mailbox_addr($account,$domain=null,$mail_login_type=null)
+	/*static*/ public function mailbox_addr($account, $domain = null, $mail_login_type = null)
 	{
 		if (is_null($domain)) $domain = $this->defaultDomain;
 		if (is_null($mail_login_type)) $mail_login_type = $this->loginType;
 
-		switch($mail_login_type)
+		switch ($mail_login_type)
 		{
 			case 'email':
-				$mbox = is_array($account) ? $account['account_email'] : $GLOBALS['egw']->accounts->id2name($account,'account_email');
+				$mbox = is_array($account) ? $account['account_email'] : $GLOBALS['egw']->accounts->id2name($account, 'account_email');
 				break;
 
 			case 'uidNumber':

Braces +12 added lines, -3 removed lines

@@ -235,8 +235,14 @@ 
 	 */
 	/*static*/ public function mailbox_addr($account,$domain=null,$mail_login_type=null)
 	{
-		if (is_null($domain)) $domain = $this->defaultDomain;
-		if (is_null($mail_login_type)) $mail_login_type = $this->loginType;
+		if (is_null($domain))
+		{
+			$domain = $this->defaultDomain;
+		}
+		if (is_null($mail_login_type))
+		{
+			$mail_login_type = $this->loginType;
+		}
 
 		switch($mail_login_type)
 		{
@@ -245,7 +251,10 @@ 
 				break;
 
 			case 'uidNumber':
-				if (is_array($account)) $account = $account['account_id'];
+				if (is_array($account))
+				{
+					$account = $account['account_id'];
+				}
 				$mbox = 'u'.$account.'@'.$domain;
 				break;
 

api/src/Mail/Smtp/Ldap.php

Doc Comments +1 added lines, -1 removed lines

@@ -628,7 +628,7 @@
 	 * @param int $_accountID
 	 * @param string $_forwardingAddress
 	 * @param string $_keepLocalCopy 'yes'
-	 * @return boolean true on success, false on error writing to ldap
+	 * @return boolean|null true on success, false on error writing to ldap
 	 */
 	function saveSMTPForwarding($_accountID, $_forwardingAddress, $_keepLocalCopy)
 	{

Spacing +43 added lines, -44 removed lines

@@ -157,7 +157,7 @@ 
 	 *
 	 * @param string $defaultDomain =null
 	 */
-	function __construct($defaultDomain=null)
+	function __construct($defaultDomain = null)
 	{
 		parent::__construct($defaultDomain);
 
@@ -205,9 +205,8 @@ 
 	 */
 	function addAccount($_hookValues)
 	{
-		$mailLocalAddress = $_hookValues['account_email'] ? $_hookValues['account_email'] :
-			Api\Accounts::email($_hookValues['account_firstname'],
-				$_hookValues['account_lastname'],$_hookValues['account_lid'],$this->defaultDomain);
+		$mailLocalAddress = $_hookValues['account_email'] ? $_hookValues['account_email'] : Api\Accounts::email($_hookValues['account_firstname'],
+				$_hookValues['account_lastname'], $_hookValues['account_lid'], $this->defaultDomain);
 
 		$ds = $this->getLdapConnection();
 
@@ -219,13 +218,13 @@ 
 		}
 		$allValues 	= ldap_get_entries($ds, $sri);
 		$accountDN 	= $allValues[0]['dn'];
-		$objectClasses	= $allValues[0]['objectclass'];
+		$objectClasses = $allValues[0]['objectclass'];
 		unset($objectClasses['count']);
 
 		// add our mail schema, if not already set
-		if(!in_array(static::SCHEMA,$objectClasses) && !in_array(strtolower(static::SCHEMA),$objectClasses))
+		if (!in_array(static::SCHEMA, $objectClasses) && !in_array(strtolower(static::SCHEMA), $objectClasses))
 		{
-			$objectClasses[]	= static::SCHEMA;
+			$objectClasses[] = static::SCHEMA;
 		}
 		// the new code for postfix+cyrus+ldap
 		$newData = array(
@@ -256,7 +255,7 @@ 
 		{
 			error_log(__METHOD__.'('.array2string(func_get_args()).") --> ldap_mod_replace(,'$accountDN',".
 				array2string($newData).') returning '.array2string($ret).
-				(!$ret?' ('.ldap_error($ds).')':''));
+				(!$ret ? ' ('.ldap_error($ds).')' : ''));
 		}
 		return $ret;
 	}
@@ -270,7 +269,7 @@ 
 	 */
 	function addAccountExtra(array $_hookValues, array $allValues, array &$newData)
 	{
-		unset($_hookValues, $allValues, $newData);	// not used, but required by function signature
+		unset($_hookValues, $allValues, $newData); // not used, but required by function signature
 	}
 
 	/**
@@ -281,24 +280,24 @@ 
 	 */
 	function getAccountEmailAddress($_accountName)
 	{
-		$emailAddresses	= array();
+		$emailAddresses = array();
 		$ds = $this->getLdapConnection();
 		$filter = '(&'.static::USER_FILTER.'('.static::USER_ATTR.'='.Api\Ldap::quote($_accountName).'))';
-		$attributes	= array('dn', static::MAIL_ATTR, static::ALIAS_ATTR);
+		$attributes = array('dn', static::MAIL_ATTR, static::ALIAS_ATTR);
 		$sri = @ldap_search($ds, $this->search_base, $filter, $attributes);
 
 		if ($sri)
 		{
-			$realName = trim($GLOBALS['egw_info']['user']['account_firstname'] . (!empty($GLOBALS['egw_info']['user']['account_firstname']) ? ' ' : '') . $GLOBALS['egw_info']['user']['account_lastname']);
+			$realName = trim($GLOBALS['egw_info']['user']['account_firstname'].(!empty($GLOBALS['egw_info']['user']['account_firstname']) ? ' ' : '').$GLOBALS['egw_info']['user']['account_lastname']);
 			$allValues = ldap_get_entries($ds, $sri);
 
-			if(isset($allValues[0][static::MAIL_ATTR]))
+			if (isset($allValues[0][static::MAIL_ATTR]))
 			{
-				foreach($allValues[0][static::MAIL_ATTR] as $key => $value)
+				foreach ($allValues[0][static::MAIL_ATTR] as $key => $value)
 				{
 					if ($key === 'count') continue;
 
-					$emailAddresses[] = array (
+					$emailAddresses[] = array(
 						'name'		=> $realName,
 						'address'	=> $value,
 						'type'		=> !$key ? 'default' : 'alternate',
@@ -307,7 +306,7 @@ 
 			}
 			if (static::ALIAS_ATTR && isset($allValues[0][static::ALIAS_ATTR]))
 			{
-				foreach(self::getAttributePrefix($allValues[0][static::ALIAS_ATTR], static::ALIAS_PREFIX) as $value)
+				foreach (self::getAttributePrefix($allValues[0][static::ALIAS_ATTR], static::ALIAS_PREFIX) as $value)
 				{
 					$emailAddresses[] = array(
 						'name'		=> $realName,
@@ -334,7 +333,7 @@ 
 	 * @return array with values for keys 'mailLocalAddress', 'mailAlternateAddress' (array), 'mailForwardingAddress' (array),
 	 * 	'accountStatus' ("active"), 'quotaLimit' and 'deliveryMode' ("forwardOnly")
 	 */
-	function getUserData($user, $match_uid_at_domain=false)
+	function getUserData($user, $match_uid_at_domain = false)
 	{
 		$userData = array(
 			'mailbox' => array(),
@@ -394,7 +393,7 @@ 
 			$allValues = ldap_get_entries($ldap, $sri);
 			if ($this->debug) error_log(__METHOD__."('$user') --> ldap_search(, '$this->search_base', '$filter') --> ldap_get_entries=".array2string($allValues[0]));
 
-			foreach($allValues as $key => $values)
+			foreach ($allValues as $key => $values)
 			{
 				if ($key === 'count') continue;
 
@@ -477,16 +476,16 @@ 
 
 				if (static::FORWARD_ATTR)
 				{
-					$userData['mailForwardingAddress']	= self::getAttributePrefix($values[static::FORWARD_ATTR], static::FORWARD_PREFIX);
+					$userData['mailForwardingAddress'] = self::getAttributePrefix($values[static::FORWARD_ATTR], static::FORWARD_PREFIX);
 				}
 
-				if (static::MAILBOX_ATTR) $userData['mailMessageStore']	= $values[static::MAILBOX_ATTR][0];
+				if (static::MAILBOX_ATTR) $userData['mailMessageStore'] = $values[static::MAILBOX_ATTR][0];
 
 				$userData['deliveryMode'] = $deliveryMode;
 
 				// eg. suse stores all email addresses as aliases
 				if (static::REQUIRE_MAIL_AS_ALIAS &&
-					($k = array_search($userData['mailLocalAddress'],$userData['mailAlternateAddress'])) !== false)
+					($k = array_search($userData['mailLocalAddress'], $userData['mailAlternateAddress'])) !== false)
 				{
 					unset($userData['mailAlternateAddress'][$k]);
 				}
@@ -519,9 +518,9 @@ 
 	 * @return boolean true on success, false on error writing to ldap
 	 */
 	function setUserData($_uidnumber, array $_mailAlternateAddress, array $_mailForwardingAddress, $_deliveryMode,
-		$_accountStatus, $_mailLocalAddress, $_quota, $_forwarding_only=false, $_setMailbox=null)
+		$_accountStatus, $_mailLocalAddress, $_quota, $_forwarding_only = false, $_setMailbox = null)
 	{
-		unset($_forwarding_only);	// not used
+		unset($_forwarding_only); // not used
 
 		if (static::USERID_ATTR)
 		{
@@ -541,15 +540,15 @@ 
 		$allValues 	= ldap_get_entries($ldap, $sri);
 
 		$accountDN 	= $allValues[0]['dn'];
-		$uid	   	= $allValues[0][static::USER_ATTR][0];
-		$objectClasses	= $allValues[0]['objectclass'];
+		$uid = $allValues[0][static::USER_ATTR][0];
+		$objectClasses = $allValues[0]['objectclass'];
 
 		unset($objectClasses['count']);
 
-		if(!in_array(static::SCHEMA,$objectClasses) && !in_array(strtolower(static::SCHEMA),$objectClasses))
+		if (!in_array(static::SCHEMA, $objectClasses) && !in_array(strtolower(static::SCHEMA), $objectClasses))
 		{
-			$objectClasses[]	= static::SCHEMA;
-			$newData['objectclass']	= $objectClasses;
+			$objectClasses[] = static::SCHEMA;
+			$newData['objectclass'] = $objectClasses;
 		}
 
 		sort($_mailAlternateAddress);
@@ -562,7 +561,7 @@ 
 			self::setAttributePrefix($newData[static::ALIAS_ATTR], $_mailAlternateAddress, static::ALIAS_PREFIX);
 
 			// all email must be stored as alias for suse
-			if (static::REQUIRE_MAIL_AS_ALIAS && !in_array($_mailLocalAddress,(array)$_mailAlternateAddress))
+			if (static::REQUIRE_MAIL_AS_ALIAS && !in_array($_mailLocalAddress, (array)$_mailAlternateAddress))
 			{
 				self::setAttributePrefix($newData[static::ALIAS_ATTR], $_mailLocalAddress, static::ALIAS_PREFIX);
 			}
@@ -595,12 +594,12 @@ 
 		if (static::QUOTA_ATTR)
 		{
 			self::setAttributePrefix($newData[static::QUOTA_ATTR],
-				(int)$_quota > 0 ? (int)$_quota*static::QUOTA_FACTOR : array(), static::QUOTA_PREFIX);
+				(int)$_quota > 0 ? (int)$_quota * static::QUOTA_FACTOR : array(), static::QUOTA_PREFIX);
 		}
 		// does schema support enabling/disabling mail via attribute
 		if (static::MAIL_ENABLE_ATTR)
 		{
-			$newData[static::MAIL_ENABLE_ATTR]	= $_accountStatus ?
+			$newData[static::MAIL_ENABLE_ATTR] = $_accountStatus ?
 				(static::MAIL_ENABLED == self::MAIL_ENABLED_USE_MAIL ? $_mailLocalAddress : static::MAIL_ENABLED) : array();
 		}
 		// if we have no mail-enabled attribute, but require primary mail in aliases-attr
@@ -642,7 +641,7 @@ 
 			$uid = $GLOBALS['egw']->accounts->id2name($_accountID);
 			$filter = '(&'.static::USER_FILTER.'('.static::USER_ATTR.'='.Api\Ldap::quote($uid).'))';
 		}
-		$attributes	= array('dn', static::FORWARD_ATTR, 'objectclass');
+		$attributes = array('dn', static::FORWARD_ATTR, 'objectclass');
 		if (static::FORWARD_ONLY_ATTR)
 		{
 			$attributes[] = static::FORWARD_ONLY_ATTR;
@@ -653,12 +652,12 @@ 
 		{
 			$newData = array();
 			$allValues = ldap_get_entries($ds, $sri);
-			$objectClasses  = $allValues[0]['objectclass'];
-			$newData['objectclass']	= $allValues[0]['objectclass'];
+			$objectClasses = $allValues[0]['objectclass'];
+			$newData['objectclass'] = $allValues[0]['objectclass'];
 
 			unset($newData['objectclass']['count']);
 
-			if(!in_array(static::SCHEMA,$objectClasses))
+			if (!in_array(static::SCHEMA, $objectClasses))
 			{
 				$newData['objectclass'][] = static::SCHEMA;
 			}
@@ -668,9 +667,9 @@ 
 				$newData[static::FORWARD_ATTR] = $allValues[0][static::FORWARD_ATTR];
 				$forwards = self::getAttributePrefix($newData[static::FORWARD_ATTR], static::FORWARD_PREFIX);
 
-				if(!empty($_forwardingAddress))
+				if (!empty($_forwardingAddress))
 				{
-					if($forwards)
+					if ($forwards)
 					{
 						if (!is_array($_forwardingAddress))
 						{
@@ -702,7 +701,7 @@ 
 			}
 			if ($this->debug) error_log(__METHOD__.'('.array2string(func_get_args()).") --> ldap_mod_replace(,'{$allValues[0]['dn']}',".array2string($newData).')');
 
-			return ldap_modify ($ds, $allValues[0]['dn'], $newData);
+			return ldap_modify($ds, $allValues[0]['dn'], $newData);
 		}
 	}
 
@@ -744,9 +743,9 @@ 
 		unset($entries['count']);
 
 		$mailboxes = array();
-		foreach($entries as $entry)
+		foreach ($entries as $entry)
 		{
-			if ($entry[static::USER_ATTR][0] == 'anonymous') continue;	// anonymous is never a mail-user!
+			if ($entry[static::USER_ATTR][0] == 'anonymous') continue; // anonymous is never a mail-user!
 			list($mailbox) = explode('@', $entry[static::MAILBOX_ATTR ? static::MAILBOX_ATTR : static::MAIL_ATTR][0]);
 			$mailboxes[$entry[static::USER_ATTR][0]] = $mailbox;
 		}
@@ -760,13 +759,13 @@ 
 	 * @param string|array $values value(s) to set
 	 * @param string $prefix ='' prefix to use or ''
 	 */
-	protected static function setAttributePrefix(&$attribute, $values, $prefix='')
+	protected static function setAttributePrefix(&$attribute, $values, $prefix = '')
 	{
 		//$attribute_in = $attribute;
 		if (empty($attribute)) $attribute = array();
 		if (!is_array($attribute)) $attribute = (array)$attribute;
 
-		foreach((array)$values as $value)
+		foreach ((array)$values as $value)
 		{
 			$attribute[] = $prefix.$value;
 		}
@@ -781,7 +780,7 @@ 
 	 * @param boolean $remove =true remove returned values from $attribute
 	 * @return array with values (prefix removed) or array() if nothing found
 	 */
-	protected static function getAttributePrefix(&$attribute, $prefix='', $remove=true)
+	protected static function getAttributePrefix(&$attribute, $prefix = '', $remove = true)
 	{
 		//$attribute_in = $attribute;
 		$values = array();
@@ -790,7 +789,7 @@ 
 		{
 			unset($attribute['count']);
 
-			foreach($attribute as $key => $value)
+			foreach ($attribute as $key => $value)
 			{
 				if (!$prefix || stripos($value, $prefix) === 0)
 				{

Braces +69 added lines, -17 removed lines

@@ -296,7 +296,10 @@ 
 			{
 				foreach($allValues[0][static::MAIL_ATTR] as $key => $value)
 				{
-					if ($key === 'count') continue;
+					if ($key === 'count')
+					{
+						continue;
+					}
 
 					$emailAddresses[] = array (
 						'name'		=> $realName,
@@ -317,7 +320,10 @@ 
 				}
 			}
 		}
-		if ($this->debug) error_log(__METHOD__."('$_accountName') returning ".array2string($emailAddresses));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."('$_accountName') returning ".array2string($emailAddresses));
+		}
 
 		return $emailAddresses;
 	}
@@ -350,7 +356,10 @@ 
 		}
 		elseif (strpos($user, '@') === false)
 		{
-			if (is_numeric($user)) $user = $GLOBALS['egw']->accounts->id2name($user);
+			if (is_numeric($user))
+			{
+				$user = $GLOBALS['egw']->accounts->id2name($user);
+			}
 			$filter = '(&'.static::USER_FILTER.'('.static::USER_ATTR.'='.Api\Ldap::quote($user).'))';
 		}
 		else	// email address --> build filter by attributes defined in config
@@ -367,7 +376,10 @@ 
 			else
 			{
 				$to_or = array('('.static::MAIL_ATTR.'='.Api\Ldap::quote($user).')');
-				if ($match_uid_at_domain) $to_or[] = '('.static::USER_ATTR.'='.Api\Ldap::quote($namepart).')';
+				if ($match_uid_at_domain)
+				{
+					$to_or[] = '('.static::USER_ATTR.'='.Api\Ldap::quote($namepart).')';
+				}
 				if (static::ALIAS_ATTR)
 				{
 					$to_or[] = '('.static::ALIAS_ATTR.'='.static::ALIAS_PREFIX.Api\Ldap::quote($user).')';
@@ -392,11 +404,17 @@ 
 		if ($sri)
 		{
 			$allValues = ldap_get_entries($ldap, $sri);
-			if ($this->debug) error_log(__METHOD__."('$user') --> ldap_search(, '$this->search_base', '$filter') --> ldap_get_entries=".array2string($allValues[0]));
+			if ($this->debug)
+			{
+				error_log(__METHOD__."('$user') --> ldap_search(, '$this->search_base', '$filter') --> ldap_get_entries=".array2string($allValues[0]));
+			}
 
 			foreach($allValues as $key => $values)
 			{
-				if ($key === 'count') continue;
+				if ($key === 'count')
+				{
+					continue;
+				}
 
 				// groups are always active (if they have an email) and allways forwardOnly
 				if (in_array(static::GROUP_SCHEMA, $values['objectclass']))
@@ -421,11 +439,14 @@ 
 					}
 					if (static::FORWARD_ONLY_ATTR)
 					{
-						if (static::FORWARD_ONLY)	// check caseinsensitiv for existence of that value
+						if (static::FORWARD_ONLY)
+						{
+							// check caseinsensitiv for existence of that value
 						{
 							$deliveryMode = self::getAttributePrefix($values[static::FORWARD_ONLY_ATTR], static::FORWARD_ONLY) ?
 								Mail\Smtp::FORWARD_ONLY : '';
 						}
+						}
 						else	// check for existence of any value
 						{
 							$deliveryMode = $values[static::FORWARD_ONLY_ATTR]['count'] > 0 ?
@@ -458,7 +479,10 @@ 
 				}
 
 				// regular user-data can only be from users, NOT groups
-				if (in_array(static::GROUP_SCHEMA, $values['objectclass'])) continue;
+				if (in_array(static::GROUP_SCHEMA, $values['objectclass']))
+				{
+					continue;
+				}
 
 				$userData['mailLocalAddress'] = $values[static::MAIL_ATTR][0];
 				$userData['accountStatus'] = $accountStatus;
@@ -480,7 +504,10 @@ 
 					$userData['mailForwardingAddress']	= self::getAttributePrefix($values[static::FORWARD_ATTR], static::FORWARD_PREFIX);
 				}
 
-				if (static::MAILBOX_ATTR) $userData['mailMessageStore']	= $values[static::MAILBOX_ATTR][0];
+				if (static::MAILBOX_ATTR)
+				{
+					$userData['mailMessageStore']	= $values[static::MAILBOX_ATTR][0];
+				}
 
 				$userData['deliveryMode'] = $deliveryMode;
 
@@ -499,7 +526,10 @@ 
 				}
 			}
 		}
-		if ($this->debug) error_log(__METHOD__."('$user') returning ".array2string($userData));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."('$user') returning ".array2string($userData));
+		}
 
 		return $userData;
 	}
@@ -617,7 +647,10 @@ 
 
 		$this->addAccountExtra(array('location' => 'setUserData'), $allValues[0], $newData);
 
-		if ($this->debug) error_log(__METHOD__.'('.array2string(func_get_args()).") --> ldap_mod_replace(,'$accountDN',".array2string($newData).')');
+		if ($this->debug)
+		{
+			error_log(__METHOD__.'('.array2string(func_get_args()).") --> ldap_mod_replace(,'$accountDN',".array2string($newData).')');
+		}
 
 		return ldap_mod_replace($ldap, $accountDN, $newData);
 	}
@@ -700,7 +733,10 @@ 
 				// merge in again all new set forwards incl. opt. prefix
 				self::setAttributePrefix($newData[static::FORWARD_ATTR], $forwards, static::FORWARD_PREFIX);
 			}
-			if ($this->debug) error_log(__METHOD__.'('.array2string(func_get_args()).") --> ldap_mod_replace(,'{$allValues[0]['dn']}',".array2string($newData).')');
+			if ($this->debug)
+			{
+				error_log(__METHOD__.'('.array2string(func_get_args()).") --> ldap_mod_replace(,'{$allValues[0]['dn']}',".array2string($newData).')');
+			}
 
 			return ldap_modify ($ds, $allValues[0]['dn'], $newData);
 		}
@@ -746,7 +782,11 @@ 
 		$mailboxes = array();
 		foreach($entries as $entry)
 		{
-			if ($entry[static::USER_ATTR][0] == 'anonymous') continue;	// anonymous is never a mail-user!
+			if ($entry[static::USER_ATTR][0] == 'anonymous')
+			{
+				continue;
+			}
+			// anonymous is never a mail-user!
 			list($mailbox) = explode('@', $entry[static::MAILBOX_ATTR ? static::MAILBOX_ATTR : static::MAIL_ATTR][0]);
 			$mailboxes[$entry[static::USER_ATTR][0]] = $mailbox;
 		}
@@ -763,8 +803,14 @@ 
 	protected static function setAttributePrefix(&$attribute, $values, $prefix='')
 	{
 		//$attribute_in = $attribute;
-		if (empty($attribute)) $attribute = array();
-		if (!is_array($attribute)) $attribute = (array)$attribute;
+		if (empty($attribute))
+		{
+			$attribute = array();
+		}
+		if (!is_array($attribute))
+		{
+			$attribute = (array)$attribute;
+		}
 
 		foreach((array)$values as $value)
 		{
@@ -794,12 +840,18 @@ 
 			{
 				if (!$prefix || stripos($value, $prefix) === 0)
 				{
-					if ($remove) unset($attribute[$key]);
+					if ($remove)
+					{
+						unset($attribute[$key]);
+					}
 					$values[] = substr($value, strlen($prefix));
 				}
 			}
 			// reindex $attribute, if neccessary
-			if ($values && $attribute) $attribute = array_values($attribute);
+			if ($values && $attribute)
+			{
+				$attribute = array_values($attribute);
+			}
 		}
 		//error_log(__METHOD__."(".array2string($attribute_in).", '$prefix', $remove) attribute=".array2string($attribute).' returning '.array2string($values));
 		return $values;

api/src/Session.php

Doc Comments +3 added lines, -2 removed lines

@@ -311,6 +311,7 @@ 
 	 * Encrypt the variables in the session
 	 *
 	 * Is called by self::__destruct().
+	 * @param string $kp3
 	 */
 	static function encrypt($kp3)
 	{
@@ -439,7 +440,7 @@ 
 	 * @param boolean $no_session =false dont create a real session, eg. for GroupDAV clients using only basic auth, no cookie support
 	 * @param boolean $auth_check =true if false, the user is loged in without checking his password (eg. for single sign on), default = true
 	 * @param boolean $fail_on_forced_password_change =false true: do NOT create session, if password change requested
-	 * @return string|boolean session id or false if session was not created, $this->(cd_)reason contains cause
+	 * @return false|string session id or false if session was not created, $this->(cd_)reason contains cause
 	 */
 	function create($login,$passwd = '',$passwd_type = '',$no_session=false,$auth_check=true,$fail_on_forced_password_change=false)
 	{
@@ -1021,7 +1022,7 @@ 
 	/**
 	 * Terminate a session
 	 *
-	 * @param int|string $sessionid nummeric or php session id of session to be terminated
+	 * @param string $sessionid nummeric or php session id of session to be terminated
 	 * @param string $kp3
 	 * @return boolean true on success, false on error
 	 */

Indentation +53 added lines, -53 removed lines

@@ -80,60 +80,60 @@ 
 	const MCRYPT_MODE = MCRYPT_MODE_ECB;
 
 	/**
-	* current user login (account_lid@domain)
-	*
-	* @var string
-	*/
+	 * current user login (account_lid@domain)
+	 *
+	 * @var string
+	 */
 	var $login;
 
 	/**
-	* current user password
-	*
-	* @var string
-	*/
+	 * current user password
+	 *
+	 * @var string
+	 */
 	var $passwd;
 
 	/**
-	* current user db/ldap account id
-	*
-	* @var int
-	*/
+	 * current user db/ldap account id
+	 *
+	 * @var int
+	 */
 	var $account_id;
 
 	/**
-	* current user account login id (without the eGW-domain/-instance part
-	*
-	* @var string
-	*/
+	 * current user account login id (without the eGW-domain/-instance part
+	 *
+	 * @var string
+	 */
 	var $account_lid;
 
 	/**
-	* domain for current user
-	*
-	* @var string
-	*/
+	 * domain for current user
+	 *
+	 * @var string
+	 */
 	var $account_domain;
 
 	/**
-	* type flag, A - anonymous session, N - None, normal session
-	*
-	* @var string
-	*/
+	 * type flag, A - anonymous session, N - None, normal session
+	 *
+	 * @var string
+	 */
 	var $session_flags;
 
 	/**
-	* current user session id
-	*
-	* @var string
-	*/
+	 * current user session id
+	 *
+	 * @var string
+	 */
 	var $sessionid;
 
 	/**
-	* an other session specific id (md5 from a random string),
-	* used together with the sessionid for xmlrpc basic auth and the encryption of session-data (if that's enabled)
-	*
-	* @var string
-	*/
+	 * an other session specific id (md5 from a random string),
+	 * used together with the sessionid for xmlrpc basic auth and the encryption of session-data (if that's enabled)
+	 *
+	 * @var string
+	 */
 	var $kp3;
 
 	/**
@@ -144,17 +144,17 @@ 
 	var $sessionid_access_log;
 
 	/**
-	* name of XML-RPC/SOAP method called
-	*
-	* @var string
-	*/
+	 * name of XML-RPC/SOAP method called
+	 *
+	 * @var string
+	 */
 	var $xmlrpc_method_called;
 
 	/**
-	* Array with the name of the system domains
-	*
-	* @var array
-	*/
+	 * Array with the name of the system domains
+	 *
+	 * @var array
+	 */
 	private $egw_domains;
 
 	/**
@@ -248,9 +248,9 @@ 
 
 		// 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);
-      	}
+	  	{
+	  		ini_set('session.gc_maxlifetime', $GLOBALS['egw_info']['server']['sessions_timeout']=14400);
+	  	}
 	}
 
 	/**
@@ -661,14 +661,14 @@ 
 	const ACCESS_LOG_TABLE = 'egw_access_log';
 
 	/**
-    * Write or update (for logout) the access_log
-	*
-	* @param string|int $sessionid nummeric or PHP session id or 0 for unsuccessful logins
-	* @param string $login ='' account_lid (evtl. with domain) or '' for setting the logout-time
-	* @param string $user_ip ='' ip to log
-	* @param int $account_id =0 numerical account_id
-	* @return int $sessionid primary key of egw_access_log for login, null otherwise
-	*/
+	 * Write or update (for logout) the access_log
+	 *
+	 * @param string|int $sessionid nummeric or PHP session id or 0 for unsuccessful logins
+	 * @param string $login ='' account_lid (evtl. with domain) or '' for setting the logout-time
+	 * @param string $user_ip ='' ip to log
+	 * @param int $account_id =0 numerical account_id
+	 * @return int $sessionid primary key of egw_access_log for login, null otherwise
+	 */
 	private function log_access($sessionid,$login='',$user_ip='',$account_id=0)
 	{
 		$now = time();
@@ -716,7 +716,7 @@ 
 
 	/**
 	 * Protect against brute force attacks, block login if too many unsuccessful login attmepts
-     *
+	 *
 	 * @param string $login account_lid (evtl. with domain)
 	 * @param string $ip ip of the user
 	 * @returns bool login blocked?

Spacing +165 added lines, -168 removed lines

@@ -173,7 +173,7 @@ 
 	const CD_BAD_LOGIN_OR_PASSWORD = 5;
 	const CD_FORCE_PASSWORD_CHANGE = 97;
 	const CD_ACCOUNT_EXPIRED = 98;
-	const CD_BLOCKED = 99;	// to many failed attempts to loing
+	const CD_BLOCKED = 99; // to many failed attempts to loing
 
 	/**
 	 * Verbose reason why session creation failed
@@ -194,7 +194,7 @@ 
 	 *
 	 * @param array $domain_names =null domain-names used in this install
 	 */
-	function __construct(array $domain_names=null)
+	function __construct(array $domain_names = null)
 	{
 		$this->required_files = $_SESSION[self::EGW_REQUIRED_FILES];
 
@@ -210,27 +210,27 @@ 
 			$save_rep = false;
 			if (!isset($GLOBALS['egw_info']['server']['max_access_log_age']))
 			{
-				$GLOBALS['egw_info']['server']['max_access_log_age'] = 90;	// default 90 days
+				$GLOBALS['egw_info']['server']['max_access_log_age'] = 90; // default 90 days
 				$save_rep = true;
 			}
 			if (!isset($GLOBALS['egw_info']['server']['block_time']))
 			{
-				$GLOBALS['egw_info']['server']['block_time'] = 1;	// default 1min, its enough to slow down brute force attacks
+				$GLOBALS['egw_info']['server']['block_time'] = 1; // default 1min, its enough to slow down brute force attacks
 				$save_rep = true;
 			}
 			if (!isset($GLOBALS['egw_info']['server']['num_unsuccessful_id']))
 			{
-				$GLOBALS['egw_info']['server']['num_unsuccessful_id']  = 3;	// default 3 trys per id
+				$GLOBALS['egw_info']['server']['num_unsuccessful_id'] = 3; // default 3 trys per id
 				$save_rep = true;
 			}
 			if (!isset($GLOBALS['egw_info']['server']['num_unsuccessful_ip']))
 			{
-				$GLOBALS['egw_info']['server']['num_unsuccessful_ip']  = $GLOBALS['egw_info']['server']['num_unsuccessful_id'] * 5;	// default is 5 times as high as the id default; since accessing via proxy is quite common
+				$GLOBALS['egw_info']['server']['num_unsuccessful_ip'] = $GLOBALS['egw_info']['server']['num_unsuccessful_id'] * 5; // default is 5 times as high as the id default; since accessing via proxy is quite common
 				$save_rep = true;
 			}
 			if (!isset($GLOBALS['egw_info']['server']['install_id']))
 			{
-				$GLOBALS['egw_info']['server']['install_id']  = md5(Auth::randomstring(15));
+				$GLOBALS['egw_info']['server']['install_id'] = md5(Auth::randomstring(15));
 			}
 			if (!isset($GLOBALS['egw_info']['server']['max_history']))
 			{
@@ -242,12 +242,12 @@ 
 			{
 				$config = new Config('phpgwapi');
 				$config->read_repository();
-				$config->value('max_access_log_age',$GLOBALS['egw_info']['server']['max_access_log_age']);
-				$config->value('block_time',$GLOBALS['egw_info']['server']['block_time']);
-				$config->value('num_unsuccessful_id',$GLOBALS['egw_info']['server']['num_unsuccessful_id']);
-				$config->value('num_unsuccessful_ip',$GLOBALS['egw_info']['server']['num_unsuccessful_ip']);
-				$config->value('install_id',$GLOBALS['egw_info']['server']['install_id']);
-				$config->value('max_history',$GLOBALS['egw_info']['server']['max_history']);
+				$config->value('max_access_log_age', $GLOBALS['egw_info']['server']['max_access_log_age']);
+				$config->value('block_time', $GLOBALS['egw_info']['server']['block_time']);
+				$config->value('num_unsuccessful_id', $GLOBALS['egw_info']['server']['num_unsuccessful_id']);
+				$config->value('num_unsuccessful_ip', $GLOBALS['egw_info']['server']['num_unsuccessful_ip']);
+				$config->value('install_id', $GLOBALS['egw_info']['server']['install_id']);
+				$config->value('max_history', $GLOBALS['egw_info']['server']['max_history']);
 				$config->save_repository();
 			}
 		}
@@ -256,7 +256,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);
+      		ini_set('session.gc_maxlifetime', $GLOBALS['egw_info']['server']['sessions_timeout'] = 14400);
       	}
 	}
 
@@ -329,15 +329,15 @@ 
 
 		if (!isset($_SESSION[self::EGW_SESSION_ENCRYPTED]) && self::init_crypt($kp3))
 		{
-			foreach(self::$egw_session_vars as $name)
+			foreach (self::$egw_session_vars as $name)
 			{
 				if (isset($_SESSION[$name]))
 				{
-					$_SESSION[$name] = mcrypt_generic(self::$mcrypt,serialize($_SESSION[$name]));
+					$_SESSION[$name] = mcrypt_generic(self::$mcrypt, serialize($_SESSION[$name]));
 					//error_log(__METHOD__."() 'encrypting' session var: $name, len=".strlen($_SESSION[$name]));
 				}
 			}
-			$_SESSION[self::EGW_SESSION_ENCRYPTED] = true;	// flag session as encrypted
+			$_SESSION[self::EGW_SESSION_ENCRYPTED] = true; // flag session as encrypted
 
 			mcrypt_generic_deinit(self::$mcrypt);
 			self::$mcrypt = null;
@@ -352,24 +352,24 @@ 
 	 * @param boolean $recursion =true if true call itself for every item > $limit
 	 * @param int $limit =1000 log only differences > $limit
 	 */
-	static function log_session_usage(&$arr,$label,$recursion=true,$limit=1000)
+	static function log_session_usage(&$arr, $label, $recursion = true, $limit = 1000)
 	{
 		if (!is_array($arr)) return;
 
 		$sizes = array();
-		foreach($arr as $key => &$data)
+		foreach ($arr as $key => &$data)
 		{
 			$sizes[$key] = strlen(serialize($data));
 		}
-		arsort($sizes,SORT_NUMERIC);
-		foreach($sizes as $key => $size)
+		arsort($sizes, SORT_NUMERIC);
+		foreach ($sizes as $key => $size)
 		{
 			$diff = $size - (int)$_SESSION[$label.'-sizes'][$key];
 			$_SESSION[$label.'-sizes'][$key] = $size;
 			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);
 			}
 		}
 	}
@@ -384,15 +384,15 @@ 
 	{
 		if ($_SESSION[self::EGW_SESSION_ENCRYPTED] && self::init_crypt(self::get_request('kp3')))
 		{
-			foreach(self::$egw_session_vars as $name)
+			foreach (self::$egw_session_vars as $name)
 			{
 				if (isset($_SESSION[$name]))
 				{
-					$_SESSION[$name] = unserialize(trim(mdecrypt_generic(self::$mcrypt,$_SESSION[$name])));
+					$_SESSION[$name] = unserialize(trim(mdecrypt_generic(self::$mcrypt, $_SESSION[$name])));
 					//error_log(__METHOD__."() 'decrypting' session var $name: gettype($name) = ".gettype($_SESSION[$name]));
 				}
 			}
-			unset($_SESSION[self::EGW_SESSION_ENCRYPTED]);	// delete encryption flag
+			unset($_SESSION[self::EGW_SESSION_ENCRYPTED]); // delete encryption flag
 		}
 	}
 
@@ -405,15 +405,15 @@ 
 	 * @param string $mode =self::MCRYPT_MODE
 	 * @return boolean true if encryption is used, false otherwise
 	 */
-	static private function init_crypt($kp3,$algo=self::MCRYPT_ALGO,$mode=self::MCRYPT_MODE)
+	static private function init_crypt($kp3, $algo = self::MCRYPT_ALGO, $mode = self::MCRYPT_MODE)
 	{
-		if(!$GLOBALS['egw_info']['server']['mcrypt_enabled'])
+		if (!$GLOBALS['egw_info']['server']['mcrypt_enabled'])
 		{
-			return false;	// session encryption is switched off
+			return false; // session encryption is switched off
 		}
 		if ($GLOBALS['egw_info']['currentapp'] == 'syncml' || !$kp3)
 		{
-			$kp3 = 'staticsyncmlkp3';	// syncml has no kp3!
+			$kp3 = 'staticsyncmlkp3'; // syncml has no kp3!
 		}
 		if (is_null(self::$mcrypt))
 		{
@@ -429,9 +429,9 @@ 
 			}
 			$iv_size = mcrypt_enc_get_iv_size(self::$mcrypt);
 			$iv = !isset($GLOBALS['egw_info']['server']['mcrypt_iv']) || strlen($GLOBALS['egw_info']['server']['mcrypt_iv']) < $iv_size ?
-				mcrypt_create_iv ($iv_size, MCRYPT_RAND) : substr($GLOBALS['egw_info']['server']['mcrypt_iv'],0,$iv_size);
+				mcrypt_create_iv($iv_size, MCRYPT_RAND) : substr($GLOBALS['egw_info']['server']['mcrypt_iv'], 0, $iv_size);
 
-			if (mcrypt_generic_init(self::$mcrypt,$kp3, $iv) < 0)
+			if (mcrypt_generic_init(self::$mcrypt, $kp3, $iv) < 0)
 			{
 				error_log(__METHOD__."() could not initialise mcrypt, sessions get NOT encrypted!");
 				return self::$mcrypt = false;
@@ -451,7 +451,7 @@ 
 	 * @param boolean $fail_on_forced_password_change =false true: do NOT create session, if password change requested
 	 * @return string|boolean session id or false if session was not created, $this->(cd_)reason contains cause
 	 */
-	function create($login,$passwd = '',$passwd_type = '',$no_session=false,$auth_check=true,$fail_on_forced_password_change=false)
+	function create($login, $passwd = '', $passwd_type = '', $no_session = false, $auth_check = true, $fail_on_forced_password_change = false)
 	{
 		try {
 			if (is_array($login))
@@ -469,9 +469,9 @@ 
 			}
 			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);
+			self::split_login_domain($login, $this->account_lid, $this->account_domain);
 			// add domain to the login, if not already there
-			if (substr($this->login,-strlen($this->account_domain)-1) != '@'.$this->account_domain)
+			if (substr($this->login, -strlen($this->account_domain) - 1) != '@'.$this->account_domain)
 			{
 				$this->login .= '@'.$this->account_domain;
 			}
@@ -488,7 +488,7 @@ 
 			{
 				$this->account_domain = $GLOBALS['egw_info']['user']['domain'];
 			}
-			elseif($this->account_domain != $GLOBALS['egw_info']['user']['domain'])
+			elseif ($this->account_domain != $GLOBALS['egw_info']['user']['domain'])
 			{
 				throw new Exception("Wrong domain! '$this->account_domain' != '{$GLOBALS['egw_info']['user']['domain']}'");
 			}
@@ -496,9 +496,9 @@ 
 
 			$user_ip = self::getuser_ip();
 
-			$this->account_id = $GLOBALS['egw']->accounts->name2id($this->account_lid,'account_lid','u');
+			$this->account_id = $GLOBALS['egw']->accounts->name2id($this->account_lid, 'account_lid', 'u');
 
-			if (($blocked = $this->login_blocked($login,$user_ip)) ||	// too many unsuccessful attempts
+			if (($blocked = $this->login_blocked($login, $user_ip)) || // too many unsuccessful attempts
 				$GLOBALS['egw_info']['server']['global_denied_users'][$this->account_lid] ||
 				$auth_check && !$GLOBALS['egw']->auth->authenticate($this->account_lid, $this->passwd, $this->passwd_type) ||
 				$this->account_id && $GLOBALS['egw']->accounts->get_type($this->account_id) == 'g')
@@ -507,9 +507,9 @@ 
 				$this->cd_reason = $blocked ? self::CD_BLOCKED : self::CD_BAD_LOGIN_OR_PASSWORD;
 
 				// we dont log anon users as it would block the website
-				if (!$GLOBALS['egw']->acl->get_specific_rights_for_account($this->account_id,'anonymous','phpgwapi'))
+				if (!$GLOBALS['egw']->acl->get_specific_rights_for_account($this->account_id, 'anonymous', 'phpgwapi'))
 				{
-					$this->log_access($this->reason,$login,$user_ip,0);	// log unsuccessfull login
+					$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)");
 				return false;
@@ -531,7 +531,7 @@ 
 			if ($this->account_lid != ($lid = $GLOBALS['egw']->accounts->id2name($this->account_id)))
 			{
 				$this->account_lid = $lid;
-				$this->login = $lid.substr($this->login,strlen($lid));
+				$this->login = $lid.substr($this->login, strlen($lid));
 			}
 
 			$GLOBALS['egw_info']['user']['account_id'] = $this->account_id;
@@ -553,7 +553,7 @@ 
 				}
 				$this->sessionid = session_id();
 			}
-			$this->kp3       = Auth::randomstring(24);
+			$this->kp3 = Auth::randomstring(24);
 
 			$GLOBALS['egw_info']['user'] = $this->read_repositories();
 			if ($GLOBALS['egw']->accounts->is_expired($GLOBALS['egw_info']['user']))
@@ -567,7 +567,7 @@ 
 
 			Cache::setSession('phpgwapi', 'password', base64_encode($this->passwd));
 
-			if ($GLOBALS['egw']->acl->check('anonymous',1,'phpgwapi'))
+			if ($GLOBALS['egw']->acl->check('anonymous', 1, 'phpgwapi'))
 			{
 				$this->session_flags = 'A';
 			}
@@ -585,46 +585,46 @@ 
 				'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)
+				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
+						$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)");
 						return false;
 					}
 				}
 			}
 			$GLOBALS['egw']->db->transaction_begin();
-			$this->register_session($this->login,$user_ip,$now,$this->session_flags);
+			$this->register_session($this->login, $user_ip, $now, $this->session_flags);
 			if ($this->session_flags != 'A')		// dont log anonymous sessions
 			{
-				$this->sessionid_access_log = $this->log_access($this->sessionid,$login,$user_ip,$this->account_id);
+				$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']->accounts->update_lastlogin($this->account_id, $user_ip);
 			$GLOBALS['egw']->db->transaction_commit();
 
 			if ($GLOBALS['egw_info']['server']['usecookies'] && !$no_session)
 			{
-				self::egw_setcookie(self::EGW_SESSION_NAME,$this->sessionid);
-				self::egw_setcookie('kp3',$this->kp3);
-				self::egw_setcookie('domain',$this->account_domain);
+				self::egw_setcookie(self::EGW_SESSION_NAME, $this->sessionid);
+				self::egw_setcookie('kp3', $this->kp3);
+				self::egw_setcookie('domain', $this->account_domain);
 			}
 			if ($GLOBALS['egw_info']['server']['usecookies'] && !$no_session || isset($_COOKIE['last_loginid']))
 			{
-				self::egw_setcookie('last_loginid', $this->account_lid ,$now+1209600); /* For 2 weeks */
-				self::egw_setcookie('last_domain',$this->account_domain,$now+1209600);
+				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");
 
 			return $this->sessionid;
 		}
 		// catch all exceptions, as their (allways logged) trace (eg. on a database error) would contain the user password
-		catch(Exception $e) {
+		catch (Exception $e) {
 			$this->reason = $this->cd_reason = $e->getMessage();
 			error_log(__METHOD__."('$login', ".array2string(str_repeat('*', strlen($passwd))).
 				", '$passwd_type', no_session=".array2string($no_session).
@@ -643,13 +643,12 @@ 
 	 * @param int $now
 	 * @param string $session_flags
 	 */
-	private function register_session($login,$user_ip,$now,$session_flags)
+	private function register_session($login, $user_ip, $now, $session_flags)
 	{
 		// restore session vars set before session was started
 		if (is_array($this->required_files))
 		{
-			$_SESSION[self::EGW_REQUIRED_FILES] = !is_array($_SESSION[self::EGW_REQUIRED_FILES]) ? $this->required_files :
-				array_unique(array_merge($_SESSION[self::EGW_REQUIRED_FILES],$this->required_files));
+			$_SESSION[self::EGW_REQUIRED_FILES] = !is_array($_SESSION[self::EGW_REQUIRED_FILES]) ? $this->required_files : array_unique(array_merge($_SESSION[self::EGW_REQUIRED_FILES], $this->required_files));
 			unset($this->required_files);
 		}
 		$_SESSION[self::EGW_SESSION_VAR] = array(
@@ -679,13 +678,13 @@ 
 	* @param int $account_id =0 numerical account_id
 	* @return int $sessionid primary key of egw_access_log for login, null otherwise
 	*/
-	private function log_access($sessionid,$login='',$user_ip='',$account_id=0)
+	private function log_access($sessionid, $login = '', $user_ip = '', $account_id = 0)
 	{
 		$now = time();
 
 		if ($login)
 		{
-			$GLOBALS['egw']->db->insert(self::ACCESS_LOG_TABLE,array(
+			$GLOBALS['egw']->db->insert(self::ACCESS_LOG_TABLE, array(
 				'session_php' => $sessionid,
 				'loginid'   => $login,
 				'ip'        => $user_ip,
@@ -693,10 +692,10 @@ 
 				'account_id'=> $account_id,
 				'user_agent'=> $_SERVER['HTTP_USER_AGENT'],
 				'session_dla'    => $now,
-				'session_action' => $this->update_dla(false),	// dont update egw_access_log
-			),false,__LINE__,__FILE__);
+				'session_action' => $this->update_dla(false), // dont update egw_access_log
+			), false, __LINE__, __FILE__);
 
-			$ret = $GLOBALS['egw']->db->get_last_insert_id(self::ACCESS_LOG_TABLE,'sessionid');
+			$ret = $GLOBALS['egw']->db->get_last_insert_id(self::ACCESS_LOG_TABLE, 'sessionid');
 		}
 		else
 		{
@@ -704,20 +703,20 @@ 
 			{
 				$sessionid = $this->sessionid_access_log;
 			}
-			$GLOBALS['egw']->db->update(self::ACCESS_LOG_TABLE,array(
+			$GLOBALS['egw']->db->update(self::ACCESS_LOG_TABLE, array(
 				'lo' => $now
-			),is_numeric($sessionid) ? array(
+			), is_numeric($sessionid) ? array(
 				'sessionid' => $sessionid,
 			) : array(
 				'session_php' => $sessionid,
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 
 			// run maintenance only on logout, to not delay login
 			if ($GLOBALS['egw_info']['server']['max_access_log_age'])
 			{
 				$max_age = $now - $GLOBALS['egw_info']['server']['max_access_log_age'] * 24 * 60 * 60;
 
-				$GLOBALS['egw']->db->delete(self::ACCESS_LOG_TABLE,"li < $max_age",__LINE__,__FILE__);
+				$GLOBALS['egw']->db->delete(self::ACCESS_LOG_TABLE, "li < $max_age", __LINE__, __FILE__);
 			}
 		}
 		//error_log(__METHOD__."('$sessionid', '$login', '$user_ip', $account_id) returning ".array2string($ret));
@@ -731,12 +730,12 @@ 
 	 * @param string $ip ip of the user
 	 * @returns bool login blocked?
 	 */
-	private function login_blocked($login,$ip)
+	private function login_blocked($login, $ip)
 	{
 		$block_time = time() - $GLOBALS['egw_info']['server']['block_time'] * 60;
 
 		$false_id = $false_ip = 0;
-		foreach($GLOBALS['egw']->db->union(array(
+		foreach ($GLOBALS['egw']->db->union(array(
 			array(
 				'table' => self::ACCESS_LOG_TABLE,
 				'cols'  => "'false_ip' AS name,COUNT(*) AS num",
@@ -773,28 +772,28 @@ 
 		//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));
-				$mailer->setBody(lang("Too many unsucessful attempts to login: %1 for the user '%2', %3 for the IP %4",$false_id,$login,$false_ip,$ip));
-				foreach(preg_split('/,\s*/',$GLOBALS['egw_info']['server']['admin_mails']) as $mail)
+				$mailer->addHeader('Subject', lang("eGroupWare: login blocked for user '%1', IP %2", $login, $ip));
+				$mailer->setBody(lang("Too many unsucessful attempts to login: %1 for the user '%2', %3 for the IP %4", $false_id, $login, $false_ip, $ip));
+				foreach (preg_split('/,\s*/', $GLOBALS['egw_info']['server']['admin_mails']) as $mail)
 				{
 					$mailer->addAddress($mail);
 				}
 				$mailer->send();
 			}
-			catch(Exception $e) {
+			catch (Exception $e) {
 				// ignore exception, but log it, to block the account and give a correct error-message to user
 				error_log(__METHOD__."('$login', '$ip') ".$e->getMessage());
 			}
 			// save time of mail, to not send to many mails
 			$config = new Config('phpgwapi');
 			$config->read_repository();
-			$config->value('login_blocked_mail_time',time());
+			$config->value('login_blocked_mail_time', time());
 			$config->save_repository();
 		}
 		return $blocked;
@@ -815,7 +814,7 @@ 
 	 * @param boolean $only_basic_auth =false return only a basic auth pseudo sessionid, default no
 	 * @return string
 	 */
-	static function get_sessionid($only_basic_auth=false)
+	static function get_sessionid($only_basic_auth = false)
 	{
 		// for WebDAV and GroupDAV we use a pseudo sessionid created from md5(user:passwd)
 		// --> allows this stateless protocolls which use basic auth to use sessions!
@@ -842,11 +841,11 @@ 
 				EGW_SERVER_ROOT.':'.self::getuser_ip().':'.filemtime(EGW_SERVER_ROOT.'/api/setup/setup.inc.php').
 				':'.$_SERVER['HTTP_USER_AGENT']);
 		}
-		elseif(!$only_basic_auth && isset($_REQUEST[self::EGW_SESSION_NAME]))
+		elseif (!$only_basic_auth && isset($_REQUEST[self::EGW_SESSION_NAME]))
 		{
 			$sessionid = $_REQUEST[self::EGW_SESSION_NAME];
 		}
-		elseif(!$only_basic_auth && isset($_COOKIE[self::EGW_SESSION_NAME]))
+		elseif (!$only_basic_auth && isset($_COOKIE[self::EGW_SESSION_NAME]))
 		{
 			$sessionid = $_COOKIE[self::EGW_SESSION_NAME];
 		}
@@ -854,7 +853,7 @@ 
 		{
 			$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;
 	}
 
@@ -870,9 +869,7 @@ 
 	 */
 	static function get_request($name)
 	{
-		return isset($_REQUEST[$name]) ? $_REQUEST[$name] :
-			(isset($_COOKIE[$name]) ? $_COOKIE[$name] :
-			(isset($_COOKIE[$name=ucfirst($name)]) ? $_COOKIE[$name] : null));
+		return isset($_REQUEST[$name]) ? $_REQUEST[$name] : (isset($_COOKIE[$name]) ? $_COOKIE[$name] : (isset($_COOKIE[$name = ucfirst($name)]) ? $_COOKIE[$name] : null));
 	}
 
 	/**
@@ -882,13 +879,13 @@ 
 	 * @param string $kp3 ?? to be verified
 	 * @return bool is the session valid?
 	 */
-	function verify($sessionid=null,$kp3=null)
+	function verify($sessionid = null, $kp3 = null)
 	{
 		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."('$sessionid','$kp3') ".function_backtrace());
 
 		$fill_egw_info_and_repositories = !$GLOBALS['egw_info']['flags']['restored_from_session'];
 
-		if(!$sessionid)
+		if (!$sessionid)
 		{
 			$sessionid = self::get_sessionid();
 			$kp3       = self::get_request('kp3');
@@ -915,23 +912,23 @@ 
 			if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."('$sessionid') session does NOT exist!");
 			return false;
 		}
-		$session =& $_SESSION[self::EGW_SESSION_VAR];
+		$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!");
-			$this->destroy($sessionid,$kp3);
+			$this->destroy($sessionid, $kp3);
 			return false;
 		}
 
 		$this->session_flags = $session['session_flags'];
 
-		$this->split_login_domain($session['session_lid'],$this->account_lid,$this->account_domain);
+		$this->split_login_domain($session['session_lid'], $this->account_lid, $this->account_domain);
 
 		// This is to ensure that we authenticate to the correct domain (might not be default)
-		if($GLOBALS['egw_info']['user']['domain'] && $this->account_domain != $GLOBALS['egw_info']['user']['domain'])
+		if ($GLOBALS['egw_info']['user']['domain'] && $this->account_domain != $GLOBALS['egw_info']['user']['domain'])
 		{
-			return false;	// session not verified, domain changed
+			return false; // session not verified, domain changed
 		}
 		$GLOBALS['egw_info']['user']['kp3'] = $this->kp3;
 
@@ -944,7 +941,7 @@ 
 		{
 			$this->update_notification_heartbeat();
 		}
-		$this->account_id = $GLOBALS['egw']->accounts->name2id($this->account_lid,'account_lid','u');
+		$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')");
@@ -982,7 +979,7 @@ 
 
 		if ($GLOBALS['egw_info']['server']['sessions_checkip'])
 		{
-			if (strtoupper(substr(PHP_OS,0,3)) != 'WIN' && (!$GLOBALS['egw_info']['user']['session_ip'] ||
+			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");
@@ -1005,9 +1002,9 @@ 
 		// query accesslog-id, if not set in session (session is made persistent after login!)
 		if (!$this->sessionid_access_log && $this->session_flags != 'A')
 		{
-			$this->sessionid_access_log = $GLOBALS['egw']->db->select(self::ACCESS_LOG_TABLE,'sessionid',array(
+			$this->sessionid_access_log = $GLOBALS['egw']->db->select(self::ACCESS_LOG_TABLE, 'sessionid', array(
 				'session_php' => $this->sessionid,
-			),__LINE__,__FILE__)->fetchColumn();
+			), __LINE__, __FILE__)->fetchColumn();
 			//error_log(__METHOD__."() sessionid=$this->sessionid --> sessionid_access_log=$this->sessionid_access_log");
 		}
 
@@ -1018,9 +1015,9 @@ 
 			(!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");
-			self::egw_setcookie(self::EGW_SESSION_NAME,$this->sessionid);
-			self::egw_setcookie('kp3',$this->kp3);
-			self::egw_setcookie('domain',$this->account_domain);
+			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");
@@ -1035,27 +1032,27 @@ 
 	 * @param string $kp3
 	 * @return boolean true on success, false on error
 	 */
-	function destroy($sessionid, $kp3='')
+	function destroy($sessionid, $kp3 = '')
 	{
 		if (!$sessionid && $kp3)
 		{
 			return false;
 		}
-		$this->log_access($sessionid);	// log logout-time
+		$this->log_access($sessionid); // log logout-time
 
 		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
 		{
-			$sessionid = $GLOBALS['egw']->db->select(self::ACCESS_LOG_TABLE,'session_php',array(
+			$sessionid = $GLOBALS['egw']->db->select(self::ACCESS_LOG_TABLE, 'session_php', array(
 					'sessionid' => $sessionid,
-				),__LINE__,__FILE__)->fetchColumn();
+				), __LINE__, __FILE__)->fetchColumn();
 		}
 
 		Hooks::process(array(
 			'location'  => 'session_destroyed',
 			'sessionid' => $sessionid,
-		),'',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
 
 		// Only do the following, if where working with the current user
 		if (!$GLOBALS['egw_info']['user']['sessionid'] || $sessionid == $GLOBALS['egw_info']['user']['sessionid'])
@@ -1076,7 +1073,7 @@ 
 		}
 		else
 		{
-			$this->commit_session();	// close our own session
+			$this->commit_session(); // close our own session
 
 			session_id($sessionid);
 			if (session_start())
@@ -1116,25 +1113,25 @@ 
 		// as $webserver_url may be part of $url (as /egw is part of phpgwapi/js/egw_instant_load.html)
 		if (($url[0] != '/' || $webserver_url != '/') && (!$webserver_url || strpos($url, $webserver_url.'/') === false))
 		{
-			if($url[0] != '/' && substr($webserver_url,-1) != '/')
+			if ($url[0] != '/' && substr($webserver_url, -1) != '/')
 			{
-				$url = $webserver_url .'/'. $url;
+				$url = $webserver_url.'/'.$url;
 			}
 			else
 			{
-				$url = $webserver_url . $url;
+				$url = $webserver_url.$url;
 			}
 		}
 
-		if(isset($GLOBALS['egw_info']['server']['enforce_ssl']) && $GLOBALS['egw_info']['server']['enforce_ssl'])
+		if (isset($GLOBALS['egw_info']['server']['enforce_ssl']) && $GLOBALS['egw_info']['server']['enforce_ssl'])
 		{
-			if(substr($url ,0,4) != 'http')
+			if (substr($url, 0, 4) != 'http')
 			{
 				$url = 'https://'.$_SERVER['HTTP_HOST'].$url;
 			}
 			else
 			{
-				$url = str_replace ( 'http:', 'https:', $url);
+				$url = str_replace('http:', 'https:', $url);
 			}
 		}
 		$vars = array();
@@ -1147,7 +1144,7 @@ 
 		}
 
 		// check if the url already contains a query and ensure that vars is an array and all strings are in extravars
-		list($ret_url,$othervars) = explode('?', $url, 2);
+		list($ret_url, $othervars) = explode('?', $url, 2);
 		if ($extravars && is_array($extravars))
 		{
 			$vars += $extravars;
@@ -1155,19 +1152,19 @@ 
 		}
 		else
 		{
-			if ($othervars) $extravars .= ($extravars?'&':'').$othervars;
+			if ($othervars) $extravars .= ($extravars ? '&' : '').$othervars;
 		}
 
 		// parse extravars string into the vars array
 		if ($extravars)
 		{
-			foreach(explode('&',$extravars) as $expr)
+			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 (substr($var,-2) == '[]')
+				list($var, $val) = explode('=', $expr, 2);
+				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;
+					$vars[substr($var, 0, -2)][] = $val;
 				}
 				else
 				{
@@ -1180,11 +1177,11 @@ 
 		if (count($vars))
 		{
 			$query = array();
-			foreach($vars as $key => $value)
+			foreach ($vars as $key => $value)
 			{
 				if (is_array($value))
 				{
-					foreach($value as $val)
+					foreach ($value as $val)
 					{
 						$query[] = $key.'[]='.urlencode($val);
 					}
@@ -1194,7 +1191,7 @@ 
 					$query[] = $key.'='.urlencode($value);
 				}
 			}
-			$ret_url .= '?' . implode('&',$query);
+			$ret_url .= '?'.implode('&', $query);
 		}
 		return $ret_url;
 	}
@@ -1239,7 +1236,7 @@ 
 	 * @param int $cookietime =0 when cookie should expire, 0 for session only (optional)
 	 * @param string $cookiepath =null optional path (eg. '/') if the eGW install-dir should not be used
 	 */
-	public static function egw_setcookie($cookiename,$cookievalue='',$cookietime=0,$cookiepath=null)
+	public static function egw_setcookie($cookiename, $cookievalue = '', $cookietime = 0, $cookiepath = null)
 	{
 		if (empty(self::$cookie_domain) || empty(self::$cookie_path))
 		{
@@ -1252,11 +1249,11 @@ 
 		static $is_iOS = null;
 		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,
-				is_null($cookiepath) ? self::$cookie_path : $cookiepath,self::$cookie_domain,
+				!$cookietime && $is_iOS ? time() + self::IOS_SESSION_COOKIE_LIFETIME : $cookietime,
+				is_null($cookiepath) ? self::$cookie_path : $cookiepath, self::$cookie_domain,
 				// 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);
 		}
@@ -1275,21 +1272,21 @@ 
 		else
 		{
 			// Use HTTP_X_FORWARDED_HOST if set, which is the case behind a none-transparent proxy
-			self::$cookie_domain = isset($_SERVER['HTTP_X_FORWARDED_HOST']) ?  $_SERVER['HTTP_X_FORWARDED_HOST'] : $_SERVER['HTTP_HOST'];
+			self::$cookie_domain = isset($_SERVER['HTTP_X_FORWARDED_HOST']) ? $_SERVER['HTTP_X_FORWARDED_HOST'] : $_SERVER['HTTP_HOST'];
 		}
 		// remove port from HTTP_HOST
 		$arr = null;
-		if (preg_match("/^(.*):(.*)$/",self::$cookie_domain,$arr))
+		if (preg_match("/^(.*):(.*)$/", self::$cookie_domain, $arr))
 		{
 			self::$cookie_domain = $arr[1];
 		}
-		if (count(explode('.',self::$cookie_domain)) <= 1)
+		if (count(explode('.', self::$cookie_domain)) <= 1)
 		{
 			// setcookie dont likes domains without dots, leaving it empty, gets setcookie to fill the domain in
 			self::$cookie_domain = '';
 		}
 		if (!$GLOBALS['egw_info']['server']['cookiepath'] ||
-			!(self::$cookie_path = parse_url($GLOBALS['egw_info']['server']['webserver_url'],PHP_URL_PATH)))
+			!(self::$cookie_path = parse_url($GLOBALS['egw_info']['server']['webserver_url'], PHP_URL_PATH)))
 		{
 			self::$cookie_path = '/';
 		}
@@ -1309,7 +1306,7 @@ 
 	 * @param array $domains =null defaults to $GLOBALS['egw_domain'] from the header
 	 * @return string $GLOBALS['egw_info']['user']['domain'] set with the domain/instance to use
 	 */
-	public static function search_instance($login,$domain_requested,&$default_domain,$server_names,array $domains=null)
+	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).")");
 
@@ -1317,10 +1314,10 @@ 
 
 		if (!isset($default_domain) || !isset($domains[$default_domain]))	// allow to overwrite the default domain
 		{
-			foreach((array)$server_names as $server_name)
+			foreach ((array)$server_names as $server_name)
 			{
-				list($server_name) = explode(':', $server_name);	// remove port from HTTP_HOST
-				if(isset($domains[$server_name]))
+				list($server_name) = explode(':', $server_name); // remove port from HTTP_HOST
+				if (isset($domains[$server_name]))
 				{
 					$default_domain = $server_name;
 					break;
@@ -1330,7 +1327,7 @@ 
 					$parts = explode('.', $server_name);
 					array_shift($parts);
 					$domain_part = implode('.', $parts);
-					if(isset($domains[$domain_part]))
+					if (isset($domains[$domain_part]))
 					{
 						$default_domain = $domain_part;
 						break;
@@ -1346,11 +1343,11 @@ 
 		}
 		if (isset($login))	// on login
 		{
-			if (strpos($login,'@') === false || count($domains) == 1)
+			if (strpos($login, '@') === false || count($domains) == 1)
 			{
-				$login .= '@' . (isset($_POST['logindomain']) ? $_POST['logindomain'] : $default_domain);
+				$login .= '@'.(isset($_POST['logindomain']) ? $_POST['logindomain'] : $default_domain);
 			}
-			$parts = explode('@',$login);
+			$parts = explode('@', $login);
 			$domain = array_pop($parts);
 			$GLOBALS['login'] = $login;
 		}
@@ -1383,7 +1380,7 @@ 
 	 * @param boolean $update_access_log =false false: dont update egw_access_log table, but set $this->action
 	 * @return string action as written to egw_access_log.session_action
 	 */
-	private function update_dla($update_access_log=false)
+	private function update_dla($update_access_log = false)
 	{
 		// This way XML-RPC users aren't always listed as xmlrpc.php
 		if (!$update_access_log)
@@ -1401,14 +1398,14 @@ 
 				$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'];
 				}
 				elseif ($egw_path)
 				{
-					list(,$action) = explode($egw_path,$action,2);
+					list(,$action) = explode($egw_path, $action, 2);
 				}
 			}
 			$this->set_action($action);
@@ -1416,13 +1413,13 @@ 
 		// update dla in access-log table, if we have an access-log row (non-anonymous session)
 		if ($this->sessionid_access_log && $update_access_log)
 		{
-			$GLOBALS['egw']->db->update(self::ACCESS_LOG_TABLE,array(
+			$GLOBALS['egw']->db->update(self::ACCESS_LOG_TABLE, array(
 				'session_dla' => time(),
 				'session_action' => $this->action,
-				'lo' => null,	// just in case it was (automatic) timed out before
-			),array(
+				'lo' => null, // just in case it was (automatic) timed out before
+			), array(
 				'sessionid' => $this->sessionid_access_log,
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 		}
 
 		$_SESSION[self::EGW_SESSION_VAR]['session_dla'] = time();
@@ -1440,12 +1437,12 @@ 
 		// update dla in access-log table, if we have an access-log row (non-anonymous session)
 		if ($this->sessionid_access_log)
 		{
-			$GLOBALS['egw']->db->update(self::ACCESS_LOG_TABLE,array(
+			$GLOBALS['egw']->db->update(self::ACCESS_LOG_TABLE, array(
 				'notification_heartbeat' => time(),
-			),array(
+			), array(
 				'sessionid' => $this->sessionid_access_log,
 				'lo IS NULL',
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 		}
 	}
 
@@ -1466,7 +1463,7 @@ 
 		{
 			// authentication happens in login.php, which does NOT yet create egw-object in session
 			// --> need to store homedirectory in session
-			if(isset($GLOBALS['auto_create_acct']['homedirectory']))
+			if (isset($GLOBALS['auto_create_acct']['homedirectory']))
 			{
 				Cache::setSession(__CLASS__, 'homedirectory',
 					$user['homedirectory'] = $GLOBALS['auto_create_acct']['homedirectory']);
@@ -1479,7 +1476,7 @@ 
 		$user['preferences'] = $GLOBALS['egw']->preferences->read_repository();
 		if (is_object($GLOBALS['egw']->datetime))
 		{
-			$GLOBALS['egw']->datetime->__construct();		// to set tz_offset from the now read prefs
+			$GLOBALS['egw']->datetime->__construct(); // to set tz_offset from the now read prefs
 		}
 		$user['apps']        = $GLOBALS['egw']->applications->read_repository();
 		$user['domain']      = $this->account_domain;
@@ -1502,9 +1499,9 @@ 
 	 * @param string &$account_lid returned account_lid (ie. user)
 	 * @param string &$domain returned domain (ie. domain)
 	 */
-	private function split_login_domain($login,&$account_lid,&$domain)
+	private function split_login_domain($login, &$account_lid, &$domain)
 	{
-		$parts = explode('@',$login);
+		$parts = explode('@', $login);
 
 		//conference - for strings like vinicius@thyamad.com@default ,
 		//allows that user have a login that is his e-mail. (viniciuscb)
@@ -1512,11 +1509,11 @@ 
 		{
 			$probable_domain = array_pop($parts);
 			//Last part of login string, when separated by @, is a domain name
-			if (in_array($probable_domain,$this->egw_domains))
+			if (in_array($probable_domain, $this->egw_domains))
 			{
 				$got_login = true;
 				$domain = $probable_domain;
-				$account_lid = implode('@',$parts);
+				$account_lid = implode('@', $parts);
 			}
 		}
 
@@ -1539,9 +1536,9 @@ 
 	 * @param boolean $allow_password_md5 =false can password alread be an md5 hash
 	 * @return string
 	 */
-	static function user_pw_hash($user,$password,$allow_password_md5=false)
+	static function user_pw_hash($user, $password, $allow_password_md5 = false)
 	{
-		$password_md5 = $allow_password_md5 && preg_match('/^[a-f0-9]{32}$/',$password) ? $password : md5($password);
+		$password_md5 = $allow_password_md5 && preg_match('/^[a-f0-9]{32}$/', $password) ? $password : md5($password);
 
 		$hash = sha1(strtolower($user).$password_md5);
 
@@ -1555,7 +1552,7 @@ 
 	{
 		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
+		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);
 		if (($sessionid = self::get_sessionid()))
 		{
@@ -1582,7 +1579,7 @@ 
 	 * @param int $expire =null expiration time in seconds, default $GLOBALS['egw_info']['flags']['nocachecontrol'] or php.ini session.cache_expire
 	 * @param int $private =null allows to set private caching with given expiration time, by setting it to true
 	 */
-	public static function cache_control($expire=null, $private=null)
+	public static function cache_control($expire = null, $private = null)
 	{
 		if (is_null($expire) && isset($GLOBALS['egw_info']['flags']['nocachecontrol']) && is_int($GLOBALS['egw_info']['flags']['nocachecontrol']))
 		{
@@ -1592,7 +1589,7 @@ 
 		if (!isset($_SESSION))
 		{
 			// controling caching and expires header
-			if(!isset($expire) && (!isset($GLOBALS['egw_info']['flags']['nocachecontrol']) ||
+			if (!isset($expire) && (!isset($GLOBALS['egw_info']['flags']['nocachecontrol']) ||
 				!$GLOBALS['egw_info']['flags']['nocachecontrol']))
 			{
 				session_cache_limiter('nocache');
@@ -1602,7 +1599,7 @@ 
 				// allow public caching: proxys, cdns, ...
 				if (isset($expire))
 				{
-					session_cache_expire((int)ceil($expire/60));	// in minutes
+					session_cache_expire((int)ceil($expire / 60)); // in minutes
 				}
 				session_cache_limiter($private ? 'private' : 'public');
 			}
@@ -1615,8 +1612,8 @@ 
 		// session already started
 		if (isset($_SESSION))
 		{
-			if ($expire && (session_cache_limiter() !== ($expire===true?'private_no_expire':'public') ||
-				is_int($expire) && $expire/60 !== session_cache_expire()))
+			if ($expire && (session_cache_limiter() !== ($expire === true ? 'private_no_expire' : 'public') ||
+				is_int($expire) && $expire / 60 !== session_cache_expire()))
 			{
 				$file = $line = null;
 				if (headers_sent($file, $line))
@@ -1624,20 +1621,20 @@ 
 					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('Cache-Control: private, max-age='.(60 * session_cache_expire()));
 					header_remove('Expires');
 				}
 				elseif ($private)
 				{
 					header('Cache-Control: private, max-age='.$expire);
-					header('Expires: ' . gmdate('D, d M Y H:i:s', time()+$expire) . ' GMT');
+					header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expire).' GMT');
 				}
 				else
 				{
 					header('Cache-Control: public, max-age='.$expire);
-					header('Expires: ' . gmdate('D, d M Y H:i:s', time()+$expire) . ' GMT');
+					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+
@@ -1662,10 +1659,10 @@ 
 	 * @param array $filter =array() extra filter for sessions
 	 * @return array with sessions (values for keys as in $sort)
 	 */
-	public static function session_list($start,$sort='DESC',$order='session_dla',$all_no_sort=False,array $filter=array())
+	public static function session_list($start, $sort = 'DESC', $order = 'session_dla', $all_no_sort = False, array $filter = array())
 	{
 		$sessions = array();
-		if (!preg_match('/^[a-z0-9_ ,]+$/i',$order_by=$order.' '.$sort) || $order_by == ' ')
+		if (!preg_match('/^[a-z0-9_ ,]+$/i', $order_by = $order.' '.$sort) || $order_by == ' ')
 		{
 			$order_by = 'session_dla DESC';
 		}
@@ -1673,7 +1670,7 @@ 
 		$filter[] = 'account_id>0';
 		$filter[] = 'session_dla > '.(int)(time() - $GLOBALS['egw_info']['server']['sessions_timeout']);
 		$filter[] = '(notification_heartbeat IS NULL OR notification_heartbeat > '.self::heartbeat_limit().')';
-		foreach($GLOBALS['egw']->db->select(self::ACCESS_LOG_TABLE, '*', $filter, __LINE__, __FILE__,
+		foreach ($GLOBALS['egw']->db->select(self::ACCESS_LOG_TABLE, '*', $filter, __LINE__, __FILE__,
 			$all_no_sort ? false : $start, 'ORDER BY '.$order_by) as $row)
 		{
 			$sessions[$row['sessionid']] = $row;
@@ -1687,7 +1684,7 @@ 
 	 * @param array $filter =array() extra filter for sessions
 	 * @return int number of active sessions
 	 */
-	public static function session_count(array $filter=array())
+	public static function session_count(array $filter = array())
 	{
 		$filter['lo'] = null;
 		$filter[] = 'account_id>0';
@@ -1703,16 +1700,16 @@ 
 	 */
 	public static function heartbeat_limit()
 	{
-		static $limit=null;
+		static $limit = null;
 
 		if (is_null($limit))
 		{
 			$config = Config::read('notifications');
-			if (!($popup_poll_interval  = $config['popup_poll_interval']))
+			if (!($popup_poll_interval = $config['popup_poll_interval']))
 			{
 				$popup_poll_interval = 60;
 			}
-			$limit = (int)(time() - $popup_poll_interval-10);	// 10s grace periode
+			$limit = (int)(time() - $popup_poll_interval - 10); // 10s grace periode
 		}
 		return $limit;
 	}

Braces +176 added lines, -45 removed lines

@@ -255,7 +255,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);
       	}
 	}
@@ -292,7 +292,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();
@@ -354,7 +357,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)
@@ -369,7 +375,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);
+				}
 			}
 		}
 	}
@@ -467,7 +476,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
@@ -511,7 +523,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)
@@ -561,7 +576,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;
 			}
 
@@ -585,25 +603,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();
@@ -619,7 +646,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;
 		}
@@ -773,10 +803,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));
@@ -854,7 +887,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;
 	}
 
@@ -884,7 +920,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'];
 
@@ -900,7 +939,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;
 		}
 
@@ -912,14 +954,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;
 		}
@@ -947,7 +995,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;
 		}
 
@@ -965,7 +1016,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'));
@@ -976,7 +1030,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;
 		}
 
@@ -985,7 +1042,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;
 			}
 		}
@@ -998,7 +1058,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;
 		}
 
@@ -1017,13 +1080,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;
 	}
@@ -1043,14 +1112,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',
@@ -1060,7 +1135,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
@@ -1155,7 +1233,10 @@ 
 		}
 		else
 		{
-			if ($othervars) $extravars .= ($extravars?'&':'').$othervars;
+			if ($othervars)
+			{
+				$extravars .= ($extravars?'&':'').$othervars;
+			}
 		}
 
 		// parse extravars string into the vars array
@@ -1164,7 +1245,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;
@@ -1245,14 +1330,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,
@@ -1260,6 +1353,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);
 		}
+		}
 	}
 
 	/**
@@ -1311,15 +1405,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;
@@ -1344,11 +1448,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);
@@ -1362,7 +1469,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;
 	}
@@ -1401,7 +1511,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'];
@@ -1427,7 +1540,10 @@ 
 
 		$_SESSION[self::EGW_SESSION_VAR]['session_dla'] = time();
 		$_SESSION[self::EGW_SESSION_VAR]['session_action'] = $this->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 $this->action;
 	}
@@ -1553,7 +1669,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);
@@ -1563,10 +1682,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;
 	}
@@ -1624,9 +1749,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)
@@ -1640,10 +1768,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/Storage.php

Doc Comments +2 added lines, -2 removed lines

@@ -366,7 +366,7 @@ 
 	 * @param string $join ='' sql to do a join, added as is after the table-name, eg. ", table2 WHERE x=y" or
 	 *	"LEFT JOIN table2 ON (x=y)", Note: there's no quoting done on $join!
 	 * @param boolean $need_full_no_count =false If true an unlimited query is run to determine the total number of rows, default false
-	 * @param mixed $only_keys =false, see search
+	 * @param boolean $only_keys =false, see search
 	 * @param string|array $extra_cols =array()
 	 * @return int total number of rows
 	 */
@@ -734,7 +734,7 @@ 
 	 * Check if cf is stored as 1:N relation in DB and array in memory
 	 *
 	 * @param string $name
-	 * @return string
+	 * @return boolean
 	 */
 	function is_multiple($name)
 	{

Indentation +6 added lines, -6 removed lines

@@ -210,12 +210,12 @@
 	}
 
 	/**
-	* saves custom field data
-	*
-	* @param array $data data to save (cf's have to be prefixed with self::CF_PREFIX = #)
-	* @param array $extra_cols =array() extra-data to be saved
-	* @return bool false on success, errornumber on failure
-	*/
+	 * saves custom field data
+	 *
+	 * @param array $data data to save (cf's have to be prefixed with self::CF_PREFIX = #)
+	 * @param array $extra_cols =array() extra-data to be saved
+	 * @return bool false on success, errornumber on failure
+	 */
 	function save_customfields($data, array $extra_cols=array())
 	{
 		foreach (array_keys((array)$this->customfields) as $name)

Spacing +100 added lines, -102 removed lines

@@ -118,41 +118,41 @@ 
 	 * @param boolean $allow_multiple_values =false should we allow AND store multiple values (1:N relations)
 	 * @param string $timestamp_type =null default null=leave them as is, 'ts'|'integer' use integer unix timestamps, 'object' use DateTime objects
 	 */
-	function __construct($app,$table,$extra_table,$column_prefix='',
-		$extra_key='_name',$extra_value='_value',$extra_id='_id',
-		Db $db=null,$no_clone=true,$allow_multiple_values=false,$timestamp_type=null)
+	function __construct($app, $table, $extra_table, $column_prefix = '',
+		$extra_key = '_name', $extra_value = '_value', $extra_id = '_id',
+		Db $db = null, $no_clone = true, $allow_multiple_values = false, $timestamp_type = null)
 	{
 		// calling the Storage\Base constructor
-		parent::__construct($app,$table,$db,$column_prefix,$no_clone,$timestamp_type);
+		parent::__construct($app, $table, $db, $column_prefix, $no_clone, $timestamp_type);
 
 		$this->allow_multiple_values = $allow_multiple_values;
 		$this->extra_table = $extra_table;
-		if (!$this->extra_id) $this->extra_id = $this->autoinc_id;	// default to auto id of regular table
+		if (!$this->extra_id) $this->extra_id = $this->autoinc_id; // default to auto id of regular table
 
 		// if names from columns of extra table are only postfixes (starting with _), prepend column prefix
-		if (!($prefix=$column_prefix))
+		if (!($prefix = $column_prefix))
 		{
-			list($prefix) = explode('_',$this->autoinc_id);
+			list($prefix) = explode('_', $this->autoinc_id);
 		}
-		elseif(substr($prefix,-1) == '_')
+		elseif (substr($prefix, -1) == '_')
 		{
-			$prefix = substr($prefix,0,-1);	// remove trailing underscore from column prefix parameter
+			$prefix = substr($prefix, 0, -1); // remove trailing underscore from column prefix parameter
 		}
-		foreach(array(
+		foreach (array(
 			'extra_id' => $extra_id,
 			'extra_key' => $extra_key,
 			'extra_value' => $extra_value
 		) as $col => $val)
 		{
 			$this->$col = $col_name = $val;
-			if ($col_name[0] == '_') $this->$col = $prefix . $val;
+			if ($col_name[0] == '_') $this->$col = $prefix.$val;
 		}
 		// some sanity checks, maybe they should be active only for development
-		if (!($extra_defs = $this->db->get_table_definitions($app,$extra_table)))
+		if (!($extra_defs = $this->db->get_table_definitions($app, $extra_table)))
 		{
 			throw new Exception\WrongParameter("extra table $extra_table is NOT defined!");
 		}
-		foreach(array('extra_id','extra_key','extra_value') as $col)
+		foreach (array('extra_id', 'extra_key', 'extra_value') as $col)
 		{
 			if (!$this->$col || !isset($extra_defs['fd'][$this->$col]))
 			{
@@ -177,23 +177,23 @@ 
 	 * @param array $field_names =null custom fields to read, default all
 	 * @return array id => $this->cf_field(name) => value
 	 */
-	function read_customfields($ids,$field_names=null)
+	function read_customfields($ids, $field_names = null)
 	{
 		if (is_null($field_names)) $field_names = array_keys($this->customfields);
 
-		foreach((array)$ids as $key => $id)
+		foreach ((array)$ids as $key => $id)
 		{
 			if (!(int)$id && is_array($ids)) unset($ids[$key]);
 		}
-		if (!$ids || !$field_names) return array();	// nothing to do
+		if (!$ids || !$field_names) return array(); // nothing to do
 
 		$entries = array();
-		foreach($this->db->select($this->extra_table,'*',array(
+		foreach ($this->db->select($this->extra_table, '*', array(
 			$this->extra_id => $ids,
 			$this->extra_key => $field_names,
-		),__LINE__,__FILE__,false,'',$this->app) as $row)
+		), __LINE__, __FILE__, false, '', $this->app) as $row)
 		{
-			$entry =& $entries[$row[$this->extra_id]];
+			$entry = & $entries[$row[$this->extra_id]];
 			if (!is_array($entry)) $entry = array();
 			$field = $this->get_cf_field($row[$this->extra_key]);
 
@@ -216,7 +216,7 @@ 
 	* @param array $extra_cols =array() extra-data to be saved
 	* @return bool false on success, errornumber on failure
 	*/
-	function save_customfields($data, array $extra_cols=array())
+	function save_customfields($data, array $extra_cols = array())
 	{
 		foreach (array_keys((array)$this->customfields) as $name)
 		{
@@ -229,22 +229,21 @@ 
 			$is_multiple = $this->is_multiple($name);
 
 			// we explicitly need to delete fields, if value is empty or field allows multiple values or we have no unique index
-			if(empty($data[$field]) || $is_multiple || !$this->extra_has_unique_index)
+			if (empty($data[$field]) || $is_multiple || !$this->extra_has_unique_index)
 			{
-				$this->db->delete($this->extra_table,$where,__LINE__,__FILE__,$this->app);
-				if (empty($data[$field])) continue;	// nothing else to do for empty values
+				$this->db->delete($this->extra_table, $where, __LINE__, __FILE__, $this->app);
+				if (empty($data[$field])) continue; // nothing else to do for empty values
 			}
-			foreach($is_multiple && !is_array($data[$field]) ? explode(',',$data[$field]) :
-				// regular custom fields (!$is_multiple) eg. addressbook store multiple values comma-separated
+			foreach ($is_multiple && !is_array($data[$field]) ? explode(',', $data[$field]) : // regular custom fields (!$is_multiple) eg. addressbook store multiple values comma-separated
 				(array)(!$is_multiple && is_array($data[$field]) ? implode(',', $data[$field]) : $data[$field]) as $value)
 			{
-				if (!$this->db->insert($this->extra_table,array($this->extra_value => $value)+$extra_cols,$where,__LINE__,__FILE__,$this->app))
+				if (!$this->db->insert($this->extra_table, array($this->extra_value => $value) + $extra_cols, $where, __LINE__, __FILE__, $this->app))
 				{
 					return $this->db->Errno;
 				}
 			}
 		}
-		return false;	// no error
+		return false; // no error
 	}
 
 	/**
@@ -260,7 +259,7 @@ 
 
 		if ($this->customfields)
 		{
-			foreach(array_keys($this->customfields) as $name)
+			foreach (array_keys($this->customfields) as $name)
 			{
 				if (isset($new[$field = $this->get_cf_field($name)]))
 				{
@@ -280,16 +279,16 @@ 
 	 * @param string $join sql to do a join, added as is after the table-name, eg. ", table2 WHERE x=y" or
 	 * @return array|boolean data if row could be retrived else False
 	 */
-	function read($keys,$extra_cols='',$join='')
+	function read($keys, $extra_cols = '', $join = '')
 	{
-		if (!parent::read($keys,$extra_cols,$join))
+		if (!parent::read($keys, $extra_cols, $join))
 		{
 			return false;
 		}
 		if (($id = (int)$this->data[$this->db_key_cols[$this->autoinc_id]]) && $this->customfields &&
 			($cfs = $this->read_customfields($id)))
 		{
-			$this->data = array_merge($this->data,$cfs[$id]);
+			$this->data = array_merge($this->data, $cfs[$id]);
 		}
 		return $this->data;
 	}
@@ -303,14 +302,14 @@ 
 	 * @param string|array $extra_where =null extra where clause, eg. to check an etag, returns true if no affected rows!
 	 * @return int|boolean 0 on success, or errno != 0 on error, or true if $extra_where is given and no rows affected
 	 */
-	function save($keys=null,$extra_where=null)
+	function save($keys = null, $extra_where = null)
 	{
 		if (is_array($keys) && count($keys) && !isset($keys[0]))	// allow to use an etag, eg array('etag=etag+1')
 		{
 			$this->data_merge($keys);
 			$keys = null;
 		}
-		$ret = parent::save($keys,$extra_where);
+		$ret = parent::save($keys, $extra_where);
 
 		if ($ret == 0 && $this->customfields)
 		{
@@ -328,26 +327,26 @@ 
 	 * @param boolean $only_return_ids =false return $ids of delete call to db object, but not run it (can be used by extending classes!)
 	 * @return int|array affected rows, should be 1 if ok, 0 if an error or array with id's if $only_return_ids
 	 */
-	function delete($keys=null,$only_return_ids=false)
+	function delete($keys = null, $only_return_ids = false)
 	{
 		if ($this->customfields || $only_return_ids)
 		{
-			$query = parent::delete($keys,true);
+			$query = parent::delete($keys, true);
 			// check if query contains more then the id's
 			if (!isset($query[$this->autoinc_id]) || count($query) != 1)
 			{
-				foreach($this->db->select($this->table_name,$this->autoinc_id,$query,__LINE__,__FILE__,false,'',$this->app) as $row)
+				foreach ($this->db->select($this->table_name, $this->autoinc_id, $query, __LINE__, __FILE__, false, '', $this->app) as $row)
 				{
 					$ids[] = $row[$this->autoinc_id];
 				}
-				if (!$ids) return 0;	// no rows affected
+				if (!$ids) return 0; // no rows affected
 			}
 			else
 			{
 				$ids = (array)$query[$this->autoinc_id];
 			}
 			if ($only_return_ids) return $ids;
-			$this->db->delete($this->extra_table,array($this->extra_id => $ids),__LINE__,__FILE__);
+			$this->db->delete($this->extra_table, array($this->extra_id => $ids), __LINE__, __FILE__);
 		}
 		return parent::delete($keys);
 	}
@@ -370,32 +369,32 @@ 
 	 * @param string|array $extra_cols =array()
 	 * @return int total number of rows
 	 */
-	function get_rows($query,&$rows,&$readonlys,$join='',$need_full_no_count=false,$only_keys=false,$extra_cols=array())
+	function get_rows($query, &$rows, &$readonlys, $join = '', $need_full_no_count = false, $only_keys = false, $extra_cols = array())
 	{
-		parent::get_rows($query,$rows,$readonlys,$join,$need_full_no_count,$only_keys,$extra_cols);
+		parent::get_rows($query, $rows, $readonlys, $join, $need_full_no_count, $only_keys, $extra_cols);
 
-		$selectcols = $query['selectcols'] ? explode(',',$query['selectcols']) : array();
+		$selectcols = $query['selectcols'] ? explode(',', $query['selectcols']) : array();
 
-		if ($rows && $this->customfields && (!$selectcols || in_array('customfields',$selectcols)))
+		if ($rows && $this->customfields && (!$selectcols || in_array('customfields', $selectcols)))
 		{
 			$id2keys = array();
-			foreach($rows as $key => $row)
+			foreach ($rows as $key => $row)
 			{
 				$id2keys[$row[$this->db_key_cols[$this->autoinc_id]]] = $key;
 			}
 			// check if only certain cf's to show
 			if (!in_array('customfields', $selectcols))
 			{
-				foreach($selectcols as $col)
+				foreach ($selectcols as $col)
 				{
 					if ($this->is_cf($col)) $fields[] = $this->get_cf_name($col);
 				}
 			}
-			if (($cfs = $this->read_customfields(array_keys($id2keys),$fields)))
+			if (($cfs = $this->read_customfields(array_keys($id2keys), $fields)))
 			{
-				foreach($cfs as $id => $data)
+				foreach ($cfs as $id => $data)
 				{
-					$rows[$id2keys[$id]] = array_merge($rows[$id2keys[$id]],$data);
+					$rows[$id2keys[$id]] = array_merge($rows[$id2keys[$id]], $data);
 				}
 			}
 		}
@@ -422,12 +421,12 @@ 
 	 * @param boolean $need_full_no_count =false If true an unlimited query is run to determine the total number of rows, default false
 	 * @return array|NULL array of matching rows (the row is an array of the cols) or NULL
 	 */
-	function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false)
+	function &search($criteria, $only_keys = True, $order_by = '', $extra_cols = '', $wildcard = '', $empty = False, $op = 'AND', $start = false, $filter = null, $join = '', $need_full_no_count = false)
 	{
 		//error_log(__METHOD__.'('.array2string(array_combine(array_slice(array('criteria','only_keys','order_by','extra_cols','wildcard','empty','op','start','filter','join','need_full_no_count'), 0, count(func_get_args())), func_get_args())).')');
 		if (!$this->customfields)
 		{
-			return parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,$start,$filter,$join,$need_full_no_count);
+			return parent::search($criteria, $only_keys, $order_by, $extra_cols, $wildcard, $empty, $op, $start, $filter, $join, $need_full_no_count);
 		}
 		if ($only_keys === false)
 		{
@@ -436,7 +435,7 @@ 
 		// if string given as criteria --> search in all (or $this->columns_to_search) columns including custom fields
 		if ($criteria && is_string($criteria))
 		{
-			$criteria = $this->search2criteria($criteria,$wildcard,$op);
+			$criteria = $this->search2criteria($criteria, $wildcard, $op);
 		}
 		if ($criteria && is_array($criteria))
 		{
@@ -445,10 +444,10 @@ 
 			{
 				if (($negate = $criteria[$this->extra_value][0] === '!'))
 				{
-					$criteria[$this->extra_value] = substr($criteria[$this->extra_value],1);
+					$criteria[$this->extra_value] = substr($criteria[$this->extra_value], 1);
 				}
-				$criteria[] = $this->extra_table.'.'.$this->extra_value . ' ' .($negate ? 'NOT ' : '').
-					$this->db->capabilities[Db::CAPABILITY_CASE_INSENSITIV_LIKE]. ' ' .
+				$criteria[] = $this->extra_table.'.'.$this->extra_value.' '.($negate ? 'NOT ' : '').
+					$this->db->capabilities[Db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.
 					$this->db->quote($wildcard.$criteria[$this->extra_value].$wildcard);
 				unset($criteria[$this->extra_value]);
 			}
@@ -457,14 +456,14 @@ 
 			{
 				if ($criteria[$this->autoinc_id])
 				{
-					$criteria[] = $this->db->expression($this->table_name,$this->table_name.'.',
+					$criteria[] = $this->db->expression($this->table_name, $this->table_name.'.',
 						array($this->autoinc_id => $criteria[$this->autoinc_id]));
 				}
 				unset($criteria[$this->autoinc_id]);
 			}
 			// replace ambiguous column with (an exact match of) table_name.column
 			$extra_join_added = $join && strpos($join, $this->extra_join) !== false;
-			foreach($criteria as $name => $val)
+			foreach ($criteria as $name => $val)
 			{
 				// only add extra_join, if we really need it
 				if (!$extra_join_added && (
@@ -476,9 +475,9 @@ 
 					$extra_join_added = true;
 				}
 				$extra_columns = $this->db->get_table_definitions($this->app, $this->extra_table);
-				if(is_string($name) && $extra_columns['fd'][array_search($name, $this->db_cols)])
+				if (is_string($name) && $extra_columns['fd'][array_search($name, $this->db_cols)])
 				{
-					$criteria[] = $this->db->expression($this->table_name,$this->table_name.'.',array(
+					$criteria[] = $this->db->expression($this->table_name, $this->table_name.'.', array(
 						array_search($name, $this->db_cols) => $val,
 					));
 					unset($criteria[$name]);
@@ -490,12 +489,12 @@ 
 						$name = substr($name, 1);
 						if (($negate = $criteria[$name][0] === '!'))
 						{
-							$val = substr($val,1);
+							$val = substr($val, 1);
 						}
-						$cfcriteria[] = '(' . $this->extra_table.'.'.$this->extra_value . ' ' .($negate ? 'NOT ' : '').
-							$this->db->capabilities[Db::CAPABILITY_CASE_INSENSITIV_LIKE]. ' ' .
-							$this->db->quote($wildcard.$val.$wildcard) . ' AND ' .
-							$this->extra_table.'.'.$this->extra_key . ' = ' . $this->db->quote($name) .
+						$cfcriteria[] = '('.$this->extra_table.'.'.$this->extra_value.' '.($negate ? 'NOT ' : '').
+							$this->db->capabilities[Db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.
+							$this->db->quote($wildcard.$val.$wildcard).' AND '.
+							$this->extra_table.'.'.$this->extra_key.' = '.$this->db->quote($name).
 							')';
 						unset($criteria[self::CF_PREFIX.$name]);
 					}
@@ -507,38 +506,38 @@ 
 					}
 				}
 			}
-			if ($cfcriteria && $op =='OR') $criteria[] = implode(' OR ',$cfcriteria);
+			if ($cfcriteria && $op == 'OR') $criteria[] = implode(' OR ', $cfcriteria);
 		}
-		if($only_keys === true)
+		if ($only_keys === true)
 		{
 			// Expand to keys here, so table_name can be prepended below
 			$only_keys = array_values($this->db_key_cols);
 		}
 		// replace ambiguous column with (an exact match of) table_name.column
-		if(is_array($only_keys))
+		if (is_array($only_keys))
 		{
-			foreach($only_keys as $key => &$col)
+			foreach ($only_keys as $key => &$col)
 			{
-				if(is_numeric($key) && in_array($col, $this->db_cols, true))
+				if (is_numeric($key) && in_array($col, $this->db_cols, true))
 				{
-					$col = $this->table_name .'.'.array_search($col, $this->db_cols).' AS '.$col;
+					$col = $this->table_name.'.'.array_search($col, $this->db_cols).' AS '.$col;
 				}
 			}
 		}
 		// check if we order by a custom field --> join cf table for given cf and order by it's value
-		if (strpos($order_by,self::CF_PREFIX) !== false)
+		if (strpos($order_by, self::CF_PREFIX) !== false)
 		{
 			// fields to order by, as cutomfields may have names with spaces, we examine each order by criteria
-			$fields2order = explode(',',$order_by);
-			foreach($fields2order as $v)
+			$fields2order = explode(',', $order_by);
+			foreach ($fields2order as $v)
 			{
-				if (strpos($v,self::CF_PREFIX) !== false)
+				if (strpos($v, self::CF_PREFIX) !== false)
 				{
 					// we found a customfield, so we split that part by space char in order to get Sorting Direction and Fieldname
-					$buff = explode(' ',trim($v));
+					$buff = explode(' ', trim($v));
 					$orderDir = array_pop($buff);
-					$key = substr(trim(implode(' ',$buff)), 1);
-					switch($this->customfields[$key]['type'])
+					$key = substr(trim(implode(' ', $buff)), 1);
+					switch ($this->customfields[$key]['type'])
 					{
 						case 'int':
 							$order_by = str_replace($v, 'extra_order.'.$this->extra_value.' IS NULL,'.
@@ -571,26 +570,26 @@ 
 		{
 			$_cfnames = array_keys($this->customfields);
 			$extra_filter = null;
-			foreach($filter as $name => $val)
+			foreach ($filter as $name => $val)
 			{
 				// replace ambiguous auto-id with (an exact match of) table_name.autoid
 				if (is_string($name) && $name == $this->autoinc_id)
 				{
 					if ((int)$filter[$this->autoinc_id])
 					{
-						$filter[] = $this->db->expression($this->table_name,$this->table_name.'.',array(
+						$filter[] = $this->db->expression($this->table_name, $this->table_name.'.', array(
 							$this->autoinc_id => $filter[$this->autoinc_id],
 						));
 					}
 					unset($filter[$this->autoinc_id]);
 				}
 				// replace ambiguous column with (an exact match of) table_name.column
-				elseif (is_string($name) && $val!=null && in_array($name, $this->db_cols))
+				elseif (is_string($name) && $val != null && in_array($name, $this->db_cols))
 				{
 					$extra_columns = $this->db->get_table_definitions($this->app, $this->extra_table);
 					if ($extra_columns['fd'][array_search($name, $this->db_cols)])
 					{
-						$filter[] = $this->db->expression($this->table_name,$this->table_name.'.',array(
+						$filter[] = $this->db->expression($this->table_name, $this->table_name.'.', array(
 							array_search($name, $this->db_cols) => $val,
 						));
 						unset($filter[$name]);
@@ -602,61 +601,61 @@ 
 					{
 						if ($val[0] === '!')	// negative filter
 						{
-							$sql_filter = 'extra_filter.'.$this->extra_value.'!='.$this->db->quote(substr($val,1));
+							$sql_filter = 'extra_filter.'.$this->extra_value.'!='.$this->db->quote(substr($val, 1));
 						}
 						else	// using Db::expression to allow to use array() with possible values or NULL
 						{
-							if($this->customfields[$this->get_cf_name($name)]['type'] == 'select' &&
+							if ($this->customfields[$this->get_cf_name($name)]['type'] == 'select' &&
 								$this->customfields[$this->get_cf_name($name)]['rows'] > 1)
 							{
 								// Multi-select - any entry with the filter value selected matches
-								$sql_filter = str_replace($this->extra_value,'extra_filter.'.
-									$this->extra_value,$this->db->expression($this->extra_table,array(
-										$this->db->concat("','",$this->extra_value,"','").' '.$this->db->capabilities[Db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.$this->db->quote('%,'.$val.',%')
+								$sql_filter = str_replace($this->extra_value, 'extra_filter.'.
+									$this->extra_value, $this->db->expression($this->extra_table, array(
+										$this->db->concat("','", $this->extra_value, "','").' '.$this->db->capabilities[Db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.$this->db->quote('%,'.$val.',%')
 									))
 								);
 							}
 							elseif ($this->customfields[$this->get_cf_name($name)]['type'] == 'text')
 							{
-								$sql_filter = str_replace($this->extra_value,'extra_filter.'.$this->extra_value,
-										$this->db->expression($this->extra_table,array(
+								$sql_filter = str_replace($this->extra_value, 'extra_filter.'.$this->extra_value,
+										$this->db->expression($this->extra_table, array(
 										$this->extra_value.' '.$this->db->capabilities[Db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.$this->db->quote($wildcard.$val.$wildcard)
 									))
 								);
 							}
 							else
 							{
-								$sql_filter = str_replace($this->extra_value,'extra_filter.'.
-									$this->extra_value,$this->db->expression($this->extra_table,array($this->extra_value => $val)));
+								$sql_filter = str_replace($this->extra_value, 'extra_filter.'.
+									$this->extra_value, $this->db->expression($this->extra_table, array($this->extra_value => $val)));
 							}
 						}
 						// need to use a LEFT JOIN for negative search or to allow NULL values
-						$need_left_join = $val[0] === '!' || strpos($sql_filter,'IS NULL') !== false ? ' LEFT ' : '';
-						$join .= str_replace('extra_filter','extra_filter'.$extra_filter,$need_left_join.$this->extra_join_filter.
+						$need_left_join = $val[0] === '!' || strpos($sql_filter, 'IS NULL') !== false ? ' LEFT ' : '';
+						$join .= str_replace('extra_filter', 'extra_filter'.$extra_filter, $need_left_join.$this->extra_join_filter.
 							' AND extra_filter.'.$this->extra_key.'='.$this->db->quote($this->get_cf_name($name)).
 							' AND '.$sql_filter);
 						++$extra_filter;
 					}
 					unset($filter[$name]);
 				}
-				elseif(is_int($name) && $this->is_cf($val))	// lettersearch: #cfname LIKE 's%'
+				elseif (is_int($name) && $this->is_cf($val))	// lettersearch: #cfname LIKE 's%'
 				{
-					$_cf = explode(' ',$val);
-					foreach($_cf as $cf_np)
+					$_cf = explode(' ', $val);
+					foreach ($_cf as $cf_np)
 					{
 						// building cf_name by glueing parts together (, in case someone used whitespace in their custom field names)
-						$tcf_name = ($tcf_name?$tcf_name.' ':'').$cf_np;
+						$tcf_name = ($tcf_name ? $tcf_name.' ' : '').$cf_np;
 						// reacts on the first one found that matches an existing customfield, should be better then the old behavior of
 						// simply splitting by " " and using the first part
-						if ($this->is_cf($tcf_name) && ($cfn = $this->get_cf_name($tcf_name)) && array_search($cfn,(array)$_cfnames,true)!==false )
+						if ($this->is_cf($tcf_name) && ($cfn = $this->get_cf_name($tcf_name)) && array_search($cfn, (array)$_cfnames, true) !== false)
 						{
 							$cf = $tcf_name;
 							break;
 						}
 					}
-					$join .= str_replace('extra_filter','extra_filter'.$extra_filter,$this->extra_join_filter.
+					$join .= str_replace('extra_filter', 'extra_filter'.$extra_filter, $this->extra_join_filter.
 						' AND extra_filter.'.$this->extra_key.'='.$this->db->quote($this->get_cf_name($cf)).
-						' AND '.str_replace($cf,'extra_filter.'.$this->extra_value,$val));
+						' AND '.str_replace($cf, 'extra_filter.'.$this->extra_value, $val));
 					++$extra_filter;
 					unset($filter[$name]);
 				}
@@ -668,15 +667,14 @@ 
 			if (is_array($only_keys))
 			{
 				$only_keys = array_values($only_keys);
-				$only_keys[0] = 'DISTINCT '.($only_keys[0] != $this->autoinc_id ? $only_keys[0] :
-					$this->table_name.'.'.$this->autoinc_id.' AS '.$this->autoinc_id);
+				$only_keys[0] = 'DISTINCT '.($only_keys[0] != $this->autoinc_id ? $only_keys[0] : $this->table_name.'.'.$this->autoinc_id.' AS '.$this->autoinc_id);
 			}
 			else
 			{
 				$only_keys = 'DISTINCT '.$only_keys;
 			}
 		}
-		return parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,$start,$filter,$join,$need_full_no_count);
+		return parent::search($criteria, $only_keys, $order_by, $extra_cols, $wildcard, $empty, $op, $start, $filter, $join, $need_full_no_count);
 	}
 
 	/**
@@ -716,7 +714,7 @@ 
 	 */
 	function get_cf_name($field)
 	{
-		return substr($field,1);
+		return substr($field, 1);
 	}
 
 	/**
@@ -738,7 +736,7 @@ 
 	 */
 	function is_multiple($name)
 	{
-		return $this->allow_multiple_values && in_array($this->customfields[$name]['type'],array('select','select-account')) &&
+		return $this->allow_multiple_values && in_array($this->customfields[$name]['type'], array('select', 'select-account')) &&
 			$this->customfields[$name]['rows'] > 1;
 	}
 }

Braces +64 added lines, -15 removed lines

@@ -127,7 +127,11 @@ 
 
 		$this->allow_multiple_values = $allow_multiple_values;
 		$this->extra_table = $extra_table;
-		if (!$this->extra_id) $this->extra_id = $this->autoinc_id;	// default to auto id of regular table
+		if (!$this->extra_id)
+		{
+			$this->extra_id = $this->autoinc_id;
+		}
+		// default to auto id of regular table
 
 		// if names from columns of extra table are only postfixes (starting with _), prepend column prefix
 		if (!($prefix=$column_prefix))
@@ -145,7 +149,10 @@ 
 		) as $col => $val)
 		{
 			$this->$col = $col_name = $val;
-			if ($col_name[0] == '_') $this->$col = $prefix . $val;
+			if ($col_name[0] == '_')
+			{
+				$this->$col = $prefix . $val;
+			}
 		}
 		// some sanity checks, maybe they should be active only for development
 		if (!($extra_defs = $this->db->get_table_definitions($app,$extra_table)))
@@ -179,13 +186,23 @@ 
 	 */
 	function read_customfields($ids,$field_names=null)
 	{
-		if (is_null($field_names)) $field_names = array_keys($this->customfields);
+		if (is_null($field_names))
+		{
+			$field_names = array_keys($this->customfields);
+		}
 
 		foreach((array)$ids as $key => $id)
 		{
-			if (!(int)$id && is_array($ids)) unset($ids[$key]);
+			if (!(int)$id && is_array($ids))
+			{
+				unset($ids[$key]);
+			}
 		}
-		if (!$ids || !$field_names) return array();	// nothing to do
+		if (!$ids || !$field_names)
+		{
+			return array();
+		}
+		// nothing to do
 
 		$entries = array();
 		foreach($this->db->select($this->extra_table,'*',array(
@@ -194,7 +211,10 @@ 
 		),__LINE__,__FILE__,false,'',$this->app) as $row)
 		{
 			$entry =& $entries[$row[$this->extra_id]];
-			if (!is_array($entry)) $entry = array();
+			if (!is_array($entry))
+			{
+				$entry = array();
+			}
 			$field = $this->get_cf_field($row[$this->extra_key]);
 
 			if ($this->allow_multiple_values && $this->is_multiple($row[$this->extra_key]))
@@ -220,7 +240,10 @@ 
 	{
 		foreach (array_keys((array)$this->customfields) as $name)
 		{
-			if (!isset($data[$field = $this->get_cf_field($name)])) continue;
+			if (!isset($data[$field = $this->get_cf_field($name)]))
+			{
+				continue;
+			}
 
 			$where = array(
 				$this->extra_id    => isset($data[$this->autoinc_id]) ? $data[$this->autoinc_id] : $data[$this->db_key_cols[$this->autoinc_id]],
@@ -232,7 +255,11 @@ 
 			if(empty($data[$field]) || $is_multiple || !$this->extra_has_unique_index)
 			{
 				$this->db->delete($this->extra_table,$where,__LINE__,__FILE__,$this->app);
-				if (empty($data[$field])) continue;	// nothing else to do for empty values
+				if (empty($data[$field]))
+				{
+					continue;
+				}
+				// nothing else to do for empty values
 			}
 			foreach($is_multiple && !is_array($data[$field]) ? explode(',',$data[$field]) :
 				// regular custom fields (!$is_multiple) eg. addressbook store multiple values comma-separated
@@ -305,9 +332,12 @@ 
 	 */
 	function save($keys=null,$extra_where=null)
 	{
-		if (is_array($keys) && count($keys) && !isset($keys[0]))	// allow to use an etag, eg array('etag=etag+1')
+		if (is_array($keys) && count($keys) && !isset($keys[0]))
+		{
+			// allow to use an etag, eg array('etag=etag+1')
 		{
 			$this->data_merge($keys);
+		}
 			$keys = null;
 		}
 		$ret = parent::save($keys,$extra_where);
@@ -340,13 +370,20 @@ 
 				{
 					$ids[] = $row[$this->autoinc_id];
 				}
-				if (!$ids) return 0;	// no rows affected
+				if (!$ids)
+				{
+					return 0;
+				}
+				// no rows affected
 			}
 			else
 			{
 				$ids = (array)$query[$this->autoinc_id];
 			}
-			if ($only_return_ids) return $ids;
+			if ($only_return_ids)
+			{
+				return $ids;
+			}
 			$this->db->delete($this->extra_table,array($this->extra_id => $ids),__LINE__,__FILE__);
 		}
 		return parent::delete($keys);
@@ -388,7 +425,10 @@ 
 			{
 				foreach($selectcols as $col)
 				{
-					if ($this->is_cf($col)) $fields[] = $this->get_cf_name($col);
+					if ($this->is_cf($col))
+					{
+						$fields[] = $this->get_cf_name($col);
+					}
 				}
 			}
 			if (($cfs = $this->read_customfields(array_keys($id2keys),$fields)))
@@ -507,7 +547,10 @@ 
 					}
 				}
 			}
-			if ($cfcriteria && $op =='OR') $criteria[] = implode(' OR ',$cfcriteria);
+			if ($cfcriteria && $op =='OR')
+			{
+				$criteria[] = implode(' OR ',$cfcriteria);
+			}
 		}
 		if($only_keys === true)
 		{
@@ -598,11 +641,14 @@ 
 				}
 				elseif (is_string($name) && $this->is_cf($name))
 				{
-					if (!empty($val))	// empty -> dont filter
+					if (!empty($val))
+					{
+						// empty -> dont filter
 					{
 						if ($val[0] === '!')	// negative filter
 						{
 							$sql_filter = 'extra_filter.'.$this->extra_value.'!='.$this->db->quote(substr($val,1));
+					}
 						}
 						else	// using Db::expression to allow to use array() with possible values or NULL
 						{
@@ -639,9 +685,12 @@ 
 					}
 					unset($filter[$name]);
 				}
-				elseif(is_int($name) && $this->is_cf($val))	// lettersearch: #cfname LIKE 's%'
+				elseif(is_int($name) && $this->is_cf($val))
+				{
+					// lettersearch: #cfname LIKE 's%'
 				{
 					$_cf = explode(' ',$val);
+				}
 					foreach($_cf as $cf_np)
 					{
 						// building cf_name by glueing parts together (, in case someone used whitespace in their custom field names)

api/src/Storage/Customfields.php

Doc Comments +1 added lines, -1 removed lines

@@ -159,7 +159,7 @@
 	 * @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
-	 * @return boolen true: if there is a custom field useing html, false if not
+	 * @return boolean true: if there is a custom field useing html, false if not
 	 */
 	public static function use_html($app, $all_private_too=false, $only_type2=null)
 	{

Spacing +35 added lines, -35 removed lines

@@ -42,7 +42,7 @@ 
 	 *
 	 * @var boolean
 	 */
-	protected $all_private_too=false;
+	protected $all_private_too = false;
 
 	/**
 	 * Iterator initialised for custom fields
@@ -62,7 +62,7 @@ 
 	 * @param Api\Db $db =null reference to database instance to use
 	 * @return array with customfields
 	 */
-	function __construct($app, $all_private_too=false, $only_type2=null, $start=0, $num_rows=null, Api\Db $db=null)
+	function __construct($app, $all_private_too = false, $only_type2 = null, $start = 0, $num_rows = null, Api\Db $db = null)
 	{
 		$this->app = $app;
 		$this->all_private_too = $all_private_too;
@@ -116,7 +116,7 @@ 
 	protected function commasep_match($column, $values)
 	{
 		$to_or = array($column.' IS NULL');
-		foreach((array) $values as $value)
+		foreach ((array)$values as $value)
 		{
 			$to_or[] = self::$db->concat("','", $column, "','").' LIKE '.self::$db->quote('%,'.$value.',%');
 		}
@@ -132,9 +132,9 @@ 
 	 * @param Api\Db $db =null reference to database to use
 	 * @return array with customfields
 	 */
-	public static function get($app, $all_private_too=false, $only_type2=null, Api\Db $db=null)
+	public static function get($app, $all_private_too = false, $only_type2 = null, Api\Db $db = null)
 	{
-		$cache_key = $app.':'.($all_private_too?'all':$GLOBALS['egw_info']['user']['account_id']).':'.$only_type2;
+		$cache_key = $app.':'.($all_private_too ? 'all' : $GLOBALS['egw_info']['user']['account_id']).':'.$only_type2;
 		$cfs = Api\Cache::getInstance(__CLASS__, $cache_key);
 
 		if (!isset($cfs))
@@ -161,9 +161,9 @@ 
 	 * @param string $only_type2 =null if given only return fields of type2 == $only_type2
 	 * @return boolen true: if there is a custom field useing html, false if not
 	 */
-	public static function use_html($app, $all_private_too=false, $only_type2=null)
+	public static function use_html($app, $all_private_too = false, $only_type2 = null)
 	{
-		foreach(self::get($app, $all_private_too, $only_type2) as $data)
+		foreach (self::get($app, $all_private_too, $only_type2) as $data)
 		{
 			if ($data['type'] == 'htmlarea') return true;
 		}
@@ -186,17 +186,17 @@ 
 	 */
 	public static function format(array $field, $value)
 	{
-		switch($field['type'])
+		switch ($field['type'])
 		{
 			case 'select-account':
 				if ($value)
 				{
 					$values = array();
-					foreach($field['rows'] > 1 ? explode(',', $value) : (array) $value as $value)
+					foreach ($field['rows'] > 1 ? explode(',', $value) : (array)$value as $value)
 					{
 						$values[] = Api\Accounts::username($value);
 					}
-					$value = implode(', ',$values);
+					$value = implode(', ', $values);
 				}
 				break;
 
@@ -211,7 +211,7 @@ 
 					$field['values'] = self::get_options_from_file($field['values']['@']);
 				}
 				$values = array();
-				foreach($field['rows'] > 1 ? explode(',', $value) : (array) $value as $value)
+				foreach ($field['rows'] > 1 ? explode(',', $value) : (array)$value as $value)
 				{
 					$values[] = isset($field['values'][$value]) ? $field['values'][$value] : '#'.$value;
 				}
@@ -275,12 +275,12 @@ 
 	{
 		$options = array();
 
-		if (!($path = realpath($file[0] == '/' ? $file : EGW_SERVER_ROOT.'/'.$file)) ||	// file does not exist
-			substr($path,0,strlen(EGW_SERVER_ROOT)+1) != EGW_SERVER_ROOT.'/' ||	// we are NOT inside the eGW root
-			basename($path,'.php').'.php' != basename($path) ||	// extension is NOT .php
+		if (!($path = realpath($file[0] == '/' ? $file : EGW_SERVER_ROOT.'/'.$file)) || // file does not exist
+			substr($path, 0, strlen(EGW_SERVER_ROOT) + 1) != EGW_SERVER_ROOT.'/' || // we are NOT inside the eGW root
+			basename($path, '.php').'.php' != basename($path) || // extension is NOT .php
 			basename($path) == 'header.inc.php')	// dont allow to include our header again
 		{
-			return array(lang("'%1' is no php file in the eGW server root (%2)!".': '.$path,$file,EGW_SERVER_ROOT));
+			return array(lang("'%1' is no php file in the eGW server root (%2)!".': '.$path, $file, EGW_SERVER_ROOT));
 		}
 		include($path);
 
@@ -298,7 +298,7 @@ 
 
 		if (is_null($link_types))
 		{
-			$link_types = array_keys(array_intersect(Api\Link::app_list('query'),Api\Link::app_list('title')));
+			$link_types = array_keys(array_intersect(Api\Link::app_list('query'), Api\Link::app_list('title')));
 			$link_types[] = 'link-entry';
 		}
 		return $link_types;
@@ -315,31 +315,31 @@ 
 	 * @param array $old =null old values before the update, if existing
 	 * @param string $id_name ='id' name/key of the (link-)id in $values
 	 */
-	public static function update_links($own_app,array $values,array $old=null,$id_name='id')
+	public static function update_links($own_app, array $values, array $old = null, $id_name = 'id')
 	{
 		$link_types = self::get_link_types();
 
-		foreach(self::get($own_app) as $name => $data)
+		foreach (self::get($own_app) as $name => $data)
 		{
-			if (!in_array($data['type'],$link_types)) continue;
+			if (!in_array($data['type'], $link_types)) continue;
 
 			// do we have a different old value --> delete that link
 			if ($old && $old['#'.$name] && $old['#'.$name] != $values['#'.$name])
 			{
 				if ($data['type'] == 'link-entry')
 				{
-					list($app,$id) = explode(':',$old['#'.$name]);
+					list($app, $id) = explode(':', $old['#'.$name]);
 				}
 				else
 				{
 					$app = $data['type'];
 					$id = $old['#'.$name];
 				}
-				Api\Link::unlink(false,$own_app,$values[$id_name],'',$app,$id);
+				Api\Link::unlink(false, $own_app, $values[$id_name], '', $app, $id);
 			}
 			if ($data['type'] == 'link-entry')
 			{
-				list($app,$id) = explode(':',$values['#'.$name]);
+				list($app, $id) = explode(':', $values['#'.$name]);
 			}
 			else
 			{
@@ -348,7 +348,7 @@ 
 			}
 			if ($id)	// create new link, does nothing for already existing links
 			{
-				Api\Link::link($own_app,$values[$id_name],$app,$id);
+				Api\Link::link($own_app, $values[$id_name], $app, $id);
 			}
 		}
 	}
@@ -369,25 +369,25 @@ 
 		$old = $cfs[$cf['name']];
 
 		// Add new one in for numbering
-		if(!$cf['id'])
+		if (!$cf['id'])
 		{
 			$cfs[$cf['name']] = $cf;
 		}
 
-		if($old['order'] != $cf['order'] || $cf['order'] % 10 !== 0)
+		if ($old['order'] != $cf['order'] || $cf['order'] % 10 !== 0)
 		{
 			$cfs[$cf['name']]['order'] = $cf['order'];
-			uasort($cfs, function($a1, $a2){
+			uasort($cfs, function($a1, $a2) {
 				return $a1['order'] - $a2['order'];
 			});
 			$n = 0;
-			foreach($cfs as $old_cf)
+			foreach ($cfs as $old_cf)
 			{
 				$n += 10;
-				if($old_cf['order'] != $n)
+				if ($old_cf['order'] != $n)
 				{
 					$old_cf['order'] = $n;
-					if($old_cf['name'] != $cf['name'])
+					if ($old_cf['name'] != $cf['name'])
 					{
 						$update[] = $old_cf;
 					}
@@ -417,7 +417,7 @@ 
 			'cf_app' => $cf['app'],
 		), __LINE__, __FILE__);
 
-		foreach($update as $old_cf)
+		foreach ($update as $old_cf)
 		{
 			self::$db->$op(self::TABLE, array(
 				'cf_order' => $old_cf['order'],
@@ -442,7 +442,7 @@ 
 		if ($cfs) $query[] = self::$db->expression(self::TABLE, 'NOT ', array('cf_name' => array_keys($cfs)));
 		self::$db->delete(self::TABLE, $query, __LINE__, __FILE__);
 
-		foreach($cfs as $name => $cf)
+		foreach ($cfs as $name => $cf)
 		{
 			if (empty($cf['name'])) $cf['name'] = $name;
 			if (empty($cf['app']))  $cf['app'] = $app;
@@ -461,7 +461,7 @@ 
 	{
 		if (($cached = Api\Cache::getInstance(__CLASS__, $app)))
 		{
-			foreach($cached as $key)
+			foreach ($cached as $key)
 			{
 				Api\Cache::unsetInstance(__CLASS__, $key);
 			}
@@ -481,12 +481,12 @@ 
 		$total = 0;
 		if (($cfs = self::get($app, true)))
 		{
-			foreach($cfs as &$data)
+			foreach ($cfs as &$data)
 			{
 				if ($data['private'])
 				{
 					$changed = 0;
-					foreach($data['private'] as &$id)
+					foreach ($data['private'] as &$id)
 					{
 						if (isset($ids2change[$id]))
 						{
@@ -516,7 +516,7 @@ 
 		$types = array();
 		if (($cfs = self::get($app, true)))
 		{
-			foreach($cfs as $name => $data)
+			foreach ($cfs as $name => $data)
 			{
 				if ($data['type'] == 'select-account' || $data['type'] == 'api-accounts')
 				{

Braces +42 added lines, -11 removed lines

@@ -80,7 +80,10 @@ 
 		{
 			$query[] = $this->commasep_match('cf_type2', $only_type2);
 		}
-		if (!$db) $db = self::$db;
+		if (!$db)
+		{
+			$db = self::$db;
+		}
 		$this->iterator = $db->select(self::TABLE, '*', $query, __LINE__, __FILE__,
 			!isset($num_rows) ? false : $start, 'ORDER BY cf_order ASC', 'phpgwapi', $num_rows);
 	}
@@ -165,7 +168,10 @@ 
 	{
 		foreach(self::get($app, $all_private_too, $only_type2) as $data)
 		{
-			if ($data['type'] == 'htmlarea') return true;
+			if ($data['type'] == 'htmlarea')
+			{
+				return true;
+			}
 		}
 		return false;
 	}
@@ -227,7 +233,10 @@ 
 				break;
 
 			case 'htmlarea':	// ToDo: EMail probably has a nicer html2text method
-				if ($value) $value = strip_tags(preg_replace('/<(br|p)[^>]*>/i', "\r\n", str_replace(array("\r", "\n"), '', $value)));
+				if ($value)
+				{
+					$value = strip_tags(preg_replace('/<(br|p)[^>]*>/i', "\r\n", str_replace(array("\r", "\n"), '', $value)));
+				}
 				break;
 
 			case 'ajax_select':	// ToDo: returns unchanged value for now
@@ -245,7 +254,10 @@ 
 					{
 						$app = $field['type'];
 					}
-					if ($value) $value = Api\Link::title($app, $value);
+					if ($value)
+					{
+						$value = Api\Link::title($app, $value);
+					}
 				}
 				break;
 		}
@@ -278,10 +290,13 @@ 
 		if (!($path = realpath($file[0] == '/' ? $file : EGW_SERVER_ROOT.'/'.$file)) ||	// file does not exist
 			substr($path,0,strlen(EGW_SERVER_ROOT)+1) != EGW_SERVER_ROOT.'/' ||	// we are NOT inside the eGW root
 			basename($path,'.php').'.php' != basename($path) ||	// extension is NOT .php
-			basename($path) == 'header.inc.php')	// dont allow to include our header again
+			basename($path) == 'header.inc.php')
+		{
+			// dont allow to include our header again
 		{
 			return array(lang("'%1' is no php file in the eGW server root (%2)!".': '.$path,$file,EGW_SERVER_ROOT));
 		}
+		}
 		include($path);
 
 		return $options;
@@ -321,7 +336,10 @@ 
 
 		foreach(self::get($own_app) as $name => $data)
 		{
-			if (!in_array($data['type'],$link_types)) continue;
+			if (!in_array($data['type'],$link_types))
+			{
+				continue;
+			}
 
 			// do we have a different old value --> delete that link
 			if ($old && $old['#'.$name] && $old['#'.$name] != $values['#'.$name])
@@ -346,10 +364,13 @@ 
 				$app = $data['type'];
 				$id = $values['#'.$name];
 			}
-			if ($id)	// create new link, does nothing for already existing links
+			if ($id)
+			{
+				// create new link, does nothing for already existing links
 			{
 				Api\Link::link($own_app,$values[$id_name],$app,$id);
 			}
+			}
 		}
 	}
 
@@ -377,7 +398,8 @@ 
 		if($old['order'] != $cf['order'] || $cf['order'] % 10 !== 0)
 		{
 			$cfs[$cf['name']]['order'] = $cf['order'];
-			uasort($cfs, function($a1, $a2){
+			uasort($cfs, function($a1, $a2)
+			{
 				return $a1['order'] - $a2['order'];
 			});
 			$n = 0;
@@ -439,13 +461,22 @@ 
 	public static function save($app, array $cfs)
 	{
 		$query = array('cf_app' => $app);
-		if ($cfs) $query[] = self::$db->expression(self::TABLE, 'NOT ', array('cf_name' => array_keys($cfs)));
+		if ($cfs)
+		{
+			$query[] = self::$db->expression(self::TABLE, 'NOT ', array('cf_name' => array_keys($cfs)));
+		}
 		self::$db->delete(self::TABLE, $query, __LINE__, __FILE__);
 
 		foreach($cfs as $name => $cf)
 		{
-			if (empty($cf['name'])) $cf['name'] = $name;
-			if (empty($cf['app']))  $cf['app'] = $app;
+			if (empty($cf['name']))
+			{
+				$cf['name'] = $name;
+			}
+			if (empty($cf['app']))
+			{
+				$cf['app'] = $app;
+			}
 
 			self::update($cf);
 		}

api/src/Storage/History.php

Doc Comments +2 added lines

@@ -112,6 +112,8 @@
 
 	/**
 	 * Static function to add a history record
+	 * @param string $field_code
+	 * @param string $new_value
 	 */
 	public static function static_add($appname, $id, $user, $field_code, $new_value, $old_value = '')
 	{

Spacing +30 added lines, -30 removed lines

@@ -51,7 +51,7 @@ 
 	 * @param string $appname app name this instance operates on
 	 * @return historylog
 	 */
-	function __construct($appname='',$user=null)
+	function __construct($appname = '', $user = null)
 	{
 		$this->appname = $appname ? $appname : $GLOBALS['egw_info']['flags']['currentapp'];
 		$this->user = !is_null($user) ? $user : $GLOBALS['egw_info']['user']['account_id'];
@@ -80,7 +80,7 @@ 
 		{
 			$where['history_record_id'] = $record_id;
 		}
-		$this->db->delete(self::TABLE,$where,__LINE__,__FILE__);
+		$this->db->delete(self::TABLE, $where, __LINE__, __FILE__);
 
 		return $this->db->affected_rows();
 	}
@@ -93,11 +93,11 @@ 
 	 * @param string $new_value new value
 	 * @param string $old_value old value
 	 */
-	function add($status,$record_id,$new_value,$old_value)
+	function add($status, $record_id, $new_value, $old_value)
 	{
 		if ($new_value != $old_value)
 		{
-			$this->db->insert(self::TABLE,array(
+			$this->db->insert(self::TABLE, array(
 				'history_record_id' => $record_id,
 				'history_appname'   => $this->appname,
 				'history_owner'     => $this->user,
@@ -106,7 +106,7 @@ 
 				'history_old_value' => $old_value,
 				'history_timestamp' => time(),
 				'sessionid' => $GLOBALS['egw']->session->sessionid_access_log,
-			),false,__LINE__,__FILE__);
+			), false, __LINE__, __FILE__);
 		}
 	}
 
@@ -117,7 +117,7 @@ 
 	{
 		if ($new_value != $old_value)
 		{
-			$GLOBALS['egw']->db->insert(self::TABLE,array(
+			$GLOBALS['egw']->db->insert(self::TABLE, array(
 				'history_record_id' => $id,
 				'history_appname'   => $appname,
 				'history_owner'     => (int)$user,
@@ -126,7 +126,7 @@ 
 				'history_old_value' => $old_value,
 				'history_timestamp' => time(),
 				'sessionid' => $GLOBALS['egw']->session->sessionid_access_log,
-			),false,__LINE__,__FILE__);
+			), false, __LINE__, __FILE__);
 		}
 	}
 
@@ -140,11 +140,11 @@ 
 	 * @return array of arrays with keys id, record_id, appname, owner (account_id), status, new_value, old_value,
 	 * 	timestamp (Y-m-d H:i:s in servertime), user_ts (timestamp in user-time)
 	 */
-	function search($filter,$order='history_id',$sort='DESC',$limit=null)
+	function search($filter, $order = 'history_id', $sort = 'DESC', $limit = null)
 	{
 		if (!is_array($filter)) $filter = is_numeric($filter) ? array('history_record_id' => $filter) : array();
 
-		if (!$order || !preg_match('/^[a-z0-9_]+$/i',$order) || !preg_match('/^(asc|desc)?$/i',$sort))
+		if (!$order || !preg_match('/^[a-z0-9_]+$/i', $order) || !preg_match('/^(asc|desc)?$/i', $sort))
 		{
 			$orderby = 'ORDER BY history_id DESC';
 		}
@@ -152,9 +152,9 @@ 
 		{
 			$orderby = "ORDER BY $order $sort";
 		}
-		foreach($filter as $col => $value)
+		foreach ($filter as $col => $value)
 		{
-			if (!is_numeric($col) && substr($col,0,8) != 'history_')
+			if (!is_numeric($col) && substr($col, 0, 8) != 'history_')
 			{
 				$filter['history_'.$col] = $value;
 				unset($filter[$col]);
@@ -166,11 +166,11 @@ 
 		if (!$filter['history_record_id']) return array();
 
 		$rows = array();
-		foreach($this->db->select(self::TABLE, '*', $filter, __LINE__, __FILE__,
+		foreach ($this->db->select(self::TABLE, '*', $filter, __LINE__, __FILE__,
 			isset($limit) ? 0 : false, $orderby, 'phpgwapi', $limit) as $row)
 		{
 			$row['user_ts'] = $this->db->from_timestamp($row['history_timestamp']) + 3600 * $GLOBALS['egw_info']['user']['preferences']['common']['tz_offset'];
-			$rows[] = Api\Db::strip_array_keys($row,'history_');
+			$rows[] = Api\Db::strip_array_keys($row, 'history_');
 		}
 		return $rows;
 	}
@@ -188,8 +188,8 @@ 
 		$rows = array();
 		$filter['history_appname'] = $query['appname'];
 		$filter['history_record_id'] = $query['record_id'];
-		if(is_array($query['colfilter'])) {
-			foreach($query['colfilter'] as $column => $value) {
+		if (is_array($query['colfilter'])) {
+			foreach ($query['colfilter'] as $column => $value) {
 				$filter[$column] = $value;
 			}
 		}
@@ -199,20 +199,20 @@ 
 		}
 		else
 		{
-			$total = $GLOBALS['egw']->db->select(self::TABLE,'COUNT(*)',$filter,__LINE__,__FILE__,false,'','phpgwapi',0)->fetchColumn();
+			$total = $GLOBALS['egw']->db->select(self::TABLE, 'COUNT(*)', $filter, __LINE__, __FILE__, false, '', 'phpgwapi', 0)->fetchColumn();
 		}
 		// filter out private (or no longer defined) custom fields
 		if ($filter['history_appname'])
 		{
 			$to_or[] = "history_status NOT LIKE '#%'";
 			// explicitly allow "##" used to store iCal/vCard X-attributes
-			if (in_array($filter['history_appname'], array('calendar','infolog','addressbook')))
+			if (in_array($filter['history_appname'], array('calendar', 'infolog', 'addressbook')))
 			{
 				$to_or[] = "history_status LIKE '##%'";
 			}
 			if (($cfs = Customfields::get($filter['history_appname'])))
 			{
-				$to_or[] =  'history_status IN ('.implode(',', array_map(function($str)
+				$to_or[] = 'history_status IN ('.implode(',', array_map(function($str)
 				{
 					return $GLOBALS['egw']->db->quote('#'.$str);
 				}, array_keys($cfs))).')';
@@ -221,25 +221,25 @@ 
 		}
 		$_query = array(array(
 			'table' => self::TABLE,
-			'cols' => array('history_id', 'history_record_id','history_appname','history_owner','history_status','history_new_value', 'history_timestamp','history_old_value'),
+			'cols' => array('history_id', 'history_record_id', 'history_appname', 'history_owner', 'history_status', 'history_new_value', 'history_timestamp', 'history_old_value'),
 			'where' => $filter,
 		));
 
 		// Add in files, if possible
-		if($GLOBALS['egw_info']['user']['apps']['filemanager'] &&
-			$file = Api\Vfs\Sqlfs\StreamWrapper::url_stat("/apps/{$query['appname']}/{$query['record_id']}",STREAM_URL_STAT_LINK))
+		if ($GLOBALS['egw_info']['user']['apps']['filemanager'] &&
+			$file = Api\Vfs\Sqlfs\StreamWrapper::url_stat("/apps/{$query['appname']}/{$query['record_id']}", STREAM_URL_STAT_LINK))
 		{
 			$_query[] = array(
 				'table' => Api\Vfs\Sqlfs\StreamWrapper::TABLE,
-				'cols' =>array('fs_id', 'fs_dir', "'filemanager'",'COALESCE(fs_modifier,fs_creator)',"'~file~'",'fs_name','fs_modified', 'fs_mime'),
+				'cols' =>array('fs_id', 'fs_dir', "'filemanager'", 'COALESCE(fs_modifier,fs_creator)', "'~file~'", 'fs_name', 'fs_modified', 'fs_mime'),
 				'where' => array('fs_dir' => $file['ino'])
 			);
 		}
 		$new_file_id = array();
-		foreach($GLOBALS['egw']->db->union(
+		foreach ($GLOBALS['egw']->db->union(
 			$_query,
 			__LINE__, __FILE__,
-			' ORDER BY ' . ($query['order'] ? $query['order'] : 'history_timestamp') . ' ' . ($query['sort'] ? $query['sort'] : 'DESC'),
+			' ORDER BY '.($query['order'] ? $query['order'] : 'history_timestamp').' '.($query['sort'] ? $query['sort'] : 'DESC'),
 			$query['start'],
 			$query['num_rows']
 		) as $row)
@@ -247,15 +247,15 @@ 
 			$row['user_ts'] = $GLOBALS['egw']->db->from_timestamp($row['history_timestamp']) + 3600 * $GLOBALS['egw_info']['user']['preferences']['common']['tz_offset'];
 
 			// Explode multi-part values
-			foreach(array('history_new_value','history_old_value') as $field)
+			foreach (array('history_new_value', 'history_old_value') as $field)
 			{
-				if(strpos($row[$field],Tracking::ONE2N_SEPERATOR) !== false)
+				if (strpos($row[$field], Tracking::ONE2N_SEPERATOR) !== false)
 				{
-					$row[$field] = explode(Tracking::ONE2N_SEPERATOR,$row[$field]);
+					$row[$field] = explode(Tracking::ONE2N_SEPERATOR, $row[$field]);
 				}
 			}
 			// Get information needed for proper display
-			if($row['history_appname'] == 'filemanager')
+			if ($row['history_appname'] == 'filemanager')
 			{
 				$new_version = $new_file_id[$row['history_new_value']];
 				$new_file_id[$row['history_new_value']] = count($rows);
@@ -271,12 +271,12 @@ 
 					'mime' => $row['history_old_value']
 				);
 				$row['history_old_value'] = '';
-				if($new_version !== null)
+				if ($new_version !== null)
 				{
 					$rows[$new_version]['old_value'] = $row['history_new_value'];
 				}
 			}
-			$rows[] = Api\Db::strip_array_keys($row,'history_');
+			$rows[] = Api\Db::strip_array_keys($row, 'history_');
 		}
 		if ($mysql_calc_rows)
 		{

Braces +16 added lines, -5 removed lines

@@ -142,7 +142,10 @@ 
 	 */
 	function search($filter,$order='history_id',$sort='DESC',$limit=null)
 	{
-		if (!is_array($filter)) $filter = is_numeric($filter) ? array('history_record_id' => $filter) : array();
+		if (!is_array($filter))
+		{
+			$filter = is_numeric($filter) ? array('history_record_id' => $filter) : array();
+		}
 
 		if (!$order || !preg_match('/^[a-z0-9_]+$/i',$order) || !preg_match('/^(asc|desc)?$/i',$sort))
 		{
@@ -160,10 +163,16 @@ 
 				unset($filter[$col]);
 			}
 		}
-		if (!isset($filter['history_appname'])) $filter['history_appname'] = $this->appname;
+		if (!isset($filter['history_appname']))
+		{
+			$filter['history_appname'] = $this->appname;
+		}
 
 		// do not try to read all history entries of an app
-		if (!$filter['history_record_id']) return array();
+		if (!$filter['history_record_id'])
+		{
+			return array();
+		}
 
 		$rows = array();
 		foreach($this->db->select(self::TABLE, '*', $filter, __LINE__, __FILE__,
@@ -188,8 +197,10 @@ 
 		$rows = array();
 		$filter['history_appname'] = $query['appname'];
 		$filter['history_record_id'] = $query['record_id'];
-		if(is_array($query['colfilter'])) {
-			foreach($query['colfilter'] as $column => $value) {
+		if(is_array($query['colfilter']))
+		{
+			foreach($query['colfilter'] as $column => $value)
+			{
 				$filter[$column] = $value;
 			}
 		}

api/src/Storage/Tracking.php

Doc Comments +1 added lines, -2 removed lines

@@ -528,7 +528,7 @@ 
 	 * @param array $data current entry
 	 * @param array $old = null old/last state of the entry or null for a new entry
 	 * @param boolean $deleted = null can be set to true to let the tracking know the item got deleted or undelted
-	 * @param array $email_notified=null if present will return the emails notified, if given emails in that list will not be notified
+	 * @param array $email_notified if present will return the emails notified, if given emails in that list will not be notified
 	 * @return boolean true on success, false on error (error messages are in $this->errors)
 	 */
 	public function do_notifications($data,$old,$deleted=null,&$email_notified=null)
@@ -824,7 +824,6 @@ 
 	 * The default implementation prefers depending on the prefer_user_as_sender class-var the user over
 	 * what is returned by get_config('sender').
 	 *
-	 * @param int $user account_lid of user
 	 * @param array $data
 	 * @param array $old
 	 * @param bool $prefer_id returns the userid rather than email

Spacing +163 added lines, -163 removed lines

@@ -194,12 +194,12 @@ 
 	{
 		if ($cf_app)
 		{
-			$linkable_cf_types = array('link-entry')+array_keys(Api\Link::app_list());
-			foreach(Customfields::get($cf_app, true) as $cf_name => $cf_data)
+			$linkable_cf_types = array('link-entry') + array_keys(Api\Link::app_list());
+			foreach (Customfields::get($cf_app, true) as $cf_name => $cf_data)
 			{
 				$this->field2history['#'.$cf_name] = '#'.$cf_name;
 
-				if (in_array($cf_data['type'],$linkable_cf_types))
+				if (in_array($cf_data['type'], $linkable_cf_types))
 				{
 					$this->cf_link_fields['#'.$cf_name] = $cf_data['type'] == 'link-entry' ? '' : $cf_data['type'];
 				}
@@ -216,9 +216,9 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return array of details as array with values for keys 'label','value','type'
 	 */
-	function get_details($data,$receiver=null)
+	function get_details($data, $receiver = null)
 	{
-		unset($data, $receiver);	// not uses as just a stub
+		unset($data, $receiver); // not uses as just a stub
 
 		return array();
 	}
@@ -230,14 +230,14 @@ 
 	 * @param string $only_type2 = null if given only return fields of type2 == $only_type2
 	 * @return array of details as array with values for keys 'label','value','type'
 	 */
-	function get_customfields($data, $only_type2=null)
+	function get_customfields($data, $only_type2 = null)
 	{
 		$details = array();
 
-		if (($cfs = Customfields::get($this->app, $all_private_too=false, $only_type2)))
+		if (($cfs = Customfields::get($this->app, $all_private_too = false, $only_type2)))
 		{
 			$header_done = false;
-			foreach($cfs as $name => $field)
+			foreach ($cfs as $name => $field)
 			{
 				if (in_array($field['type'], Customfields::$non_printable_fields)) continue;
 
@@ -278,9 +278,9 @@ 
 	 * @param array $old = null old/last state of the entry or null for a new entry
 	 * @return mixed
 	 */
-	protected function get_config($name,$data,$old=null)
+	protected function get_config($name, $data, $old = null)
 	{
-		unset($name, $data, $old);	// not used as just a stub
+		unset($name, $data, $old); // not used as just a stub
 
 		return null;
 	}
@@ -296,7 +296,7 @@ 
 	 * @param boolean $skip_notification = false do NOT send any notification
 	 * @return int|boolean false on error, integer number of changes logged or true for new entries ($old == null)
 	 */
-	public function track(array $data,array $old=null,$user=null,$deleted=null,array $changed_fields=null,$skip_notification=false)
+	public function track(array $data, array $old = null, $user = null, $deleted = null, array $changed_fields = null, $skip_notification = false)
 	{
 		$this->user = !is_null($user) ? $user : $GLOBALS['egw_info']['user']['account_id'];
 
@@ -305,7 +305,7 @@ 
 		if ($old && $this->field2history)
 		{
 			//error_log(__METHOD__.__LINE__.' Changedfields:'.print_r($changed_fields,true));
-			$changes = $this->save_history($data,$old,$deleted,$changed_fields);
+			$changes = $this->save_history($data, $old, $deleted, $changed_fields);
 			//error_log(__METHOD__.__LINE__.' Changedfields:'.print_r($changed_fields,true));
 			//error_log(__METHOD__.__LINE__.' Changes:'.print_r($changes,true));
 		}
@@ -313,10 +313,10 @@ 
 		//error_log(__METHOD__.__LINE__.' LinkFields:'.array2string($this->cf_link_fields));
 		if ($changes && $this->cf_link_fields)
 		{
-			$this->update_links($data,(array)$old);
+			$this->update_links($data, (array)$old);
 		}
 		// do not run do_notifications if we have no changes
-		if ($changes && !$skip_notification && !$this->do_notifications($data,$old,$deleted))
+		if ($changes && !$skip_notification && !$this->do_notifications($data, $old, $deleted))
 		{
 			$changes = false;
 		}
@@ -333,45 +333,45 @@ 
 	{
 		//error_log(__METHOD__.__LINE__.array2string($data).function_backtrace());
 		//error_log(__METHOD__.__LINE__.array2string($this->cf_link_fields));
-		foreach(array_keys((array)$this->cf_link_fields) as $name)
+		foreach (array_keys((array)$this->cf_link_fields) as $name)
 		{
 			//error_log(__METHOD__.__LINE__.' Field:'.$name. ' Value (new):'.array2string($data[$name]));
 			//error_log(__METHOD__.__LINE__.' Field:'.$name. ' Value (old):'.array2string($old[$name]));
-			if (is_array($data[$name]) && array_key_exists('id',$data[$name])) $data[$name] = $data[$name]['id'];
-			if (is_array($old[$name]) && array_key_exists('id',$old[$name])) $old[$name] = $old[$name]['id'];
+			if (is_array($data[$name]) && array_key_exists('id', $data[$name])) $data[$name] = $data[$name]['id'];
+			if (is_array($old[$name]) && array_key_exists('id', $old[$name])) $old[$name] = $old[$name]['id'];
 			//error_log(__METHOD__.__LINE__.'(After processing) Field:'.$name. ' Value (new):'.array2string($data[$name]));
 			//error_log(__METHOD__.__LINE__.'(After processing) Field:'.$name. ' Value (old):'.array2string($old[$name]));
 		}
-		$current_ids = array_unique(array_diff(array_intersect_key($data,$this->cf_link_fields),array('',0,NULL)));
-		$old_ids = $old ? array_unique(array_diff(array_intersect_key($old,$this->cf_link_fields),array('',0,NULL))) : array();
+		$current_ids = array_unique(array_diff(array_intersect_key($data, $this->cf_link_fields), array('', 0, NULL)));
+		$old_ids = $old ? array_unique(array_diff(array_intersect_key($old, $this->cf_link_fields), array('', 0, NULL))) : array();
 		//error_log(__METHOD__.__LINE__.array2string($current_ids));
 		//error_log(__METHOD__.__LINE__.array2string($old_ids));
 		// create links for added application entry
-		foreach(array_diff($current_ids,$old_ids) as $name => $id)
+		foreach (array_diff($current_ids, $old_ids) as $name => $id)
 		{
 			if (!($app = $this->cf_link_fields[$name]))
 			{
-				list($app,$id) = explode(':',$id);
-				if (!$id) continue;	// can be eg. 'addressbook:', if no contact selected
+				list($app, $id) = explode(':', $id);
+				if (!$id) continue; // can be eg. 'addressbook:', if no contact selected
 			}
 			$source_id = $data[$this->id_field];
 			//error_log(__METHOD__.__LINE__.array2string($source_id));
-			if ($source_id) Api\Link::link($this->app,$source_id,$app,$id);
+			if ($source_id) Api\Link::link($this->app, $source_id, $app, $id);
 			//error_log(__METHOD__.__LINE__."Api\Link::link('$this->app',".array2string($source_id).",'$app',$id);");
 			//echo "<p>Api\Link::link('$this->app',{$data[$this->id_field]},'$app',$id);</p>\n";
 		}
 
 		// unlink removed application entries
-		foreach(array_diff($old_ids,$current_ids) as $name => $id)
+		foreach (array_diff($old_ids, $current_ids) as $name => $id)
 		{
-			if (!isset($data[$name])) continue;	// ignore not set link cf's, eg. from sync clients
+			if (!isset($data[$name])) continue; // ignore not set link cf's, eg. from sync clients
 			if (!($app = $this->cf_link_fields[$name]))
 			{
-				list($app,$id) = explode(':',$id);
+				list($app, $id) = explode(':', $id);
 				if (!$id) continue;
 			}
 			$source_id = $data[$this->id_field];
-			if ($source_id) Api\Link::unlink(null,$this->app,$source_id,0,$app,$id);
+			if ($source_id) Api\Link::unlink(null, $this->app, $source_id, 0, $app, $id);
 			//echo "<p>Api\Link::unlink(NULL,'$this->app',{$data[$this->id_field]},0,'$app',$id);</p>\n";
 		}
 	}
@@ -386,14 +386,14 @@ 
 	 * @param array $changed_fields = null changed fields from ealier call to $this->changed_fields($data,$old), to not compute it again
 	 * @return int number of log-entries made
 	 */
-	protected function save_history(array $data,array $old=null,$deleted=null,array $changed_fields=null)
+	protected function save_history(array $data, array $old = null, $deleted = null, array $changed_fields = null)
 	{
-		unset($deleted);	// not used, but required by function signature
+		unset($deleted); // not used, but required by function signature
 
 		//error_log(__METHOD__.__LINE__.' Changedfields:'.array2string($changed_fields));
 		if (is_null($changed_fields))
 		{
-			$changed_fields = self::changed_fields($data,$old);
+			$changed_fields = self::changed_fields($data, $old);
 			//error_log(__METHOD__.__LINE__.' Changedfields:'.array2string($changed_fields));
 		}
 		if (!$changed_fields && ($old || !$GLOBALS['egw_info']['server']['log_user_agent_action'])) return 0;
@@ -408,30 +408,30 @@ 
 			$this->historylog->add('user_agent_action', $data[$this->id_field],
 				$_SERVER['HTTP_USER_AGENT'], $_SESSION[Api\Session::EGW_SESSION_VAR]['session_action']);
 		}
-		foreach($changed_fields as $name)
+		foreach ($changed_fields as $name)
 		{
 			$status = isset($this->field2history[$name]) ? $this->field2history[$name] : $name;
 			//error_log(__METHOD__.__LINE__." Name $name,".' Status:'.array2string($status));
 			if (is_array($status))	// 1:N relation --> remove common rows
 			{
 				//error_log(__METHOD__.__LINE__.' is Array');
-				self::compact_1_N_relation($data[$name],$status);
-				self::compact_1_N_relation($old[$name],$status);
-				$added = array_values(array_diff($data[$name],$old[$name]));
-				$removed = array_values(array_diff($old[$name],$data[$name]));
-				$n = max(array(count($added),count($removed)));
-				for($i = 0; $i < $n; ++$i)
+				self::compact_1_N_relation($data[$name], $status);
+				self::compact_1_N_relation($old[$name], $status);
+				$added = array_values(array_diff($data[$name], $old[$name]));
+				$removed = array_values(array_diff($old[$name], $data[$name]));
+				$n = max(array(count($added), count($removed)));
+				for ($i = 0; $i < $n; ++$i)
 				{
 					//error_log(__METHOD__."() $i: historylog->add('$name',data['$this->id_field']={$data[$this->id_field]},".array2string($added[$i]).','.array2string($removed[$i]));
-					$this->historylog->add($name,$data[$this->id_field],$added[$i],$removed[$i]);
+					$this->historylog->add($name, $data[$this->id_field], $added[$i], $removed[$i]);
 				}
 			}
 			else
 			{
 				//error_log(__METHOD__.__LINE__.' IDField:'.array2string($this->id_field).' ->'.$data[$this->id_field].' New:'.$data[$name].' Old:'.$old[$name]);
-				$this->historylog->add($status,$data[$this->id_field],
-					is_array($data[$name]) ? implode(',',$data[$name]) : $data[$name],
-					is_array($old[$name]) ? implode(',',$old[$name]) : $old[$name]);
+				$this->historylog->add($status, $data[$this->id_field],
+					is_array($data[$name]) ? implode(',', $data[$name]) : $data[$name],
+					is_array($old[$name]) ? implode(',', $old[$name]) : $old[$name]);
 			}
 		}
 		//error_log(__METHOD__.__LINE__.' return:'.count($changed_fields));
@@ -447,28 +447,28 @@ 
 	 * @param array $old = null
 	 * @return array of keys with different values in $data and $old
 	 */
-	public function changed_fields(array $data,array $old=null)
+	public function changed_fields(array $data, array $old = null)
 	{
 		if (is_null($old)) return array_keys($data);
 		$changed_fields = array();
-		foreach($this->field2history as $name => $status)
+		foreach ($this->field2history as $name => $status)
 		{
-			if (!$old[$name] && !$data[$name]) continue;	// treat all sorts of empty equally
+			if (!$old[$name] && !$data[$name]) continue; // treat all sorts of empty equally
 
-			if ($name[0] == '#' && !isset($data[$name])) continue;	// no set customfields are not stored, therefore not changed
+			if ($name[0] == '#' && !isset($data[$name])) continue; // no set customfields are not stored, therefore not changed
 
 			if (is_array($status))	// 1:N relation
 			{
-				self::compact_1_N_relation($data[$name],$status);
-				self::compact_1_N_relation($old[$name],$status);
+				self::compact_1_N_relation($data[$name], $status);
+				self::compact_1_N_relation($old[$name], $status);
 			}
 			if ($old[$name] != $data[$name])
 			{
 				// normalize arrays, we do NOT care for the order of multiselections
 				if (is_array($data[$name]) || is_array($old[$name]))
 				{
-					if (!is_array($data[$name])) $data[$name] = explode(',',$data[$name]);
-					if (!is_array($old[$name])) $old[$name] = explode(',',$old[$name]);
+					if (!is_array($data[$name])) $data[$name] = explode(',', $data[$name]);
+					if (!is_array($old[$name])) $old[$name] = explode(',', $old[$name]);
 					if (count($data[$name]) == count($old[$name]))
 					{
 						sort($data[$name]);
@@ -478,13 +478,13 @@ 
 				}
 				elseif (str_replace("\r", '', $old[$name]) == str_replace("\r", '', $data[$name]))
 				{
-					continue;	// change only in CR (eg. different OS) --> ignore
+					continue; // change only in CR (eg. different OS) --> ignore
 				}
 				$changed_fields[] = $name;
 				//echo "<p>$name: ".array2string($data[$name]).' != '.array2string($old[$name])."</p>\n";
 			}
 		}
-		foreach($data as $name => $value)
+		foreach ($data as $name => $value)
 		{
 			if ($name[0] == '#' && $name[1] == '#' && $value !== $old[$name])
 			{
@@ -501,18 +501,18 @@ 
 	 * @param array &$rows rows of the 1:N relation
 	 * @param array $cols field names as values
 	 */
-	private static function compact_1_N_relation(&$rows,array $cols)
+	private static function compact_1_N_relation(&$rows, array $cols)
 	{
 		if (is_array($rows))
 		{
-			foreach($rows as &$row)
+			foreach ($rows as &$row)
 			{
 				$values = array();
-				foreach($cols as $col)
+				foreach ($cols as $col)
 				{
 					$values[] = $row[$col];
 				}
-				$row = implode(self::ONE2N_SEPERATOR,$values);
+				$row = implode(self::ONE2N_SEPERATOR, $values);
 			}
 		}
 		else
@@ -531,7 +531,7 @@ 
 	 * @param array $email_notified=null if present will return the emails notified, if given emails in that list will not be notified
 	 * @return boolean true on success, false on error (error messages are in $this->errors)
 	 */
-	public function do_notifications($data,$old,$deleted=null,&$email_notified=null)
+	public function do_notifications($data, $old, $deleted = null, &$email_notified = null)
 	{
 		$this->errors = $email_sent = array();
 		if (!empty($email_notified) && is_array($email_notified)) $email_sent = $email_notified;
@@ -539,19 +539,19 @@ 
 		if (!$this->notify_current_user && $this->user)		// do we have a current user and should we notify the current user about his own changes
 		{
 			//error_log("do_notificaton() adding user=$this->user to email_sent, to not notify him");
-			$email_sent[] = $GLOBALS['egw']->accounts->id2name($this->user,'account_email');
+			$email_sent[] = $GLOBALS['egw']->accounts->id2name($this->user, 'account_email');
 		}
-		$skip_notify = $this->get_config('skip_notify',$data,$old);
-		if($skip_notify && is_array($skip_notify))
+		$skip_notify = $this->get_config('skip_notify', $data, $old);
+		if ($skip_notify && is_array($skip_notify))
 		{
 			$email_sent = array_merge($email_sent, $skip_notify);
 		}
 
 		// entry creator
-		if ($this->creator_field && ($email = $GLOBALS['egw']->accounts->id2name($data[$this->creator_field],'account_email')) &&
+		if ($this->creator_field && ($email = $GLOBALS['egw']->accounts->id2name($data[$this->creator_field], 'account_email')) &&
 			!in_array($email, $email_sent))
 		{
-			if ($this->send_notification($data,$old,$email,$data[$this->creator_field],'notify_creator'))
+			if ($this->send_notification($data, $old, $email, $data[$this->creator_field], 'notify_creator'))
 			{
 				$email_sent[] = $email;
 			}
@@ -560,12 +560,12 @@ 
 		// members of group when entry owned by group
 		if ($this->creator_field && $GLOBALS['egw']->accounts->get_type($data[$this->creator_field]) == 'g')
 		{
-			foreach($GLOBALS['egw']->accounts->members($data[$this->creator_field],true) as $u)
+			foreach ($GLOBALS['egw']->accounts->members($data[$this->creator_field], true) as $u)
 			{
-				if (($email = $GLOBALS['egw']->accounts->id2name($u,'account_email')) &&
+				if (($email = $GLOBALS['egw']->accounts->id2name($u, 'account_email')) &&
 					!in_array($email, $email_sent))
 				{
-					if ($this->send_notification($data,$old,$email,$u,'notify_owner_group_member'))
+					if ($this->send_notification($data, $old, $email, $u, 'notify_owner_group_member'))
 					{
 						$email_sent[] = $email;
 					}
@@ -582,14 +582,14 @@ 
 			if ($data[$this->assigned_field])	// current assignments
 			{
 				$assignees = is_array($data[$this->assigned_field]) ?
-					$data[$this->assigned_field] : explode(',',$data[$this->assigned_field]);
+					$data[$this->assigned_field] : explode(',', $data[$this->assigned_field]);
 			}
 			if ($old && $old[$this->assigned_field])
 			{
 				$old_assignees = is_array($old[$this->assigned_field]) ?
-					$old[$this->assigned_field] : explode(',',$old[$this->assigned_field]);
+					$old[$this->assigned_field] : explode(',', $old[$this->assigned_field]);
 			}
-			foreach(array_unique(array_merge($assignees,$old_assignees)) as $assignee)
+			foreach (array_unique(array_merge($assignees, $old_assignees)) as $assignee)
 			{
 				//error_log(__METHOD__."() assignee=$assignee, type=".$GLOBALS['egw']->accounts->get_type($assignee).", email=".$GLOBALS['egw']->accounts->id2name($assignee,'account_email'));
 				if (!$assignee) continue;
@@ -597,10 +597,10 @@ 
 				// item assignee is a user
 				if ($GLOBALS['egw']->accounts->get_type($assignee) == 'u')
 				{
-					if (($email = $GLOBALS['egw']->accounts->id2name($assignee,'account_email')) && !in_array($email, $email_sent))
+					if (($email = $GLOBALS['egw']->accounts->id2name($assignee, 'account_email')) && !in_array($email, $email_sent))
 					{
-						if ($this->send_notification($data,$old,$email,$assignee,'notify_assigned',
-							in_array($assignee,$assignees) !== in_array($assignee,$old_assignees) || $deleted))	// assignment changed
+						if ($this->send_notification($data, $old, $email, $assignee, 'notify_assigned',
+							in_array($assignee, $assignees) !== in_array($assignee, $old_assignees) || $deleted))	// assignment changed
 						{
 							$email_sent[] = $email;
 						}
@@ -608,12 +608,12 @@ 
 				}
 				else	// item assignee is a group
 				{
-					foreach($GLOBALS['egw']->accounts->members($assignee,true) as $u)
+					foreach ($GLOBALS['egw']->accounts->members($assignee, true) as $u)
 					{
-						if (($email = $GLOBALS['egw']->accounts->id2name($u,'account_email')) && !in_array($email, $email_sent))
+						if (($email = $GLOBALS['egw']->accounts->id2name($u, 'account_email')) && !in_array($email, $email_sent))
 						{
-							if ($this->send_notification($data,$old,$email,$u,'notify_assigned',
-								in_array($u,$assignees) !== in_array($u,$old_assignees) || $deleted))	// assignment changed
+							if ($this->send_notification($data, $old, $email, $u, 'notify_assigned',
+								in_array($u, $assignees) !== in_array($u, $old_assignees) || $deleted))	// assignment changed
 							{
 								$email_sent[] = $email;
 							}
@@ -624,14 +624,14 @@ 
 		}
 
 		// notification copies
-		if (($copies = $this->get_config('copy',$data,$old)))
+		if (($copies = $this->get_config('copy', $data, $old)))
 		{
-			$lang = $this->get_config('lang',$data,$old);
-			foreach($copies as $email)
+			$lang = $this->get_config('lang', $data, $old);
+			foreach ($copies as $email)
 			{
-				if (strchr($email,'@') !== false && !in_array($email, $email_sent))
+				if (strchr($email, '@') !== false && !in_array($email, $email_sent))
 				{
-					if ($this->send_notification($data,$old,$email,$lang,'notify_copy'))
+					if ($this->send_notification($data, $old, $email, $lang, 'notify_copy'))
 					{
 						$email_sent[] = $email;
 					}
@@ -676,7 +676,7 @@ 
 	 * @param boolean $deleted = null can be set to true to let the tracking know the item got deleted or undelted
 	 * @return boolean true on success or false if notification not requested or error (error-message is in $this->errors)
 	 */
-	public function send_notification($data,$old,$email,$user_or_lang,$check=null,$assignment_changed=true,$deleted=null)
+	public function send_notification($data, $old, $email, $user_or_lang, $check = null, $assignment_changed = true, $deleted = null)
 	{
 		//error_log(__METHOD__."(,,'$email',$user_or_lang,$check,$assignment_changed,$deleted)");
 		if (!$email) return false;
@@ -688,16 +688,16 @@ 
 		{
 			$GLOBALS['egw_info']['user']['account_id'] = $user_or_lang;
 			$GLOBALS['egw']->preferences->__construct($user_or_lang);
-			$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->read_repository(false);	// no session prefs!
+			$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->read_repository(false); // no session prefs!
 
 			if ($check && $this->check2pref) $check = $this->check2pref[$check];
 
-			if ($check && !$GLOBALS['egw_info']['user']['preferences'][$this->app][$check] ||	// no notification requested
+			if ($check && !$GLOBALS['egw_info']['user']['preferences'][$this->app][$check] || // no notification requested
 				// only notification about changed assignment requested
 				$check && $GLOBALS['egw_info']['user']['preferences'][$this->app][$check] === 'assignment' && !$assignment_changed ||
 				$this->user == $user_or_lang && !$this->notify_current_user)  // no popup for own actions
 			{
-				$do_notify = false;	// no notification requested / necessary
+				$do_notify = false; // no notification requested / necessary
 			}
 		}
 		else
@@ -720,33 +720,33 @@ 
 
 			// Cache message body to not have to re-generate it every time
 			$lang = Api\Translation::$userlang;
-			$date_format = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'] .
+			$date_format = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'].
 				$GLOBALS['egw_info']['user']['preferences']['common']['timeformat'];
 
 			// Cache text body
-			$body_cache =& $this->body_cache[$data[$this->id_field]][$lang][$date_format];
-			if(empty($data[$this->id_field]) || !isset($body_cache['text']))
+			$body_cache = & $this->body_cache[$data[$this->id_field]][$lang][$date_format];
+			if (empty($data[$this->id_field]) || !isset($body_cache['text']))
 			{
-				$body_cache['text'] = $this->get_body(false,$data,$old,false,$receiver);
+				$body_cache['text'] = $this->get_body(false, $data, $old, false, $receiver);
 			}
 			// Cache HTML body
-			if(empty($data[$this->id_field]) || !isset($body_cache['html']))
+			if (empty($data[$this->id_field]) || !isset($body_cache['html']))
 			{
-				$body_cache['html'] = $this->get_body(true,$data,$old,false,$receiver);
+				$body_cache['html'] = $this->get_body(true, $data, $old, false, $receiver);
 			}
 
 			// get rest of notification message
-			$sender = $this->get_sender($data,$old,true,$receiver);
-			$subject = $this->get_subject($data,$old,$deleted,$receiver);
-			$link = $this->get_notification_link($data,$old,$receiver);
-			$attachments = $this->get_attachments($data,$old,$receiver);
+			$sender = $this->get_sender($data, $old, true, $receiver);
+			$subject = $this->get_subject($data, $old, $deleted, $receiver);
+			$link = $this->get_notification_link($data, $old, $receiver);
+			$attachments = $this->get_attachments($data, $old, $receiver);
 		}
 
 		// restore user enviroment BEFORE calling notification class or returning
 		$GLOBALS['egw_info']['user'] = $save_user;
 		// need to call preferences constructor and read_repository, to set user timezone again
 		$GLOBALS['egw']->preferences->__construct($GLOBALS['egw_info']['user']['account_id']);
-		$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->read_repository(false);	// no session prefs!
+		$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->read_repository(false); // no session prefs!
 
 		// Re-load date/time preferences
 		Api\DateTime::init();
@@ -801,11 +801,11 @@ 
 	 *
 	 * @return string
 	 */
-	public function datetime($timestamp,$do_time=true)
+	public function datetime($timestamp, $do_time = true)
 	{
-		if (!is_a($timestamp,'DateTime'))
+		if (!is_a($timestamp, 'DateTime'))
 		{
-			$timestamp = new Api\DateTime($timestamp,Api\DateTime::$server_timezone);
+			$timestamp = new Api\DateTime($timestamp, Api\DateTime::$server_timezone);
 		}
 		$timestamp->setTimezone(Api\DateTime::$user_timezone);
 		if (is_null($do_time))
@@ -831,25 +831,25 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return string or userid
 	 */
-	protected function get_sender($data,$old,$prefer_id=false,$receiver=null)
+	protected function get_sender($data, $old, $prefer_id = false, $receiver = null)
 	{
-		unset($receiver);	// not used, but required by function signature
+		unset($receiver); // not used, but required by function signature
 
-		$sender = $this->get_config('sender',$data,$old);
+		$sender = $this->get_config('sender', $data, $old);
 		//echo "<p>".__METHOD__."() get_config('sender',...)='".htmlspecialchars($sender)."'</p>\n";
 
 		if (($this->prefer_user_as_sender || !$sender) && $this->user &&
-			($email = $GLOBALS['egw']->accounts->id2name($this->user,'account_email')))
+			($email = $GLOBALS['egw']->accounts->id2name($this->user, 'account_email')))
 		{
-			$name = $GLOBALS['egw']->accounts->id2name($this->user,'account_fullname');
+			$name = $GLOBALS['egw']->accounts->id2name($this->user, 'account_fullname');
 
-			if($prefer_id) {
+			if ($prefer_id) {
 				$sender = $this->user;
 			} else {
 				$sender = $name ? $name.' <'.$email.'>' : $email;
 			}
 		}
-		elseif(!$sender)
+		elseif (!$sender)
 		{
 			$sender = 'eGroupWare '.lang($this->app).' <noreply@'.$GLOBALS['egw_info']['server']['mail_suffix'].'>';
 		}
@@ -864,11 +864,11 @@ 
 	 * @param array $old
 	 * @return string
 	 */
-	protected function get_title($data,$old)
+	protected function get_title($data, $old)
 	{
-		unset($old);	// not used, but required by function signature
+		unset($old); // not used, but required by function signature
 
-		return Api\Link::title($this->app,$data[$this->id_field]);
+		return Api\Link::title($this->app, $data[$this->id_field]);
 	}
 
 	/**
@@ -882,11 +882,11 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return string
 	 */
-	protected function get_subject($data,$old,$deleted=null,$receiver=null)
+	protected function get_subject($data, $old, $deleted = null, $receiver = null)
 	{
-		unset($old, $deleted, $receiver);	// not used, but required by function signature
+		unset($old, $deleted, $receiver); // not used, but required by function signature
 
-		return Api\Link::title($this->app,$data[$this->id_field]);
+		return Api\Link::title($this->app, $data[$this->id_field]);
 	}
 
 	/**
@@ -899,9 +899,9 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return string
 	 */
-	protected function get_message($data,$old,$receiver=null)
+	protected function get_message($data, $old, $receiver = null)
 	{
-		unset($data, $old, $receiver);	// not used, but required by function signature
+		unset($data, $old, $receiver); // not used, but required by function signature
 
 		return '';
 	}
@@ -917,24 +917,24 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return string|array string with link (!$allow_popup) or array(link,popup-size), popup size is something like '640x480'
 	 */
-	protected function get_link($data,$old,$allow_popup=false,$receiver=null)
+	protected function get_link($data, $old, $allow_popup = false, $receiver = null)
 	{
-		unset($receiver);	// not used, but required by function signature
+		unset($receiver); // not used, but required by function signature
 
-		if (($link = $this->get_config('link',$data,$old)))
+		if (($link = $this->get_config('link', $data, $old)))
 		{
-			if (!$this->get_config('link_no_id', $data) && strpos($link,$this->id_field.'=') === false && isset($data[$this->id_field]))
+			if (!$this->get_config('link_no_id', $data) && strpos($link, $this->id_field.'=') === false && isset($data[$this->id_field]))
 			{
-				$link .= strpos($link,'?') === false ? '?' : '&';
+				$link .= strpos($link, '?') === false ? '?' : '&';
 				$link .= $this->id_field.'='.$data[$this->id_field];
 			}
 		}
 		else
 		{
-			if (($view = Api\Link::view($this->app,$data[$this->id_field])))
+			if (($view = Api\Link::view($this->app, $data[$this->id_field])))
 			{
-				$link = $GLOBALS['egw']->link('/index.php',$view);
-				$popup = Api\Link::is_popup($this->app,'view');
+				$link = $GLOBALS['egw']->link('/index.php', $view);
+				$popup = Api\Link::is_popup($this->app, 'view');
 			}
 		}
 		if ($link[0] == '/')
@@ -945,12 +945,12 @@ 
 		if (!$allow_popup)
 		{
 			// remove the session-id in the notification mail!
-			$link = preg_replace('/(sessionid|kp3|domain)=[^&]+&?/','',$link);
+			$link = preg_replace('/(sessionid|kp3|domain)=[^&]+&?/', '', $link);
 
 			if ($popup) $link .= '&nopopup=1';
 		}
 		//error_log(__METHOD__."(..., $allow_popup, $receiver) returning ".array2string($allow_popup ? array($link,$popup) : $link));
-		return $allow_popup ? array($link,$popup) : $link;
+		return $allow_popup ? array($link, $popup) : $link;
 	}
 
 	/**
@@ -961,18 +961,18 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return array with link
 	 */
-	protected function get_notification_link($data,$old,$receiver=null)
+	protected function get_notification_link($data, $old, $receiver = null)
 	{
-		unset($receiver);	// not used, but required by function signature
+		unset($receiver); // not used, but required by function signature
 
-		if (($view = Api\Link::view($this->app,$data[$this->id_field])))
+		if (($view = Api\Link::view($this->app, $data[$this->id_field])))
 		{
 			return array(
-				'text' 	=> $this->get_title($data,$old),
+				'text' 	=> $this->get_title($data, $old),
 				'app'	=> $this->app,
 				'id'	=> $data[$this->id_field],
 				'view' 	=> $view,
-				'popup'	=> Api\Link::is_popup($this->app,'view'),
+				'popup'	=> Api\Link::is_popup($this->app, 'view'),
 			);
 		}
 		return false;
@@ -988,15 +988,15 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return string
 	 */
-	public function get_body($html_email,$data,$old,$integrate_link = true,$receiver=null)
+	public function get_body($html_email, $data, $old, $integrate_link = true, $receiver = null)
 	{
 		$body = '';
-		if($this->get_config(self::CUSTOM_NOTIFICATION, $data, $old))
+		if ($this->get_config(self::CUSTOM_NOTIFICATION, $data, $old))
 		{
-			$body = $this->get_custom_message($data,$old);
-			if(($sig = $this->get_signature($data,$old,$receiver)))
+			$body = $this->get_custom_message($data, $old);
+			if (($sig = $this->get_signature($data, $old, $receiver)))
 			{
-				$body .= ($html_email ? '<br />':'') . "\n$sig";
+				$body .= ($html_email ? '<br />' : '')."\n$sig";
 			}
 			return $body;
 		}
@@ -1005,35 +1005,35 @@ 
 			$body = '<table cellspacing="2" cellpadding="0" border="0" width="100%">'."\n";
 		}
 		// new or modified message
-		if (($message = $this->get_message($data,$old,$receiver)))
+		if (($message = $this->get_message($data, $old, $receiver)))
 		{
 			foreach ((array)$message as $_message)
 			{
-				$body .= $this->format_line($html_email,'message',false,($_message=='---'?($html_email?'<hr/>':$_message):$_message));
+				$body .= $this->format_line($html_email, 'message', false, ($_message == '---' ? ($html_email ? '<hr/>' : $_message) : $_message));
 			}
 		}
-		if ($integrate_link && ($link = $this->get_link($data,$old,false,$receiver)))
+		if ($integrate_link && ($link = $this->get_link($data, $old, false, $receiver)))
 		{
-			$body .= $this->format_line($html_email,'link',false,$integrate_link === true ? lang('You can respond by visiting:') : $integrate_link,$link);
+			$body .= $this->format_line($html_email, 'link', false, $integrate_link === true ? lang('You can respond by visiting:') : $integrate_link, $link);
 		}
-		foreach($this->get_details($data,$receiver) as $name => $detail)
+		foreach ($this->get_details($data, $receiver) as $name => $detail)
 		{
 			// if there's no old entry, the entry is not modified by definition
 			// if both values are '', 0 or null, we count them as equal too
 			$modified = $old && $data[$name] != $old[$name] && !(!$data[$name] && !$old[$name]);
 			//if ($modified) error_log("data[$name]=".print_r($data[$name],true).", old[$name]=".print_r($old[$name],true)." --> modified=".(int)$modified);
-			if (empty($detail['value']) && !$modified) continue;	// skip unchanged, empty values
+			if (empty($detail['value']) && !$modified) continue; // skip unchanged, empty values
 
-			$body .= $this->format_line($html_email,$detail['type'],$modified,
+			$body .= $this->format_line($html_email, $detail['type'], $modified,
 				$detail['label'] ? $detail['label'] : '', $detail['value']);
 		}
 		if ($html_email)
 		{
 			$body .= "</table>\n";
 		}
-		if(($sig = $this->get_signature($data,$old,$receiver)))
+		if (($sig = $this->get_signature($data, $old, $receiver)))
 		{
-			$body .= ($html_email ? '<br />':'') . "\n$sig";
+			$body .= ($html_email ? '<br />' : '')."\n$sig";
 		}
 		return $body;
 	}
@@ -1049,20 +1049,20 @@ 
 	 * @param string $data = null data or null to display just $line over 2 columns
 	 * @return string
 	 */
-	protected function format_line($html_mail,$type,$modified,$line,$data=null)
+	protected function format_line($html_mail, $type, $modified, $line, $data = null)
 	{
 		//error_log(__METHOD__.'('.array2string($html_mail).",'$type',".array2string($modified).",'$line',".array2string($data).')');
 		$content = '';
 
 		if ($html_mail)
 		{
-			if (!$this->html_content_allow) $line = Api\Html::htmlspecialchars($line);	// XSS
+			if (!$this->html_content_allow) $line = Api\Html::htmlspecialchars($line); // XSS
 
 			$color = $modified ? 'red' : false;
 			$size  = '110%';
 			$bold = false;
 			$background = '#FFFFF1';
-			switch($type)
+			switch ($type)
 			{
 				case 'message':
 					$background = '#D3DCE3;';
@@ -1080,7 +1080,7 @@ 
 					if (strpos($data, '<br') === false)
 					{
 						$data = nl2br($this->html_content_allow ? $data : Api\Html::htmlspecialchars($data));
-						$this->html_content_allow = true;	// to NOT do htmlspecialchars again
+						$this->html_content_allow = true; // to NOT do htmlspecialchars again
 					}
 					break;
 				case 'reply':
@@ -1089,13 +1089,13 @@ 
 				default:
 					$size = false;
 			}
-			$style = ($bold ? 'font-weight:bold;' : '').($size ? 'font-size:'.$size.';' : '').($color?'color:'.$color:'');
+			$style = ($bold ? 'font-weight:bold;' : '').($size ? 'font-size:'.$size.';' : '').($color ? 'color:'.$color : '');
 
-			$content = '<tr style="background-color: '.$background.';"><td style="'.$style.($line && $data?'" width="20%':'" colspan="2').'">';
+			$content = '<tr style="background-color: '.$background.';"><td style="'.$style.($line && $data ? '" width="20%' : '" colspan="2').'">';
 		}
 		else	// text-mail
 		{
-			if ($type == 'reply') $content = str_repeat('-',64)."\n";
+			if ($type == 'reply') $content = str_repeat('-', 64)."\n";
 
 			if ($modified) $content .= '> ';
 		}
@@ -1107,7 +1107,7 @@ 
 			if ($type == 'link')
 			{
 				// the link is often too long for html boxes chunk-split allows to break lines if needed
-				$content .= Api\Html::a_href(chunk_split(rawurldecode($data),40,'&#8203;'),$data,'','target="_blank"');
+				$content .= Api\Html::a_href(chunk_split(rawurldecode($data), 40, '&#8203;'), $data, '', 'target="_blank"');
 			}
 			elseif ($this->html_content_allow)
 			{
@@ -1120,7 +1120,7 @@ 
 		}
 		else
 		{
-			$content .= ($content&&$data?': ':'').$data;
+			$content .= ($content && $data ? ': ' : '').$data;
 		}
 		if ($html_mail) $content .= '</td></tr>';
 
@@ -1137,9 +1137,9 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return array or array with values for either 'string' or 'path' and optionally (mime-)'type', 'filename' and 'encoding'
 	 */
-	protected function get_attachments($data,$old,$receiver=null)
+	protected function get_attachments($data, $old, $receiver = null)
 	{
-		unset($data, $old, $receiver);	// not used, but required by function signature
+		unset($data, $old, $receiver); // not used, but required by function signature
 
 	 	return array();
 	}
@@ -1152,20 +1152,20 @@ 
 	 */
 	protected function get_signature($data, $old, $receiver)
 	{
-		unset($old, $receiver);	// not used, but required by function signature
+		unset($old, $receiver); // not used, but required by function signature
 
 		$config = Api\Config::read('notifications');
-		if(!isset($data[$this->id_field]))
+		if (!isset($data[$this->id_field]))
 		{
-			error_log($this->app . ' did not properly implement bo_tracking->id_field.  Merge skipped.');
+			error_log($this->app.' did not properly implement bo_tracking->id_field.  Merge skipped.');
 		}
-		elseif(class_exists($this->app. '_merge'))
+		elseif (class_exists($this->app.'_merge'))
 		{
 			$merge_class = $this->app.'_merge';
 			$merge = new $merge_class();
 			$error = null;
 			$sig = $merge->merge_string($config['signature'], array($data[$this->id_field]), $error, 'text/html');
-			if($error)
+			if ($error)
 			{
 				error_log($error);
 				return $config['signature'];
@@ -1182,27 +1182,27 @@ 
 	protected function get_custom_message($data, $old, $merge_class = null)
 	{
 		$message = $this->get_config(self::CUSTOM_NOTIFICATION, $data, $old);
-		if(!$message)
+		if (!$message)
 		{
 			return '';
 		}
 
 		// Automatically set merge class from naming conventions
-		if($merge_class == null)
+		if ($merge_class == null)
 		{
 			$merge_class = $this->app.'_merge';
 		}
-		if(!isset($data[$this->id_field]))
+		if (!isset($data[$this->id_field]))
 		{
-			error_log($this->app . ' did not properly implement bo_tracking->id_field.  Merge skipped.');
+			error_log($this->app.' did not properly implement bo_tracking->id_field.  Merge skipped.');
 			return $message;
 		}
-		elseif(class_exists($merge_class))
+		elseif (class_exists($merge_class))
 		{
 			$merge = new $merge_class();
 			$error = null;
 			$merged_message = $merge->merge_string($message, array($data[$this->id_field]), $error, 'text/html');
-			if($error)
+			if ($error)
 			{
 				error_log($error);
 				return $message;

Braces +157 added lines, -39 removed lines

@@ -239,7 +239,10 @@ 
 			$header_done = false;
 			foreach($cfs as $name => $field)
 			{
-				if (in_array($field['type'], Customfields::$non_printable_fields)) continue;
+				if (in_array($field['type'], Customfields::$non_printable_fields))
+				{
+					continue;
+				}
 
 				if (!$header_done)
 				{
@@ -337,8 +340,14 @@ 
 		{
 			//error_log(__METHOD__.__LINE__.' Field:'.$name. ' Value (new):'.array2string($data[$name]));
 			//error_log(__METHOD__.__LINE__.' Field:'.$name. ' Value (old):'.array2string($old[$name]));
-			if (is_array($data[$name]) && array_key_exists('id',$data[$name])) $data[$name] = $data[$name]['id'];
-			if (is_array($old[$name]) && array_key_exists('id',$old[$name])) $old[$name] = $old[$name]['id'];
+			if (is_array($data[$name]) && array_key_exists('id',$data[$name]))
+			{
+				$data[$name] = $data[$name]['id'];
+			}
+			if (is_array($old[$name]) && array_key_exists('id',$old[$name]))
+			{
+				$old[$name] = $old[$name]['id'];
+			}
 			//error_log(__METHOD__.__LINE__.'(After processing) Field:'.$name. ' Value (new):'.array2string($data[$name]));
 			//error_log(__METHOD__.__LINE__.'(After processing) Field:'.$name. ' Value (old):'.array2string($old[$name]));
 		}
@@ -352,11 +361,18 @@ 
 			if (!($app = $this->cf_link_fields[$name]))
 			{
 				list($app,$id) = explode(':',$id);
-				if (!$id) continue;	// can be eg. 'addressbook:', if no contact selected
+				if (!$id)
+				{
+					continue;
+				}
+				// can be eg. 'addressbook:', if no contact selected
 			}
 			$source_id = $data[$this->id_field];
 			//error_log(__METHOD__.__LINE__.array2string($source_id));
-			if ($source_id) Api\Link::link($this->app,$source_id,$app,$id);
+			if ($source_id)
+			{
+				Api\Link::link($this->app,$source_id,$app,$id);
+			}
 			//error_log(__METHOD__.__LINE__."Api\Link::link('$this->app',".array2string($source_id).",'$app',$id);");
 			//echo "<p>Api\Link::link('$this->app',{$data[$this->id_field]},'$app',$id);</p>\n";
 		}
@@ -364,14 +380,24 @@ 
 		// unlink removed application entries
 		foreach(array_diff($old_ids,$current_ids) as $name => $id)
 		{
-			if (!isset($data[$name])) continue;	// ignore not set link cf's, eg. from sync clients
+			if (!isset($data[$name]))
+			{
+				continue;
+			}
+			// ignore not set link cf's, eg. from sync clients
 			if (!($app = $this->cf_link_fields[$name]))
 			{
 				list($app,$id) = explode(':',$id);
-				if (!$id) continue;
+				if (!$id)
+				{
+					continue;
+				}
 			}
 			$source_id = $data[$this->id_field];
-			if ($source_id) Api\Link::unlink(null,$this->app,$source_id,0,$app,$id);
+			if ($source_id)
+			{
+				Api\Link::unlink(null,$this->app,$source_id,0,$app,$id);
+			}
 			//echo "<p>Api\Link::unlink(NULL,'$this->app',{$data[$this->id_field]},0,'$app',$id);</p>\n";
 		}
 	}
@@ -396,7 +422,10 @@ 
 			$changed_fields = self::changed_fields($data,$old);
 			//error_log(__METHOD__.__LINE__.' Changedfields:'.array2string($changed_fields));
 		}
-		if (!$changed_fields && ($old || !$GLOBALS['egw_info']['server']['log_user_agent_action'])) return 0;
+		if (!$changed_fields && ($old || !$GLOBALS['egw_info']['server']['log_user_agent_action']))
+		{
+			return 0;
+		}
 
 		if (!is_object($this->historylog) || $this->historylog->user != $this->user)
 		{
@@ -412,10 +441,13 @@ 
 		{
 			$status = isset($this->field2history[$name]) ? $this->field2history[$name] : $name;
 			//error_log(__METHOD__.__LINE__." Name $name,".' Status:'.array2string($status));
-			if (is_array($status))	// 1:N relation --> remove common rows
+			if (is_array($status))
+			{
+				// 1:N relation --> remove common rows
 			{
 				//error_log(__METHOD__.__LINE__.' is Array');
 				self::compact_1_N_relation($data[$name],$status);
+			}
 				self::compact_1_N_relation($old[$name],$status);
 				$added = array_values(array_diff($data[$name],$old[$name]));
 				$removed = array_values(array_diff($old[$name],$data[$name]));
@@ -449,17 +481,31 @@ 
 	 */
 	public function changed_fields(array $data,array $old=null)
 	{
-		if (is_null($old)) return array_keys($data);
+		if (is_null($old))
+		{
+			return array_keys($data);
+		}
 		$changed_fields = array();
 		foreach($this->field2history as $name => $status)
 		{
-			if (!$old[$name] && !$data[$name]) continue;	// treat all sorts of empty equally
+			if (!$old[$name] && !$data[$name])
+			{
+				continue;
+			}
+			// treat all sorts of empty equally
 
-			if ($name[0] == '#' && !isset($data[$name])) continue;	// no set customfields are not stored, therefore not changed
+			if ($name[0] == '#' && !isset($data[$name]))
+			{
+				continue;
+			}
+			// no set customfields are not stored, therefore not changed
 
-			if (is_array($status))	// 1:N relation
+			if (is_array($status))
+			{
+				// 1:N relation
 			{
 				self::compact_1_N_relation($data[$name],$status);
+			}
 				self::compact_1_N_relation($old[$name],$status);
 			}
 			if ($old[$name] != $data[$name])
@@ -467,13 +513,22 @@ 
 				// normalize arrays, we do NOT care for the order of multiselections
 				if (is_array($data[$name]) || is_array($old[$name]))
 				{
-					if (!is_array($data[$name])) $data[$name] = explode(',',$data[$name]);
-					if (!is_array($old[$name])) $old[$name] = explode(',',$old[$name]);
+					if (!is_array($data[$name]))
+					{
+						$data[$name] = explode(',',$data[$name]);
+					}
+					if (!is_array($old[$name]))
+					{
+						$old[$name] = explode(',',$old[$name]);
+					}
 					if (count($data[$name]) == count($old[$name]))
 					{
 						sort($data[$name]);
 						sort($old[$name]);
-						if ($data[$name] == $old[$name]) continue;
+						if ($data[$name] == $old[$name])
+						{
+							continue;
+						}
 					}
 				}
 				elseif (str_replace("\r", '', $old[$name]) == str_replace("\r", '', $data[$name]))
@@ -534,13 +589,19 @@ 
 	public function do_notifications($data,$old,$deleted=null,&$email_notified=null)
 	{
 		$this->errors = $email_sent = array();
-		if (!empty($email_notified) && is_array($email_notified)) $email_sent = $email_notified;
+		if (!empty($email_notified) && is_array($email_notified))
+		{
+			$email_sent = $email_notified;
+		}
 
-		if (!$this->notify_current_user && $this->user)		// do we have a current user and should we notify the current user about his own changes
+		if (!$this->notify_current_user && $this->user)
+		{
+			// do we have a current user and should we notify the current user about his own changes
 		{
 			//error_log("do_notificaton() adding user=$this->user to email_sent, to not notify him");
 			$email_sent[] = $GLOBALS['egw']->accounts->id2name($this->user,'account_email');
 		}
+		}
 		$skip_notify = $this->get_config('skip_notify',$data,$old);
 		if($skip_notify && is_array($skip_notify))
 		{
@@ -579,11 +640,14 @@ 
 			//error_log(__METHOD__."() data[$this->assigned_field]=".print_r($data[$this->assigned_field],true).", old[$this->assigned_field]=".print_r($old[$this->assigned_field],true));
 			$old_assignees = array();
 			$assignees = $assigned ? $assigned : array();
-			if ($data[$this->assigned_field])	// current assignments
+			if ($data[$this->assigned_field])
+			{
+				// current assignments
 			{
 				$assignees = is_array($data[$this->assigned_field]) ?
 					$data[$this->assigned_field] : explode(',',$data[$this->assigned_field]);
 			}
+			}
 			if ($old && $old[$this->assigned_field])
 			{
 				$old_assignees = is_array($old[$this->assigned_field]) ?
@@ -592,7 +656,10 @@ 
 			foreach(array_unique(array_merge($assignees,$old_assignees)) as $assignee)
 			{
 				//error_log(__METHOD__."() assignee=$assignee, type=".$GLOBALS['egw']->accounts->get_type($assignee).", email=".$GLOBALS['egw']->accounts->id2name($assignee,'account_email'));
-				if (!$assignee) continue;
+				if (!$assignee)
+				{
+					continue;
+				}
 
 				// item assignee is a user
 				if ($GLOBALS['egw']->accounts->get_type($assignee) == 'u')
@@ -600,10 +667,13 @@ 
 					if (($email = $GLOBALS['egw']->accounts->id2name($assignee,'account_email')) && !in_array($email, $email_sent))
 					{
 						if ($this->send_notification($data,$old,$email,$assignee,'notify_assigned',
-							in_array($assignee,$assignees) !== in_array($assignee,$old_assignees) || $deleted))	// assignment changed
+							in_array($assignee,$assignees) !== in_array($assignee,$old_assignees) || $deleted))
+						{
+							// assignment changed
 						{
 							$email_sent[] = $email;
 						}
+						}
 					}
 				}
 				else	// item assignee is a group
@@ -613,10 +683,13 @@ 
 						if (($email = $GLOBALS['egw']->accounts->id2name($u,'account_email')) && !in_array($email, $email_sent))
 						{
 							if ($this->send_notification($data,$old,$email,$u,'notify_assigned',
-								in_array($u,$assignees) !== in_array($u,$old_assignees) || $deleted))	// assignment changed
+								in_array($u,$assignees) !== in_array($u,$old_assignees) || $deleted))
+							{
+								// assignment changed
 							{
 								$email_sent[] = $email;
 							}
+							}
 						}
 					}
 				}
@@ -679,25 +752,38 @@ 
 	public function send_notification($data,$old,$email,$user_or_lang,$check=null,$assignment_changed=true,$deleted=null)
 	{
 		//error_log(__METHOD__."(,,'$email',$user_or_lang,$check,$assignment_changed,$deleted)");
-		if (!$email) return false;
+		if (!$email)
+		{
+			return false;
+		}
 
 		$save_user = $GLOBALS['egw_info']['user'];
 		$do_notify = true;
 
-		if (is_numeric($user_or_lang))	// user --> read everything from his prefs
+		if (is_numeric($user_or_lang))
+		{
+			// user --> read everything from his prefs
 		{
 			$GLOBALS['egw_info']['user']['account_id'] = $user_or_lang;
+		}
 			$GLOBALS['egw']->preferences->__construct($user_or_lang);
 			$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->read_repository(false);	// no session prefs!
 
-			if ($check && $this->check2pref) $check = $this->check2pref[$check];
+			if ($check && $this->check2pref)
+			{
+				$check = $this->check2pref[$check];
+			}
 
 			if ($check && !$GLOBALS['egw_info']['user']['preferences'][$this->app][$check] ||	// no notification requested
 				// only notification about changed assignment requested
 				$check && $GLOBALS['egw_info']['user']['preferences'][$this->app][$check] === 'assignment' && !$assignment_changed ||
-				$this->user == $user_or_lang && !$this->notify_current_user)  // no popup for own actions
+				$this->user == $user_or_lang && !$this->notify_current_user)
 			{
-				$do_notify = false;	// no notification requested / necessary
+				// no popup for own actions
+			{
+				$do_notify = false;
+			}
+			// no notification requested / necessary
 			}
 		}
 		else
@@ -706,10 +792,13 @@ 
 			$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->default_prefs();
 			$GLOBALS['egw_info']['user']['preferences']['common']['lang'] = $user_or_lang;
 		}
-		if ($GLOBALS['egw_info']['user']['preferences']['common']['lang'] != Api\Translation::$userlang)	// load the right language if needed
+		if ($GLOBALS['egw_info']['user']['preferences']['common']['lang'] != Api\Translation::$userlang)
+		{
+			// load the right language if needed
 		{
 			Api\Translation::init();
 		}
+		}
 
 		$receiver = is_numeric($user_or_lang) ? $user_or_lang : $email;
 
@@ -813,7 +902,10 @@ 
 			$do_time = ($timestamp->format('Hi') != '0000');
 		}
 		$format = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'];
-		if ($do_time) $format .= ' '.($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] != 12 ? 'H:i' : 'h:i a');
+		if ($do_time)
+		{
+			$format .= ' '.($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] != 12 ? 'H:i' : 'h:i a');
+		}
 
 		return $timestamp->format($format);
 	}
@@ -843,9 +935,12 @@ 
 		{
 			$name = $GLOBALS['egw']->accounts->id2name($this->user,'account_fullname');
 
-			if($prefer_id) {
+			if($prefer_id)
+			{
 				$sender = $this->user;
-			} else {
+			}
+			else
+			{
 				$sender = $name ? $name.' <'.$email.'>' : $email;
 			}
 		}
@@ -947,7 +1042,10 @@ 
 			// remove the session-id in the notification mail!
 			$link = preg_replace('/(sessionid|kp3|domain)=[^&]+&?/','',$link);
 
-			if ($popup) $link .= '&nopopup=1';
+			if ($popup)
+			{
+				$link .= '&nopopup=1';
+			}
 		}
 		//error_log(__METHOD__."(..., $allow_popup, $receiver) returning ".array2string($allow_popup ? array($link,$popup) : $link));
 		return $allow_popup ? array($link,$popup) : $link;
@@ -1022,7 +1120,11 @@ 
 			// if both values are '', 0 or null, we count them as equal too
 			$modified = $old && $data[$name] != $old[$name] && !(!$data[$name] && !$old[$name]);
 			//if ($modified) error_log("data[$name]=".print_r($data[$name],true).", old[$name]=".print_r($old[$name],true)." --> modified=".(int)$modified);
-			if (empty($detail['value']) && !$modified) continue;	// skip unchanged, empty values
+			if (empty($detail['value']) && !$modified)
+			{
+				continue;
+			}
+			// skip unchanged, empty values
 
 			$body .= $this->format_line($html_email,$detail['type'],$modified,
 				$detail['label'] ? $detail['label'] : '', $detail['value']);
@@ -1056,7 +1158,11 @@ 
 
 		if ($html_mail)
 		{
-			if (!$this->html_content_allow) $line = Api\Html::htmlspecialchars($line);	// XSS
+			if (!$this->html_content_allow)
+			{
+				$line = Api\Html::htmlspecialchars($line);
+			}
+			// XSS
 
 			$color = $modified ? 'red' : false;
 			$size  = '110%';
@@ -1095,15 +1201,24 @@ 
 		}
 		else	// text-mail
 		{
-			if ($type == 'reply') $content = str_repeat('-',64)."\n";
+			if ($type == 'reply')
+			{
+				$content = str_repeat('-',64)."\n";
+			}
 
-			if ($modified) $content .= '> ';
+			if ($modified)
+			{
+				$content .= '> ';
+			}
 		}
 		$content .= $line;
 
 		if ($html_mail)
 		{
-			if ($line && $data) $content .= '</td><td style="'.$style.'">';
+			if ($line && $data)
+			{
+				$content .= '</td><td style="'.$style.'">';
+			}
 			if ($type == 'link')
 			{
 				// the link is often too long for html boxes chunk-split allows to break lines if needed
@@ -1122,7 +1237,10 @@ 
 		{
 			$content .= ($content&&$data?': ':'').$data;
 		}
-		if ($html_mail) $content .= '</td></tr>';
+		if ($html_mail)
+		{
+			$content .= '</td></tr>';
+		}
 
 		$content .= "\n";
 

api/src/Translation.php

Doc Comments +1 added lines, -1 removed lines

@@ -742,7 +742,7 @@
 	 *
 	 * @param string $app application name
 	 * @param string $lang language code
-	 * @return the full path of the filename for the requested app and language
+	 * @return string full path of the filename for the requested app and language
 	 */
 	static function get_lang_file($app,$lang)
 	{

Indentation +13 added lines, -13 removed lines

@@ -738,12 +738,12 @@ 
 	}
 
  	/**
-	 * provides centralization and compatibility to locate the lang files
-	 *
-	 * @param string $app application name
-	 * @param string $lang language code
-	 * @return the full path of the filename for the requested app and language
-	 */
+ 	 * provides centralization and compatibility to locate the lang files
+ 	 *
+ 	 * @param string $app application name
+ 	 * @param string $lang language code
+ 	 * @return the full path of the filename for the requested app and language
+ 	 */
 	static function get_lang_file($app,$lang)
 	{
 		if ($app == 'common') $app = 'phpgwapi';
@@ -1074,13 +1074,13 @@ 
 	}
 
  	/**
-	 * detect_encoding - try to detect the encoding
-	 *    only to be used if the string in question has no structure that determines his encoding
-	 *
-	 * @param string - to be evaluated
-	 * @param string $verify =null encoding to verify, get checked first and have a match for only ascii or no detection available
-	 * @return string - encoding
-	 */
+ 	 * detect_encoding - try to detect the encoding
+ 	 *    only to be used if the string in question has no structure that determines his encoding
+ 	 *
+ 	 * @param string - to be evaluated
+ 	 * @param string $verify =null encoding to verify, get checked first and have a match for only ascii or no detection available
+ 	 * @return string - encoding
+ 	 */
 	static function detect_encoding($string, $verify=null)
 	{
 		if (function_exists('iconv'))

Spacing +100 added lines, -100 removed lines

@@ -99,7 +99,7 @@ 
 	 *
 	 * @var array
 	 */
-	static $instance_specific_translations = array('loginscreen','mainscreen','custom');
+	static $instance_specific_translations = array('loginscreen', 'mainscreen', 'custom');
 
 	/**
 	 * returns the charset to use (!$lang) or the charset of the lang-files or $lang
@@ -107,7 +107,7 @@ 
 	 * @param string|boolean $lang =False return charset of the active user-lang, or $lang if specified
 	 * @return string charset
 	 */
-	static function charset($lang=False)
+	static function charset($lang = False)
 	{
 		static $charsets = array();
 
@@ -115,11 +115,11 @@ 
 		{
 			if (!isset($charsets[$lang]))
 			{
-				if (!($charsets[$lang] = self::$db->select(self::LANG_TABLE,'content',array(
+				if (!($charsets[$lang] = self::$db->select(self::LANG_TABLE, 'content', array(
 					'lang'		=> $lang,
 					'message_id'=> 'charset',
 					'app_name'	=> 'common',
-				),__LINE__,__FILE__)->fetchColumn()))
+				), __LINE__, __FILE__)->fetchColumn()))
 				{
 					$charsets[$lang] = 'utf-8';
 				}
@@ -153,7 +153,7 @@ 
 	 *
 	 * @param boolean $load_translations =true should we also load translations for common and currentapp
 	 */
-	static function init($load_translations=true)
+	static function init($load_translations = true)
 	{
 		if (!isset(self::$db))
 		{
@@ -165,11 +165,11 @@ 
 		}
 		else
 		{
-			self::$system_charset =& $GLOBALS['egw_setup']->system_charset;
+			self::$system_charset = & $GLOBALS['egw_setup']->system_charset;
 		}
 		if ((self::$mbstring = check_load_extension('mbstring')))
 		{
-			if(!empty(self::$system_charset))
+			if (!empty(self::$system_charset))
 			{
 				$ini_default_charset = version_compare(PHP_VERSION, '5.6', '<') ? 'mbstring.internal_encoding' : 'default_charset';
 				ini_set($ini_default_charset, self::$system_charset);
@@ -178,7 +178,7 @@ 
 
 		// try loading load_via from tree-wide cache and check if it contains more rules
 		if (($load_via = Cache::getTree(__CLASS__, 'load_via')) &&
-			$load_via >= self::$load_via && 	// > for array --> contains more elements
+			$load_via >= self::$load_via && // > for array --> contains more elements
 			// little sanity check: cached array contains all stock keys, otherwise ignore it
 			!array_diff_key(self::$load_via, $load_via))
 		{
@@ -217,13 +217,13 @@ 
 	 * @param string $not_found ='*' what to add to not found phrases, default '*'
 	 * @return string with translation
 	 */
-	static function translate($key, $vars=null, $not_found='' )
+	static function translate($key, $vars = null, $not_found = '')
 	{
 		if (!self::$lang_arr)
 		{
 			self::init();
 		}
-		$ret = $key;				// save key if we dont find a translation
+		$ret = $key; // save key if we dont find a translation
 		if ($not_found) $ret .= $not_found;
 
 		if (isset(self::$lang_arr[$key]))
@@ -243,16 +243,16 @@ 
 		{
 			if (count($vars) > 1)
 			{
-				static $placeholders = array('%3','%2','%1','|%2|','|%3|','%4','%5','%6','%7','%8','%9','%10');
+				static $placeholders = array('%3', '%2', '%1', '|%2|', '|%3|', '%4', '%5', '%6', '%7', '%8', '%9', '%10');
 				// to cope with $vars[0] containing '%2' (eg. an urlencoded path like a referer),
 				// we first replace '%2' in $ret with '|%2|' and then use that as 2. placeholder
 				// we do that for %3 as well, ...
-				$vars = array_merge(array('|%3|','|%2|'),$vars);	// push '|%2|' (and such) as first replacement on $vars
-				$ret = str_replace($placeholders,$vars,$ret);
+				$vars = array_merge(array('|%3|', '|%2|'), $vars); // push '|%2|' (and such) as first replacement on $vars
+				$ret = str_replace($placeholders, $vars, $ret);
 			}
 			else
 			{
-				$ret = str_replace('%1',$vars[0],$ret);
+				$ret = str_replace('%1', $vars[0], $ret);
 			}
 		}
 		return $ret;
@@ -267,14 +267,14 @@ 
 	 * 	if multiple names given, they are requested in one request from cache and loaded in given order
 	 * @param string $lang =false 2 or 5 char lang-code or false for the users language
 	 */
-	static function add_app($apps, $lang=null)
+	static function add_app($apps, $lang = null)
 	{
 		//error_log(__METHOD__."(".array2string($apps).", $lang) count(self::\$lang_arr)=".count(self::$lang_arr));
 		//$start = microtime(true);
 		if (!$lang) $lang = self::$userlang;
 		$tree_level = $instance_level = array();
 		if (!is_array($apps)) $apps = (array)$apps;
-		foreach($apps as $key => $app)
+		foreach ($apps as $key => $app)
 		{
 			if (!isset(self::$loaded_apps[$app]) || self::$loaded_apps[$app] != $lang && $app != 'common')
 			{
@@ -298,26 +298,26 @@ 
 
 		// merging loaded translations together
 		$updated_load_via = false;
-		foreach((array)$apps as $app)
+		foreach ((array)$apps as $app)
 		{
 			$l = $app == 'custom' ? 'en' : $lang;
 			if (isset($tree_level[$app.':'.$l]))
 			{
-				$loaded =& $tree_level[$app.':'.$l];
+				$loaded = & $tree_level[$app.':'.$l];
 			}
 			elseif (isset($instance_level[$app.':'.$l]))
 			{
-				$loaded =& $instance_level[$app.':'.$l];
+				$loaded = & $instance_level[$app.':'.$l];
 			}
 			else
 			{
 				if (($instance_specific = in_array($app, self::$instance_specific_translations)))
 				{
-					$loaded =& self::load_app($app, $l);
+					$loaded = & self::load_app($app, $l);
 				}
 				else
 				{
-					$loaded =& self::load_app_files($app, $l, null, $updated_load_via);
+					$loaded = & self::load_app_files($app, $l, null, $updated_load_via);
 				}
 				//error_log(__METHOD__."('$app', '$lang') instance_specific=$instance_specific, load_app(_files)() returned ".(is_array($loaded)?'Array('.count($loaded).')':array2string($loaded)));
 				if ($loaded || $instance_specific)
@@ -330,14 +330,14 @@ 
 			if ($loaded)
 			{
 				self::$lang_arr = array_merge(self::$lang_arr, $loaded);
-				self::$loaded_apps[$app] = $l;	// dont set something not existing to $loaded_apps, no need to load client-side
+				self::$loaded_apps[$app] = $l; // dont set something not existing to $loaded_apps, no need to load client-side
 			}
 		}
 		// Re-merge custom over instance level, they have higher precidence
-		if($tree_level && !$instance_level && self::$instance_specific_translations)
+		if ($tree_level && !$instance_level && self::$instance_specific_translations)
 		{
 			$custom = Cache::getInstance(__CLASS__, 'custom:en');
-			if($custom)
+			if ($custom)
 			{
 				self::$lang_arr = array_merge(self::$lang_arr, $custom);
 			}
@@ -358,15 +358,15 @@ 
 	 * @param string $lang =false 2 or 5 char lang-code or false for the users language
 	 * @return array the loaded strings
 	 */
-	static function &load_app($app,$lang)
+	static function &load_app($app, $lang)
 	{
 		//$start = microtime(true);
 		if (is_null(self::$db)) self::init(false);
 		$loaded = array();
-		foreach(self::$db->select(self::LANG_TABLE,'message_id,content',array(
+		foreach (self::$db->select(self::LANG_TABLE, 'message_id,content', array(
 			'lang'		=> $lang,
 			'app_name'	=> $app,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
 			$loaded[strtolower($row['message_id'])] = $row['content'];
 		}
@@ -390,7 +390,7 @@ 
 		'sitemgr-link' => array('sitemgr'),
 		'groupdav' => array('api'),
 		'developer_tools' => array('etemplate'),
-		'login' => array('api','registration'),
+		'login' => array('api', 'registration'),
 	);
 
 	/**
@@ -402,7 +402,7 @@ 
 	{
 		$lang = $GLOBALS['egw_info']['user']['preferences']['common']['lang'];
 		$apps = array_keys($GLOBALS['egw_info']['apps']);
-		foreach($apps as $app)
+		foreach ($apps as $app)
 		{
 			$file = self::get_lang_file($app, $lang);
 			// check if file has changed compared to what's cached
@@ -432,7 +432,7 @@ 
 		Cache::unsetTree(__CLASS__, $app.':'.$lang);
 		Cache::unsetTree(__CLASS__, self::get_lang_file($app, $lang));
 
-		foreach(self::$load_via as $load => $via)
+		foreach (self::$load_via as $load => $via)
 		{
 			//error_log("load_via[load='$load'] = via = ".array2string($via));
 			if ($via === 'all-apps' || in_array($app, (array)$via))
@@ -454,7 +454,7 @@ 
 	 * @param string $_lang =null
 	 * @return array $lang or $app => number pairs
 	 */
-	static function statistics($_lang=null)
+	static function statistics($_lang = null)
 	{
 		$cache = Cache::getTree(__CLASS__, 'statistics');
 
@@ -465,7 +465,7 @@ 
 			{
 				$en_phrases = array_keys(self::load_app_files(null, 'en', 'all-apps'));
 				$cache['']['en'] = count($en_phrases);
-				foreach(array_keys(self::get_available_langs()) as $lang)
+				foreach (array_keys(self::get_available_langs()) as $lang)
 				{
 					if ($lang == 'en') continue;
 					$lang_phrases = array_keys(self::load_app_files(null, $lang, 'all-apps'));
@@ -476,7 +476,7 @@ 
 			else
 			{
 				$cache['en'] = array();
-				foreach(scandir(EGW_SERVER_ROOT) as $app)
+				foreach (scandir(EGW_SERVER_ROOT) as $app)
 				{
 					if ($app[0] == '.' || !is_dir(EGW_SERVER_ROOT.'/'.$app) ||
 						!file_exists(self::get_lang_file($app, 'en')))
@@ -514,7 +514,7 @@ 
 		if (!in_array($_app, self::$instance_specific_translations))
 		{
 			// 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));
+			$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);
 
@@ -534,7 +534,7 @@ 
 	 * @param type $time
 	 * @return type
 	 */
-	static function max_lang_time($time=null)
+	static function max_lang_time($time = null)
 	{
 		static $max_lang_time = null;
 
@@ -545,7 +545,7 @@ 
 		if (isset($time) && $time > $max_lang_time)
 		{
 			//error_log(__METHOD__."($time) updating previous max_lang_time=$max_lang_time to $time");
-			Cache::setTree(__CLASS__, 'max_lang_time', $max_lang_time=$time);
+			Cache::setTree(__CLASS__, 'max_lang_time', $max_lang_time = $time);
 		}
 		return $max_lang_time;
 	}
@@ -561,34 +561,34 @@ 
 	 * @param boolean $updated_load_via =false on return true if self::$load_via was updated
 	 * @return array the loaded strings
 	 */
-	static function &load_app_files($app, $lang, $just_app_file=null, &$updated_load_via=false)
+	static function &load_app_files($app, $lang, $just_app_file = null, &$updated_load_via = false)
 	{
 		//$start = microtime(true);
 		$load_app = isset($just_app_file) ? $just_app_file : (isset(self::$load_via[$app]) ? self::$load_via[$app] : $app);
 		$loaded = array();
-		foreach($load_app == 'all-apps' ? scandir(EGW_SERVER_ROOT) : (array)$load_app as $app_dir)
+		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)) ||
+				!@file_exists($file = self::get_lang_file($app_dir, $lang)) ||
 				!($f = fopen($file, 'r')))
 			{
 				continue;
 			}
 			// store ctime of file we parse
-			Cache::setTree(__CLASS__, $file, $time=filemtime($file));
+			Cache::setTree(__CLASS__, $file, $time = filemtime($file));
 			self::max_lang_time($time);
 
 			$line_nr = 0;
 			//use fgets and split the line, as php5.3.3 with squeeze does not support splitting lines with fgetcsv while reading properly
 			//if the first letter after the delimiter is a german umlaut (UTF8 representation thereoff)
 			//while(($line = fgetcsv($f, 1024, "\t")))
-			while(($read = fgets($f)))
+			while (($read = fgets($f)))
 			{
 				$line = explode("\t", trim($read));
 				++$line_nr;
 				if (count($line) != 4) continue;
-				list($l_id,$l_app,$l_lang,$l_translation) = $line;
+				list($l_id, $l_app, $l_lang, $l_translation) = $line;
 				if ($l_lang != $lang) continue;
 				if (!isset($just_app_file) && $l_app != $app)
 				{
@@ -629,7 +629,7 @@ 
 			// little sanity check: cached array contains all stock keys, otherwise ignore it
 			!array_diff_key(self::$load_via, $load_via))
 		{
-			foreach($load_via as $app => $via)
+			foreach ($load_via as $app => $via)
 			{
 				if (self::$load_via[$app] != $via)
 				{
@@ -655,15 +655,15 @@ 
 	 * @param boolean $force_read =false force a re-read of the languages
 	 * @return array with lang-code => descriptiv lang-name pairs
 	 */
-	static function get_available_langs($translate=true, $force_read=false)
+	static function get_available_langs($translate = true, $force_read = false)
 	{
 		if (!is_array(self::$langs) || $force_read)
 		{
-			if (!($f = fopen($file=EGW_SERVER_ROOT.'/setup/lang/languages','rb')))
+			if (!($f = fopen($file = EGW_SERVER_ROOT.'/setup/lang/languages', 'rb')))
 			{
 				throw new Exception("List of available languages (%1) missing!", $file);
 			}
-			while(($line = fgetcsv($f, null, "\t")))
+			while (($line = fgetcsv($f, null, "\t")))
 			{
 				self::$langs[$line[0]] = $line[1];
 			}
@@ -673,12 +673,12 @@ 
 			{
 				if (is_null(self::$db)) self::init(false);
 
-				foreach(self::$langs as $lang => $name)
+				foreach (self::$langs as $lang => $name)
 				{
-					self::$langs[$lang] = self::translate($name,False,'');
+					self::$langs[$lang] = self::translate($name, False, '');
 				}
 			}
-			uasort(self::$langs,'strcasecmp');
+			uasort(self::$langs, 'strcasecmp');
 		}
 		return self::$langs;
 	}
@@ -691,7 +691,7 @@ 
 	 * @param boolean $force_read =false force a re-read of the languages
 	 * @return array with lang-code => descriptiv lang-name pairs
 	 */
-	static function get_installed_langs($force_read=false)
+	static function get_installed_langs($force_read = false)
 	{
 		return self::get_available_langs($force_read);
 	}
@@ -708,7 +708,7 @@ 
 		{
 			return self::$langs[$lang];
 		}
-		return self::$db->select(self::LANGUAGES_TABLE,'lang_name',array('lang_id' => $lang),__LINE__,__FILE__)->fetchColumn();
+		return self::$db->select(self::LANGUAGES_TABLE, 'lang_name', array('lang_id' => $lang), __LINE__, __FILE__)->fetchColumn();
 	}
 
 	/**
@@ -717,20 +717,20 @@ 
 	 * @param boolean $force_read =false
 	 * @return array with lang_id => lang_name pairs
 	 */
-	static function list_langs($force_read=false)
+	static function list_langs($force_read = false)
 	{
 		if (!$force_read)
 		{
-			return Cache::getInstance(__CLASS__,'list_langs',array(__CLASS__,'list_langs'),array(true));
+			return Cache::getInstance(__CLASS__, 'list_langs', array(__CLASS__, 'list_langs'), array(true));
 		}
-		$languages = self::get_installed_langs();	// available languages
-		$availible = "('".implode("','",array_keys($languages))."')";
+		$languages = self::get_installed_langs(); // available languages
+		$availible = "('".implode("','", array_keys($languages))."')";
 
 		// this shows first the installed, then the available and then the rest
-		foreach(self::$db->select(self::LANGUAGES_TABLE,array(
-			'lang_id','lang_name',
+		foreach (self::$db->select(self::LANGUAGES_TABLE, array(
+			'lang_id', 'lang_name',
 			"CASE WHEN lang_id IN $availible THEN 1 ELSE 0 END AS availible",
-		),"lang_id NOT IN ('".implode("','",array_keys($languages))."')",__LINE__,__FILE__,false,' ORDER BY availible DESC,lang_name') as $row)
+		), "lang_id NOT IN ('".implode("','", array_keys($languages))."')", __LINE__, __FILE__, false, ' ORDER BY availible DESC,lang_name') as $row)
 		{
 			$languages[$row['lang_id']] = $row['lang_name'];
 		}
@@ -744,7 +744,7 @@ 
 	 * @param string $lang language code
 	 * @return the full path of the filename for the requested app and language
 	 */
-	static function get_lang_file($app,$lang)
+	static function get_lang_file($app, $lang)
 	{
 		if ($app == 'common') $app = 'phpgwapi';
 		return EGW_SERVER_ROOT.'/'.$app.'/'.self::LANG_DIR.'/'.self::LANGFILE_PREFIX.$lang.self::LANGFILE_EXTENSION;
@@ -757,7 +757,7 @@ 
 	 */
 	static function get_installed_charsets()
 	{
-		static $charsets=null;
+		static $charsets = null;
 
 		if (!isset($charsets))
 		{
@@ -787,13 +787,13 @@ 
 		static $extra = array(
 			'&szlig;' => 'ss',
 		);
-		$entities = htmlentities($_str,ENT_QUOTES,self::charset());
+		$entities = htmlentities($_str, ENT_QUOTES, self::charset());
 
-		$estr = str_replace(array_keys($extra),array_values($extra), $entities);
-		$ustr = preg_replace('/&([aAuUoO])uml;/','\\1e', $estr);	// replace german umlauts with the letter plus one 'e'
-		$astr = preg_replace('/&([a-zA-Z])(grave|acute|circ|ring|cedil|tilde|slash|uml);/','\\1', $ustr);	// remove all types of accents
+		$estr = str_replace(array_keys($extra), array_values($extra), $entities);
+		$ustr = preg_replace('/&([aAuUoO])uml;/', '\\1e', $estr); // replace german umlauts with the letter plus one 'e'
+		$astr = preg_replace('/&([a-zA-Z])(grave|acute|circ|ring|cedil|tilde|slash|uml);/', '\\1', $ustr); // remove all types of accents
 
-		return preg_replace('/&([a-zA-Z]+|#[0-9]+|);/','', $astr);	// remove all other entities
+		return preg_replace('/&([a-zA-Z]+|#[0-9]+|);/', '', $astr); // remove all other entities
 	}
 
 	/**
@@ -805,7 +805,7 @@ 
 	 * @param boolean $check_to_from =true internal to bypass all charset replacements
 	 * @return string|array converted string(s) from $data
 	 */
-	static function convert($data,$from=False,$to=False,$check_to_from=true)
+	static function convert($data, $from = False, $to = False, $check_to_from = true)
 	{
 		if ($check_to_from)
 		{
@@ -816,7 +816,7 @@ 
 			if (!$from)
 			{
 				$from = self::$mbstring ? strtolower(mb_detect_encoding($data)) : 'iso-8859-1';
-				if($from == 'ascii')
+				if ($from == 'ascii')
 				{
 					$from = 'iso-8859-1';
 				}
@@ -826,7 +826,7 @@ 
 				 php does not seem to support gb2312
 				 but seems to be able to decode it as EUC-CN
 			*/
-			switch($from)
+			switch ($from)
 			{
 				case 'ks_c_5601-1987':
 					$from = 'CP949';
@@ -872,9 +872,9 @@ 
 		}
 		if (is_array($data))
 		{
-			foreach($data as $key => $str)
+			foreach ($data as $key => $str)
 			{
-				$ret[$key] = self::convert($str,$from,$to,false);	// false = bypass the above checks, as they are already done
+				$ret[$key] = self::convert($str, $from, $to, false); // false = bypass the above checks, as they are already done
 			}
 			return $ret;
 		}
@@ -886,7 +886,7 @@ 
 		{
 			return utf8_decode($data);
 		}
-		if (self::$mbstring && !$prefer_iconv && ($data = @mb_convert_encoding($data,$to,$from)) != '')
+		if (self::$mbstring && !$prefer_iconv && ($data = @mb_convert_encoding($data, $to, $from)) != '')
 		{
 			return $data;
 		}
@@ -914,12 +914,12 @@ 
 			// in an email on the first Traditional/Japanese/Korean character,
 			// but in reality when people send mails in GB2312, UMA mostly use
 			// extended GB13000/GB18030 which allow T/Jap/Korean characters.
-			if($from == 'euc-cn')
+			if ($from == 'euc-cn')
 			{
 				$from = 'gb18030';
 			}
 
-			if (($convertedData = iconv($from,$to,$data)))
+			if (($convertedData = iconv($from, $to, $data)))
 			{
 				return $convertedData;
 			}
@@ -934,9 +934,9 @@ 
 	 * @param string|boolean $from charset $data is in or False if it should be detected
 	 * @return string|array converted string(s) from $data
 	 */
-	static function convert_jsonsafe($_data,$from=False)
+	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));
 
@@ -945,12 +945,12 @@ 
 		{
 			$test = @json_encode($data);
 			//error_log(__METHOD__.__LINE__.' ->'.strlen($data).' Error:'.json_last_error().'<- data:#'.$test.'#');
-			if (($test=="null" || $test === false || is_null($test)) && strlen($data)>0)
+			if (($test == "null" || $test === false || is_null($test)) && strlen($data) > 0)
 			{
 				// try to fix broken utf8
-				$x = (function_exists('mb_convert_encoding')?mb_convert_encoding($data,'UTF-8','UTF-8'):(function_exists('iconv')?@iconv("UTF-8","UTF-8//IGNORE",$data):$data));
+				$x = (function_exists('mb_convert_encoding') ? mb_convert_encoding($data, 'UTF-8', 'UTF-8') : (function_exists('iconv') ? @iconv("UTF-8", "UTF-8//IGNORE", $data) : $data));
 				$test = @json_encode($x);
-				if (($test=="null" || $test === false || is_null($test)) && strlen($data)>0)
+				if (($test == "null" || $test === false || is_null($test)) && strlen($data) > 0)
 				{
 					// this should not be needed, unless something fails with charset detection/ wrong charset passed
 					error_log(__METHOD__.__LINE__.' Charset Reported:'.$from.' Charset Detected:'.self::detect_encoding($data));
@@ -973,36 +973,36 @@ 
 	 * @param string $message_id
 	 * @param string $content translation or null to delete translation
 	 */
-	static function write($lang,$app,$message_id,$content)
+	static function write($lang, $app, $message_id, $content)
 	{
 		if ($content)
 		{
-			self::$db->insert(self::LANG_TABLE,array(
+			self::$db->insert(self::LANG_TABLE, array(
 				'content' => $content,
-			),array(
+			), array(
 				'lang' => $lang,
 				'app_name' => $app,
 				'message_id' => $message_id,
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 		}
 		else
 		{
-			self::$db->delete(self::LANG_TABLE,array(
+			self::$db->delete(self::LANG_TABLE, array(
 				'lang' => $lang,
 				'app_name' => $app,
 				'message_id' => $message_id,
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 		}
 		// invalidate the cache
-		if(!in_array($app,self::$instance_specific_translations))
+		if (!in_array($app, self::$instance_specific_translations))
 		{
-			Cache::unsetCache(Cache::TREE,__CLASS__,$app.':'.$lang);
+			Cache::unsetCache(Cache::TREE, __CLASS__, $app.':'.$lang);
 		}
 		else
 		{
-			foreach(array_keys((array)self::get_installed_langs()) as $key)
+			foreach (array_keys((array)self::get_installed_langs()) as $key)
 			{
-				Cache::unsetCache(Cache::INSTANCE,__CLASS__,$app.':'.$key);
+				Cache::unsetCache(Cache::INSTANCE, __CLASS__, $app.':'.$key);
 			}
 		}
  	}
@@ -1015,13 +1015,13 @@ 
 	 * @param string $message_id
 	 * @return string|boolean content or false if not found
 	 */
-	static function read($lang,$app_name,$message_id)
+	static function read($lang, $app_name, $message_id)
 	{
-		return self::$db->select(self::LANG_TABLE,'content',array(
+		return self::$db->select(self::LANG_TABLE, 'content', array(
 			'lang' => $lang,
 			'app_name' => $app_name,
 			'message_id' => $message_id,
-		),__LINE__,__FILE__)->fetchColumn();
+		), __LINE__, __FILE__)->fetchColumn();
 	}
 
 	/**
@@ -1032,22 +1032,22 @@ 
 	 * @param string $lang ='' default check all langs
 	 * @return string
 	 */
-	static function get_message_id($translation,$app=null,$lang=null)
+	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;
 
-		$id = self::$db->select(self::LANG_TABLE,'message_id',$where,__LINE__,__FILE__)->fetchColumn();
+		$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)
+		if (!$id)
 		{
 			$ids = array_filter(array_keys(self::$lang_arr), function($haystack) use($translation) {
-				return stripos(self::$lang_arr[$haystack],$translation) !== false;
+				return stripos(self::$lang_arr[$haystack], $translation) !== false;
 			});
 			$id = array_shift($ids);
-			if(!$id && ($lang && $lang !== 'en' || self::$userlang != 'en'))
+			if (!$id && ($lang && $lang !== 'en' || self::$userlang != 'en'))
 			{
 				// Try english
 				if (in_array($app, self::$instance_specific_translations))
@@ -1064,7 +1064,7 @@ 
 				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) {
-					return stripos($lang_arr[$haystack],$translation) !== false;
+					return stripos($lang_arr[$haystack], $translation) !== false;
 				});
 				$id = array_shift($ids);
 			}
@@ -1081,7 +1081,7 @@ 
 	 * @param string $verify =null encoding to verify, get checked first and have a match for only ascii or no detection available
 	 * @return string - encoding
 	 */
-	static function detect_encoding($string, $verify=null)
+	static function detect_encoding($string, $verify = null)
 	{
 		if (function_exists('iconv'))
 		{
@@ -1104,7 +1104,7 @@ 
 		}
 		if ($verify && (!isset($detected) || $detected === 'ascii'))
 		{
-			return $verify;	// ascii matches all charsets
+			return $verify; // ascii matches all charsets
 		}
 		return isset($detected) ? $detected : 'iso-8859-1'; // we choose to return iso-8859-1 as default
 	}

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