EGroupware / egroupware

api/src/Mail/Imap.php

Doc Comments +7 added lines, -6 removed lines

@@ -140,7 +140,7 @@ 
 	 * Construtor
 	 *
 	 * @param array
-	 * @param bool|int|string $_adminConnection create admin connection if true or account_id or imap username
+	 * @param boolean|string $_adminConnection create admin connection if true or account_id or imap username
 	 * @param int $_timeout =null timeout in secs, if none given fmail pref or default of 20 is used
 	 * @return void
 	 */
@@ -564,7 +564,7 @@ 
 	 * Returns an array containing the names of the selected mailboxes
 	 *
 	 * @param   string  $reference          base mailbox to start the search (default is current mailbox)
-	 * @param   string  $restriction_search false or 0 means return all mailboxes
+	 * @param   integer  $restriction_search false or 0 means return all mailboxes
 	 *                                      true or 1 return only the mailbox that contains that exact name
 	 *                                      2 return all mailboxes in that hierarchy level
 	 * @param   string  $returnAttributes   true means return an assoc array containing mailbox names and mailbox attributes
@@ -648,7 +648,7 @@ 
 	 * Returns an array containing the names of the subscribed selected mailboxes
 	 *
 	 * @param   string  $reference          base mailbox to start the search
-	 * @param   string  $restriction_search false or 0 means return all mailboxes
+	 * @param   integer  $restriction_search false or 0 means return all mailboxes
 	 *                                      true or 1 return only the mailbox that contains that exact name
 	 *                                      2 return all mailboxes in that hierarchy level
 	 * @param   string  $returnAttributes   true means return an assoc array containing mailbox names and mailbox attributes
@@ -716,7 +716,7 @@ 
 	 * Returns an array containing the names of the selected unsubscribed mailboxes
 	 *
 	 * @param   string  $reference          base mailbox to start the search
-	 * @param   string  $restriction_search false or 0 means return all mailboxes
+	 * @param   integer  $restriction_search false or 0 means return all mailboxes
 	 *                                      true or 1 return only the mailbox that contains that exact name
 	 *                                      2 return all mailboxes in that hierarchy level
 	 *
@@ -894,6 +894,7 @@ 
 	 *
 	 * @var array $_nameSpace
 	 * @var string $_folderName
+	 * @param string $_folderName
 	 * @return string the prefix (may be an empty string)
 	 */
 	static function getFolderPrefixFromNamespace($_nameSpace, $_folderName)
@@ -912,7 +913,7 @@ 
 	 * @param string $_mailbox
 	 * @param string $delimiter
 	 * @param string $prefix
-	 * @param string $reclevel = 0, counter to keep track of the current recursionlevel
+	 * @param integer $reclevel = 0, counter to keep track of the current recursionlevel
 	 * @return array of mailboxes
 	 */
 	function getMailBoxesRecursive($_mailbox, $delimiter, $prefix, $reclevel=0)
@@ -1344,7 +1345,7 @@ 
 	/**
 	 * Get vacation message for given user
 	 *
-	 * @param int|string $_euser nummeric account_id or imap username
+	 * @param string|null $_euser nummeric account_id or imap username
 	 * @param string $_scriptName =null
 	 * @throws Exception on connection error or authentication failure
 	 * @return array

Switch Indentation +30 added lines, -30 removed lines

@@ -580,16 +580,16 @@ 
 		$mailbox = '';
 		if ( is_int( $restriction_search ) ){
 			switch ( $restriction_search ) {
-			case 0:
-				$searchstring = $reference."*";
-				break;
-			case 1:
-				$mailbox = $searchstring = $reference;
-				//$reference = '%';
-				break;
-			case 2:
-				$searchstring = $reference."%";
-				break;
+				case 0:
+					$searchstring = $reference."*";
+					break;
+				case 1:
+					$mailbox = $searchstring = $reference;
+					//$reference = '%';
+					break;
+				case 2:
+					$searchstring = $reference."%";
+					break;
 			}
 		}else{
 			if ( is_string( $restriction_search ) ){
@@ -664,16 +664,16 @@ 
 		$mailbox = '';
 		if ( is_int( $restriction_search ) ){
 			switch ( $restriction_search ) {
-			case 0:
-				$searchstring = $reference."*";
-				break;
-			case 1:
-				$mailbox = $searchstring = $reference;
-				//$reference = '%';
-				break;
-			case 2:
-				$searchstring = $reference."%";
-				break;
+				case 0:
+					$searchstring = $reference."*";
+					break;
+				case 1:
+					$mailbox = $searchstring = $reference;
+					//$reference = '%';
+					break;
+				case 2:
+					$searchstring = $reference."%";
+					break;
 			}
 		}else{
 			if ( is_string( $restriction_search ) ){
@@ -730,16 +730,16 @@ 
 
 		if ( is_int( $restriction_search ) ){
 			switch ( $restriction_search ) {
-			case 0:
-				$mailbox = $reference."*";
-				break;
-			case 1:
-				$mailbox = $reference;
-				$reference = '%';
-				break;
-			case 2:
-				$mailbox = "%";
-				break;
+				case 0:
+					$mailbox = $reference."*";
+					break;
+				case 1:
+					$mailbox = $reference;
+					$reference = '%';
+					break;
+				case 2:
+					$mailbox = "%";
+					break;
 			}
 		}else{
 			if ( is_string( $restriction_search ) ){

Spacing +135 added lines, -135 removed lines

@@ -66,7 +66,7 @@ 
 	static public $default_params = array(
 		//'debug' => '/tmp/imap.log', // uncomment to log communitcation with IMAP server
 		//'debug_literal' => true,    // uncomment to log mail contents returned by IMAP server
-		'cache' => true,              // default caching via Cache / Api\Cache
+		'cache' => true, // default caching via Cache / Api\Cache
 	);
 
 	/**
@@ -144,7 +144,7 @@ 
 	 * @param int $_timeout =null timeout in secs, if none given fmail pref or default of 20 is used
 	 * @return void
 	 */
-	function __construct(array $params, $_adminConnection=false, $_timeout=null)
+	function __construct(array $params, $_adminConnection = false, $_timeout = null)
 	{
 		if (function_exists('mb_convert_encoding'))
 		{
@@ -156,7 +156,7 @@ 
 		$this->loginType = $this->params['acc_imap_logintype'];
 		$this->domainName = $this->params['acc_domain'];
 
-		if (is_null($_timeout)) $_timeout = $this->params['acc_imap_timeout']?$this->params['acc_imap_timeout']:self::getTimeOut ();
+		if (is_null($_timeout)) $_timeout = $this->params['acc_imap_timeout'] ? $this->params['acc_imap_timeout'] : self::getTimeOut();
 
 		// Horde use locale for translation of error messages
 		Api\Preferences::setlocale(LC_MESSAGES);
@@ -175,7 +175,7 @@ 
 			'port' => $this->params['acc_imap_port'],
 			'secure' => Account::ssl2secure($this->params['acc_imap_ssl']),
 			'timeout' => $_timeout,
-		)+self::$default_params;
+		) + self::$default_params;
 
 		if ($parent_params['cache'] === true)
 		{
@@ -199,7 +199,7 @@ 
 				// as we have no way to tell this apart we ignore BINARY this affects
 				// Horde_Imap_Client_Fetch_Query::bodyPart for its fetch parameter decode=true is ignored
 				// (other functionality depending on BINARY is, of cause, affected too)
-				$parent_params['capability_ignore']= array_merge((array)$parent_params['capability_ignore'],array('BINARY'));
+				$parent_params['capability_ignore'] = array_merge((array)$parent_params['capability_ignore'], array('BINARY'));
 				break;
 		}
 		parent::__construct($parent_params);
@@ -212,7 +212,7 @@ 
 	 *
 	 * @param string $_username =true create an admin connection for given user or $this->acc_imap_username
 	 */
-	function adminConnection($_username=true)
+	function adminConnection($_username = true)
 	{
 		if ($this->isAdminConnection !== $_username)
 		{
@@ -229,7 +229,7 @@ 
 	 * @param string $_username =null create an admin connection for given user or $this->acc_imap_username
 	 * @throws Horde_IMAP_Client_Exception
 	 */
-	public function checkAdminConnection($_username=true)
+	public function checkAdminConnection($_username = true)
 	{
 		if ($this->acc_imap_administration)
 		{
@@ -246,7 +246,7 @@ 
 	 */
 	public function __get($name)
 	{
-		switch($name)
+		switch ($name)
 		{
 			case 'acc_imap_administration':
 				return !empty($this->params['acc_imap_admin_username']);
@@ -264,7 +264,7 @@ 
 				{
 					return $this->$name;
 				}
-				if (array_key_exists($name,$this->params))
+				if (array_key_exists($name, $this->params))
 				{
 					return $this->params[$name];
 				}
@@ -285,9 +285,9 @@ 
 	 * @deprecated allready called by constructor automatic, parameters must be passed to constructor!
 	 * @throws Api\Exception\WrongParameter
 	 */
-	function openConnection($_adminConnection=false, $_timeout=null)
+	function openConnection($_adminConnection = false, $_timeout = null)
 	{
-		unset($_timeout);	// not used
+		unset($_timeout); // not used
 		if ($_adminConnection !== $this->params['adminConnection'])
 		{
 			throw new Api\Exception\WrongParameter('need to set parameters on calling Account->imapServer()!');
@@ -300,7 +300,7 @@ 
 	 * @param string _use decide if the use is for IMAP or SIEVE, by now only the default differs
 	 * @return int - timeout (either set or default 20/10)
 	 */
-	static function getTimeOut($_use='IMAP')
+	static function getTimeOut($_use = 'IMAP')
 	{
 		$timeout = $GLOBALS['egw_info']['user']['preferences']['mail']['connectionTimeout'];
 		if (empty($timeout) || !($timeout > 0)) $timeout = $_use == 'SIEVE' ? 10 : 20; // this is the default value
@@ -325,7 +325,7 @@ 
 	 */
 	function addAccount($_hookValues)
 	{
-		unset($_hookValues);	// not used
+		unset($_hookValues); // not used
 		return true;
 	}
 
@@ -337,7 +337,7 @@ 
 	 */
 	function updateAccount($_hookValues)
 	{
-		unset($_hookValues);	// not used
+		unset($_hookValues); // not used
 		return true;
 	}
 
@@ -349,7 +349,7 @@ 
 	 */
 	function deleteAccount($_hookValues)
 	{
-		unset($_hookValues);	// not used
+		unset($_hookValues); // not used
 		return true;
 	}
 
@@ -366,7 +366,7 @@ 
 	 */
 	function encodeFolderName($_folderName)
 	{
-		if($this->mbAvailable) {
+		if ($this->mbAvailable) {
 			return mb_convert_encoding($_folderName, "UTF7-IMAP", Api\Translation::charset());
 		}
 
@@ -383,17 +383,17 @@ 
 	 */
 	function getMailbox($mailbox)
 	{
-		$mailboxes = $this->listMailboxes($mailbox,Horde_Imap_Client::MBOX_ALL);
-		if (empty($mailboxes)) $mailboxes = $this->listMailboxes($mailbox,Horde_Imap_Client::MBOX_UNSUBSCRIBED);
+		$mailboxes = $this->listMailboxes($mailbox, Horde_Imap_Client::MBOX_ALL);
+		if (empty($mailboxes)) $mailboxes = $this->listMailboxes($mailbox, Horde_Imap_Client::MBOX_UNSUBSCRIBED);
 		//error_log(__METHOD__.__LINE__.'->'.$mailbox.'/'.array2string($mailboxes));
 		$mboxes = new Horde_Imap_Client_Mailbox_List($mailboxes);
 		//_debug_array($mboxes->count());
 		foreach ($mboxes->getIterator() as $k =>$box)
 		{
 			//error_log(__METHOD__.__LINE__.'->'.$k);
-			if ($k!='user' && $k != '' && $k==$mailbox) return $box['mailbox']; //_debug_array(array($k => $client->status($k)));
+			if ($k != 'user' && $k != '' && $k == $mailbox) return $box['mailbox']; //_debug_array(array($k => $client->status($k)));
 		}
-		return ($this->mailboxExist($mailbox)?$mailbox:false);
+		return ($this->mailboxExist($mailbox) ? $mailbox : false);
 	}
 
 	/**
@@ -409,23 +409,23 @@ 
 			//error_log(__METHOD__.__LINE__.':'.$mailbox);
 			$currentMailbox = $this->currentMailbox();
 		}
-		catch(\Exception $e)
+		catch (\Exception $e)
 		{
 			//error_log(__METHOD__.__LINE__.' failed detecting currentMailbox:'.$currentMailbox.':'.$e->getMessage());
-			$currentMailbox=null;
+			$currentMailbox = null;
 			unset($e);
 		}
 		try
 		{
 			//error_log(__METHOD__.__LINE__.':'.$mailbox);
 			$this->openMailbox($mailbox);
-			$returnvalue=true;
+			$returnvalue = true;
 		}
-		catch(\Exception $e)
+		catch (\Exception $e)
 		{
 			//error_log(__METHOD__.__LINE__.' failed opening:'.$mailbox.':'.$e->getMessage().' Called by:'.function_backtrace());
 			unset($e);
-			$returnvalue=false;
+			$returnvalue = false;
 		}
 		if (!empty($currentMailbox) && $currentMailbox['mailbox'] != $mailbox)
 		{
@@ -434,7 +434,7 @@ 
 				//error_log(__METHOD__.__LINE__.':'.$currentMailbox .'<->'.$mailbox);
 				$this->openMailbox($currentMailbox['mailbox']);
 			}
-			catch(\Exception $e)
+			catch (\Exception $e)
 			{
 				//error_log(__METHOD__.__LINE__.' failed reopening:'.$currentMailbox.':'.$e->getMessage());
 				unset($e);
@@ -454,7 +454,7 @@ 
 		{
 			$mailbox = $this->currentMailbox();
 		}
-		catch(\Exception $e)
+		catch (\Exception $e)
 		{
 			error_log(__METHOD__.' ('.__LINE__.') failed fetching currentMailbox:'.$e->getMessage());
 			//throw new egw_exception(__METHOD__.' ('.__LINE__.") failed to ".__METHOD__." :".$e->getMessage());
@@ -472,16 +472,16 @@ 
 	 */
 	function getSpecialUseFolders()
 	{
-		$mailboxes = $this->getMailboxes('',0,true);
+		$mailboxes = $this->getMailboxes('', 0, true);
 		$suF = array();
 		foreach ($mailboxes as $box)
 		{
-			if ($box['MAILBOX']!='user' && $box['MAILBOX'] != '')
+			if ($box['MAILBOX'] != 'user' && $box['MAILBOX'] != '')
 			{
 				//error_log(__METHOD__.__LINE__.$k.'->'.array2string($box));
-				if (isset($box['ATTRIBUTES'])&&!empty($box['ATTRIBUTES'])&&
-					stripos(strtolower(array2string($box['ATTRIBUTES'])),'\noselect')=== false&&
-					stripos(strtolower(array2string($box['ATTRIBUTES'])),'\nonexistent')=== false)
+				if (isset($box['ATTRIBUTES']) && !empty($box['ATTRIBUTES']) &&
+					stripos(strtolower(array2string($box['ATTRIBUTES'])), '\noselect') === false &&
+					stripos(strtolower(array2string($box['ATTRIBUTES'])), '\nonexistent') === false)
 				{
 					$suF[$box['MAILBOX']] = $box;
 				}
@@ -503,7 +503,7 @@ 
 			$status = $this->status($mailbox);
 			foreach ($status as $key => $v)
 			{
-				$_status[strtoupper($key)]=$v;
+				$_status[strtoupper($key)] = $v;
 			}
 			return $_status;
 		}
@@ -521,9 +521,9 @@ 
 	 * @param ignoreStatusCache bool ignore the cache used for counters
 	 * @return array with counters
 	 */
-	function getStatus($mailbox, $ignoreStatusCache=false)
+	function getStatus($mailbox, $ignoreStatusCache = false)
 	{
-		$mailboxes = $this->listMailboxes($mailbox,Horde_Imap_Client::MBOX_ALL,array(
+		$mailboxes = $this->listMailboxes($mailbox, Horde_Imap_Client::MBOX_ALL, array(
 				'attributes'=>true,
 				'children'=>true, //child info
 				'delimiter'=>true,
@@ -537,16 +537,16 @@ 
 		//error_log(__METHOD__.__LINE__.array2string($mboxes->count()));
 		foreach ($mboxes->getIterator() as $k =>$box)
 		{
-			if ($k!='user' && $k != '' && $k==$mailbox)
+			if ($k != 'user' && $k != '' && $k == $mailbox)
 			{
-				if (stripos(array2string($box['attributes']),'\noselect')=== false)
+				if (stripos(array2string($box['attributes']), '\noselect') === false)
 				{
 					$status = $this->status($k, $flags);
 					foreach ($status as $key => $v)
 					{
-						$_status[strtoupper($key)]=$v;
+						$_status[strtoupper($key)] = $v;
 					}
-					$_status['HIERACHY_DELIMITER'] = $_status['delimiter'] = ($box['delimiter']?$box['delimiter']:$this->getDelimiter('personal'));
+					$_status['HIERACHY_DELIMITER'] = $_status['delimiter'] = ($box['delimiter'] ? $box['delimiter'] : $this->getDelimiter('personal'));
 					$_status['ATTRIBUTES'] = $box['attributes'];
 					//error_log(__METHOD__.__LINE__.$k.'->'.array2string($_status));
 					return $_status;
@@ -572,14 +572,14 @@ 
 	 *
 	 * @return  mixed   array of mailboxes
 	 */
-	function getMailboxes($reference = ''  , $restriction_search = 0, $returnAttributes = false)
+	function getMailboxes($reference = '', $restriction_search = 0, $returnAttributes = false)
 	{
-		if ( is_bool($restriction_search) ){
-			$restriction_search = (int) $restriction_search;
+		if (is_bool($restriction_search)) {
+			$restriction_search = (int)$restriction_search;
 		}
 		$mailbox = '';
-		if ( is_int( $restriction_search ) ){
-			switch ( $restriction_search ) {
+		if (is_int($restriction_search)) {
+			switch ($restriction_search) {
 			case 0:
 				$searchstring = $reference."*";
 				break;
@@ -591,8 +591,8 @@ 
 				$searchstring = $reference."%";
 				break;
 			}
-		}else{
-			if ( is_string( $restriction_search ) ){
+		} else {
+			if (is_string($restriction_search)) {
 				$mailbox = $searchstring = $restriction_search;
 			}
 		}
@@ -605,35 +605,35 @@ 
 				'special_use'=>true,
 				'sort'=>true,
 			);
-		if ($returnAttributes==false)
+		if ($returnAttributes == false)
 		{
 			unset($options['attributes']);
 			unset($options['children']);
 			unset($options['special_use']);
 		}
-		$mailboxes = $this->listMailboxes($searchstring,Horde_Imap_Client::MBOX_ALL, $options);
+		$mailboxes = $this->listMailboxes($searchstring, Horde_Imap_Client::MBOX_ALL, $options);
 		//$mboxes = new Horde_Imap_Client_Mailbox_List($mailboxes);
 		//_debug_array($mboxes->count());
 		foreach ((array)$mailboxes as $k =>$box)
 		{
 			//error_log(__METHOD__.__LINE__.' Box:'.$k.'->'.array2string($box));
-			$ret[$k]=array('MAILBOX'=>$k,'ATTRIBUTES'=>$box['attributes'],'delimiter'=>($box['delimiter']?$box['delimiter']:$this->getDelimiter('personal')),'SUBSCRIBED'=>true);
+			$ret[$k] = array('MAILBOX'=>$k, 'ATTRIBUTES'=>$box['attributes'], 'delimiter'=>($box['delimiter'] ? $box['delimiter'] : $this->getDelimiter('personal')), 'SUBSCRIBED'=>true);
 		}
 		// for unknown reasons on ALL, UNSUBSCRIBED are not returned
 		//always fetch unsubscribed, think about only fetching it when $options['attributes'] is set
 		//but then allMailboxes are not all, ....
 		//if (!empty($mailbox) && !isset($ret[$mailbox]))
 		{
-			$unsub_mailboxes = $this->listMailboxes($searchstring,Horde_Imap_Client::MBOX_UNSUBSCRIBED, $options);
+			$unsub_mailboxes = $this->listMailboxes($searchstring, Horde_Imap_Client::MBOX_UNSUBSCRIBED, $options);
 			//$mboxes = new Horde_Imap_Client_Mailbox_List($mailboxes);
 			//_debug_array($mboxes->count());
 			//error_log(__METHOD__.__LINE__.' '.$mailbox.':'.count((array)$mailboxes).'->'.function_backtrace());
 			foreach ((array)$unsub_mailboxes as $k =>$box)
 			{
 				//error_log(__METHOD__.__LINE__.' Box:'.$k.' already In?'.array_key_exists($k,$boxexists).'->'.array2string($box));
-				if(!array_key_exists($k,$ret))
+				if (!array_key_exists($k, $ret))
 				{
-					$ret[$k]=array('MAILBOX'=>$k,'ATTRIBUTES'=>$box['attributes'],'delimiter'=>($box['delimiter']?$box['delimiter']:$this->getDelimiter('personal')),'SUBSCRIBED'=>false);
+					$ret[$k] = array('MAILBOX'=>$k, 'ATTRIBUTES'=>$box['attributes'], 'delimiter'=>($box['delimiter'] ? $box['delimiter'] : $this->getDelimiter('personal')), 'SUBSCRIBED'=>false);
 				}
 				else
 				{
@@ -656,14 +656,14 @@ 
 	 *
 	 * @return  mixed   array of mailboxes
 	 */
-	function listSubscribedMailboxes($reference = ''  , $restriction_search = 0, $returnAttributes = false)
+	function listSubscribedMailboxes($reference = '', $restriction_search = 0, $returnAttributes = false)
 	{
-		if ( is_bool($restriction_search) ){
-			$restriction_search = (int) $restriction_search;
+		if (is_bool($restriction_search)) {
+			$restriction_search = (int)$restriction_search;
 		}
 		$mailbox = '';
-		if ( is_int( $restriction_search ) ){
-			switch ( $restriction_search ) {
+		if (is_int($restriction_search)) {
+			switch ($restriction_search) {
 			case 0:
 				$searchstring = $reference."*";
 				break;
@@ -675,8 +675,8 @@ 
 				$searchstring = $reference."%";
 				break;
 			}
-		}else{
-			if ( is_string( $restriction_search ) ){
+		} else {
+			if (is_string($restriction_search)) {
 				$mailbox = $searchstring = $restriction_search;
 			}
 		}
@@ -688,25 +688,25 @@ 
 				'special_use'=>true,
 				'sort'=>true,
 			);
-		if ($returnAttributes==false)
+		if ($returnAttributes == false)
 		{
 			unset($options['attributes']);
 			unset($options['children']);
 			unset($options['special_use']);
 		}
-		$mailboxes = $this->listMailboxes($searchstring,Horde_Imap_Client::MBOX_SUBSCRIBED_EXISTS, $options);
+		$mailboxes = $this->listMailboxes($searchstring, Horde_Imap_Client::MBOX_SUBSCRIBED_EXISTS, $options);
 		//$mboxes = new Horde_Imap_Client_Mailbox_List($mailboxes);
 		//_debug_array($mboxes->count());
 		foreach ((array)$mailboxes as $k =>$box)
 		{
 			//error_log(__METHOD__.__LINE__.' Searched for:'.$mailbox.' got Box:'.$k.'->'.array2string($box).function_backtrace());
-			if ($returnAttributes==false)
+			if ($returnAttributes == false)
 			{
-				$ret[]=$k;
+				$ret[] = $k;
 			}
 			else
 			{
-				$ret[$k]=array('MAILBOX'=>$k,'ATTRIBUTES'=>$box['attributes'],'delimiter'=>($box['delimiter']?$box['delimiter']:$this->getDelimiter('personal')),'SUBSCRIBED'=>true);
+				$ret[$k] = array('MAILBOX'=>$k, 'ATTRIBUTES'=>$box['attributes'], 'delimiter'=>($box['delimiter'] ? $box['delimiter'] : $this->getDelimiter('personal')), 'SUBSCRIBED'=>true);
 			}
 		}
 		return $ret;
@@ -722,14 +722,14 @@ 
 	 *
 	 * @return  mixed   array of mailboxes
 	 */
-	function listUnSubscribedMailboxes($reference = ''  , $restriction_search = 0)
+	function listUnSubscribedMailboxes($reference = '', $restriction_search = 0)
 	{
-		if ( is_bool($restriction_search) ){
-			$restriction_search = (int) $restriction_search;
+		if (is_bool($restriction_search)) {
+			$restriction_search = (int)$restriction_search;
 		}
 
-		if ( is_int( $restriction_search ) ){
-			switch ( $restriction_search ) {
+		if (is_int($restriction_search)) {
+			switch ($restriction_search) {
 			case 0:
 				$mailbox = $reference."*";
 				break;
@@ -741,8 +741,8 @@ 
 				$mailbox = "%";
 				break;
 			}
-		}else{
-			if ( is_string( $restriction_search ) ){
+		} else {
+			if (is_string($restriction_search)) {
 				$mailbox = $restriction_search;
 			}
 		}
@@ -751,17 +751,17 @@ 
 			'sort'=>true,
 			//'flat'=>true,
 		);
-		$mailboxes = $this->listMailboxes($mailbox,Horde_Imap_Client::MBOX_SUBSCRIBED_EXISTS, $options);
+		$mailboxes = $this->listMailboxes($mailbox, Horde_Imap_Client::MBOX_SUBSCRIBED_EXISTS, $options);
 		foreach ($mailboxes as $box)
 		{
 			//error_log(__METHOD__.__LINE__.' Box:'.$k.'->'.array2string($box['mailbox']->utf8));
-			$sret[]=$box['mailbox']->utf8;
+			$sret[] = $box['mailbox']->utf8;
 		}
-		$unsubscribed = $this->listMailboxes($mailbox,Horde_Imap_Client::MBOX_UNSUBSCRIBED, $options);
+		$unsubscribed = $this->listMailboxes($mailbox, Horde_Imap_Client::MBOX_UNSUBSCRIBED, $options);
 		foreach ($unsubscribed as $box)
 		{
 			//error_log(__METHOD__.__LINE__.' Box:'.$k.'->'.array2string($box['mailbox']->utf8));
-			if (!in_array($box['mailbox']->utf8,$sret) && $box['mailbox']->utf8!='INBOX') $ret[]=$box['mailbox']->utf8;
+			if (!in_array($box['mailbox']->utf8, $sret) && $box['mailbox']->utf8 != 'INBOX') $ret[] = $box['mailbox']->utf8;
 		}
 		return $ret;
 	}
@@ -773,12 +773,12 @@ 
 	 * @param int $flags =null default Horde_Imap_Client::STATUS_ALL | Horde_Imap_Client::STATUS_FLAGS | Horde_Imap_Client::STATUS_PERMFLAGS
 	 * @return array of counters for mailbox
 	 */
-	function examineMailbox($mailbox, $flags=null)
+	function examineMailbox($mailbox, $flags = null)
 	{
-		if ($mailbox=='') return false;
+		if ($mailbox == '') return false;
 		$mailboxes = $this->listMailboxes($mailbox);
 
-		if (is_null($flags)) $flags = Horde_Imap_Client::STATUS_ALL | Horde_Imap_Client::STATUS_FLAGS | Horde_Imap_Client::STATUS_PERMFLAGS;
+		if (is_null($flags)) $flags = Horde_Imap_Client::STATUS_ALL|Horde_Imap_Client::STATUS_FLAGS|Horde_Imap_Client::STATUS_PERMFLAGS;
 
 		$mboxes = new Horde_Imap_Client_Mailbox_List($mailboxes);
 		//_debug_array($mboxes->count());
@@ -786,18 +786,18 @@ 
 		{
 			//error_log(__METHOD__.__LINE__.array2string($box));
 			unset($box);
-			if ($k!='user' && $k != '' && $k==$mailbox)
+			if ($k != 'user' && $k != '' && $k == $mailbox)
 			{
 				$status = $this->status($k, $flags);
 				//error_log(__METHOD__.__LINE__.array2string($status));
 				foreach ($status as $key => $v)
 				{
-					$_status[strtoupper($key)]=$v;
+					$_status[strtoupper($key)] = $v;
 				}
-				if ($flags & (Horde_Imap_Client::STATUS_FLAGS|Horde_Imap_Client::STATUS_PERMFLAGS))
+				if ($flags&(Horde_Imap_Client::STATUS_FLAGS|Horde_Imap_Client::STATUS_PERMFLAGS))
 				{
 					self::$supports_keywords[$this->ImapServerId] = stripos(implode('', $status['flags']), '$label') !== false ||
-						in_array('\\*', $status['permflags']);	// arbitrary keyswords also allow keywords
+						in_array('\\*', $status['permflags']); // arbitrary keyswords also allow keywords
 				}
 				return $_status;
 			}
@@ -836,7 +836,7 @@ 
 	 */
 	function hasCapability($capability)
 	{
-		if ($capability=='SUPPORTS_KEYWORDS')
+		if ($capability == 'SUPPORTS_KEYWORDS')
 		{
 			// if pseudo-flag is not set, call examineMailbox now to set it (no STATUS_ALL = counters necessary)
 			if (!isset(self::$supports_keywords[$this->ImapServerId]))
@@ -848,7 +848,7 @@ 
 				catch (\Exception $e)
 				{
 					error_log(__METHOD__.__LINE__.' (examineServer for detection) '.$capability.'->'.array2string(self::$supports_keywords).' failed '.function_backtrace());
-					self::$supports_keywords[$this->ImapServerId]=false;
+					self::$supports_keywords[$this->ImapServerId] = false;
 				}
 			}
 			//error_log(__METHOD__.__LINE__.' '.$capability.'->'.array2string(self::$supports_keywords).' '.function_backtrace());
@@ -898,9 +898,9 @@ 
 	 */
 	static function getFolderPrefixFromNamespace($_nameSpace, $_folderName)
 	{
-		foreach($_nameSpace as &$singleNameSpace)
+		foreach ($_nameSpace as &$singleNameSpace)
 		{
-			if (substr($_folderName,0,strlen($singleNameSpace['prefix'])) == $singleNameSpace['prefix']) return $singleNameSpace['prefix'];
+			if (substr($_folderName, 0, strlen($singleNameSpace['prefix'])) == $singleNameSpace['prefix']) return $singleNameSpace['prefix'];
 		}
 		return "";
 	}
@@ -915,33 +915,33 @@ 
 	 * @param string $reclevel = 0, counter to keep track of the current recursionlevel
 	 * @return array of mailboxes
 	 */
-	function getMailBoxesRecursive($_mailbox, $delimiter, $prefix, $reclevel=0)
+	function getMailBoxesRecursive($_mailbox, $delimiter, $prefix, $reclevel = 0)
 	{
 		if ($reclevel > 25) {
-			error_log( __METHOD__." Recursion Level Exeeded ($reclevel) while looking up $_mailbox$delimiter ");
+			error_log(__METHOD__." Recursion Level Exeeded ($reclevel) while looking up $_mailbox$delimiter ");
 			return array();
 		}
 		$reclevel++;
 		// clean up double delimiters
-		$mailbox = preg_replace('~'.($delimiter == '.' ? "\\".$delimiter:$delimiter).'+~s',$delimiter,$_mailbox);
+		$mailbox = preg_replace('~'.($delimiter == '.' ? "\\".$delimiter : $delimiter).'+~s', $delimiter, $_mailbox);
 		//get that mailbox in question
-		$mbx = $this->getMailboxes($mailbox,1,true);
+		$mbx = $this->getMailboxes($mailbox, 1, true);
 		$mbxkeys = array_keys($mbx);
 
 		// Example: Array([INBOX/GaGa] => Array([MAILBOX] => INBOX/GaGa[ATTRIBUTES] => Array([0] => \\unmarked)[delimiter] => /))
-		if (is_array($mbx[$mbxkeys[0]]["ATTRIBUTES"]) && (in_array('\HasChildren',$mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\Haschildren',$mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\haschildren',$mbx[$mbxkeys[0]]["ATTRIBUTES"])))
+		if (is_array($mbx[$mbxkeys[0]]["ATTRIBUTES"]) && (in_array('\HasChildren', $mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\Haschildren', $mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\haschildren', $mbx[$mbxkeys[0]]["ATTRIBUTES"])))
 		{
-			$buff = $this->getMailboxes($mbx[$mbxkeys[0]]['MAILBOX'].($mbx[$mbxkeys[0]]['MAILBOX'] == $prefix ? '':$delimiter),2,false);
+			$buff = $this->getMailboxes($mbx[$mbxkeys[0]]['MAILBOX'].($mbx[$mbxkeys[0]]['MAILBOX'] == $prefix ? '' : $delimiter), 2, false);
 			$allMailboxes = array();
 			foreach ($buff as $mbxname) {
-				$mbxname = preg_replace('~'.($delimiter == '.' ? "\\".$delimiter:$delimiter).'+~s',$delimiter,$mbxname['MAILBOX']);
+				$mbxname = preg_replace('~'.($delimiter == '.' ? "\\".$delimiter : $delimiter).'+~s', $delimiter, $mbxname['MAILBOX']);
 				#echo "About to recur in level $reclevel:".$mbxname."<br>";
-				if ( $mbxname != $mbx[$mbxkeys[0]]['MAILBOX'] && $mbxname != $prefix  && $mbxname != $mbx[$mbxkeys[0]]['MAILBOX'].$delimiter)
+				if ($mbxname != $mbx[$mbxkeys[0]]['MAILBOX'] && $mbxname != $prefix && $mbxname != $mbx[$mbxkeys[0]]['MAILBOX'].$delimiter)
 				{
 					$allMailboxes = array_merge($allMailboxes, self::getMailBoxesRecursive($mbxname, $delimiter, $prefix, $reclevel));
 				}
 			}
-			if (!(in_array('\NoSelect',$mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\Noselect',$mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\noselect',$mbx[$mbxkeys[0]]["ATTRIBUTES"]))) $allMailboxes[] = $mbx[$mbxkeys[0]]['MAILBOX'];
+			if (!(in_array('\NoSelect', $mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\Noselect', $mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\noselect', $mbx[$mbxkeys[0]]["ATTRIBUTES"]))) $allMailboxes[] = $mbx[$mbxkeys[0]]['MAILBOX'];
 			return $allMailboxes;
 		}
 		else
@@ -960,24 +960,24 @@ 
 	 */
 	function getNameSpace()
 	{
-		static $nameSpace=null;
+		static $nameSpace = null;
 		$foldersNameSpace = array();
 		$delimiter = $this->getDelimiter();
-		if (empty($delimiter)) $delimiter='/';
+		if (empty($delimiter)) $delimiter = '/';
 		if (is_null($nameSpace)) $nameSpace = $this->getNameSpaceArray();
 		if (is_array($nameSpace)) {
-			foreach($nameSpace as $type => $singleNameSpaceArray)
+			foreach ($nameSpace as $type => $singleNameSpaceArray)
 			{
 				foreach ($singleNameSpaceArray as $singleNameSpace)
 				{
 					$_foldersNameSpace = array();
-					if($type == 'personal' && $singleNameSpace['name'] == '#mh/' && ($this->folderExists('Mail')||$this->folderExists('INBOX')))
+					if ($type == 'personal' && $singleNameSpace['name'] == '#mh/' && ($this->folderExists('Mail') || $this->folderExists('INBOX')))
 					{
 						$_foldersNameSpace['prefix_present'] = 'forced';
 						// uw-imap server with mailbox prefix or dovecot maybe
-						$_foldersNameSpace['prefix'] = ($this->folderExists('Mail')?'Mail':(!empty($singleNameSpace['name'])?$singleNameSpace['name']:''));
+						$_foldersNameSpace['prefix'] = ($this->folderExists('Mail') ? 'Mail' : (!empty($singleNameSpace['name']) ? $singleNameSpace['name'] : ''));
 					}
-					elseif($type == 'personal' && ($singleNameSpace['name'] == '#mh/') && $this->folderExists('mail'))
+					elseif ($type == 'personal' && ($singleNameSpace['name'] == '#mh/') && $this->folderExists('mail'))
 					{
 						$_foldersNameSpace['prefix_present'] = 'forced';
 						// uw-imap server with mailbox prefix or dovecot maybe
@@ -986,9 +986,9 @@ 
 						$_foldersNameSpace['prefix_present'] = !empty($singleNameSpace['name']);
 						$_foldersNameSpace['prefix'] = $singleNameSpace['name'];
 					}
-					$_foldersNameSpace['delimiter'] = ($singleNameSpace['delimiter']?$singleNameSpace['delimiter']:$delimiter);
+					$_foldersNameSpace['delimiter'] = ($singleNameSpace['delimiter'] ? $singleNameSpace['delimiter'] : $delimiter);
 					$_foldersNameSpace['type'] = $type;
-					$foldersNameSpace[] =$_foldersNameSpace;
+					$foldersNameSpace[] = $_foldersNameSpace;
 				}
 			}
 		}
@@ -1000,29 +1000,29 @@ 
 	 * @param mixed _type (1=personal, 2=user/other, 3=shared)
 	 * @return string the delimimiter
 	 */
-	function getDelimiter($_type=1)
+	function getDelimiter($_type = 1)
 	{
 		switch ($_type)
 		{
 			case 'user':
 			case 'other':
 			case 2:
-				$type=2;
+				$type = 2;
 				break;
 			case 'shared':
 			case '':
 			case 3:
-				$type=3;
+				$type = 3;
 				break;
 			case 'personal':
 			case 1:
 			default:
-				$type=1;
+				$type = 1;
 		}
 		$namespaces = $this->getNamespaces();
 		foreach ($namespaces as $nsp)
 		{
-			if ($nsp['type']==$type && $nsp['delimiter']) return $nsp['delimiter'];
+			if ($nsp['type'] == $type && $nsp['delimiter']) return $nsp['delimiter'];
 		}
 		return "/";
 	}
@@ -1059,11 +1059,11 @@ 
 		switch ($this->loginType)
 		{
 			case 'email':
-				$accountemail = $GLOBALS['egw']->accounts->id2name($accountID,'account_email');
+				$accountemail = $GLOBALS['egw']->accounts->id2name($accountID, 'account_email');
 				//$accountemail = $GLOBALS['egw']->accounts->read($GLOBALS['egw']->accounts->name2id($_username,'account_email'));
 				if (!empty($accountemail))
 				{
-					list($lusername,$domain) = explode('@',$accountemail,2);
+					list($lusername, $domain) = explode('@', $accountemail, 2);
 					if (strtolower($domain) == strtolower($this->domainName) && !empty($lusername))
 					{
 						$_username = $lusername;
@@ -1082,8 +1082,8 @@ 
 				if (empty($this->loginType))
 				{
 					// try to figure out by params['acc_imap_username']
-					list($lusername,$domain) = explode('@',$this->params['acc_imap_username'],2);
-					if (strpos($_username,'@')===false && !empty($domain) && !empty($lusername))
+					list($lusername, $domain) = explode('@', $this->params['acc_imap_username'], 2);
+					if (strpos($_username, '@') === false && !empty($domain) && !empty($lusername))
 					{
 						$_username = $_username.'@'.$domain;
 					}
@@ -1127,20 +1127,20 @@ 
 	 * @param string $_folderName=''
 	 * @return string utf-7 encoded (done in getMailboxName)
 	 */
-	function getUserMailboxString($_username, $_folderName='')
+	function getUserMailboxString($_username, $_folderName = '')
 	{
 		$nameSpaces = $this->getNameSpaceArray();
 
-		if(!isset($nameSpaces['others'])) {
+		if (!isset($nameSpaces['others'])) {
 			return false;
 		}
 
 		$username = $this->getMailBoxUserName($_username);
-		if($this->loginType == 'vmailmgr' || $this->loginType == 'email' || $this->loginType == 'uidNumber') {
-			$username .= '@'. $this->domainName;
+		if ($this->loginType == 'vmailmgr' || $this->loginType == 'email' || $this->loginType == 'uidNumber') {
+			$username .= '@'.$this->domainName;
 		}
 
-		$mailboxString = $nameSpaces['others'][0]['name'] . $username . (!empty($_folderName) ? ($nameSpaces['others'][0]['delimiter']?$nameSpaces['others'][0]['delimiter']:'/') . $_folderName : '');
+		$mailboxString = $nameSpaces['others'][0]['name'].$username.(!empty($_folderName) ? ($nameSpaces['others'][0]['delimiter'] ? $nameSpaces['others'][0]['delimiter'] : '/').$_folderName : '');
 
 		return $mailboxString;
 	}
@@ -1159,7 +1159,7 @@ 
 		);
 		//error_log(__METHOD__.__LINE__.array2string($types));
 		$result = array();
-		foreach($this->getNamespaces() as $data)
+		foreach ($this->getNamespaces() as $data)
 		{
 			//error_log(__METHOD__.__LINE__.array2string($data));
 			if (isset($types[$data['type']]))
@@ -1169,7 +1169,7 @@ 
 					'name' => $data['name'],
 					'prefix' => $data['name'],
 					'prefix_present' => !empty($data['name']),
-					'delimiter' => ($data['delimiter']?$data['delimiter']:'/'),
+					'delimiter' => ($data['delimiter'] ? $data['delimiter'] : '/'),
 				);
 			}
 		}
@@ -1190,7 +1190,7 @@ 
 		{
 			if ($qInfo['storage'])
 			{
-				return array('USED'=>$qInfo['storage']['usage'],'QMAX'=>$qInfo['storage']['limit']);
+				return array('USED'=>$qInfo['storage']['usage'], 'QMAX'=>$qInfo['storage']['limit']);
 			}
 		}
 		return false;
@@ -1204,7 +1204,7 @@ 
 	 * @param string $_what - what to retrieve either limit/QMAX, usage/USED or ALL is supported
 	 * @return int|array|boolean the quota for specified user (by what) or array with values for "limit" and "usage", or false
 	 */
-	function getQuotaByUser($_username, $_what='QMAX')
+	function getQuotaByUser($_username, $_what = 'QMAX')
 	{
 		$mailboxName = $this->getUserMailboxString($_username);
 		$storageQuota = $this->getQuotaRoot($mailboxName);
@@ -1213,7 +1213,7 @@ 
 		if (is_array($storageQuota) && isset($storageQuota[$mailboxName]) && is_array($storageQuota[$mailboxName]) &&
 			isset($storageQuota[$mailboxName]['storage']) && is_array($storageQuota[$mailboxName]['storage']))
 		{
-			switch($_what)
+			switch ($_what)
 			{
 				case 'QMAX':
 					$_what = 'limit';
@@ -1239,7 +1239,7 @@ 
 	 */
 	function getUserData($_username)
 	{
-		unset($_username);	// not used
+		unset($_username); // not used
 		return array();
 	}
 
@@ -1252,7 +1252,7 @@ 
 	 */
 	function setUserData($_username, $_quota)
 	{
-		unset($_username, $_quota);	// not used
+		unset($_username, $_quota); // not used
 		return true;
 	}
 
@@ -1286,10 +1286,10 @@ 
 	 * @param array $params
 	 * @throws Api\Exception\WrongParameter
 	 */
-	public function __call($name,array $params=null)
+	public function __call($name, array $params = null)
 	{
 		if ($this->debug) error_log(__METHOD__.'->'.$name.' with params:'.array2string($params));
-		switch($name)
+		switch ($name)
 		{
 			case 'installScript':
 			case 'getScript':
@@ -1304,9 +1304,9 @@ 
 				if (is_null($this->sieve))
 				{
 					$this->sieve = new Sieve($this);
-					$this->error =& $this->sieve->error;
+					$this->error = & $this->sieve->error;
 				}
-				$ret = call_user_func_array(array($this->sieve,$name),$params);
+				$ret = call_user_func_array(array($this->sieve, $name), $params);
 				//error_log(__CLASS__.'->'.$name.'('.array2string($params).') returns '.array2string($ret));
 				return $ret;
 		}
@@ -1321,7 +1321,7 @@ 
 	 * @param string $_scriptName =null
 	 * @return boolean
 	 */
-	public function setVacationUser($_euser, array $_vacation, $_scriptName=null)
+	public function setVacationUser($_euser, array $_vacation, $_scriptName = null)
 	{
 		if ($this->debug) error_log(__METHOD__.' User:'.array2string($_euser).' Scriptname:'.array2string($_scriptName).' VacationMessage:'.array2string($_vacation));
 
@@ -1333,8 +1333,8 @@ 
 		{
 			$this->adminConnection($_euser);
 			$this->sieve = new Sieve($this, $_euser, $_scriptName);
-			$this->scriptName =& $this->sieve->scriptName;
-			$this->error =& $this->sieve->error;
+			$this->scriptName = & $this->sieve->scriptName;
+			$this->error = & $this->sieve->error;
 		}
 		$ret = $this->setVacation($_vacation, $_scriptName);
 
@@ -1349,7 +1349,7 @@ 
 	 * @throws Exception on connection error or authentication failure
 	 * @return array
 	 */
-	public function getVacationUser($_euser, $_scriptName=null)
+	public function getVacationUser($_euser, $_scriptName = null)
 	{
 		if ($this->debug) error_log(__METHOD__.' User:'.array2string($_euser));
 
@@ -1361,8 +1361,8 @@ 
 		{
 			$this->adminConnection($_euser);
 			$this->sieve = new Sieve($this, $_euser, $_scriptName);
-			$this->error =& $this->sieve->error;
-			$this->scriptName =& $this->sieve->scriptName;
+			$this->error = & $this->sieve->error;
+			$this->scriptName = & $this->sieve->scriptName;
 		}
 		return $this->sieve->getVacation();
 	}
@@ -1382,7 +1382,7 @@ 
 	 */
 	public static function init_static()
 	{
-		self::$supports_keywords =& Api\Cache::getSession (__CLASS__, 'supports_keywords');
+		self::$supports_keywords = & Api\Cache::getSession(__CLASS__, 'supports_keywords');
 	}
 }
 Imap::init_static();

Braces +130 added lines, -42 removed lines

@@ -156,7 +156,10 @@ 
 		$this->loginType = $this->params['acc_imap_logintype'];
 		$this->domainName = $this->params['acc_domain'];
 
-		if (is_null($_timeout)) $_timeout = $this->params['acc_imap_timeout']?$this->params['acc_imap_timeout']:self::getTimeOut ();
+		if (is_null($_timeout))
+		{
+			$_timeout = $this->params['acc_imap_timeout']?$this->params['acc_imap_timeout']:self::getTimeOut ();
+		}
 
 		// Horde use locale for translation of error messages
 		Api\Preferences::setlocale(LC_MESSAGES);
@@ -167,7 +170,10 @@ 
 		{
 			$username = $this->getMailBoxUserName($username);
 		}
-		if ($_adminConnection) $this->adminConnection($username);
+		if ($_adminConnection)
+		{
+			$this->adminConnection($username);
+		}
 		$parent_params = array(
 			'username' => $this->params[$_adminConnection ? 'acc_imap_admin_username' : 'acc_imap_username'],
 			'password' => $this->params[$_adminConnection ? 'acc_imap_admin_password' : 'acc_imap_password'],
@@ -303,7 +309,11 @@ 
 	static function getTimeOut($_use='IMAP')
 	{
 		$timeout = $GLOBALS['egw_info']['user']['preferences']['mail']['connectionTimeout'];
-		if (empty($timeout) || !($timeout > 0)) $timeout = $_use == 'SIEVE' ? 10 : 20; // this is the default value
+		if (empty($timeout) || !($timeout > 0))
+		{
+			$timeout = $_use == 'SIEVE' ? 10 : 20;
+		}
+		// this is the default value
 		return $timeout;
 	}
 
@@ -366,7 +376,8 @@ 
 	 */
 	function encodeFolderName($_folderName)
 	{
-		if($this->mbAvailable) {
+		if($this->mbAvailable)
+		{
 			return mb_convert_encoding($_folderName, "UTF7-IMAP", Api\Translation::charset());
 		}
 
@@ -384,14 +395,21 @@ 
 	function getMailbox($mailbox)
 	{
 		$mailboxes = $this->listMailboxes($mailbox,Horde_Imap_Client::MBOX_ALL);
-		if (empty($mailboxes)) $mailboxes = $this->listMailboxes($mailbox,Horde_Imap_Client::MBOX_UNSUBSCRIBED);
+		if (empty($mailboxes))
+		{
+			$mailboxes = $this->listMailboxes($mailbox,Horde_Imap_Client::MBOX_UNSUBSCRIBED);
+		}
 		//error_log(__METHOD__.__LINE__.'->'.$mailbox.'/'.array2string($mailboxes));
 		$mboxes = new Horde_Imap_Client_Mailbox_List($mailboxes);
 		//_debug_array($mboxes->count());
 		foreach ($mboxes->getIterator() as $k =>$box)
 		{
 			//error_log(__METHOD__.__LINE__.'->'.$k);
-			if ($k!='user' && $k != '' && $k==$mailbox) return $box['mailbox']; //_debug_array(array($k => $client->status($k)));
+			if ($k!='user' && $k != '' && $k==$mailbox)
+			{
+				return $box['mailbox'];
+			}
+			//_debug_array(array($k => $client->status($k)));
 		}
 		return ($this->mailboxExist($mailbox)?$mailbox:false);
 	}
@@ -460,8 +478,14 @@ 
 			//throw new egw_exception(__METHOD__.' ('.__LINE__.") failed to ".__METHOD__." :".$e->getMessage());
 			unset($e);
 		}
-		if (!empty($mailbox)) return $mailbox['mailbox'];
-		if (empty($mailbox) && $this->mailboxExist('INBOX')) return 'INBOX';
+		if (!empty($mailbox))
+		{
+			return $mailbox['mailbox'];
+		}
+		if (empty($mailbox) && $this->mailboxExist('INBOX'))
+		{
+			return 'INBOX';
+		}
 		return null;
 	}
 
@@ -531,7 +555,10 @@ 
 			));
 
 		$flags = Horde_Imap_Client::STATUS_ALL;
-		if ($ignoreStatusCache) $flags |= Horde_Imap_Client::STATUS_FORCE_REFRESH;
+		if ($ignoreStatusCache)
+		{
+			$flags |= Horde_Imap_Client::STATUS_FORCE_REFRESH;
+		}
 
 		$mboxes = new Horde_Imap_Client_Mailbox_List($mailboxes);
 		//error_log(__METHOD__.__LINE__.array2string($mboxes->count()));
@@ -574,12 +601,15 @@ 
 	 */
 	function getMailboxes($reference = ''  , $restriction_search = 0, $returnAttributes = false)
 	{
-		if ( is_bool($restriction_search) ){
+		if ( is_bool($restriction_search) )
+		{
 			$restriction_search = (int) $restriction_search;
 		}
 		$mailbox = '';
-		if ( is_int( $restriction_search ) ){
-			switch ( $restriction_search ) {
+		if ( is_int( $restriction_search ) )
+		{
+			switch ( $restriction_search )
+			{
 			case 0:
 				$searchstring = $reference."*";
 				break;
@@ -591,8 +621,11 @@ 
 				$searchstring = $reference."%";
 				break;
 			}
-		}else{
-			if ( is_string( $restriction_search ) ){
+		}
+		else
+		{
+			if ( is_string( $restriction_search ) )
+			{
 				$mailbox = $searchstring = $restriction_search;
 			}
 		}
@@ -658,12 +691,15 @@ 
 	 */
 	function listSubscribedMailboxes($reference = ''  , $restriction_search = 0, $returnAttributes = false)
 	{
-		if ( is_bool($restriction_search) ){
+		if ( is_bool($restriction_search) )
+		{
 			$restriction_search = (int) $restriction_search;
 		}
 		$mailbox = '';
-		if ( is_int( $restriction_search ) ){
-			switch ( $restriction_search ) {
+		if ( is_int( $restriction_search ) )
+		{
+			switch ( $restriction_search )
+			{
 			case 0:
 				$searchstring = $reference."*";
 				break;
@@ -675,8 +711,11 @@ 
 				$searchstring = $reference."%";
 				break;
 			}
-		}else{
-			if ( is_string( $restriction_search ) ){
+		}
+		else
+		{
+			if ( is_string( $restriction_search ) )
+			{
 				$mailbox = $searchstring = $restriction_search;
 			}
 		}
@@ -724,12 +763,15 @@ 
 	 */
 	function listUnSubscribedMailboxes($reference = ''  , $restriction_search = 0)
 	{
-		if ( is_bool($restriction_search) ){
+		if ( is_bool($restriction_search) )
+		{
 			$restriction_search = (int) $restriction_search;
 		}
 
-		if ( is_int( $restriction_search ) ){
-			switch ( $restriction_search ) {
+		if ( is_int( $restriction_search ) )
+		{
+			switch ( $restriction_search )
+			{
 			case 0:
 				$mailbox = $reference."*";
 				break;
@@ -741,8 +783,11 @@ 
 				$mailbox = "%";
 				break;
 			}
-		}else{
-			if ( is_string( $restriction_search ) ){
+		}
+		else
+		{
+			if ( is_string( $restriction_search ) )
+			{
 				$mailbox = $restriction_search;
 			}
 		}
@@ -761,7 +806,10 @@ 
 		foreach ($unsubscribed as $box)
 		{
 			//error_log(__METHOD__.__LINE__.' Box:'.$k.'->'.array2string($box['mailbox']->utf8));
-			if (!in_array($box['mailbox']->utf8,$sret) && $box['mailbox']->utf8!='INBOX') $ret[]=$box['mailbox']->utf8;
+			if (!in_array($box['mailbox']->utf8,$sret) && $box['mailbox']->utf8!='INBOX')
+			{
+				$ret[]=$box['mailbox']->utf8;
+			}
 		}
 		return $ret;
 	}
@@ -775,10 +823,16 @@ 
 	 */
 	function examineMailbox($mailbox, $flags=null)
 	{
-		if ($mailbox=='') return false;
+		if ($mailbox=='')
+		{
+			return false;
+		}
 		$mailboxes = $this->listMailboxes($mailbox);
 
-		if (is_null($flags)) $flags = Horde_Imap_Client::STATUS_ALL | Horde_Imap_Client::STATUS_FLAGS | Horde_Imap_Client::STATUS_PERMFLAGS;
+		if (is_null($flags))
+		{
+			$flags = Horde_Imap_Client::STATUS_ALL | Horde_Imap_Client::STATUS_FLAGS | Horde_Imap_Client::STATUS_PERMFLAGS;
+		}
 
 		$mboxes = new Horde_Imap_Client_Mailbox_List($mailboxes);
 		//_debug_array($mboxes->count());
@@ -860,7 +914,10 @@ 
 		}
 		catch (\Exception $e)
 		{
-			if ($this->debug) error_log(__METHOD__.__LINE__.' error querying for capability:'.$capability.' ->'.$e->getMessage());
+			if ($this->debug)
+			{
+				error_log(__METHOD__.__LINE__.' error querying for capability:'.$capability.' ->'.$e->getMessage());
+			}
 			return false;
 		}
 		if (!is_array($cap))
@@ -900,7 +957,10 @@ 
 	{
 		foreach($_nameSpace as &$singleNameSpace)
 		{
-			if (substr($_folderName,0,strlen($singleNameSpace['prefix'])) == $singleNameSpace['prefix']) return $singleNameSpace['prefix'];
+			if (substr($_folderName,0,strlen($singleNameSpace['prefix'])) == $singleNameSpace['prefix'])
+			{
+				return $singleNameSpace['prefix'];
+			}
 		}
 		return "";
 	}
@@ -917,7 +977,8 @@ 
 	 */
 	function getMailBoxesRecursive($_mailbox, $delimiter, $prefix, $reclevel=0)
 	{
-		if ($reclevel > 25) {
+		if ($reclevel > 25)
+		{
 			error_log( __METHOD__." Recursion Level Exeeded ($reclevel) while looking up $_mailbox$delimiter ");
 			return array();
 		}
@@ -933,7 +994,8 @@ 
 		{
 			$buff = $this->getMailboxes($mbx[$mbxkeys[0]]['MAILBOX'].($mbx[$mbxkeys[0]]['MAILBOX'] == $prefix ? '':$delimiter),2,false);
 			$allMailboxes = array();
-			foreach ($buff as $mbxname) {
+			foreach ($buff as $mbxname)
+			{
 				$mbxname = preg_replace('~'.($delimiter == '.' ? "\\".$delimiter:$delimiter).'+~s',$delimiter,$mbxname['MAILBOX']);
 				#echo "About to recur in level $reclevel:".$mbxname."<br>";
 				if ( $mbxname != $mbx[$mbxkeys[0]]['MAILBOX'] && $mbxname != $prefix  && $mbxname != $mbx[$mbxkeys[0]]['MAILBOX'].$delimiter)
@@ -941,7 +1003,10 @@ 
 					$allMailboxes = array_merge($allMailboxes, self::getMailBoxesRecursive($mbxname, $delimiter, $prefix, $reclevel));
 				}
 			}
-			if (!(in_array('\NoSelect',$mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\Noselect',$mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\noselect',$mbx[$mbxkeys[0]]["ATTRIBUTES"]))) $allMailboxes[] = $mbx[$mbxkeys[0]]['MAILBOX'];
+			if (!(in_array('\NoSelect',$mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\Noselect',$mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\noselect',$mbx[$mbxkeys[0]]["ATTRIBUTES"])))
+			{
+				$allMailboxes[] = $mbx[$mbxkeys[0]]['MAILBOX'];
+			}
 			return $allMailboxes;
 		}
 		else
@@ -963,9 +1028,16 @@ 
 		static $nameSpace=null;
 		$foldersNameSpace = array();
 		$delimiter = $this->getDelimiter();
-		if (empty($delimiter)) $delimiter='/';
-		if (is_null($nameSpace)) $nameSpace = $this->getNameSpaceArray();
-		if (is_array($nameSpace)) {
+		if (empty($delimiter))
+		{
+			$delimiter='/';
+		}
+		if (is_null($nameSpace))
+		{
+			$nameSpace = $this->getNameSpaceArray();
+		}
+		if (is_array($nameSpace))
+		{
 			foreach($nameSpace as $type => $singleNameSpaceArray)
 			{
 				foreach ($singleNameSpaceArray as $singleNameSpace)
@@ -982,7 +1054,9 @@ 
 						$_foldersNameSpace['prefix_present'] = 'forced';
 						// uw-imap server with mailbox prefix or dovecot maybe
 						$_foldersNameSpace['prefix'] = 'mail';
-					} else {
+					}
+					else
+					{
 						$_foldersNameSpace['prefix_present'] = !empty($singleNameSpace['name']);
 						$_foldersNameSpace['prefix'] = $singleNameSpace['name'];
 					}
@@ -1022,7 +1096,10 @@ 
 		$namespaces = $this->getNamespaces();
 		foreach ($namespaces as $nsp)
 		{
-			if ($nsp['type']==$type && $nsp['delimiter']) return $nsp['delimiter'];
+			if ($nsp['type']==$type && $nsp['delimiter'])
+			{
+				return $nsp['delimiter'];
+			}
 		}
 		return "/";
 	}
@@ -1131,12 +1208,14 @@ 
 	{
 		$nameSpaces = $this->getNameSpaceArray();
 
-		if(!isset($nameSpaces['others'])) {
+		if(!isset($nameSpaces['others']))
+		{
 			return false;
 		}
 
 		$username = $this->getMailBoxUserName($_username);
-		if($this->loginType == 'vmailmgr' || $this->loginType == 'email' || $this->loginType == 'uidNumber') {
+		if($this->loginType == 'vmailmgr' || $this->loginType == 'email' || $this->loginType == 'uidNumber')
+		{
 			$username .= '@'. $this->domainName;
 		}
 
@@ -1288,7 +1367,10 @@ 
 	 */
 	public function __call($name,array $params=null)
 	{
-		if ($this->debug) error_log(__METHOD__.'->'.$name.' with params:'.array2string($params));
+		if ($this->debug)
+		{
+			error_log(__METHOD__.'->'.$name.' with params:'.array2string($params));
+		}
 		switch($name)
 		{
 			case 'installScript':
@@ -1323,7 +1405,10 @@ 
 	 */
 	public function setVacationUser($_euser, array $_vacation, $_scriptName=null)
 	{
-		if ($this->debug) error_log(__METHOD__.' User:'.array2string($_euser).' Scriptname:'.array2string($_scriptName).' VacationMessage:'.array2string($_vacation));
+		if ($this->debug)
+		{
+			error_log(__METHOD__.' User:'.array2string($_euser).' Scriptname:'.array2string($_scriptName).' VacationMessage:'.array2string($_vacation));
+		}
 
 		if (is_numeric($_euser))
 		{
@@ -1351,7 +1436,10 @@ 
 	 */
 	public function getVacationUser($_euser, $_scriptName=null)
 	{
-		if ($this->debug) error_log(__METHOD__.' User:'.array2string($_euser));
+		if ($this->debug)
+		{
+			error_log(__METHOD__.' User:'.array2string($_euser));
+		}
 
 		if (is_numeric($_euser))
 		{

api/src/Mail/Imap/Iface.php

Doc Comments +1 added lines

@@ -121,6 +121,7 @@
 	 * @param bool $_adminConnection create admin connection if true
 	 * @param int $_timeout =null timeout in secs, if none given fmail pref or default of 20 is used
 	 * @throws Exception on error
+	 * @return void
 	 */
 	function openConnection($_adminConnection=false, $_timeout=null);
 

Spacing +8 added lines, -8 removed lines

@@ -14,9 +14,9 @@ 
 namespace EGroupware\Api\Mail\Imap;
 
 define('IMAP_NAMESPACE_PERSONAL', 'personal');
-define('IMAP_NAMESPACE_OTHERS'	, 'others');
-define('IMAP_NAMESPACE_SHARED'	, 'shared');
-define('IMAP_NAMESPACE_ALL'	, 'all');
+define('IMAP_NAMESPACE_OTHERS', 'others');
+define('IMAP_NAMESPACE_SHARED', 'shared');
+define('IMAP_NAMESPACE_ALL', 'all');
 
 /**
  * This class holds all information about the imap connection.
@@ -87,7 +87,7 @@ 
 	 * @param string $_folderName=''
 	 * @return string utf-7 encoded (done in getMailboxName)
 	 */
-	function getUserMailboxString($_username, $_folderName='');
+	function getUserMailboxString($_username, $_folderName = '');
 
 	/**
 	 * get list of namespaces
@@ -103,7 +103,7 @@ 
 	 * @param string $_what - what to retrieve either QMAX, USED or ALL is supported
 	 * @return mixed the quota for specified user (by what) or array with all available Quota Information, or false
 	 */
-	function getQuotaByUser($_username, $_what='QMAX');
+	function getQuotaByUser($_username, $_what = 'QMAX');
 
 	/**
 	 * returns information about a user
@@ -122,7 +122,7 @@ 
 	 * @param int $_timeout =null timeout in secs, if none given fmail pref or default of 20 is used
 	 * @throws Exception on error
 	 */
-	function openConnection($_adminConnection=false, $_timeout=null);
+	function openConnection($_adminConnection = false, $_timeout = null);
 
 	/**
 	 * set userdata
@@ -149,7 +149,7 @@ 
 	 * @param string $_scriptName =null
 	 * @return boolean
 	 */
-	public function setVacationUser($_euser, array $_vacation, $_scriptName=null);
+	public function setVacationUser($_euser, array $_vacation, $_scriptName = null);
 
 	/**
 	 * Get vacation message for given user
@@ -159,5 +159,5 @@ 
 	 * @throws Exception on connection error or authentication failure
 	 * @return array
 	 */
-	public function getVacationUser($_euser, $_scriptName=null);
+	public function getVacationUser($_euser, $_scriptName = null);
 }

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/Mailer.php

Doc Comments +3 added lines, -3 removed lines

@@ -251,7 +251,7 @@ 
 	/**
 	 * Add one or multiple addresses to Cc
 	 *
-	 * @param string|array|Horde_Mail_Rfc822_List $address
+	 * @param string $address
 	 * @param string $personal ='' only used if $address is a string
 	 */
 	function addCc($address, $personal=null)
@@ -270,7 +270,7 @@ 
 	/**
 	 * Add one or multiple addresses to Bcc
 	 *
-	 * @param string|array|Horde_Mail_Rfc822_List $address
+	 * @param string $address
 	 * @param string $personal ='' only used if $address is a string
 	 */
 	function addBcc($address, $personal=null)
@@ -381,7 +381,7 @@ 
 	/**
 	 * Adds an embedded image or other inline attachment
 	 *
-	 * @param string|resource $data Path to the attachment or open file-descriptor
+	 * @param string $data Path to the attachment or open file-descriptor
 	 * @param string $cid Content ID of the attachment.  Use this to identify
 	 *        the Id for accessing the image in an HTML form.
 	 * @param string $name Overrides the attachment name.

Indentation +21 added lines, -21 removed lines

@@ -481,10 +481,10 @@ 
 	 * Log mails to log file specified in $GLOBALS['egw_info']['server']['log_mail']
 	 * or regular error_log for true (can be set either in DB or header.inc.php).
 	 *
-     * @param Horde_Mail_Transport $transport =null using transport from mail-account
+	 * @param Horde_Mail_Transport $transport =null using transport from mail-account
 	 *		specified in construct, or default one, if not specified
-     * @param boolean $resend =true allways true in EGroupware!
-     * @param boolean $flowed =null send message in flowed text format,
+	 * @param boolean $resend =true allways true in EGroupware!
+	 * @param boolean $flowed =null send message in flowed text format,
 	 *		default null used flowed by default for everything but multipart/encrypted,
 	 *		unless disabled in site configuration ("disable_rfc3676_flowed")
 	 *
@@ -642,15 +642,15 @@ 
 	}
 
 	/**
-     * Get the raw email data sent by this object.
-     *
+	 * Get the raw email data sent by this object.
+	 *
 	 * Reimplement to be able to call it for saveAsDraft by calling
 	 * $this->send(new Horde_Mail_Transport_Null()),
 	 * if no base-part is set, because send is not called before.
 	 *
-     * @param  boolean $stream  If true, return a stream resource, otherwise
-     * @return stream|string  The raw email data.
-     */
+	 * @param  boolean $stream  If true, return a stream resource, otherwise
+	 * @return stream|string  The raw email data.
+	 */
 	function getRaw($stream=true)
 	{
 		try {
@@ -663,20 +663,20 @@ 
 		}
 		// code copied from Horde_Mime_Mail::getRaw(), as there is no way to inject charset in
 		// _headers->toString(), which is required to encode headers containing non-ascii chars correct
-        if ($stream) {
-            $hdr = new Horde_Stream();
-            $hdr->add($this->_headers->toString(array('charset' => 'utf-8', 'canonical' => true)), true);
-            return Horde_Stream_Wrapper_Combine::getStream(
-                array($hdr->stream,
-                      $this->getBasePart()->toString(
-                        array('stream' => true, 'canonical' => true, 'encode' => Horde_Mime_Part::ENCODE_7BIT | Horde_Mime_Part::ENCODE_8BIT | Horde_Mime_Part::ENCODE_BINARY))
-                )
-            );
-        }
-
-        return $this->_headers->toString(array('charset' => 'utf-8', 'canonical' => true)) .
+		if ($stream) {
+			$hdr = new Horde_Stream();
+			$hdr->add($this->_headers->toString(array('charset' => 'utf-8', 'canonical' => true)), true);
+			return Horde_Stream_Wrapper_Combine::getStream(
+				array($hdr->stream,
+					  $this->getBasePart()->toString(
+						array('stream' => true, 'canonical' => true, 'encode' => Horde_Mime_Part::ENCODE_7BIT | Horde_Mime_Part::ENCODE_8BIT | Horde_Mime_Part::ENCODE_BINARY))
+				)
+			);
+		}
+
+		return $this->_headers->toString(array('charset' => 'utf-8', 'canonical' => true)) .
 			$this->getBasePart()->toString(array('canonical' => true));
-    }
+	}
 
 	/**
 	 * Convert charset of text-parts of message to utf-8

Spacing +47 added lines, -47 removed lines

@@ -66,7 +66,7 @@ 
 	 * @param int|Mail\Account|boolean $account =null mail account to use, default use Mail\Account::get_default($smtp=true)
 	 *	false: no NOT initialise account and set other EGroupware specific headers, used to parse mails (not sending them!)
 	 */
-	function __construct($account=null)
+	function __construct($account = null)
 	{
 		// Horde use locale for translation of error messages
 		Preferences::setlocale(LC_MESSAGES);
@@ -105,7 +105,7 @@ 
 	 * @param int|Mail\Account $account =null mail account to use, default use Mail\Account::get_default($smtp=true)
 	 * @throws Exception\NotFound if account was not found (or not valid for current user)
 	 */
-	function  setAccount($account=null)
+	function  setAccount($account = null)
 	{
 		if (is_a($account, 'Mail\Account'))
 		{
@@ -127,7 +127,7 @@ 
 		{
 			$identity = Mail\Account::read_identity($this->account->ident_id, true, null, $this->account);
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			unset($e);
 			error_log(__METHOD__.__LINE__.' Could not read_identity for account:'.$account['acc_id'].' with IdentID:'.$account['ident_id']);
@@ -149,7 +149,7 @@ 
 	 * @param string $address
 	 * @param string $personal =''
 	 */
-	public function setFrom($address, $personal='')
+	public function setFrom($address, $personal = '')
 	{
 		$this->addHeader('From', self::add_personal($address, $personal));
 	}
@@ -161,13 +161,13 @@ 
 	 * @param string $personal ='' only used if $address is a string
 	 * @param string $type ='to' type of address to add "to", "cc", "bcc" or "replyto"
 	 */
-	function addAddress($address, $personal='', $type='to')
+	function addAddress($address, $personal = '', $type = 'to')
 	{
 		if (!isset(self::$type2header[$type]))
 		{
 			throw new Exception\WrongParameter("Unknown type '$type'!");
 		}
-		if ($personal) $address = self::add_personal ($address, $personal);
+		if ($personal) $address = self::add_personal($address, $personal);
 
 		// add to our local list
 		$this->$type->add($address);
@@ -181,7 +181,7 @@ 
 	 *
 	 * @param string $type ='to' type of address to add "to", "cc", "bcc" or "replyto"
 	 */
-	function clearAddresses($type='to')
+	function clearAddresses($type = 'to')
 	{
 		$this->$type = new Horde_Mail_Rfc822_List();
 
@@ -195,12 +195,12 @@ 
 	 * @param boolean $return_array =false true: return array of string, false: Horde_Mail_Rfc822_List
 	 * @return array|Horde_Mail_Rfc822_List supporting arrayAccess and Iterable
 	 */
-	function getAddresses($type='to', $return_array=false)
+	function getAddresses($type = 'to', $return_array = false)
 	{
 		if ($return_array)
 		{
 			$addresses = array();
-			foreach($this->$type as $addr)
+			foreach ($this->$type as $addr)
 			{
 				$addresses[] = (string)$addr;
 			}
@@ -241,7 +241,7 @@ 
 			//if (!preg_match('/^[!#$%&\'*+/0-9=?A-Z^_`a-z{|}~-]+$/u', $personal))	// that's how I read the rfc(2)822
 			if ($personal && !preg_match('/^[0-9A-Z -]*$/iu', $personal))	// but quoting is never wrong, so quote more then necessary
 			{
-				$personal = '"'.str_replace(array('\\', '"'),array('\\\\', '\\"'), $personal).'"';
+				$personal = '"'.str_replace(array('\\', '"'), array('\\\\', '\\"'), $personal).'"';
 			}
 			$address = ($personal ? $personal.' <' : '').$address.($personal ? '>' : '');
 		}
@@ -254,7 +254,7 @@ 
 	 * @param string|array|Horde_Mail_Rfc822_List $address
 	 * @param string $personal ='' only used if $address is a string
 	 */
-	function addCc($address, $personal=null)
+	function addCc($address, $personal = null)
 	{
 		$this->addAddress($address, $personal, 'cc');
 	}
@@ -273,7 +273,7 @@ 
 	 * @param string|array|Horde_Mail_Rfc822_List $address
 	 * @param string $personal ='' only used if $address is a string
 	 */
-	function addBcc($address, $personal=null)
+	function addBcc($address, $personal = null)
 	{
 		$this->addAddress($address, $personal, 'bcc');
 	}
@@ -292,7 +292,7 @@ 
 	 * @param string|array|Horde_Mail_Rfc822_List $address
 	 * @param string $personal ='' only used if $address is a string
 	 */
-	function addReplyTo($address, $personal=null)
+	function addReplyTo($address, $personal = null)
 	{
 		$this->addAddress($address, $personal, 'replyto');
 	}
@@ -327,7 +327,7 @@ 
 	 * @return integer part-number
 	 * @throws Exception\NotFound if $file could not be opened for reading
 	 */
-	public function addAttachment($data, $name = null, $type = null, $old_type=null)
+	public function addAttachment($data, $name = null, $type = null, $old_type = null)
 	{
 		// deprecated PHPMailer::AddAttachment($path, $name = '', $encoding = 'base64', $type = 'application/octet-stream') call
 		if ($type === 'base64')
@@ -360,7 +360,7 @@ 
 		// set content-type parameters, which get ignored by setType
 		if (preg_match_all('/;\s*([^=]+)=([^;]*)/', $type, $matches))
 		{
-			foreach($matches[1] as $n => $label)
+			foreach ($matches[1] as $n => $label)
 			{
 				$part->setContentTypeParameter($label, $matches[2][$n]);
 			}
@@ -462,11 +462,11 @@ 
 	 * @param array $parameters =array() eg. array('method' => 'REQUEST')
 	 * @param string $charset =null default to $this->_charset="utf-8"
 	 */
-	function setAlternativBody($content, $type, $parameters=array(), $charset=null)
+	function setAlternativBody($content, $type, $parameters = array(), $charset = null)
 	{
 		$this->_alternativBody = new Horde_Mime_Part();
 		$this->_alternativBody->setType($type);
-		foreach($parameters as $label => $data)
+		foreach ($parameters as $label => $data)
 		{
 			$this->_alternativBody->setContentTypeParameter($label, $data);
 		}
@@ -491,9 +491,9 @@ 
 	 * @throws Exception\NotFound for no smtp account available
 	 * @throws Horde_Mime_Exception
 	 */
-	function send(Horde_Mail_Transport $transport=null, $resend=true, $flowed=null)
+	function send(Horde_Mail_Transport $transport = null, $resend = true, $flowed = null)
 	{
-		unset($resend);	// parameter is not used, but required by function signature
+		unset($resend); // parameter is not used, but required by function signature
 
 		if (!($message_id = $this->getHeader('Message-ID')) &&
 			class_exists('Horde_Mime_Headers_MessageId'))	// since 2.5.0
@@ -501,24 +501,24 @@ 
 			$message_id = Horde_Mime_Headers_MessageId::create('EGroupware');
 			$this->addHeader('Message-ID', $message_id);
 		}
-		$body_sha1 = null;	// skip sha1, it requires whole mail in memory, which we traing to avoid now
+		$body_sha1 = null; // skip sha1, it requires whole mail in memory, which we traing to avoid now
 
 		$mail_id = Hooks::process(array(
 			'location' => 'send_mail',
-			'subject' => $subject=$this->getHeader('Subject'),
+			'subject' => $subject = $this->getHeader('Subject'),
 			'from' => $this->getHeader('Return-Path') ? $this->getHeader('Return-Path') : $this->getHeader('From'),
-			'to' => $to=$this->getAddresses('to', true),
-			'cc' => $cc=$this->getAddresses('cc', true),
-			'bcc' => $bcc=$this->getAddresses('bcc', true),
+			'to' => $to = $this->getAddresses('to', true),
+			'cc' => $cc = $this->getAddresses('cc', true),
+			'bcc' => $bcc = $this->getAddresses('bcc', true),
 			'body_sha1' => $body_sha1,
 			'message_id' => (string)$message_id,
-		), array(), true);	// true = call all apps
+		), array(), true); // true = call all apps
 
 		// check if we are sending an html mail with inline images
 		if (!empty($this->_htmlBody) && count($this->_parts))
 		{
 			$related = null;
-			foreach($this->_parts as $n => $part)
+			foreach ($this->_parts as $n => $part)
 			{
 				if ($part->getDisposition() == 'inline' && $part->getContentId())
 				{
@@ -574,7 +574,7 @@ 
 				$this->_body = $body;
 				$flowed = false;
 			}
-			parent::send($transport ? $transport : $this->account->smtpTransport(), true,	$flowed);	// true: keep Message-ID
+			parent::send($transport ? $transport : $this->account->smtpTransport(), true, $flowed); // true: keep Message-ID
 		}
 		catch (\Exception $e) {
 			// in case of errors/exceptions call hook again with previous returned mail_id and error-message to log
@@ -589,7 +589,7 @@ 
 				'message_id' => (string)$message_id,
 				'mail_id' => $mail_id,
 				'error' => $e->getMessage(),
-			), array(), true);	// true = call all apps
+			), array(), true); // true = call all apps
 		}
 
 		// log mails to file specified in $GLOBALS['egw_info']['server']['log_mail'] or error_log for true
@@ -602,7 +602,7 @@ 
 			$msg .= ' from instance '.$GLOBALS['egw_info']['user']['domain'].' and IP '.Session::getuser_ip();
 			$msg .= ' from user #'.$GLOBALS['egw_info']['user']['account_id'];
 
-			if ($GLOBALS['egw_info']['user']['account_id'] && class_exists(__NAMESPACE__.'\\Accounts',false))
+			if ($GLOBALS['egw_info']['user']['account_id'] && class_exists(__NAMESPACE__.'\\Accounts', false))
 			{
 				$msg .= ' ('.Accounts::username($GLOBALS['egw_info']['user']['account_id']).')';
 			}
@@ -614,7 +614,7 @@ 
 			$msg .= ' cc='.implode(', ', $cc).', bcc='.implode(', ', $bcc);
 			if ($GLOBALS['egw_info']['server']['log_mail'] !== true) $msg .= "\n\n";
 
-			error_log($msg,$GLOBALS['egw_info']['server']['log_mail'] === true ? 0 : 3,
+			error_log($msg, $GLOBALS['egw_info']['server']['log_mail'] === true ? 0 : 3,
 				$GLOBALS['egw_info']['server']['log_mail']);
 		}
 		// rethrow error
@@ -651,15 +651,15 @@ 
      * @param  boolean $stream  If true, return a stream resource, otherwise
      * @return stream|string  The raw email data.
      */
-	function getRaw($stream=true)
+	function getRaw($stream = true)
 	{
 		try {
 			$this->getBasePart();
 		}
-		catch(Horde_Mail_Exception $e)
+		catch (Horde_Mail_Exception $e)
 		{
 			unset($e);
-			parent::send(new Horde_Mail_Transport_Null(), true);	// true: keep Message-ID
+			parent::send(new Horde_Mail_Transport_Null(), true); // true: keep Message-ID
 		}
 		// code copied from Horde_Mime_Mail::getRaw(), as there is no way to inject charset in
 		// _headers->toString(), which is required to encode headers containing non-ascii chars correct
@@ -669,12 +669,12 @@ 
             return Horde_Stream_Wrapper_Combine::getStream(
                 array($hdr->stream,
                       $this->getBasePart()->toString(
-                        array('stream' => true, 'canonical' => true, 'encode' => Horde_Mime_Part::ENCODE_7BIT | Horde_Mime_Part::ENCODE_8BIT | Horde_Mime_Part::ENCODE_BINARY))
+                        array('stream' => true, 'canonical' => true, 'encode' => Horde_Mime_Part::ENCODE_7BIT|Horde_Mime_Part::ENCODE_8BIT|Horde_Mime_Part::ENCODE_BINARY))
                 )
             );
         }
 
-        return $this->_headers->toString(array('charset' => 'utf-8', 'canonical' => true)) .
+        return $this->_headers->toString(array('charset' => 'utf-8', 'canonical' => true)).
 			$this->getBasePart()->toString(array('canonical' => true));
     }
 
@@ -687,23 +687,23 @@ 
 	 * @param boolean &$converted =false on return if conversation was necessary
 	 * @return string|stream
 	 */
-	static function convert($message, $stream=false, $charset='utf-8', &$converted=false)
+	static function convert($message, $stream = false, $charset = 'utf-8', &$converted = false)
 	{
-		$mailer = new Mailer(false);	// false = no default headers and mail account
+		$mailer = new Mailer(false); // false = no default headers and mail account
 		$mailer->addHeaders(Horde_Mime_Headers::parseHeaders($message));
 		$base = Horde_Mime_Part::parseMessage($message);
-		foreach($base->partIterator() as $part)
+		foreach ($base->partIterator() as $part)
 		{
-			if ($part->getPrimaryType()== 'text')
+			if ($part->getPrimaryType() == 'text')
 			{
 				$charset = $part->getContentTypeParameter('charset');
 				if ($charset && $charset != 'utf-8')
 				{
 					$content = Translation::convert($part->toString(array(
-						'encode' => Horde_Mime_Part::ENCODE_BINARY,	// otherwise we cant recode charset
+						'encode' => Horde_Mime_Part::ENCODE_BINARY, // otherwise we cant recode charset
 					)), $charset, 'utf-8');
 					$part->setContents($content, array(
-						'encode' => Horde_Mime_Part::ENCODE_BINARY,	// $content is NOT encoded
+						'encode' => Horde_Mime_Part::ENCODE_BINARY, // $content is NOT encoded
 					));
 					$part->setContentTypeParameter('charset', 'utf-8');
 					if ($part === $base)
@@ -736,7 +736,7 @@ 
 	 * @param string $subtype =null
 	 * @return Horde_Mime_Part part with body or null
 	 */
-	function findBody($subtype=null)
+	function findBody($subtype = null)
 	{
 		try {
 			$base = $this->getBasePart();
@@ -768,11 +768,11 @@ 
 			$this->_body = $this->_htmlBody = $this->_alternativBody = null;
 			$this->clearParts();
 
-			foreach($base->partIterator() as $part)
+			foreach ($base->partIterator() as $part)
 			{
 				$id = $part->getMimeId();
 				//error_log(__METHOD__."() plain=$plain_id, html=$html_id: $id: ".$part->getType());
-				switch($id)
+				switch ($id)
 				{
 					case '0':	// base-part itself
 						continue 2;
@@ -816,11 +816,11 @@ 
 			$this->_body = $this->_htmlBody = $this->_alternativBody = null;
 			$this->clearParts();
 
-			foreach($base->partIterator() as $part)
+			foreach ($base->partIterator() as $part)
 			{
 				$id = $part->getMimeId();
 				//error_log(__METHOD__."() plain=$plain_id, html=$html_id: $id: ".$part->getType());
-				switch($id)
+				switch ($id)
 				{
 					case '0':	// base-part itself
 						continue 2;
@@ -892,7 +892,7 @@ 
 	 */
 	function clearCustomHeaders()
 	{
-		foreach($this->_headers->toArray() as $header => $value)
+		foreach ($this->_headers->toArray() as $header => $value)
 		{
 			if (stripos($header, 'x-') === 0 || $header == 'Received')
 			{

Braces +50 added lines, -13 removed lines

@@ -117,10 +117,13 @@ 
 		}
 		else
 		{
-			if (!($this->account = Mail\Account::get_default(true)))	// true = need an SMTP (not just IMAP) account
+			if (!($this->account = Mail\Account::get_default(true)))
+			{
+				// true = need an SMTP (not just IMAP) account
 			{
 				throw new Exception\NotFound('SMTP: '.lang('Account not found!'));
 			}
+			}
 		}
 
 		try
@@ -167,7 +170,10 @@ 
 		{
 			throw new Exception\WrongParameter("Unknown type '$type'!");
 		}
-		if ($personal) $address = self::add_personal ($address, $personal);
+		if ($personal)
+		{
+			$address = self::add_personal ($address, $personal);
+		}
 
 		// add to our local list
 		$this->$type->add($address);
@@ -239,10 +245,13 @@ 
 		if (is_string($address) && !empty($personal))
 		{
 			//if (!preg_match('/^[!#$%&\'*+/0-9=?A-Z^_`a-z{|}~-]+$/u', $personal))	// that's how I read the rfc(2)822
-			if ($personal && !preg_match('/^[0-9A-Z -]*$/iu', $personal))	// but quoting is never wrong, so quote more then necessary
+			if ($personal && !preg_match('/^[0-9A-Z -]*$/iu', $personal))
+			{
+				// but quoting is never wrong, so quote more then necessary
 			{
 				$personal = '"'.str_replace(array('\\', '"'),array('\\\\', '\\"'), $personal).'"';
 			}
+			}
 			$address = ($personal ? $personal.' <' : '').$address.($personal ? '>' : '');
 		}
 		return $address;
@@ -345,7 +354,10 @@ 
 			throw new Exception\NotFound("File '$data' not found!");
 		}
 
-		if (empty($type) && !is_resource($data)) $type = Vfs::mime_content_type($data);
+		if (empty($type) && !is_resource($data))
+		{
+			$type = Vfs::mime_content_type($data);
+		}
 
 		// set "text/calendar; method=*" as alternativ body
 		$matches = null;
@@ -368,11 +380,17 @@ 
 		$part->setContents($resource);
 
 		// setting name, also sets content-disposition attachment (!), therefore we have to do it after "text/calendar; method=" handling
-		if ($name || !is_resource($data)) $part->setName($name ? $name : Vfs::basename($data));
+		if ($name || !is_resource($data))
+		{
+			$part->setName($name ? $name : Vfs::basename($data));
+		}
 
 		// this should not be necessary, because binary data get detected by mime-type,
 		// but at least Cyrus complains about NUL characters
-		if (substr($type, 0, 5) != 'text/') $part->setTransferEncoding('base64', array('send' => true));
+		if (substr($type, 0, 5) != 'text/')
+		{
+			$part->setTransferEncoding('base64', array('send' => true));
+		}
 		$part->setDisposition('attachment');
 
 		return $this->addMimePart($part);
@@ -496,9 +514,12 @@ 
 		unset($resend);	// parameter is not used, but required by function signature
 
 		if (!($message_id = $this->getHeader('Message-ID')) &&
-			class_exists('Horde_Mime_Headers_MessageId'))	// since 2.5.0
+			class_exists('Horde_Mime_Headers_MessageId'))
+		{
+			// since 2.5.0
 		{
 			$message_id = Horde_Mime_Headers_MessageId::create('EGroupware');
+		}
 			$this->addHeader('Message-ID', $message_id);
 		}
 		$body_sha1 = null;	// skip sha1, it requires whole mail in memory, which we traing to avoid now
@@ -538,7 +559,10 @@ 
 
 		try {
 			// no flowed for encrypted messages
-			if (!isset($flowed)) $flowed = $this->_body && $this->_body->getType() != 'multipart/encrypted';
+			if (!isset($flowed))
+			{
+				$flowed = $this->_body && $this->_body->getType() != 'multipart/encrypted';
+			}
 
 			// check if flowed is disabled in mail site configuration
 			if (($config = Config::read('mail')) && $config['disable_rfc3676_flowed'])
@@ -612,13 +636,19 @@ 
 				$msg .= 'ERROR '.$e->getMessage();
 			}
 			$msg .= ' cc='.implode(', ', $cc).', bcc='.implode(', ', $bcc);
-			if ($GLOBALS['egw_info']['server']['log_mail'] !== true) $msg .= "\n\n";
+			if ($GLOBALS['egw_info']['server']['log_mail'] !== true)
+			{
+				$msg .= "\n\n";
+			}
 
 			error_log($msg,$GLOBALS['egw_info']['server']['log_mail'] === true ? 0 : 3,
 				$GLOBALS['egw_info']['server']['log_mail']);
 		}
 		// rethrow error
-		if (isset($e)) throw $e;
+		if (isset($e))
+		{
+			throw $e;
+		}
 	}
 
 
@@ -663,7 +693,8 @@ 
 		}
 		// code copied from Horde_Mime_Mail::getRaw(), as there is no way to inject charset in
 		// _headers->toString(), which is required to encode headers containing non-ascii chars correct
-        if ($stream) {
+        if ($stream)
+        {
             $hdr = new Horde_Stream();
             $hdr->add($this->_headers->toString(array('charset' => 'utf-8', 'canonical' => true)), true);
             return Horde_Stream_Wrapper_Combine::getStream(
@@ -740,7 +771,10 @@ 
 	{
 		try {
 			$base = $this->getBasePart();
-			if (!($part_id = $base->findBody($subtype))) return null;
+			if (!($part_id = $base->findBody($subtype)))
+			{
+				return null;
+			}
 			return $base->getPart($part_id);
 		}
 		catch (Exception $e) {
@@ -854,7 +888,10 @@ 
 	 */
 	public function addMimePart($part)
 	{
-		if ($this->_base) $this->parseBasePart();
+		if ($this->_base)
+		{
+			$this->parseBasePart();
+		}
 
 		return parent::addMimePart($part);
 	}

api/src/Preferences.php

Doc Comments +1 added lines, -1 removed lines

@@ -968,7 +968,7 @@
 	 *
 	 * This method uses the language and nationalty set in the users common prefs.
 	 *
-	 * @param $category =LC_ALL category to set, see setlocal function
+	 * @param integer $category =LC_ALL category to set, see setlocal function
 	 * @param $charset =null default system charset
 	 * @return string the local (or best estimate) set
 	 */

Spacing +98 added lines, -98 removed lines

@@ -95,7 +95,7 @@ 
 	const TABLE = 'egw_preferences';
 	var $table = self::TABLE;
 
-	var $values,$vars;	// standard notify substitues, will be set by standard_substitues()
+	var $values, $vars; // standard notify substitues, will be set by standard_substitues()
 
 	/**
 	 * Contstructor
@@ -163,7 +163,7 @@ 
 			case self::FORCED_ID:
 				return 'forced';
 		}
-		return $this->account_id < self::DEFAULT_ID ? $this->account_id-self::DEFAULT_ID : $this->account_id;
+		return $this->account_id < self::DEFAULT_ID ? $this->account_id - self::DEFAULT_ID : $this->account_id;
 	}
 
 	/**
@@ -193,21 +193,21 @@ 
 	{
 		$prefs = Cache::getInstance(__CLASS__, $ids);
 		$db_read = array();
-		foreach((array)$ids as $id)
+		foreach ((array)$ids as $id)
 		{
 			// if prefs are not returned, null or not an array, read them from db
 			if (!isset($prefs[$id]) && !is_array($prefs[$id])) $db_read[] = $id;
 		}
 		if ($db_read)
 		{
-			foreach($this->db->select($this->table,'*',array('preference_owner' => $db_read),__LINE__,__FILE__) as $row)
+			foreach ($this->db->select($this->table, '*', array('preference_owner' => $db_read), __LINE__, __FILE__) as $row)
 			{
 				// The following replacement is required for PostgreSQL to work
 				$app = trim($row['preference_app']);
 
 				$prefs[$row['preference_owner']][$app] = self::unserialize($row['preference_value']);
 			}
-			foreach($db_read as $id)
+			foreach ($db_read as $id)
 			{
 				if (!isset($prefs[$id])) $prefs[$id] = array();
 				Cache::setInstance(__CLASS__, $id, $prefs[$id]);
@@ -226,7 +226,7 @@ 
 	 * @param boolean $use_standard_values =true should the standard values are used
 	 * @return string with parsed notify-msg
 	 */
-	function parse_notify($msg,$values=array(),$use_standard_values=True)
+	function parse_notify($msg, $values = array(), $use_standard_values = True)
 	{
 		$vals = $values ? $values : array();
 
@@ -235,13 +235,13 @@ 
 			$vals += $this->values;
 		}
 		$replace = $with = array();
-		foreach($vals as $key => $val)
+		foreach ($vals as $key => $val)
 		{
 			if ($this->debug) error_log(__METHOD__." replacing \$\$$key\$\$ with $val  ");
 			$replace[] = '$$'.$key.'$$';
 			$with[]    = $val;
 		}
-		return str_replace($replace,$with,$msg);
+		return str_replace($replace, $with, $msg);
 	}
 
 	/**
@@ -253,9 +253,9 @@ 
 	 * @param boolean $un_lang =false if true translate back
 	 * @return string
 	 */
-	function lang_notify($msg,$vals=array(),$un_lang=False)
+	function lang_notify($msg, $vals = array(), $un_lang = False)
 	{
-		foreach(array_keys($vals) as $key)
+		foreach (array_keys($vals) as $key)
 		{
 			$lname = ($lname = lang($key)) == $key.'*' ? $key : $lname;
 			if ($un_lang)
@@ -267,7 +267,7 @@ 
 				$langs[$key] = '$$'.$lname.'$$';
 			}
 		}
-		return $this->parse_notify($msg,$langs,False);
+		return $this->parse_notify($msg, $langs, False);
 	}
 
 	/**
@@ -278,7 +278,7 @@ 
 		if ($this->debug) error_log(__METHOD__." is called ");
 		if (!is_array(@$GLOBALS['egw_info']['user']['preferences']))
 		{
-			$GLOBALS['egw_info']['user']['preferences'] = $this->data;	// else no lang()
+			$GLOBALS['egw_info']['user']['preferences'] = $this->data; // else no lang()
 		}
 		// we cant use egw_info/user/fullname, as it's not set when we run
 		$this->values = array(	// standard notify replacements
@@ -287,37 +287,37 @@ 
 			'lastname'  => Accounts::id2name($this->account_id, 'account_lastname'),
 			'domain'    => $GLOBALS['egw_info']['server']['mail_suffix'],
 			'email'     => $this->email_address($this->account_id),
-			'date'      => DateTime::to('now',$GLOBALS['egw_info']['user']['preferences']['common']['dateformat']),
+			'date'      => DateTime::to('now', $GLOBALS['egw_info']['user']['preferences']['common']['dateformat']),
 		);
 		// do this first, as it might be already contain some substitues
 		//
 		$this->values['email'] = $this->parse_notify($this->values['email']);
 
 		$this->vars = array(	// langs have to be in common !!!
-			'fullname'  => lang('name of the user, eg. "%1"',$this->values['fullname']),
-			'firstname' => lang('first name of the user, eg. "%1"',$this->values['firstname']),
-			'lastname'  => lang('last name of the user, eg. "%1"',$this->values['lastname']),
-			'domain'    => lang('domain name for mail-address, eg. "%1"',$this->values['domain']),
-			'email'     => lang('email-address of the user, eg. "%1"',$this->values['email']),
-			'date'      => lang('todays date, eg. "%1"',$this->values['date']),
+			'fullname'  => lang('name of the user, eg. "%1"', $this->values['fullname']),
+			'firstname' => lang('first name of the user, eg. "%1"', $this->values['firstname']),
+			'lastname'  => lang('last name of the user, eg. "%1"', $this->values['lastname']),
+			'domain'    => lang('domain name for mail-address, eg. "%1"', $this->values['domain']),
+			'email'     => lang('email-address of the user, eg. "%1"', $this->values['email']),
+			'date'      => lang('todays date, eg. "%1"', $this->values['date']),
 		);
-		if ($this->debug) error_log(__METHOD__.print_r($this->vars,true));
+		if ($this->debug) error_log(__METHOD__.print_r($this->vars, true));
 		// do the substituetion in the effective prefs (data)
 		//
-		foreach($this->data as $app => $data)
+		foreach ($this->data as $app => $data)
 		{
-			if(!is_array($data)) continue;
-			foreach($data as $key => $val)
+			if (!is_array($data)) continue;
+			foreach ($data as $key => $val)
 			{
-				if (!is_array($val) && strpos($val,'$$') !== False)
+				if (!is_array($val) && strpos($val, '$$') !== False)
 				{
 					$this->data[$app][$key] = $this->parse_notify($val);
 				}
 				elseif (is_array($val))
 				{
-					foreach($val as $k => $v)
+					foreach ($val as $k => $v)
 					{
-						if (!is_array($v) && strpos($v,'$$') !== False)
+						if (!is_array($v) && strpos($v, '$$') !== False)
 						{
 							$this->data[$app][$key][$k] = $this->parse_notify($v);
 						}
@@ -342,12 +342,12 @@ 
 		}
 		// handling of old PHP serialized and addslashed prefs
 		$data = php_safe_unserialize($str);
-		if($data === false)
+		if ($data === false)
 		{
 			// manually retrieve the string lengths of the serialized array if unserialize failed
 			$data = php_safe_unserialize(preg_replace_callback('!s:(\d+):"(.*?)";!s', function($matches)
 			{
-				return 's:'.mb_strlen($matches[2],'8bit').':"'.$matches[2].'";';
+				return 's:'.mb_strlen($matches[2], '8bit').':"'.$matches[2].'";';
 			}, $str));
 		}
 		self::unquote($data);
@@ -366,7 +366,7 @@ 
 			$arr = stripslashes($arr);
 			return;
 		}
-		foreach($arr as $key => $value)
+		foreach ($arr as $key => $value)
 		{
 			if (is_array($value))
 			{
@@ -387,27 +387,27 @@ 
 	 * @param boolean $use_session =true should the session prefs get used (default true) or not (false)
 	 * @return array with effective prefs ($this->data)
 	 */
-	function read_repository($use_session=true)
+	function read_repository($use_session = true)
 	{
-		$this->session = $use_session ? Cache::getSession('preferences','preferences') : array();
+		$this->session = $use_session ? Cache::getSession('preferences', 'preferences') : array();
 		if (!is_array($this->session))
 		{
 			$this->session = array();
 		}
 		$this->forced = $this->default = $this->user = $this->group = array();
-		$to_read = array(self::DEFAULT_ID,self::FORCED_ID,$this->account_id);
+		$to_read = array(self::DEFAULT_ID, self::FORCED_ID, $this->account_id);
 		if ($this->account_id > 0)
 		{
 			$primary_group = Accounts::id2name($this->account_id, 'account_primary_group');
-			foreach((array)$GLOBALS['egw']->accounts->memberships($this->account_id, true) as $gid)
+			foreach ((array)$GLOBALS['egw']->accounts->memberships($this->account_id, true) as $gid)
 			{
-				if ($gid != $primary_group) $to_read[] = $gid + self::DEFAULT_ID;	// need to offset it with DEFAULT_ID = -2!
+				if ($gid != $primary_group) $to_read[] = $gid + self::DEFAULT_ID; // need to offset it with DEFAULT_ID = -2!
 			}
 			$to_read[] = $primary_group + self::DEFAULT_ID;
 		}
-		foreach($this->cache_read($to_read) as $id => $values)
+		foreach ($this->cache_read($to_read) as $id => $values)
 		{
-			switch($id)
+			switch ($id)
 			{
 				case self::FORCED_ID:
 					$this->forced = $values;
@@ -419,7 +419,7 @@ 
 					$this->user = $values;
 					break;
 				default:
-					foreach($values as $app => $vals)
+					foreach ($values as $app => $vals)
 					{
 						$this->group[$app] = (array)$vals + (array)$this->group[$app];
 					}
@@ -430,9 +430,9 @@ 
 
 		// let the (temp.) session prefs. override the user prefs.
 		//
-		foreach($this->session as $app => $values)
+		foreach ($this->session as $app => $values)
 		{
-			foreach($values as $var => $value)
+			foreach ($values as $var => $value)
 			{
 				$this->data[$app][$var] = $value;
 			}
@@ -440,9 +440,9 @@ 
 
 		// now use (primary) group defaults if needed (user-value unset or empty)
 		//
-		foreach((array)$this->group as $app => $values)
+		foreach ((array)$this->group as $app => $values)
 		{
-			foreach((array)$values as $var => $value)
+			foreach ((array)$values as $var => $value)
 			{
 				if (!isset($this->data[$app][$var]) || $this->data[$app][$var] === '')
 				{
@@ -452,9 +452,9 @@ 
 		}
 		// now use defaults if needed (user-value unset or empty)
 		//
-		foreach((array)$this->default as $app => $values)
+		foreach ((array)$this->default as $app => $values)
 		{
-			foreach((array)$values as $var => $value)
+			foreach ((array)$values as $var => $value)
 			{
 				if (!isset($this->data[$app][$var]) || $this->data[$app][$var] === '')
 				{
@@ -465,9 +465,9 @@ 
 		}
 		// now set/force forced values
 		//
-		foreach((array)$this->forced as $app => $values)
+		foreach ((array)$this->forced as $app => $values)
 		{
-			foreach((array)$values as $var => $value)
+			foreach ((array)$values as $var => $value)
 			{
 				$this->data[$app][$var] = $value;
 			}
@@ -483,12 +483,12 @@ 
 		{
 			reset($this->data);
 		}
-		if (isset($this->debug) && substr($GLOBALS['egw_info']['flags']['currentapp'],0,3) != 'log')
+		if (isset($this->debug) && substr($GLOBALS['egw_info']['flags']['currentapp'], 0, 3) != 'log')
 		{
-			echo 'user<pre>';     print_r($this->user); echo "</pre>\n";
-			echo 'forced<pre>';   print_r($this->forced); echo "</pre>\n";
-			echo 'default<pre>';  print_r($this->default); echo "</pre>\n";
-			echo 'group<pre>';    print_r($this->group); echo "</pre>\n";
+			echo 'user<pre>'; print_r($this->user); echo "</pre>\n";
+			echo 'forced<pre>'; print_r($this->forced); echo "</pre>\n";
+			echo 'default<pre>'; print_r($this->default); echo "</pre>\n";
+			echo 'group<pre>'; print_r($this->group); echo "</pre>\n";
 			echo 'effectiv<pre>'; print_r($this->data); echo "</pre>\n";
 		}
 		$this->check_set_tz_offset();
@@ -503,7 +503,7 @@ 
 	 * @param string $name =null
 	 * @return mixed
 	 */
-	function default_prefs($app=null,$name=null)
+	function default_prefs($app = null, $name = null)
 	{
 		// Etemplate::complete_array_merge() is identical to PHP >= 5.3 array_replace_recursive()
 		$default = Etemplate::complete_array_merge($this->default, $this->forced);
@@ -521,19 +521,19 @@ 
 	 */
 	function check_set_tz_offset()
 	{
-		$prefs =& $GLOBALS['egw_info']['user']['preferences']['common'];
+		$prefs = & $GLOBALS['egw_info']['user']['preferences']['common'];
 
 		if (!empty($prefs['tz']))
 		{
-			DateTime::setUserPrefs($prefs['tz'],$prefs['dateformat'],$prefs['timeformat']);
+			DateTime::setUserPrefs($prefs['tz'], $prefs['dateformat'], $prefs['timeformat']);
 			// set the old preference for compatibilty with old code
-			$prefs['tz_offset'] = DateTime::tz_offset_s()/3600;
+			$prefs['tz_offset'] = DateTime::tz_offset_s() / 3600;
 			//echo "<p>".__METHOD__."() tz=$prefs[tz] --> tz_offset=$prefs[tz_offset]</p>\n";
 
 			// ToDo: get rid of that
 			if (isset($GLOBALS['egw']) && ($GLOBALS['egw'] instanceof egw))
 			{
-				$GLOBALS['egw']->unset_datetime();	// to force an update
+				$GLOBALS['egw']->unset_datetime(); // to force an update
 			}
 		}
 	}
@@ -558,7 +558,7 @@ 
 		{
 			$this->read_repository();
 		}
-		reset ($this->data);
+		reset($this->data);
 		return $this->data;
 	}
 
@@ -573,7 +573,7 @@ 
 	 * @param string $type ='user' of preference to set: forced, default, user
 	 * @return array with new effective prefs (even when forced or default prefs are set !)
 	 */
-	function add($app_name,$var,$value = '##undef##',$type='user')
+	function add($app_name, $var, $value = '##undef##', $type = 'user')
 	{
 		//echo "<p>add('$app_name','$var','$value')</p>\n";
 		if ($value === '##undef##')
@@ -587,10 +587,10 @@ 
 				if (!isset($this->forced[$app_name][$var]) || $this->forced[$app_name][$var] === '')
 				{
 					$this->session[$app_name][$var] = $this->data[$app_name][$var] = $value;
-					Cache::setSession('preferences','preferences',$this->session);
-					if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+					Cache::setSession('preferences', 'preferences', $this->session);
+					if (method_exists($GLOBALS['egw'], 'invalidate_session_cache'))	// egw object in setup is limited
 					{
-						$GLOBALS['egw']->invalidate_session_cache();	// in case with cache the egw_info array in the session
+						$GLOBALS['egw']->invalidate_session_cache(); // in case with cache the egw_info array in the session
 					}
 				}
 				break;
@@ -631,13 +631,13 @@ 
 	 * @param string $type ='user' of preference to set: forced, default, user
 	 * @return array with new effective prefs (even when forced or default prefs are deleted!)
 	 */
-	function delete($app_name, $var = False,$type = 'user')
+	function delete($app_name, $var = False, $type = 'user')
 	{
 		//echo "<p>delete('$app_name','$var','$type')</p>\n";
 		$set_via = array(
-			'forced'  => array('user','default'),
-			'default' => array('forced','user'),
-			'user'    => array('forced','group','default'),
+			'forced'  => array('user', 'default'),
+			'default' => array('forced', 'user'),
+			'user'    => array('forced', 'group', 'default'),
 			'group'   => array('forced'),
 		);
 		if (!isset($set_via[$type]))
@@ -671,7 +671,7 @@ 
 			}
 			else
 			{
-				if($var && @isset($arr[$app_name][$var]) && $arr[$app_name][$var] !== '')
+				if ($var && @isset($arr[$app_name][$var]) && $arr[$app_name][$var] !== '')
 				{
 					$this->data[$app_name][$var] = $arr[$app_name][$var];
 					break;
@@ -679,7 +679,7 @@ 
 			}
 			unset($arr);
 		}
-		reset ($this->data);
+		reset($this->data);
 		return $this->data;
 	}
 
@@ -692,7 +692,7 @@ 
 	{
 		if ($accountid > 0)
 		{
-			$this->db->delete($this->table,array('preference_owner' => $accountid),__LINE__,__FILE__);
+			$this->db->delete($this->table, array('preference_owner' => $accountid), __LINE__, __FILE__);
 
 			Cache::unsetInstance(__CLASS__, $accountid);
 		}
@@ -707,9 +707,9 @@ 
 	{
 		if ($accountid < 0)
 		{
-			$this->db->delete($this->table,array('preference_owner' => $accountid+self::DEFAULT_ID),__LINE__,__FILE__);
+			$this->db->delete($this->table, array('preference_owner' => $accountid + self::DEFAULT_ID), __LINE__, __FILE__);
 
-			Cache::unsetInstance(__CLASS__, $accountid+self::DEFAULT_ID);
+			Cache::unsetInstance(__CLASS__, $accountid + self::DEFAULT_ID);
 		}
 	}
 
@@ -722,14 +722,14 @@ 
 	 * @param string $old_value if given, only change if that's current value
 	 * @param string $type if given limit to "user", "forced", "default", "group"
 	 */
-	public static function change_preference($app, $name, $value, $old_value=null, $type=null)
+	public static function change_preference($app, $name, $value, $old_value = null, $type = null)
 	{
 		$db = isset($GLOBALS['egw_setup']->db) ? $GLOBALS['egw_setup']->db : $GLOBALS['egw']->db;
 
 		$where = array();
 		if ($app) $where['preference_app'] = $app;
 
-		switch($type)
+		switch ($type)
 		{
 			case 'forced':
 				$where['preference_owner'] = self::FORCED_ID;
@@ -744,10 +744,10 @@ 
 				$where[] = 'preference_owner < '.self::DEFAULT_ID;
 				break;
 		}
-		foreach($db->select(self::TABLE, '*', $where, __LINE__, __FILE__) as $row)
+		foreach ($db->select(self::TABLE, '*', $where, __LINE__, __FILE__) as $row)
 		{
 			$prefs = self::unserialize($row['preference_value']);
-			if (!is_array($prefs)) $prefs = array();	// would stall update otherwise
+			if (!is_array($prefs)) $prefs = array(); // would stall update otherwise
 
 			if ($name[0] == '/' && substr($name, -1) == '/')
 			{
@@ -762,7 +762,7 @@ 
 			}
 
 			$updated = false;
-			foreach($attrs as $attr)
+			foreach ($attrs as $attr)
 			{
 				if (isset($old_value) && $prefs[$attr] != $old_value) continue;
 
@@ -791,7 +791,7 @@ 
 
 				// update instance-wide cache
 				$cached = Cache::getInstance(__CLASS__, $row['preference_owner']);
-				if($cached && $cached[$row['preference_app']])
+				if ($cached && $cached[$row['preference_app']])
 				{
 					$cached[$row['preference_app']] = $prefs;
 					Cache::setInstance(__CLASS__, $row['preference_owner'], $cached);
@@ -807,7 +807,7 @@ 
 	 * @param string $name Preference name
 	 * @param string $type ='user' of preference to set: forced, default, user
 	 */
-	public static function delete_preference($app, $name, $type='user')
+	public static function delete_preference($app, $name, $type = 'user')
 	{
 		self::change_preference($app, $name, null, null, $type);
 	}
@@ -819,12 +819,12 @@ 
 	 * @param string $to_app
 	 * @param array $names =null array of names to copy or null for all
 	 */
-	public static function copy_preferences($from_app, $to_app, array $names=null)
+	public static function copy_preferences($from_app, $to_app, array $names = null)
 	{
 		//error_log(__METHOD__."('$from_app', '$to_app', ".array2string($names).')');
 		$db = isset($GLOBALS['egw_setup']->db) ? $GLOBALS['egw_setup']->db : $GLOBALS['egw']->db;
 
-		foreach($db->select(self::TABLE, '*', array('preference_app' => $from_app), __LINE__, __FILE__) as $row)
+		foreach ($db->select(self::TABLE, '*', array('preference_app' => $from_app), __LINE__, __FILE__) as $row)
 		{
 			$prefs = self::unserialize($row['preference_value']);
 
@@ -832,7 +832,7 @@ 
 			{
 				$prefs = array_intersect_key($prefs, array_flip($names));
 			}
-			if (!$prefs) continue;	// nothing to change, as nothing set
+			if (!$prefs) continue; // nothing to change, as nothing set
 
 			$row['preference_app'] = $to_app;
 			unset($row['preference_value']);
@@ -866,11 +866,11 @@ 
 	 * @param boolean $invalid_cache =true should we invalidate the cache, default true (not used anymore)
 	 * @return array with new effective prefs (even when forced or default prefs are deleted!)
 	 */
-	function save_repository($update_session_info = False,$type='user',$invalid_cache=true)
+	function save_repository($update_session_info = False, $type = 'user', $invalid_cache = true)
 	{
-		unset($update_session_info, $invalid_cache);	// no longer used
+		unset($update_session_info, $invalid_cache); // no longer used
 
-		switch($type)
+		switch ($type)
 		{
 			case 'forced':
 				$account_id = self::FORCED_ID;
@@ -885,17 +885,17 @@ 
 
 			default:
 				$account_id = (int)$this->account_id;
-				$prefs = &$this->user;	// we use the user-array as data contains default values too
+				$prefs = &$this->user; // we use the user-array as data contains default values too
 				break;
 		}
 		//echo "<p>preferences::save_repository(,$type): account_id=$account_id, prefs="; print_r($prefs); echo "</p>\n";
 
-		if (isset($GLOBALS['egw_setup']) || !$GLOBALS['egw']->acl->check('session_only_preferences',1,'preferences') &&
+		if (isset($GLOBALS['egw_setup']) || !$GLOBALS['egw']->acl->check('session_only_preferences', 1, 'preferences') &&
 			(!($old_prefs = $this->cache_read($account_id)) || $old_prefs != $prefs))
 		{
 			//error_log(__METHOD__."(type=$type) saved, because old_prefs[$account_id] != prefs=".array2string($prefs));
 			$changed = 0;
-			foreach($prefs as $app => $value)
+			foreach ($prefs as $app => $value)
 			{
 				// check if app preferences have changed, if not no need to save them
 				if ($old_prefs && $old_prefs[$app] == $value) continue;
@@ -912,12 +912,12 @@ 
 				}
 				else
 				{
-					$this->db->insert($this->table,array(
+					$this->db->insert($this->table, array(
 						'preference_value' => json_encode($value),
-					),array(
+					), array(
 						'preference_owner' => $account_id,
 						'preference_app'   => $app,
-					),__LINE__,__FILE__);
+					), __LINE__, __FILE__);
 				}
 			}
 			if ($changed)
@@ -944,21 +944,21 @@ 
 	 * @param int $account_id as determined in and/or passed to "create_email_preferences"
 	 * @return string with email-address
 	 */
-	function email_address($account_id='')
+	function email_address($account_id = '')
 	{
 		if (isset($this->data['email']['address']))
 		{
 			return $this->data['email']['address'];
 		}
 		// if email-address is set in the account, return it
-		if (($email = Accounts::id2name($account_id,'account_email')))
+		if (($email = Accounts::id2name($account_id, 'account_email')))
 		{
 			return $email;
 		}
 		$prefs_email_address = Accounts::id2name($account_id);
-		if ($prefs_email_address && strpos($prefs_email_address,'@') === False)
+		if ($prefs_email_address && strpos($prefs_email_address, '@') === False)
 		{
-			$prefs_email_address .= '@' . $GLOBALS['egw_info']['server']['mail_suffix'];
+			$prefs_email_address .= '@'.$GLOBALS['egw_info']['server']['mail_suffix'];
 		}
 		return $prefs_email_address;
 	}
@@ -972,7 +972,7 @@ 
 	 * @param $charset =null default system charset
 	 * @return string the local (or best estimate) set
 	 */
-	static function setlocale($category=LC_ALL,$charset=null)
+	static function setlocale($category = LC_ALL, $charset = null)
 	{
 		$lang = $GLOBALS['egw_info']['user']['preferences']['common']['lang'];
 		$country = $GLOBALS['egw_info']['user']['preferences']['common']['country'];
@@ -983,12 +983,12 @@ 
 		}
 		else
 		{
-			list($lang,$lang2) = explode('-',$lang);
+			list($lang, $lang2) = explode('-', $lang);
 			$country_from_lang = strtoupper($lang2);
 		}
 		if (is_null($charset)) $charset = Translation::charset();
 
-		foreach(array(
+		foreach (array(
 			$lang.'_'.$country,
 			$lang.'_'.$country_from_lang,
 			$lang,
@@ -996,14 +996,14 @@ 
 			'C',
 		) as $local)
 		{
-			if (($ret = setlocale($category,$local.'@'.$charset)) ||
-				($ret = setlocale($category,$local)))
+			if (($ret = setlocale($category, $local.'@'.$charset)) ||
+				($ret = setlocale($category, $local)))
 			{
 				//error_log(__METHOD__."($category,$charset) lang=$lang, country=$country, country_from_lang=$country_from_lang: returning '$ret'");
 				return $ret;
 			}
 		}
 		error_log(__METHOD__."($category,$charset) lang=$lang, country=$country, country_from_lang=$country_from_lang: Could not set local!");
-		return false;	// should not happen, as the 'C' local should at least be available everywhere
+		return false; // should not happen, as the 'C' local should at least be available everywhere
 	}
 }

Braces +81 added lines, -20 removed lines

@@ -196,7 +196,10 @@ 
 		foreach((array)$ids as $id)
 		{
 			// if prefs are not returned, null or not an array, read them from db
-			if (!isset($prefs[$id]) && !is_array($prefs[$id])) $db_read[] = $id;
+			if (!isset($prefs[$id]) && !is_array($prefs[$id]))
+			{
+				$db_read[] = $id;
+			}
 		}
 		if ($db_read)
 		{
@@ -209,7 +212,10 @@ 
 			}
 			foreach($db_read as $id)
 			{
-				if (!isset($prefs[$id])) $prefs[$id] = array();
+				if (!isset($prefs[$id]))
+				{
+					$prefs[$id] = array();
+				}
 				Cache::setInstance(__CLASS__, $id, $prefs[$id]);
 			}
 		}
@@ -237,7 +243,10 @@ 
 		$replace = $with = array();
 		foreach($vals as $key => $val)
 		{
-			if ($this->debug) error_log(__METHOD__." replacing \$\$$key\$\$ with $val  ");
+			if ($this->debug)
+			{
+				error_log(__METHOD__." replacing \$\$$key\$\$ with $val  ");
+			}
 			$replace[] = '$$'.$key.'$$';
 			$with[]    = $val;
 		}
@@ -275,7 +284,10 @@ 
 	 */
 	function standard_substitutes()
 	{
-		if ($this->debug) error_log(__METHOD__." is called ");
+		if ($this->debug)
+		{
+			error_log(__METHOD__." is called ");
+		}
 		if (!is_array(@$GLOBALS['egw_info']['user']['preferences']))
 		{
 			$GLOBALS['egw_info']['user']['preferences'] = $this->data;	// else no lang()
@@ -301,12 +313,18 @@ 
 			'email'     => lang('email-address of the user, eg. "%1"',$this->values['email']),
 			'date'      => lang('todays date, eg. "%1"',$this->values['date']),
 		);
-		if ($this->debug) error_log(__METHOD__.print_r($this->vars,true));
+		if ($this->debug)
+		{
+			error_log(__METHOD__.print_r($this->vars,true));
+		}
 		// do the substituetion in the effective prefs (data)
 		//
 		foreach($this->data as $app => $data)
 		{
-			if(!is_array($data)) continue;
+			if(!is_array($data))
+			{
+				continue;
+			}
 			foreach($data as $key => $val)
 			{
 				if (!is_array($val) && strpos($val,'$$') !== False)
@@ -401,7 +419,11 @@ 
 			$primary_group = Accounts::id2name($this->account_id, 'account_primary_group');
 			foreach((array)$GLOBALS['egw']->accounts->memberships($this->account_id, true) as $gid)
 			{
-				if ($gid != $primary_group) $to_read[] = $gid + self::DEFAULT_ID;	// need to offset it with DEFAULT_ID = -2!
+				if ($gid != $primary_group)
+				{
+					$to_read[] = $gid + self::DEFAULT_ID;
+				}
+				// need to offset it with DEFAULT_ID = -2!
 			}
 			$to_read[] = $primary_group + self::DEFAULT_ID;
 		}
@@ -508,9 +530,15 @@ 
 		// Etemplate::complete_array_merge() is identical to PHP >= 5.3 array_replace_recursive()
 		$default = Etemplate::complete_array_merge($this->default, $this->forced);
 
-		if ($app) $default = $default[$app];
+		if ($app)
+		{
+			$default = $default[$app];
+		}
 
-		if ($name && is_array($default)) $default = $default[$name];
+		if ($name && is_array($default))
+		{
+			$default = $default[$name];
+		}
 
 		return $default;
 	}
@@ -588,9 +616,13 @@ 
 				{
 					$this->session[$app_name][$var] = $this->data[$app_name][$var] = $value;
 					Cache::setSession('preferences','preferences',$this->session);
-					if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+					if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))
+					{
+						// egw object in setup is limited
 					{
-						$GLOBALS['egw']->invalidate_session_cache();	// in case with cache the egw_info array in the session
+						$GLOBALS['egw']->invalidate_session_cache();
+					}
+					// in case with cache the egw_info array in the session
 					}
 				}
 				break;
@@ -646,9 +678,12 @@ 
 		}
 		$pref = &$this->$type;
 
-		if (($all = empty($var))) // to check if $var is regarded as empty (false, 0, '', null, array() should do the trick
+		if (($all = empty($var)))
+		{
+			// to check if $var is regarded as empty (false, 0, '', null, array() should do the trick
 		{
 			unset($pref[$app_name]);
+		}
 			unset($this->data[$app_name]);
 		}
 		else
@@ -727,7 +762,10 @@ 
 		$db = isset($GLOBALS['egw_setup']->db) ? $GLOBALS['egw_setup']->db : $GLOBALS['egw']->db;
 
 		$where = array();
-		if ($app) $where['preference_app'] = $app;
+		if ($app)
+		{
+			$where['preference_app'] = $app;
+		}
 
 		switch($type)
 		{
@@ -747,7 +785,11 @@ 
 		foreach($db->select(self::TABLE, '*', $where, __LINE__, __FILE__) as $row)
 		{
 			$prefs = self::unserialize($row['preference_value']);
-			if (!is_array($prefs)) $prefs = array();	// would stall update otherwise
+			if (!is_array($prefs))
+			{
+				$prefs = array();
+			}
+			// would stall update otherwise
 
 			if ($name[0] == '/' && substr($name, -1) == '/')
 			{
@@ -764,10 +806,16 @@ 
 			$updated = false;
 			foreach($attrs as $attr)
 			{
-				if (isset($old_value) && $prefs[$attr] != $old_value) continue;
+				if (isset($old_value) && $prefs[$attr] != $old_value)
+				{
+					continue;
+				}
 
 				$val = is_callable($value) ? call_user_func($value, $attr, $prefs[$attr], $row['preference_owner']) : $value;
-				if ($val === $prefs[$attr]) continue;
+				if ($val === $prefs[$attr])
+				{
+					continue;
+				}
 
 				$updated = true;
 				if ((string)$val !== '')
@@ -832,7 +880,11 @@ 
 			{
 				$prefs = array_intersect_key($prefs, array_flip($names));
 			}
-			if (!$prefs) continue;	// nothing to change, as nothing set
+			if (!$prefs)
+			{
+				continue;
+			}
+			// nothing to change, as nothing set
 
 			$row['preference_app'] = $to_app;
 			unset($row['preference_value']);
@@ -898,9 +950,15 @@ 
 			foreach($prefs as $app => $value)
 			{
 				// check if app preferences have changed, if not no need to save them
-				if ($old_prefs && $old_prefs[$app] == $value) continue;
+				if ($old_prefs && $old_prefs[$app] == $value)
+				{
+					continue;
+				}
 
-				if (!$changed++) $this->db->transaction_begin();
+				if (!$changed++)
+				{
+					$this->db->transaction_begin();
+				}
 
 				if (!is_array($value) || !$value)
 				{
@@ -986,7 +1044,10 @@ 
 			list($lang,$lang2) = explode('-',$lang);
 			$country_from_lang = strtoupper($lang2);
 		}
-		if (is_null($charset)) $charset = Translation::charset();
+		if (is_null($charset))
+		{
+			$charset = Translation::charset();
+		}
 
 		foreach(array(
 			$lang.'_'.$country,

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
@@ -187,7 +187,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];
 
@@ -203,27 +203,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']))
 			{
@@ -235,12 +235,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();
 			}
 		}
@@ -249,7 +249,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);
       	}
 	}
 
@@ -319,15 +319,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;
@@ -342,24 +342,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);
 			}
 		}
 	}
@@ -374,15 +374,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
 		}
 	}
 
@@ -395,15 +395,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))
 		{
@@ -419,9 +419,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;
@@ -441,7 +441,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))
@@ -459,9 +459,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;
 			}
@@ -478,7 +478,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']}'");
 			}
@@ -486,9 +486,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')
@@ -497,9 +497,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;
@@ -521,7 +521,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;
@@ -543,7 +543,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']))
@@ -557,7 +557,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';
 			}
@@ -575,46 +575,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).
@@ -633,13 +633,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(
@@ -669,13 +668,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,
@@ -683,10 +682,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
 		{
@@ -694,20 +693,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));
@@ -721,12 +720,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",
@@ -763,28 +762,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;
@@ -805,7 +804,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!
@@ -832,11 +831,11 @@ 
 				EGW_SERVER_ROOT.':'.self::getuser_ip().':'.filemtime(EGW_SERVER_ROOT.'/phpgwapi/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];
 		}
@@ -844,7 +843,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;
 	}
 
@@ -860,9 +859,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));
 	}
 
 	/**
@@ -872,13 +869,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');
@@ -905,23 +902,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;
 
@@ -934,7 +931,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')");
@@ -972,7 +969,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");
@@ -995,9 +992,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");
 		}
 
@@ -1008,9 +1005,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");
@@ -1025,27 +1022,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'])
@@ -1066,7 +1063,7 @@ 
 		}
 		else
 		{
-			$this->commit_session();	// close our own session
+			$this->commit_session(); // close our own session
 
 			session_id($sessionid);
 			if (session_start())
@@ -1106,25 +1103,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();
@@ -1137,7 +1134,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;
@@ -1145,19 +1142,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
 				{
@@ -1170,11 +1167,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);
 					}
@@ -1184,7 +1181,7 @@ 
 					$query[] = $key.'='.urlencode($value);
 				}
 			}
-			$ret_url .= '?' . implode('&',$query);
+			$ret_url .= '?'.implode('&', $query);
 		}
 		return $ret_url;
 	}
@@ -1229,7 +1226,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))
 		{
@@ -1242,11 +1239,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);
 		}
@@ -1265,21 +1262,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 = '/';
 		}
@@ -1299,7 +1296,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).")");
 
@@ -1307,10 +1304,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;
@@ -1320,7 +1317,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;
@@ -1336,11 +1333,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;
 		}
@@ -1363,7 +1360,7 @@ 
 	 * @param boolean $update_access_log =true false: dont update egw_access_log table
 	 * @return string action as written to egw_access_log.session_action
 	 */
-	private function update_dla($update_access_log=true)
+	private function update_dla($update_access_log = true)
 	{
 		// This way XML-RPC users aren't always listed as xmlrpc.php
 		if ($this->xmlrpc_method_called)
@@ -1379,27 +1376,27 @@ 
 			$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);
 			}
 		}
 
 		// 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' => $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();
@@ -1417,12 +1414,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__);
 		}
 	}
 
@@ -1443,7 +1440,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']);
@@ -1456,7 +1453,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;
@@ -1479,9 +1476,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)
@@ -1489,11 +1486,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);
 			}
 		}
 
@@ -1516,9 +1513,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);
 
@@ -1532,7 +1529,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()))
 		{
@@ -1559,7 +1556,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']))
 		{
@@ -1569,7 +1566,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');
@@ -1579,7 +1576,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');
 			}
@@ -1592,8 +1589,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))
@@ -1601,20 +1598,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+
@@ -1639,10 +1636,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';
 		}
@@ -1650,7 +1647,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;
@@ -1664,7 +1661,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';
@@ -1680,16 +1677,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

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

api/src/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)