EGroupware / egroupware

emailadmin/inc/class.emailadmin_imap.inc.php

Doc Comments +8 added lines, -7 removed lines

@@ -132,7 +132,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
 	 */
@@ -450,7 +450,7 @@ 
 	/**
 	 * getSpecialUseFolders
 	 *
-	 * @return current mailbox, or if none check on INBOX, and return upon existance
+	 * @return string mailbox, or if none check on INBOX, and return upon existance
 	 */
 	function getCurrentMailbox()
 	{
@@ -568,7 +568,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
@@ -652,7 +652,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
@@ -720,7 +720,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
 	 *
@@ -898,6 +898,7 @@ 
 	 *
 	 * @var array $_nameSpace
 	 * @var string $_folderName
+	 * @param string $_folderName
 	 * @return string the prefix (may be an empty string)
 	 */
 	static function getFolderPrefixFromNamespace($_nameSpace, $_folderName)
@@ -916,7 +917,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)
@@ -1355,7 +1356,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 +139 added lines, -139 removed lines

@@ -58,7 +58,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 emailadmin_horde_cache / egw_cache
+		'cache' => true, // default caching via emailadmin_horde_cache / egw_cache
 	);
 
 	/**
@@ -136,7 +136,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'))
 		{
@@ -148,18 +148,18 @@ 
 		$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();
 
-		switch($this->params['acc_imap_ssl'] & ~emailadmin_account::SSL_VERIFY)
+		switch ($this->params['acc_imap_ssl']&~emailadmin_account::SSL_VERIFY)
 		{
 			case emailadmin_account::SSL_STARTTLS:
-				$secure = 'tls';	// Horde uses 'tls' for STARTTLS, not ssl connection with tls version >= 1 and no sslv2/3
+				$secure = 'tls'; // Horde uses 'tls' for STARTTLS, not ssl connection with tls version >= 1 and no sslv2/3
 				break;
 			case emailadmin_account::SSL_SSL:
 				$secure = 'ssl';
 				break;
 			case emailadmin_account::SSL_TLS:
-				$secure = 'tlsv1';	// since Horde_Imap_Client-1.16.0 requiring Horde_Socket_Client-1.1.0
+				$secure = 'tlsv1'; // since Horde_Imap_Client-1.16.0 requiring Horde_Socket_Client-1.1.0
 				break;
 		}
 		// Horde use locale for translation of error messages
@@ -179,7 +179,7 @@ 
 			'port' => $this->params['acc_imap_port'],
 			'secure' => $secure,
 			'timeout' => $_timeout,
-		)+self::$default_params;
+		) + self::$default_params;
 
 		if ($parent_params['cache'] === true)
 		{
@@ -203,7 +203,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);
@@ -216,7 +216,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)
 		{
@@ -233,7 +233,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)
 		{
@@ -250,7 +250,7 @@ 
 	 */
 	public function __get($name)
 	{
-		switch($name)
+		switch ($name)
 		{
 			case 'acc_imap_administration':
 				return !empty($this->params['acc_imap_admin_username']);
@@ -268,7 +268,7 @@ 
 				{
 					return $this->$name;
 				}
-				if (array_key_exists($name,$this->params))
+				if (array_key_exists($name, $this->params))
 				{
 					return $this->params[$name];
 				}
@@ -289,9 +289,9 @@ 
 	 * @deprecated allready called by constructor automatic, parameters must be passed to constructor!
 	 * @return boolean|PEAR_Error true on success, PEAR_Error of false on failure
 	 */
-	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 egw_exception_wrong_parameter('need to set parameters on calling emailadmin_account->imapServer()!');
@@ -304,7 +304,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
@@ -329,7 +329,7 @@ 
 	 */
 	function addAccount($_hookValues)
 	{
-		unset($_hookValues);	// not used
+		unset($_hookValues); // not used
 		return true;
 	}
 
@@ -341,7 +341,7 @@ 
 	 */
 	function updateAccount($_hookValues)
 	{
-		unset($_hookValues);	// not used
+		unset($_hookValues); // not used
 		return true;
 	}
 
@@ -353,7 +353,7 @@ 
 	 */
 	function deleteAccount($_hookValues)
 	{
-		unset($_hookValues);	// not used
+		unset($_hookValues); // not used
 		return true;
 	}
 
@@ -370,7 +370,7 @@ 
 	 */
 	function encodeFolderName($_folderName)
 	{
-		if($this->mbAvailable) {
+		if ($this->mbAvailable) {
 			return mb_convert_encoding($_folderName, "UTF7-IMAP", translation::charset());
 		}
 
@@ -387,17 +387,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);
 	}
 
 	/**
@@ -413,23 +413,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)
 		{
@@ -438,7 +438,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);
@@ -458,7 +458,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());
@@ -476,16 +476,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;
 				}
@@ -507,7 +507,7 @@ 
 			$status = $this->status($mailbox);
 			foreach ($status as $key => $v)
 			{
-				$_status[strtoupper($key)]=$v;
+				$_status[strtoupper($key)] = $v;
 			}
 			return $_status;
 		}
@@ -525,9 +525,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,
@@ -541,16 +541,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;
@@ -576,14 +576,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;
@@ -595,8 +595,8 @@ 
 				$searchstring = $reference."%";
 				break;
 			}
-		}else{
-			if ( is_string( $restriction_search ) ){
+		} else {
+			if (is_string($restriction_search)) {
 				$mailbox = $searchstring = $restriction_search;
 			}
 		}
@@ -609,35 +609,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
 				{
@@ -660,14 +660,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;
@@ -679,8 +679,8 @@ 
 				$searchstring = $reference."%";
 				break;
 			}
-		}else{
-			if ( is_string( $restriction_search ) ){
+		} else {
+			if (is_string($restriction_search)) {
 				$mailbox = $searchstring = $restriction_search;
 			}
 		}
@@ -692,25 +692,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;
@@ -726,14 +726,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;
@@ -745,8 +745,8 @@ 
 				$mailbox = "%";
 				break;
 			}
-		}else{
-			if ( is_string( $restriction_search ) ){
+		} else {
+			if (is_string($restriction_search)) {
 				$mailbox = $restriction_search;
 			}
 		}
@@ -755,17 +755,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;
 	}
@@ -777,12 +777,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());
@@ -790,18 +790,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;
 			}
@@ -840,7 +840,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]))
@@ -852,7 +852,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());
@@ -902,9 +902,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 "";
 	}
@@ -919,33 +919,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
@@ -964,24 +964,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
@@ -990,9 +990,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;
 				}
 			}
 		}
@@ -1004,29 +1004,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 "/";
 	}
@@ -1063,11 +1063,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;
@@ -1086,8 +1086,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;
 					}
@@ -1131,20 +1131,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;
 	}
@@ -1163,7 +1163,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']]))
@@ -1173,7 +1173,7 @@ 
 					'name' => $data['name'],
 					'prefix' => $data['name'],
 					'prefix_present' => !empty($data['name']),
-					'delimiter' => ($data['delimiter']?$data['delimiter']:'/'),
+					'delimiter' => ($data['delimiter'] ? $data['delimiter'] : '/'),
 				);
 			}
 		}
@@ -1194,7 +1194,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;
@@ -1208,7 +1208,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);
@@ -1217,7 +1217,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';
@@ -1243,7 +1243,7 @@ 
 	 */
 	function getUserData($_username)
 	{
-		unset($_username);	// not used
+		unset($_username); // not used
 		return array();
 	}
 
@@ -1256,7 +1256,7 @@ 
 	 */
 	function setUserData($_username, $_quota)
 	{
-		unset($_username, $_quota);	// not used
+		unset($_username, $_quota); // not used
 		return true;
 	}
 
@@ -1290,10 +1290,10 @@ 
 	 * @param array $params
 	 * @throws Exception
 	 */
-	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':
@@ -1310,11 +1310,11 @@ 
 					{
 						PEAR::setErrorHandling(PEAR_ERROR_EXCEPTION);
 						$this->sieve = new emailadmin_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);
 				}
-				catch(Exception $e) {
+				catch (Exception $e) {
 					throw new PEAR_Exception('Error in Sieve: '.$e->getMessage(), $e);
 				}
 				//error_log(__CLASS__.'->'.$name.'('.array2string($params).') returns '.array2string($ret));
@@ -1331,7 +1331,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));
 
@@ -1344,8 +1344,8 @@ 
 			$this->adminConnection($_euser);
 			PEAR::setErrorHandling(PEAR_ERROR_EXCEPTION);
 			$this->sieve = new emailadmin_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);
 
@@ -1360,7 +1360,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));
 
@@ -1373,8 +1373,8 @@ 
 			$this->adminConnection($_euser);
 			PEAR::setErrorHandling(PEAR_ERROR_EXCEPTION);
 			$this->sieve = new emailadmin_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();
 	}
@@ -1394,7 +1394,7 @@ 
 	 */
 	public function init_static()
 	{
-		self::$supports_keywords =& egw_cache::getSession (__CLASS__, 'supports_keywords');
+		self::$supports_keywords = & egw_cache::getSession(__CLASS__, 'supports_keywords');
 	}
 }
 emailadmin_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))
 		{

emailadmin/inc/class.emailadmin_imapbase.inc.php

Doc Comments +15 added lines, -11 removed lines

@@ -410,7 +410,7 @@ 
 	 * forceEAProfileLoad
 	 * used to force the load of a specific emailadmin profile; we assume administrative use only (as of now)
 	 * @param int $_profile_id
-	 * @return object instance of emailadmin_imapbase (by reference)
+	 * @return emailadmin_imapbase instance of emailadmin_imapbase (by reference)
 	 */
 	public static function &forceEAProfileLoad($_profile_id)
 	{
@@ -684,7 +684,7 @@ 
 	/**
 	 * Get all identities of given mailaccount
 	 *
-	 * @param int|emailadmin_account $account account-object or acc_id
+	 * @param integer $account account-object or acc_id
 	 * @return array - array(email=>realname)
 	 */
 	function getAccountIdentities($account) {
@@ -1794,6 +1794,7 @@ 
 	 *
 	 * @param mixed _sort the integer sort order / or a valid and handeled SORTSTRING (right now: UID/ARRIVAL/INTERNALDATE (->ARRIVAL))
 	 * @param bool _reverse wether to add REVERSE to the Sort String or not
+	 * @param integer $_sort
 	 * @return the sort sequence for horde search
 	 */
 	function _getSortString($_sort, $_reverse=false)
@@ -2229,7 +2230,7 @@ 
 	 * @param string _parent the parent foldername
 	 * @param string _folderName the new foldername
 	 *
-	 * @return mixed name of the newly created folder or false on error
+	 * @return string name of the newly created folder or false on error
 	 * @throws egw_exception
 	 */
 	function renameFolder($_oldFolderName, $_parent, $_folderName)
@@ -3073,7 +3074,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)
@@ -3123,7 +3124,7 @@ 
 	 * abstraction layer for getDraftFolder, getTemplateFolder, getTrashFolder and getSentFolder
 	 * @param string $_type the type to fetch (Drafts|Template|Trash|Sent)
 	 * @param boolean $_checkexistance trigger check for existance
-	 * @param boolean& $created =null on return true: if folder was just created, false if not
+	 * @param boolean $created =null on return true: if folder was just created, false if not
 	 * @return mixed string or false
 	 */
 	function _getSpecialUseFolder($_type, $_checkexistance=TRUE, &$created=null)
@@ -3245,7 +3246,7 @@ 
 	/**
 	 * getTemplateFolder wrapper for _getSpecialUseFolder Type Template
 	 * @param boolean $_checkexistance trigger check for existance
-	 * @return mixed string or false
+	 * @return string string or false
 	 */
 	function getTemplateFolder($_checkexistance=TRUE)
 	{
@@ -3275,7 +3276,7 @@ 
 	/**
 	 * getOutboxFolder wrapper for _getSpecialUseFolder Type Outbox
 	 * @param boolean $_checkexistance trigger check for existance
-	 * @return mixed string or false
+	 * @return string string or false
 	 */
 	function getOutboxFolder($_checkexistance=TRUE)
 	{
@@ -4104,7 +4105,7 @@ 
 	/**
 	 * get part of the message, if its stucture is indicating its of multipart alternative style
 	 * a wrapper for multipartmixed
-	 * @param string/int $_uid the messageuid,
+	 * @param integer $_uid the messageuid,
 	 * @param Horde_Mime_Part $_structure structure for parsing
 	 * @param string $_htmlMode how to display a message, html, plain text, ...
 	 * @param boolean $_preserveSeen flag to preserve the seenflag by using body.peek
@@ -4754,6 +4755,9 @@ 
 		return $message;
 	}
 
+	/**
+	 * @param integer $cols
+	 */
 	static function wordwrap($str, $cols, $cut, $dontbreaklinesstartingwith=false)
 	{
 		$lines = explode("\n", $str);
@@ -5194,7 +5198,6 @@ 
 	 * @param string $_partID = null
 	 * @param string $_folder = null
 	 * @param boolean $_preserveSeen = false flag to preserve the seenflag by using body.peek
-	 * @param Horde_Imap_Client_Fetch_Query $fquery=null default query just structure
 	 * @return Horde_Mime_Part
 	 */
 	function getStructure($_uid, $_partID=null, $_folder=null, $_preserveSeen=false)
@@ -5773,6 +5776,7 @@ 
 	 * @param preserveHTML flag to pass through to getdisplayableBody
 	 * @param addHeaderSection flag to be able to supress headersection
 	 * @param includeAttachments flag to be able to supress possible attachments
+	 * @param emailadmin_imapbase $mailClass
 	 * @return array/bool with 'mailaddress'=>$mailaddress,
 	 *				'subject'=>$subject,
 	 *				'message'=>$message,
@@ -6226,7 +6230,7 @@ 
 	 *
 	 * @param egw_mailer $_mailObject instance of the egw_mailer/phpmailer Object to be used
 	 * @param string $_html2parse the html to parse and to be altered, if conditions meet
-	 * @param $mail_bo mail bo object
+	 * @param mail_bo $mail_bo mail bo object
 	 * @return void
 	 */
 	static function processURL2InlineImages($_mailObject, &$_html2parse, $mail_bo)
@@ -6585,7 +6589,7 @@ 
 	/**
 	 * Parses a message/rfc mail from file to the mailobject
 	 *
-	 * @param object $mailer instance of the SMTP Mailer Object
+	 * @param egw_mailer $mailer instance of the SMTP Mailer Object
 	 * @param string $tmpFileName string that points/leads to the file to be imported
 	 * @throws egw_exception_not_found if $fle is not found
 	 */

Indentation +7 added lines, -7 removed lines

@@ -6730,14 +6730,14 @@
 					{
 						if ($this->folderExists($_folder,true))
 						{
-						    if($this->isSentFolder($_folder))
+							if($this->isSentFolder($_folder))
 							{
-						        $flags = '\\Seen';
-						    } elseif($this->isDraftFolder($_folder)) {
-						        $flags = '\\Draft';
-						    } else {
-						        $flags = '';
-						    }
+								$flags = '\\Seen';
+							} elseif($this->isDraftFolder($_folder)) {
+								$flags = '\\Draft';
+							} else {
+								$flags = '';
+							}
 							$savefailed = false;
 							try
 							{

Braces +1738 added lines, -515 removed lines

@@ -178,7 +178,10 @@ 
 	public static function getInstance($_restoreSession=true, &$_profileID=0, $_validate=true, $_oldImapServerObject=false, $_reuseCache=null)
 	{
 		//$_restoreSession=false;
-		if (is_null($_reuseCache)) $_reuseCache = $_restoreSession;
+		if (is_null($_reuseCache))
+		{
+			$_reuseCache = $_restoreSession;
+		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.' RestoreSession:'.$_restoreSession.' ProfileId:'.$_profileID.'/'.emailadmin_account::get_default_acc_id().' for user:'.$GLOBALS['egw_info']['user']['account_lid'].' called from:'.function_backtrace());
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($_oldImapServerObject));
 		if ($_oldImapServerObject instanceof emailadmin_imap)
@@ -204,9 +207,15 @@ 
 			{
 				$profileID = emailadmin_account::get_default_acc_id();
 			}
-			if ($profileID!=$_profileID) $_restoreSession==false;
+			if ($profileID!=$_profileID)
+			{
+				$_restoreSession==false;
+			}
 			$_profileID=$profileID;
-			if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.' called with profileID==0 using '.$profileID.' instead->'.function_backtrace());
+			if (self::$debug)
+			{
+				error_log(__METHOD__.' ('.__LINE__.') '.' called with profileID==0 using '.$profileID.' instead->'.function_backtrace());
+			}
 		}
 		// no validation or restoreSession for old ImapServer Object, just fetch it and return it
 		if ($_oldImapServerObject===true)
@@ -245,7 +254,8 @@ 
 				// TODO: merge mailprefs into userprefs, for easy treatment
 				self::$instances[$_profileID]->mailPreferences = $GLOBALS['egw_info']['user']['preferences']['mail'];
 				self::$instances[$_profileID]->htmlOptions  = self::$instances[$_profileID]->mailPreferences['htmlOptions'];
-			} catch (egw_exception $e)
+			}
+			catch (egw_exception $e)
 			{
 				$newprofileID = emailadmin_account::get_default_acc_id();
 				// try loading the default profile for the user
@@ -263,9 +273,15 @@ 
 			self::storeActiveProfileIDToPref(self::$instances[$_profileID]->icServer, $_profileID, $_validate );
 		}
 		self::$instances[$_profileID]->profileID = $_profileID;
-		if (!isset(self::$instances[$_profileID]->idna2)) self::$instances[$_profileID]->idna2 = new egw_idna;
+		if (!isset(self::$instances[$_profileID]->idna2))
+		{
+			self::$instances[$_profileID]->idna2 = new egw_idna;
+		}
 		//if ($_profileID==0); error_log(__METHOD__.' ('.__LINE__.') '.' RestoreSession:'.$_restoreSession.' ProfileId:'.$_profileID);
-		if (is_null(self::$mailConfig)) self::$mailConfig = config::read('mail');
+		if (is_null(self::$mailConfig))
+		{
+			self::$mailConfig = config::read('mail');
+		}
 		return self::$instances[$_profileID];
 	}
 
@@ -290,14 +306,20 @@ 
 			}
 			catch (Exception $e)
 			{
-				if ($_profileID != emailadmin_account::get_default_acc_id()) $_profileID = emailadmin_account::get_default_acc_id();
+				if ($_profileID != emailadmin_account::get_default_acc_id())
+				{
+					$_profileID = emailadmin_account::get_default_acc_id();
+				}
 				error_log(__METHOD__.__LINE__.' '.$e->getMessage());
 				return false;
 			}
 		}
 		if ($oldProfileID != $_profileID)
 		{
-			if ($oldProfileID && $_profileID==0) $_profileID = $oldProfileID;
+			if ($oldProfileID && $_profileID==0)
+			{
+				$_profileID = $oldProfileID;
+			}
 			$GLOBALS['egw']->preferences->add('mail','ActiveProfileID',$_profileID,'user');
 			// save prefs
 			$GLOBALS['egw']->preferences->save_repository(true);
@@ -327,11 +349,17 @@ 
 				{
 					return $_acc_id;
 				}
-				if (self::$debug) error_log(__METHOD__."($_acc_id) account NOT valid, no imap-host!");
+				if (self::$debug)
+				{
+					error_log(__METHOD__."($_acc_id) account NOT valid, no imap-host!");
+				}
 			}
 			catch (Exception $e) {
 				unset($e);
-				if (self::$debug) error_log(__METHOD__."($_acc_id) account NOT found!");
+				if (self::$debug)
+				{
+					error_log(__METHOD__."($_acc_id) account NOT found!");
+				}
 			}
 		}
 		// no account specified or specified account not found or not valid
@@ -340,11 +368,17 @@ 
 		{
 			if (!empty($imap_host) && ($account = emailadmin_account::read($acc_id)) && $account->is_imap())
 			{
-				if (self::$debug && $_acc_id) error_log(__METHOD__."($_acc_id) using $acc_id instead");
+				if (self::$debug && $_acc_id)
+				{
+					error_log(__METHOD__."($_acc_id) using $acc_id instead");
+				}
 				return $acc_id;
 			}
 		}
-		if (self::$debug) error_log(__METHOD__."($_acc_id) NO valid account found!");
+		if (self::$debug)
+		{
+			error_log(__METHOD__."($_acc_id) NO valid account found!");
+		}
 		return 0;
 	}
 
@@ -360,10 +394,19 @@ 
 	 */
 	private function __construct($_displayCharset='utf-8',$_restoreSession=true, $_profileID=0, $_oldImapServerObject=false, $_reuseCache=null)
 	{
-		if (is_null($_reuseCache)) $_reuseCache = $_restoreSession;
-		if (!empty($_displayCharset)) self::$displayCharset = $_displayCharset;
+		if (is_null($_reuseCache))
+		{
+			$_reuseCache = $_restoreSession;
+		}
+		if (!empty($_displayCharset))
+		{
+			self::$displayCharset = $_displayCharset;
+		}
 		// not nummeric, we assume we only want an empty class object
-		if (!is_numeric($_profileID)) return true;
+		if (!is_numeric($_profileID))
+		{
+			return true;
+		}
 		if ($_restoreSession)
 		{
 			//error_log(__METHOD__." Session restore ".function_backtrace());
@@ -378,7 +421,10 @@ 
 			$firstMessage = $this->sessionData['previewMessage'];
 			$this->sessionData = array();
 		}
-		if (!$_reuseCache) $this->forcePrefReload($_profileID,!$_reuseCache);
+		if (!$_reuseCache)
+		{
+			$this->forcePrefReload($_profileID,!$_reuseCache);
+		}
 		try
 		{
 			$this->profileID = self::validateProfileID($_profileID);
@@ -402,8 +448,14 @@ 
 			$_profileID = $this->profileID = $GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'] = $this->icServer->ImapServerId;
 		}
 
-		if (is_null(self::$mailConfig)) self::$mailConfig = config::read('mail');
-		if (!isset(self::$idna2)) self::$idna2 = new egw_idna;
+		if (is_null(self::$mailConfig))
+		{
+			self::$mailConfig = config::read('mail');
+		}
+		if (!isset(self::$idna2))
+		{
+			self::$idna2 = new egw_idna;
+		}
 	}
 
 	/**
@@ -432,7 +484,10 @@ 
 		// unset the mail_preferences session object, to force the reload/rebuild
 		$GLOBALS['egw']->session->appsession('mail_preferences','mail',serialize(array()));
 		$GLOBALS['egw']->session->appsession('session_data','emailadmin',serialize(array()));
-		if ($_resetFolderObjects) emailadmin_imapbase::resetFolderObjectCache($_profile_id);
+		if ($_resetFolderObjects)
+		{
+			emailadmin_imapbase::resetFolderObjectCache($_profile_id);
+		}
 	}
 
 	/**
@@ -442,7 +497,10 @@ 
 	{
 		$this->sessionData = array();//egw_cache::getCache(egw_cache::SESSION,'mail','session_data',$callback=null,$callback_params=array(),$expiration=60*60*1);
 		self::$activeFolderCache = egw_cache::getCache(egw_cache::INSTANCE,'email','activeMailbox'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*10);
-		if (!empty(self::$activeFolderCache[$this->profileID])) $this->sessionData['mailbox'] = self::$activeFolderCache[$this->profileID];
+		if (!empty(self::$activeFolderCache[$this->profileID]))
+		{
+			$this->sessionData['mailbox'] = self::$activeFolderCache[$this->profileID];
+		}
 	}
 
 	/**
@@ -451,7 +509,10 @@ 
 	function saveSessionData()
 	{
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string(array_keys($this->sessionData)));
-		if (!empty($this->sessionData['mailbox'])) self::$activeFolderCache[$this->profileID]=$this->sessionData['mailbox'];
+		if (!empty($this->sessionData['mailbox']))
+		{
+			self::$activeFolderCache[$this->profileID]=$this->sessionData['mailbox'];
+		}
 		if (isset(self::$activeFolderCache) && is_array(self::$activeFolderCache))
 		{
 			egw_cache::setCache(egw_cache::INSTANCE,'email','activeMailbox'.trim($GLOBALS['egw_info']['user']['account_id']),self::$activeFolderCache, 60*60*10);
@@ -472,8 +533,14 @@ 
 	 */
 	static function unsetCachedObjects($_profileID=null)
 	{
-		if (is_null($_profileID)) $_profileID = emailadmin_account::get_default_acc_id();
-		if (is_array($_profileID) && $_profileID['account_id']) $account_id = $_profileID['account_id'];
+		if (is_null($_profileID))
+		{
+			$_profileID = emailadmin_account::get_default_acc_id();
+		}
+		if (is_array($_profileID) && $_profileID['account_id'])
+		{
+			$account_id = $_profileID['account_id'];
+		}
 		//error_log(__METHOD__.__LINE__.' called with ProfileID:'.array2string($_profileID).' from '.function_backtrace());
 		if (!is_array($_profileID) && (is_numeric($_profileID) || !(stripos($_profileID,'tracker_')===false)))
 		{
@@ -506,7 +573,10 @@ 
 				egw_cache::setCache(egw_cache::INSTANCE,'email','vacationNotice'.trim($account_id),$vacationCached, $expiration=60*60*24*1);
 			}
 
-			if (isset(self::$instances[$_profileID])) unset(self::$instances[$_profileID]);
+			if (isset(self::$instances[$_profileID]))
+			{
+				unset(self::$instances[$_profileID]);
+			}
 		}
 		if (is_array($_profileID) && $_profileID['location'] == 'clear_cache')
 		{
@@ -535,7 +605,10 @@ 
 	static function resetConnectionErrorCache($_ImapServerId=null,$account_id=null)
 	{
 		//error_log(__METHOD__.' ('.__LINE__.') '.' for Profile:'.array2string($_ImapServerId) .' for user:'.trim($account_id));
-		if (is_null($account_id)) $account_id = $GLOBALS['egw_info']['user']['account_id'];
+		if (is_null($account_id))
+		{
+			$account_id = $GLOBALS['egw_info']['user']['account_id'];
+		}
 		if (is_array($_ImapServerId))
 		{
 			// called via hook
@@ -574,7 +647,10 @@ 
 	static function resetFolderObjectCache($_ImapServerId=null,$account_id=null)
 	{
 		//error_log(__METHOD__.' ('.__LINE__.') '.' called for Profile:'.array2string($_ImapServerId).'->'.function_backtrace());
-		if (is_null($account_id)) $account_id = $GLOBALS['egw_info']['user']['account_id'];
+		if (is_null($account_id))
+		{
+			$account_id = $GLOBALS['egw_info']['user']['account_id'];
+		}
 		// on [location] => verify_settings we coud either use [prefs] => Array([ActiveProfileID] => 9, .. as $_ImapServerId
 		// or treat it as not given. we try that path
 		if (is_null($_ImapServerId)||is_array($_ImapServerId))
@@ -640,17 +716,22 @@ 
 	 * @param string $_profileID the ID of the mailaccount to check for identities, if null current mail-account is used
 	 * @return array - array(email=>realname)
 	 */
-	function getUserEMailAddresses($_profileID=null) {
+	function getUserEMailAddresses($_profileID=null)
+	{
 		$acc = emailadmin_account::read((!empty($_profileID)?$_profileID:$this->profileID));
 		//error_log(__METHOD__.' ('.__LINE__.') '.':'.array2string($acc));
 		$identities = $acc->identities();
 
 		$userEMailAdresses = array($acc['ident_email']=>$acc['ident_realname']);
 
-		foreach($identities as $ik => $ident) {
+		foreach($identities as $ik => $ident)
+		{
 			//error_log(__METHOD__.' ('.__LINE__.') '.':'.$ik.'->'.array2string($ident));
 			$identity = emailadmin_account::read_identity($ik);
-			if (!empty($identity['ident_email']) && !isset($userEMailAdresses[$identity['ident_email']])) $userEMailAdresses[$identity['ident_email']] = $identity['ident_realname'];
+			if (!empty($identity['ident_email']) && !isset($userEMailAdresses[$identity['ident_email']]))
+			{
+				$userEMailAdresses[$identity['ident_email']] = $identity['ident_realname'];
+			}
 		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($userEMailAdresses));
 		return $userEMailAdresses;
@@ -662,19 +743,27 @@ 
 	 * @param boolean $resolve_placeholders wether or not resolve possible placeholders in identities
 	 * @return array - array(email=>realname)
 	 */
-	static function getAllIdentities($_accountToSearch=null,$resolve_placeholders=false) {
+	static function getAllIdentities($_accountToSearch=null,$resolve_placeholders=false)
+	{
 		$userEMailAdresses = array();
 		foreach(emailadmin_account::search($only_current_user=($_accountToSearch?$_accountToSearch:true), $just_name=true) as $acc_id => $identity_name)
 		{
 			$acc = emailadmin_account::read($acc_id,($_accountToSearch?$_accountToSearch:null));
-			if (!$resolve_placeholders) $userEMailAdresses[$acc['ident_id']] = array('acc_id'=>$acc_id,'ident_id'=>$acc['ident_id'],'ident_email'=>$acc['ident_email'],'ident_org'=>$acc['ident_org'],'ident_realname'=>$acc['ident_realname'],'ident_signature'=>$acc['ident_signature'],'ident_name'=>$acc['ident_name']);
+			if (!$resolve_placeholders)
+			{
+				$userEMailAdresses[$acc['ident_id']] = array('acc_id'=>$acc_id,'ident_id'=>$acc['ident_id'],'ident_email'=>$acc['ident_email'],'ident_org'=>$acc['ident_org'],'ident_realname'=>$acc['ident_realname'],'ident_signature'=>$acc['ident_signature'],'ident_name'=>$acc['ident_name']);
+			}
 			$identities = $acc->identities($acc_id);
 
-			foreach($identities as $ik => $ident) {
+			foreach($identities as $ik => $ident)
+			{
 				//error_log(__METHOD__.' ('.__LINE__.') '.':'.$ik.'->'.array2string($ident));
 				$identity = emailadmin_account::read_identity($ik,$resolve_placeholders);
 				//error_log(__METHOD__.' ('.__LINE__.') '.':'.$ik.'->'.array2string($identity));
-				if (!isset($userEMailAdresses[$identity['ident_id']])) $userEMailAdresses[$identity['ident_id']] = array('acc_id'=>$acc_id,'ident_id'=>$identity['ident_id'],'ident_email'=>$identity['ident_email'],'ident_org'=>$identity['ident_org'],'ident_realname'=>$identity['ident_realname'],'ident_signature'=>$identity['ident_signature'],'ident_name'=>$identity['ident_name']);
+				if (!isset($userEMailAdresses[$identity['ident_id']]))
+				{
+					$userEMailAdresses[$identity['ident_id']] = array('acc_id'=>$acc_id,'ident_id'=>$identity['ident_id'],'ident_email'=>$identity['ident_email'],'ident_org'=>$identity['ident_org'],'ident_realname'=>$identity['ident_realname'],'ident_signature'=>$identity['ident_signature'],'ident_name'=>$identity['ident_name']);
+				}
 			}
 		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($userEMailAdresses));
@@ -687,19 +776,24 @@ 
 	 * @param int|emailadmin_account $account account-object or acc_id
 	 * @return array - array(email=>realname)
 	 */
-	function getAccountIdentities($account) {
+	function getAccountIdentities($account)
+	{
 		if (!$account instanceof emailadmin_account)
 		{
 			$account = emailadmin_account::read($account);
 		}
 		$userEMailAdresses = array();
 		$identities = $account->identities(null, true, 'params');
-		foreach($identities as $ik => $ident) {
+		foreach($identities as $ik => $ident)
+		{
 			//error_log(__METHOD__.' ('.__LINE__.') '.':'.$ik.'->'.array2string($ident));
 			$identity = emailadmin_account::read_identity($ik,true,null,$account);
 			//error_log(__METHOD__.' ('.__LINE__.') '.':'.$ik.'->'.array2string($identity));
 			// standardIdentity has ident_id==acc_id (as it is done within account->identities)
-			if (empty($identity['ident_id'])) $identity['ident_id'] = $identity['acc_id'];
+			if (empty($identity['ident_id']))
+			{
+				$identity['ident_id'] = $identity['acc_id'];
+			}
 			if (!isset($userEMailAdresses[$identity['ident_id']]))
 			{
 				$userEMailAdresses[$identity['ident_id']] = array('acc_id'=>$identity['acc_id'],
@@ -719,7 +813,8 @@ 
 	 * getDefaultIdentity - function to gather the default identitiy connected to the current mailaccount
 	 * @return int - id of the identity
 	 */
-	function getDefaultIdentity() {
+	function getDefaultIdentity()
+	{
 		// retrieve the signature accociated with the identity
 		$id = $this->getIdentitiesWithAccounts($_accountData=array());
 		$acc = emailadmin_account::read($this->profileID);
@@ -741,15 +836,25 @@ 
 		// account select box
 		$selectedID = $this->profileID;
 		$allAccountData = emailadmin_account::search($only_current_user=true, false, null);
-		if ($allAccountData) {
+		if ($allAccountData)
+		{
 			$rememberFirst=$selectedFound=null;
 			foreach ($allAccountData as $tmpkey => $icServers)
 			{
-				if (is_null($rememberFirst)) $rememberFirst = $tmpkey;
-				if ($tmpkey == $selectedID) $selectedFound=true;
+				if (is_null($rememberFirst))
+				{
+					$rememberFirst = $tmpkey;
+				}
+				if ($tmpkey == $selectedID)
+				{
+					$selectedFound=true;
+				}
 				//error_log(__METHOD__.' ('.__LINE__.') '.' Key:'.$tmpkey.'->'.array2string($icServers->acc_imap_host));
 				$host = $icServers->acc_imap_host;
-				if (empty($host)) continue;
+				if (empty($host))
+				{
+					continue;
+				}
 				$identities[$icServers->acc_id] = $icServers['ident_realname'].' '.$icServers['ident_org'].' <'.$icServers['ident_email'].'>';
 				//error_log(__METHOD__.' ('.__LINE__.') '.' Key:'.$tmpkey.'->'.array2string($identities[$icServers->acc_id]));
 			}
@@ -794,7 +899,8 @@ 
 	 *
 	 * @return void
 	 */
-	function closeConnection() {
+	function closeConnection()
+	{
 		//if ($icServer->_connected) error_log(__METHOD__.' ('.__LINE__.') '.' disconnect from Server');
 		//error_log(__METHOD__."() ".function_backtrace());
 		$this->icServer->disconnect();
@@ -808,7 +914,10 @@ 
 	 */
 	function reopen($_foldername)
 	{
-		if (self::$debugTimes) $starttime = microtime (true);
+		if (self::$debugTimes)
+		{
+			$starttime = microtime (true);
+		}
 
 		//error_log(__METHOD__.' ('.__LINE__.') '."('$_foldername') ".function_backtrace());
 		// TODO: trying to reduce traffic to the IMAP Server here, introduces problems with fetching the bodies of
@@ -818,12 +927,16 @@ 
 		//{
 			//error_log( __METHOD__.' ('.__LINE__.') '." $_foldername ".function_backtrace());
 			//error_log(__METHOD__.' ('.__LINE__.') '.' Connected with icServer for Profile:'.$this->profileID.'?'.print_r($this->icServer->_connected,true));
-			if ($this->folderIsSelectable($_foldername)) {
+			if ($this->folderIsSelectable($_foldername))
+			{
 				$tretval = $this->icServer->openMailbox($_foldername);
 			}
 			$folderOpened = $_foldername;
 		//}
-		if (self::$debugTimes) self::logRunTimes($starttime,null,'Folder:'.$_foldername,__METHOD__.' ('.__LINE__.') ');
+		if (self::$debugTimes)
+		{
+			self::logRunTimes($starttime,null,'Folder:'.$_foldername,__METHOD__.' ('.__LINE__.') ');
+		}
 	}
 
 
@@ -838,13 +951,22 @@ 
 	{
 		//error_log( "-------------------------->open connection ".function_backtrace());
 		//error_log(__METHOD__.' ('.__LINE__.') '.' ->'.array2string($this->icServer));
-		if (self::$debugTimes) $starttime = microtime (true);
+		if (self::$debugTimes)
+		{
+			$starttime = microtime (true);
+		}
 		$mailbox=null;
 		try
 		{
-			if(isset($this->sessionData['mailbox'])&&$this->folderExists($this->sessionData['mailbox'])) $mailbox = $this->sessionData['mailbox'];
-			if (empty($mailbox)) $mailbox = $this->icServer->getCurrentMailbox();
-/*
+			if(isset($this->sessionData['mailbox'])&&$this->folderExists($this->sessionData['mailbox']))
+			{
+				$mailbox = $this->sessionData['mailbox'];
+			}
+			if (empty($mailbox))
+			{
+				$mailbox = $this->icServer->getCurrentMailbox();
+			}
+			/*
 			if (isset(emailadmin_imap::$supports_keywords[$_icServerID]))
 			{
 				$this->icServer->openMailbox($mailbox);
@@ -869,7 +991,10 @@ 
 			error_log(__METHOD__.' ('.__LINE__.') '."->open connection for Server with profileID:".$_icServerID." failed!".$e->getMessage());
 			throw new egw_exception(__METHOD__." failed to ".__METHOD__." on Profile to $_icServerID :".$e->getMessage());
 		}
-		if (self::$debugTimes) self::logRunTimes($starttime,null,'ProfileID:'.$_icServerID,__METHOD__.' ('.__LINE__.') ');
+		if (self::$debugTimes)
+		{
+			self::logRunTimes($starttime,null,'ProfileID:'.$_icServerID,__METHOD__.' ('.__LINE__.') ');
+		}
 	}
 
 	/**
@@ -881,20 +1006,27 @@ 
 	function getQuotaRoot()
 	{
 		static $quota;
-		if (isset($quota)) return $quota;
+		if (isset($quota))
+		{
+			return $quota;
+		}
 		$this->icServer->getCurrentMailbox();
-		if(!$this->icServer->hasCapability('QUOTA')) {
+		if(!$this->icServer->hasCapability('QUOTA'))
+		{
 			$quota = false;
 			return false;
 		}
 		$quota = $this->icServer->getStorageQuotaRoot('INBOX');
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($quota));
-		if(is_array($quota)) {
+		if(is_array($quota))
+		{
 			$quota = array(
 				'usage'	=> $quota['USED'],
 				'limit'	=> $quota['QMAX'],
 			);
-		} else {
+		}
+		else
+		{
 			$quota = false;
 		}
 		return $quota;
@@ -910,7 +1042,11 @@ 
 	static function getTimeOut($_use='IMAP')
 	{
 		$timeout = $GLOBALS['egw_info']['user']['preferences']['mail']['connectionTimeout'];
-		if (empty($timeout)) $timeout = ($_use=='SIEVE'?10:20); // this is the default value
+		if (empty($timeout))
+		{
+			$timeout = ($_use=='SIEVE'?10:20);
+		}
+		// this is the default value
 		return $timeout;
 	}
 
@@ -926,9 +1062,13 @@ 
 		$foldersNameSpace = array();
 		$delimiter = $this->getHierarchyDelimiter();
 		// TODO: cache by $this->icServer->ImapServerId
-		if (is_null($nameSpace)) $nameSpace = $this->icServer->getNameSpaceArray();
+		if (is_null($nameSpace))
+		{
+			$nameSpace = $this->icServer->getNameSpaceArray();
+		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($nameSpace));
-		if (is_array($nameSpace)) {
+		if (is_array($nameSpace))
+		{
 			foreach($nameSpace as $type => $singleNameSpaceArray)
 			{
 				foreach ($singleNameSpaceArray as $k => $singleNameSpace)
@@ -945,7 +1085,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'];
 					}
@@ -971,7 +1113,10 @@ 
 		foreach($nameSpace as &$singleNameSpace)
 		{
 			//if (substr($singleNameSpace['prefix'],0,strlen($folderName))==$folderName) return $singleNameSpace['prefix'];
-			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 "";
 	}
@@ -984,8 +1129,14 @@ 
 	function getHierarchyDelimiter($_useCache=true)
 	{
 		static $HierarchyDelimiter;
-		if (is_null($HierarchyDelimiter)) $HierarchyDelimiter = egw_cache::getCache(egw_cache::INSTANCE,'email','HierarchyDelimiter'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*24*5);
-		if ($_useCache===false) unset($HierarchyDelimiter[$this->icServer->ImapServerId]);
+		if (is_null($HierarchyDelimiter))
+		{
+			$HierarchyDelimiter = egw_cache::getCache(egw_cache::INSTANCE,'email','HierarchyDelimiter'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*24*5);
+		}
+		if ($_useCache===false)
+		{
+			unset($HierarchyDelimiter[$this->icServer->ImapServerId]);
+		}
 		if (isset($HierarchyDelimiter[$this->icServer->ImapServerId])&&!empty($HierarchyDelimiter[$this->icServer->ImapServerId]))
 		{
 			return $HierarchyDelimiter[$this->icServer->ImapServerId];
@@ -1013,14 +1164,19 @@ 
 	{
 		//error_log(__METHOD__.' ('.__LINE__.') '.':'.$this->icServer->ImapServerId.' Connected:'.$this->icServer->_connected);
 		static $_specialUseFolders;
-		if (is_null($_specialUseFolders)||empty($_specialUseFolders)) $_specialUseFolders = egw_cache::getCache(egw_cache::INSTANCE,'email','specialUseFolders'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*24*5);
+		if (is_null($_specialUseFolders)||empty($_specialUseFolders))
+		{
+			$_specialUseFolders = egw_cache::getCache(egw_cache::INSTANCE,'email','specialUseFolders'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*24*5);
+		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($this->icServer->acc_folder_trash));
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($this->icServer->acc_folder_sent));
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($this->icServer->acc_folder_draft));
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($this->icServer->acc_folder_template));
 		self::$specialUseFolders = $_specialUseFolders[$this->icServer->ImapServerId];
 		if (isset($_specialUseFolders[$this->icServer->ImapServerId]) && !empty($_specialUseFolders[$this->icServer->ImapServerId]))
-			return $_specialUseFolders[$this->icServer->ImapServerId];
+		{
+					return $_specialUseFolders[$this->icServer->ImapServerId];
+		}
 		$_specialUseFolders[$this->icServer->ImapServerId]=array();
 		//if (!empty($this->icServer->acc_folder_trash) && !isset($_specialUseFolders[$this->icServer->ImapServerId][$this->icServer->acc_folder_trash]))
 			$_specialUseFolders[$this->icServer->ImapServerId][$this->icServer->acc_folder_trash]='Trash';
@@ -1049,7 +1205,8 @@ 
 	function folderIsSelectable($folderToSelect)
 	{
 		$retval = true;
-		if($folderToSelect && ($folderStatus = $this->getFolderStatus($folderToSelect,false,true))) {
+		if($folderToSelect && ($folderStatus = $this->getFolderStatus($folderToSelect,false,true)))
+		{
 			if (!empty($folderStatus['attributes']) && stripos(array2string($folderStatus['attributes']),'noselect')!==false)
 			{
 				$retval = false;
@@ -1102,18 +1259,27 @@ 
 	 */
 	function getFolderStatus($_folderName,$ignoreStatusCache=false,$basicInfoOnly=false,$fetchSubscribedInfo=true)
 	{
-		if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '." called with:$_folderName,$ignoreStatusCache,$basicInfoOnly");
-		if (!is_string($_folderName) || empty($_folderName)) // something is wrong. Do not proceed
+		if (self::$debug)
+		{
+			error_log(__METHOD__.' ('.__LINE__.') '." called with:$_folderName,$ignoreStatusCache,$basicInfoOnly");
+		}
+		if (!is_string($_folderName) || empty($_folderName))
+		{
+			// something is wrong. Do not proceed
 		{
 			return false;
 		}
+		}
 		static $folderInfoCache; // reduce traffic on single request
 		static $folderBasicInfo;
 		if (isset($folderBasicInfo[$this->profileID]))
 		{
 			$folderInfoCache = $folderBasicInfo[$this->profileID];
 		}
-		if (isset($folderInfoCache[$_folderName]) && $ignoreStatusCache==false && $basicInfoOnly) return $folderInfoCache[$_folderName];
+		if (isset($folderInfoCache[$_folderName]) && $ignoreStatusCache==false && $basicInfoOnly)
+		{
+			return $folderInfoCache[$_folderName];
+		}
 		$retValue = array();
 		$retValue['subscribed'] = false;
 /*
@@ -1131,7 +1297,10 @@ 
 			if (is_array($ret))
 			{
 				$retkeys = array_keys($ret);
-				if ($retkeys[0]==$_folderName) $folderInfoCache[$_folderName] = $ret[$retkeys[0]];
+				if ($retkeys[0]==$_folderName)
+				{
+					$folderInfoCache[$_folderName] = $ret[$retkeys[0]];
+				}
 			}
 			else
 			{
@@ -1140,7 +1309,8 @@ 
 		}
 		$folderInfo = $folderInfoCache[$_folderName];
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($folderInfo).'->'.function_backtrace());
-		if(!$folderInfo|| !is_array($folderInfo)) {
+		if(!$folderInfo|| !is_array($folderInfo))
+		{
 			try
 			{
 				$folderInfo = $this->_getStatus($_folderName,$ignoreStatusCache);
@@ -1170,7 +1340,8 @@ 
 		$retValue['shortName']		= array_pop($shortNameParts);
 		$retValue['displayName']	= $_folderName;
 		$retValue['shortDisplayName']	= $retValue['shortName'];
-		if(strtoupper($retValue['shortName']) == 'INBOX') {
+		if(strtoupper($retValue['shortName']) == 'INBOX')
+		{
 			$retValue['displayName']	= lang('INBOX');
 			$retValue['shortDisplayName']	= lang('INBOX');
 		}
@@ -1179,7 +1350,10 @@ 
 		{
 			$retValue['displayName'] = $retValue['shortDisplayName'] = lang($retValue['shortName']);
 		}
-		if ($folderInfo) $folderBasicInfo[$this->profileID][$_folderName]=$retValue;
+		if ($folderInfo)
+		{
+			$folderBasicInfo[$this->profileID][$_folderName]=$retValue;
+		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.' '.$_folderName.array2string($retValue['attributes']));
 		if ($basicInfoOnly || (isset($retValue['attributes']) && stripos(array2string($retValue['attributes']),'noselect')!==false))
 		{
@@ -1191,24 +1365,34 @@ 
 		static $subscribedFolders;
 		static $nameSpace;
 		static $prefix;
-		if (is_null($nameSpace) || empty($nameSpace[$this->profileID])) $nameSpace[$this->profileID] = $this->_getNameSpaces();
+		if (is_null($nameSpace) || empty($nameSpace[$this->profileID]))
+		{
+			$nameSpace[$this->profileID] = $this->_getNameSpaces();
+		}
 		if (!empty($nameSpace[$this->profileID]))
 		{
 			$nsNoPersonal=array();
 			foreach($nameSpace[$this->profileID] as &$ns)
 			{
-				if ($ns['type']!='personal') $nsNoPersonal[]=$ns;
+				if ($ns['type']!='personal')
+				{
+					$nsNoPersonal[]=$ns;
+				}
 			}
 			$nameSpace[$this->profileID]=$nsNoPersonal;
 		}
-		if (is_null($prefix) || empty($prefix[$this->profileID]) || empty($prefix[$this->profileID][$_folderName])) $prefix[$this->profileID][$_folderName] = $this->getFolderPrefixFromNamespace($nameSpace[$this->profileID], $_folderName);
+		if (is_null($prefix) || empty($prefix[$this->profileID]) || empty($prefix[$this->profileID][$_folderName]))
+		{
+			$prefix[$this->profileID][$_folderName] = $this->getFolderPrefixFromNamespace($nameSpace[$this->profileID], $_folderName);
+		}
 
 		if ($fetchSubscribedInfo && is_null($subscribedFolders) || empty($subscribedFolders[$this->profileID]))
 		{
 			$subscribedFolders[$this->profileID] = $this->icServer->listSubscribedMailboxes();
 		}
 
-		if($fetchSubscribedInfo && is_array($subscribedFolders[$this->profileID]) && in_array($_folderName,$subscribedFolders[$this->profileID])) {
+		if($fetchSubscribedInfo && is_array($subscribedFolders[$this->profileID]) && in_array($_folderName,$subscribedFolders[$this->profileID]))
+		{
 			$retValue['subscribed'] = true;
 		}
 
@@ -1227,8 +1411,7 @@ 
 				(isset($this->mailPreferences['trustServersUnseenInfo']) &&
 				$this->mailPreferences['trustServersUnseenInfo']==2 &&
 				$prefix[$this->profileID][$_folderName] != '' && stripos($_folderName,$prefix[$this->profileID][$_folderName]) !== false)
-			)
-			{
+			) {
 				//error_log(__METHOD__." returned folderStatus for Folder $_folderName:".print_r($prefix,true).' TS:'.$this->mailPreferences['trustServersUnseenInfo']);
 				// we filter for the combined status of unseen and undeleted, as this is what we show in list
 				try
@@ -1238,13 +1421,19 @@ 
 				}
 				catch (Exception $ee)
 				{
-					if (self::$debug) error_log(__METHOD__." could not fetch/calculate unseen counter for $_folderName Reason:'".$ee->getMessage()."' but requested.");
+					if (self::$debug)
+					{
+						error_log(__METHOD__." could not fetch/calculate unseen counter for $_folderName Reason:'".$ee->getMessage()."' but requested.");
+					}
 				}
 			}
 		}
 		catch (Exception $e)
 		{
-			if (self::$debug) error_log(__METHOD__." returned folderStatus for Folder $_folderName:".print_r($e->getMessage(),true));
+			if (self::$debug)
+			{
+				error_log(__METHOD__." returned folderStatus for Folder $_folderName:".print_r($e->getMessage(),true));
+			}
 		}
 
 		return $retValue;
@@ -1268,8 +1457,14 @@ 
 	function getHeaders($_folderName, $_startMessage, $_numberOfMessages, $_sort, $_reverse, $_filter, $_thisUIDOnly=null, $_cacheResult=true)
 	{
 		//self::$debug=true;
-		if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.function_backtrace());
-		if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '."$_folderName,$_startMessage, $_numberOfMessages, $_sort, $_reverse, ".array2string($_filter).", $_thisUIDOnly");
+		if (self::$debug)
+		{
+			error_log(__METHOD__.' ('.__LINE__.') '.function_backtrace());
+		}
+		if (self::$debug)
+		{
+			error_log(__METHOD__.' ('.__LINE__.') '."$_folderName,$_startMessage, $_numberOfMessages, $_sort, $_reverse, ".array2string($_filter).", $_thisUIDOnly");
+		}
 		$reverse = (bool)$_reverse;
 		// get the list of messages to fetch
 		$this->reopen($_folderName);
@@ -1290,21 +1485,34 @@ 
 				//$_filter['range'] ="$start:$end";
 				//$_filter['range'] ="$_startMessage:*";
 			}
-			if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '."$_folderName, $_sort, $reverse, ".array2string($_filter).", $rByUid");
-			if (self::$debug||self::$debugTimes) $starttime = microtime (true);
+			if (self::$debug)
+			{
+				error_log(__METHOD__.' ('.__LINE__.') '."$_folderName, $_sort, $reverse, ".array2string($_filter).", $rByUid");
+			}
+			if (self::$debug||self::$debugTimes)
+			{
+				$starttime = microtime (true);
+			}
 			//see this example below for a 12 week datefilter (since)
 			//$_filter = array('status'=>array('UNDELETED'),'type'=>"SINCE",'string'=> date("d-M-Y", $starttime-(3600*24*7*12)));
 			$_sortResult = $this->getSortedList($_folderName, $_sort, $reverse, $_filter, $rByUid, $_cacheResult);
 			$sortResult = $_sortResult['match']->ids;
 			//$modseq = $_sortResult['modseq'];
 			//error_log(__METHOD__.' ('.__LINE__.') '.'Modsequence:'.$modseq);
-			if (self::$debug||self::$debugTimes) self::logRunTimes($starttime,null,' call getSortedList for Folder:'.$_folderName.' Filter:'.array2string($_filter).' Ids:'.array2string($_thisUIDOnly),__METHOD__.' ('.__LINE__.') ');
+			if (self::$debug||self::$debugTimes)
+			{
+				self::logRunTimes($starttime,null,' call getSortedList for Folder:'.$_folderName.' Filter:'.array2string($_filter).' Ids:'.array2string($_thisUIDOnly),__METHOD__.' ('.__LINE__.') ');
+			}
 
-			if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.array2string($sortResult));
+			if (self::$debug)
+			{
+				error_log(__METHOD__.' ('.__LINE__.') '.array2string($sortResult));
+			}
 			#$this->icServer->setDebug(false);
 			#print "</pre>";
 			// nothing found
-			if(!is_array($sortResult) || empty($sortResult)) {
+			if(!is_array($sortResult) || empty($sortResult))
+			{
 				$retValue = array();
 				$retValue['info']['total']	= 0;
 				$retValue['info']['first']	= 0;
@@ -1316,7 +1524,8 @@ 
 			#_debug_array($sortResult);
 			#_debug_array(array_slice($sortResult, -5, -2));
 			//error_log("REVERSE: $reverse");
-			if($reverse === true) {
+			if($reverse === true)
+			{
 				if  ($_startMessage<=$total)
 				{
 					$startMessage = $_startMessage-1;
@@ -1328,7 +1537,10 @@ 
 					{
 						$numberOfMessages = $total%$_numberOfMessages;
 						//$numberOfMessages = abs($_startMessage-$total-1);
-						if ($numberOfMessages>0 && $numberOfMessages<=$_numberOfMessages) $_numberOfMessages = $numberOfMessages;
+						if ($numberOfMessages>0 && $numberOfMessages<=$_numberOfMessages)
+						{
+							$_numberOfMessages = $numberOfMessages;
+						}
 						//error_log(__METHOD__.' ('.__LINE__.') '.' Start:'.$_startMessage.' NumberOfMessages:'.$_numberOfMessages.' Total:'.$total);
 					}
 					$startMessage=($total-$_numberOfMessages)-1;
@@ -1342,19 +1554,36 @@ 
 					//$retValue['info']['first'] = $startMessage;
 					//$retValue['info']['last'] = $total;
 				}
-				if($startMessage > 0) {
-					if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.' StartMessage:'.(-($_numberOfMessages+$startMessage)).', '.-$startMessage.' Number of Messages:'.count($sortResult));
+				if($startMessage > 0)
+				{
+					if (self::$debug)
+					{
+						error_log(__METHOD__.' ('.__LINE__.') '.' StartMessage:'.(-($_numberOfMessages+$startMessage)).', '.-$startMessage.' Number of Messages:'.count($sortResult));
+					}
 					$sortResult = array_slice($sortResult, -($_numberOfMessages+$startMessage), -$startMessage);
-				} else {
-					if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.' StartMessage:'.(-($_numberOfMessages+($_startMessage-1))).', AllTheRest, Number of Messages:'.count($sortResult));
+				}
+				else
+				{
+					if (self::$debug)
+					{
+						error_log(__METHOD__.' ('.__LINE__.') '.' StartMessage:'.(-($_numberOfMessages+($_startMessage-1))).', AllTheRest, Number of Messages:'.count($sortResult));
+					}
 					$sortResult = array_slice($sortResult, -($_numberOfMessages+($_startMessage-1)));
 				}
 				$sortResult = array_reverse($sortResult);
-			} else {
-				if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.' StartMessage:'.($_startMessage-1).', '.$_numberOfMessages.' Number of Messages:'.count($sortResult));
+			}
+			else
+			{
+				if (self::$debug)
+				{
+					error_log(__METHOD__.' ('.__LINE__.') '.' StartMessage:'.($_startMessage-1).', '.$_numberOfMessages.' Number of Messages:'.count($sortResult));
+				}
 				$sortResult = array_slice($sortResult, $_startMessage-1, $_numberOfMessages);
 			}
-			if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.array2string($sortResult));
+			if (self::$debug)
+			{
+				error_log(__METHOD__.' ('.__LINE__.') '.array2string($sortResult));
+			}
 		}
 		else
 		{
@@ -1363,7 +1592,10 @@ 
 
 
 		// fetch the data for the selected messages
-		if (self::$debug||self::$debugTimes) $starttime = microtime(true);
+		if (self::$debug||self::$debugTimes)
+		{
+			$starttime = microtime(true);
+		}
 		try
 		{
 			$uidsToFetch = new Horde_Imap_Client_Ids();
@@ -1408,14 +1640,20 @@ 
 
 		$count = 0;
 
-		foreach((array)$sortResult as $uid) {
+		foreach((array)$sortResult as $uid)
+		{
 			$sortOrder[$uid] = $count++;
 		}
 
 		$count = 0;
-		if (is_object($headersNew)) {
-			if (self::$debug||self::$debugTimes) $starttime = microtime(true);
-			foreach($headersNew->ids() as $id) {
+		if (is_object($headersNew))
+		{
+			if (self::$debug||self::$debugTimes)
+			{
+				$starttime = microtime(true);
+			}
+			foreach($headersNew->ids() as $id)
+			{
 				$_headerObject = $headersNew->get($id);
 				//error_log(__METHOD__.' ('.__LINE__.') '.array2string($_headerObject));
 				$headerObject = array();
@@ -1427,8 +1665,12 @@ 
 				// Get already cached headers, 'fetchHeaders' is a label matchimg above
 				$headerForPrio = array_change_key_case($_headerObject->getHeaders('fetchHeaders',Horde_Imap_Client_Data_Fetch::HEADER_PARSE)->toArray(), CASE_UPPER);
 				// Try to fetch header with key='' as some servers might have no fetchHeaders index. e.g. yandex.com
-				if (empty($headerForPrio)) $headerForPrio = array_change_key_case($_headerObject->getHeaders('',Horde_Imap_Client_Data_Fetch::HEADER_PARSE)->toArray(), CASE_UPPER);
-				if (self::$debug) {
+				if (empty($headerForPrio))
+				{
+					$headerForPrio = array_change_key_case($_headerObject->getHeaders('',Horde_Imap_Client_Data_Fetch::HEADER_PARSE)->toArray(), CASE_UPPER);
+				}
+				if (self::$debug)
+				{
 					error_log(__METHOD__.' ('.__LINE__.') '.array2string($_headerObject).'UID:'.$_headerObject->getUid().' Size:'.$_headerObject->getSize().' Date:'.$_headerObject->getImapDate().'/'.egw_time::to($_headerObject->getImapDate(),'Y-m-d H:i:s'));
 					error_log(__METHOD__.' ('.__LINE__.') '.array2string($headerForPrio));
 				}
@@ -1439,11 +1681,16 @@ 
 					$total--;
 					continue;
 				}
-				if ( isset($headerForPrio['DISPOSITION-NOTIFICATION-TO']) ) {
+				if ( isset($headerForPrio['DISPOSITION-NOTIFICATION-TO']) )
+				{
 					$headerObject['DISPOSITION-NOTIFICATION-TO'] = self::decode_header(trim($headerForPrio['DISPOSITION-NOTIFICATION-TO']));
-				} else if ( isset($headerForPrio['RETURN-RECEIPT-TO']) ) {
+				}
+				else if ( isset($headerForPrio['RETURN-RECEIPT-TO']) )
+				{
 					$headerObject['DISPOSITION-NOTIFICATION-TO'] = self::decode_header(trim($headerForPrio['RETURN-RECEIPT-TO']));
-				} else if ( isset($headerForPrio['X-CONFIRM-READING-TO']) ) {
+				}
+				else if ( isset($headerForPrio['X-CONFIRM-READING-TO']) )
+				{
 					$headerObject['DISPOSITION-NOTIFICATION-TO'] = self::decode_header(trim($headerForPrio['X-CONFIRM-READING-TO']));
 				} /*else $sent_not = "";*/
 				//error_log(__METHOD__.' ('.__LINE__.') '.array2string($headerObject));
@@ -1475,7 +1722,11 @@ 
 						$rfcAddr = self::parseAddressList($ad); // does some fixing of known problems too
 						foreach ($rfcAddr as $_rfcAddr)
 						{
-							if (!$_rfcAddr->valid)	continue; // skip. not a valid address
+							if (!$_rfcAddr->valid)
+							{
+								continue;
+							}
+							// skip. not a valid address
 							$address[] = imap_rfc822_write_address($_rfcAddr->mailbox,$_rfcAddr->host,$_rfcAddr->personal);
 						}
 					}
@@ -1491,7 +1742,10 @@ 
 				$messageMimeType='';
 				foreach ($mailStructureObject->contentTypeMap() as $mime_id => $mime_type)
 				{
-					if ($mime_id==0 || $messageMimeType==='') $messageMimeType = $mime_type;
+					if ($mime_id==0 || $messageMimeType==='')
+					{
+						$messageMimeType = $mime_type;
+					}
 					$part = $mailStructureObject->getPart($mime_id);
 					$partdisposition = $part->getDisposition();
 					$partPrimaryType = $part->getPrimaryType();
@@ -1507,10 +1761,19 @@ 
 					if ($mime_type=='message/rfc822')
 					{
 						//error_log(__METHOD__.' ('.__LINE__.') '.' Uid:'.$uid.'->'.$mime_id.':'.array2string($part->contentTypeMap()));
-						foreach($part->contentTypeMap() as $sub_id => $sub_type) { if ($sub_id != $mime_id) $skipParts[$sub_id] = $sub_type;}
+						foreach($part->contentTypeMap() as $sub_id => $sub_type)
+						{
+if ($sub_id != $mime_id)
+						{
+							$skipParts[$sub_id] = $sub_type;
+						}
+						}
 					}
 					//error_log(__METHOD__.' ('.__LINE__.') '.' Uid:'.$uid.'->'.$mime_id.' Disp:'.$partdisposition.' Type:'.$partPrimaryType.' Skip:'.array2string($skipParts));
-					if (array_key_exists($mime_id,$skipParts)) continue;
+					if (array_key_exists($mime_id,$skipParts))
+					{
+						continue;
+					}
 					if ($partdisposition=='attachment' ||
 						($partdisposition=='inline'&&$partPrimaryType == 'image'&&$mime_type=='image/tiff') || // as we are not able to display tiffs
 						($partdisposition=='inline'&&$partPrimaryType == 'image'&&empty($cid)) ||
@@ -1521,7 +1784,10 @@ 
 						$headerObject['ATTACHMENTS'][$mime_id]['uid']=$uid;
 						$headerObject['ATTACHMENTS'][$mime_id]['cid'] = $cid;
 						$headerObject['ATTACHMENTS'][$mime_id]['partID']=$mime_id;
-						if (!isset($headerObject['ATTACHMENTS'][$mime_id]['name']))$headerObject['ATTACHMENTS'][$mime_id]['name']=$part->getName();
+						if (!isset($headerObject['ATTACHMENTS'][$mime_id]['name']))
+						{
+							$headerObject['ATTACHMENTS'][$mime_id]['name']=$part->getName();
+						}
 						if (!strcasecmp($headerObject['ATTACHMENTS'][$mime_id]['name'],'winmail.dat') ||
 							$headerObject['ATTACHMENTS'][$mime_id]['mimeType']=='application/ms-tnef')
 						{
@@ -1535,18 +1801,27 @@ 
 				//error_log(__METHOD__.' ('.__LINE__.') '.' FindBody (plain):'.array2string($mailStructureObject->findBody('plain')));
 				//error_log(__METHOD__.' ('.__LINE__.') '.' FindBody (html):'.array2string($mailStructureObject->findBody('html')));
 				//if($count == 0) error_log(__METHOD__.array2string($headerObject));
-				if (empty($headerObject['UID'])) continue;
+				if (empty($headerObject['UID']))
+				{
+					continue;
+				}
 				//$uid = ($rByUid ? $headerObject['UID'] : $headerObject['MSG_NUM']);
 				// make dates like "Mon, 23 Apr 2007 10:11:06 UT" working with strtotime
-				if(substr($headerObject['DATE'],-2) === 'UT') {
+				if(substr($headerObject['DATE'],-2) === 'UT')
+				{
 					$headerObject['DATE'] .= 'C';
 				}
-				if(substr($headerObject['INTERNALDATE'],-2) === 'UT') {
+				if(substr($headerObject['INTERNALDATE'],-2) === 'UT')
+				{
 					$headerObject['INTERNALDATE'] .= 'C';
 				}
 				//error_log(__METHOD__.' ('.__LINE__.') '.' '.$headerObject['SUBJECT'].'->'.$headerObject['DATE'].'<->'.$headerObject['INTERNALDATE'] .'#');
 				//error_log(__METHOD__.' ('.__LINE__.') '.' '.$this->decode_subject($headerObject['SUBJECT']).'->'.$headerObject['DATE']);
-				if (isset($headerObject['ATTACHMENTS']) && count($headerObject['ATTACHMENTS'])) foreach ($headerObject['ATTACHMENTS'] as &$a) { $retValue['header'][$sortOrder[$uid]]['attachments'][]=$a;}
+				if (isset($headerObject['ATTACHMENTS']) && count($headerObject['ATTACHMENTS']))
+				{
+					foreach ($headerObject['ATTACHMENTS'] as &$a) { $retValue['header'][$sortOrder[$uid]]['attachments'][]=$a;
+				}
+				}
 				$retValue['header'][$sortOrder[$uid]]['subject']	= $this->decode_subject($headerObject['SUBJECT']);
 				$retValue['header'][$sortOrder[$uid]]['size'] 		= $headerObject['SIZE'];
 				$retValue['header'][$sortOrder[$uid]]['date']		= self::_strtotime(($headerObject['DATE']&&!($headerObject['DATE']=='NIL')?$headerObject['DATE']:$headerObject['INTERNALDATE']),'ts',true);
@@ -1556,22 +1831,31 @@ 
 				$retValue['header'][$sortOrder[$uid]]['uid']		= $headerObject['UID'];
 				$retValue['header'][$sortOrder[$uid]]['priority']		= ($headerObject['PRIORITY']?$headerObject['PRIORITY']:3);
 				//error_log(__METHOD__.' ('.__LINE__.') '.' '.array2string($retValue['header'][$sortOrder[$uid]]));
-				if (isset($headerObject['DISPOSITION-NOTIFICATION-TO'])) $retValue['header'][$sortOrder[$uid]]['disposition-notification-to'] = $headerObject['DISPOSITION-NOTIFICATION-TO'];
-				if (is_array($headerObject['FLAGS'])) {
+				if (isset($headerObject['DISPOSITION-NOTIFICATION-TO']))
+				{
+					$retValue['header'][$sortOrder[$uid]]['disposition-notification-to'] = $headerObject['DISPOSITION-NOTIFICATION-TO'];
+				}
+				if (is_array($headerObject['FLAGS']))
+				{
 					$retValue['header'][$sortOrder[$uid]] = array_merge($retValue['header'][$sortOrder[$uid]],self::prepareFlagsArray($headerObject));
 				}
 				//error_log(__METHOD__.' ('.__LINE__.') '.$headerObject['SUBJECT'].'->'.array2string($_headerObject->getEnvelope()->__get('from')));
-				if(is_array($headerObject['FROM']) && $headerObject['FROM'][0]) {
+				if(is_array($headerObject['FROM']) && $headerObject['FROM'][0])
+				{
 					$retValue['header'][$sortOrder[$uid]]['sender_address'] = self::decode_header($headerObject['FROM'][0],true);
 				}
-				if(is_array($headerObject['TO']) && $headerObject['TO'][0]) {
+				if(is_array($headerObject['TO']) && $headerObject['TO'][0])
+				{
 					$retValue['header'][$sortOrder[$uid]]['to_address'] = self::decode_header($headerObject['TO'][0],true);
 					if (count($headerObject['TO'])>1)
 					{
 						$ki=0;
 						foreach($headerObject['TO'] as $k => $add)
 						{
-							if ($k==0) continue;
+							if ($k==0)
+							{
+								continue;
+							}
 							//error_log(__METHOD__.' ('.__LINE__.') '."-> $k:".array2string($add));
 							$retValue['header'][$sortOrder[$uid]]['additional_to_addresses'][$ki] = self::decode_header($add,true);
 							//error_log(__METHOD__.' ('.__LINE__.') '.array2string($retValue['header'][$sortOrder[$uid]]['additional_to_addresses'][$ki]));
@@ -1579,7 +1863,8 @@ 
 						}
 					}
 				}
-				if(is_array($headerObject['CC']) && count($headerObject['CC'])>0) {
+				if(is_array($headerObject['CC']) && count($headerObject['CC'])>0)
+				{
 					$ki=0;
 					foreach($headerObject['CC'] as $k => $add)
 					{
@@ -1593,27 +1878,41 @@ 
 
 				$count++;
 			}
-			if (self::$debug||self::$debugTimes) self::logRunTimes($starttime,null,' fetching Headers and stuff for Folder:'.$_folderName,__METHOD__.' ('.__LINE__.') ');
+			if (self::$debug||self::$debugTimes)
+			{
+				self::logRunTimes($starttime,null,' fetching Headers and stuff for Folder:'.$_folderName,__METHOD__.' ('.__LINE__.') ');
+			}
 			//self::$debug=false;
 			// sort the messages to the requested displayorder
-			if(is_array($retValue['header'])) {
+			if(is_array($retValue['header']))
+			{
 				$countMessages = $total;
-				if (isset($_filter['range'])) $countMessages = self::$folderStatusCache[$this->profileID][$_folderName]['messages'];
+				if (isset($_filter['range']))
+				{
+					$countMessages = self::$folderStatusCache[$this->profileID][$_folderName]['messages'];
+				}
 				ksort($retValue['header']);
 				$retValue['info']['total']	= $total;
 				//if ($_startMessage>$total) $_startMessage = $total-($count-1);
 				$retValue['info']['first']	= $_startMessage;
 				$retValue['info']['last']	= $_startMessage + $count - 1 ;
 				return $retValue;
-			} else {
+			}
+			else
+			{
 				$retValue = array();
 				$retValue['info']['total']	= 0;
 				$retValue['info']['first']	= 0;
 				$retValue['info']['last']	= 0;
 				return $retValue;
 			}
-		} else {
-			if ($headersNew == null && empty($_thisUIDOnly)) error_log(__METHOD__." -> retrieval of Message Details to Query $queryString failed: ".print_r($headersNew,TRUE));
+		}
+		else
+		{
+			if ($headersNew == null && empty($_thisUIDOnly))
+			{
+				error_log(__METHOD__." -> retrieval of Message Details to Query $queryString failed: ".print_r($headersNew,TRUE));
+			}
 			$retValue = array();
 			$retValue['info']['total']  = 0;
 			$retValue['info']['first']  = 0;
@@ -1630,7 +1929,10 @@ 
 	 */
 	static function prepareFlagsArray($headerObject)
 	{
-		if (is_array($headerObject['FLAGS'])) $headerFlags = array_map('strtolower',$headerObject['FLAGS']);
+		if (is_array($headerObject['FLAGS']))
+		{
+			$headerFlags = array_map('strtolower',$headerObject['FLAGS']);
+		}
 		$retValue = array();
 		$retValue['recent']		= in_array('\\recent', $headerFlags);
 		$retValue['flagged']	= in_array('\\flagged', $headerFlags);
@@ -1681,24 +1983,43 @@ 
 		//error_log(__METHOD__.' ('.__LINE__.') '.' Filter:'.array2string($_filter));
 		$try2useCache = true;
 		static $eMailListContainsDeletedMessages;
-		if (is_null($eMailListContainsDeletedMessages)) $eMailListContainsDeletedMessages = egw_cache::getCache(egw_cache::INSTANCE,'email','eMailListContainsDeletedMessages'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*1);
+		if (is_null($eMailListContainsDeletedMessages))
+		{
+			$eMailListContainsDeletedMessages = egw_cache::getCache(egw_cache::INSTANCE,'email','eMailListContainsDeletedMessages'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*1);
+		}
 		// this indicates, that there is no Filter set, and the returned set/subset should not contain DELETED Messages, nor filtered for UNDELETED
 		if ($setSession==true && ((strpos(array2string($_filter), 'UNDELETED') === false && strpos(array2string($_filter), 'DELETED') === false)))
 		{
-			if (self::$debugTimes) $starttime = microtime(true);
-			if (is_null($eMailListContainsDeletedMessages) || empty($eMailListContainsDeletedMessages[$this->profileID]) || empty($eMailListContainsDeletedMessages[$this->profileID][$_folderName])) $eMailListContainsDeletedMessages = egw_cache::getCache(egw_cache::INSTANCE,'email','eMailListContainsDeletedMessages'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*1);
+			if (self::$debugTimes)
+			{
+				$starttime = microtime(true);
+			}
+			if (is_null($eMailListContainsDeletedMessages) || empty($eMailListContainsDeletedMessages[$this->profileID]) || empty($eMailListContainsDeletedMessages[$this->profileID][$_folderName]))
+			{
+				$eMailListContainsDeletedMessages = egw_cache::getCache(egw_cache::INSTANCE,'email','eMailListContainsDeletedMessages'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*1);
+			}
 			$deletedMessages = $this->getSortedList($_folderName, 0, $three=1, array('status'=>array('DELETED')),$five=true,false);
-			if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') Found DeletedMessages:'.array2string($eMailListContainsDeletedMessages));
+			if (self::$debug)
+			{
+				error_log(__METHOD__.' ('.__LINE__.') Found DeletedMessages:'.array2string($eMailListContainsDeletedMessages));
+			}
 			$eMailListContainsDeletedMessages[$this->profileID][$_folderName] =$deletedMessages['count'];
 			egw_cache::setCache(egw_cache::INSTANCE,'email','eMailListContainsDeletedMessages'.trim($GLOBALS['egw_info']['user']['account_id']),$eMailListContainsDeletedMessages, 60*60*1);
-			if (self::$debugTimes) self::logRunTimes($starttime,null,'setting eMailListContainsDeletedMessages for Profile:'.$this->profileID.' Folder:'.$_folderName.' to '.$eMailListContainsDeletedMessages[$this->profileID][$_folderName],__METHOD__.' ('.__LINE__.') ');			//error_log(__METHOD__.' ('.__LINE__.') '.' Profile:'.$this->profileID.' Folder:'.$_folderName.' -> EXISTS/SessStat:'.array2string($folderStatus['MESSAGES']).'/'.self::$folderStatusCache[$this->profileID][$_folderName]['messages'].' ListContDelMsg/SessDeleted:'.$eMailListContainsDeletedMessages[$this->profileID][$_folderName].'/'.self::$folderStatusCache[$this->profileID][$_folderName]['deleted']);
+			if (self::$debugTimes)
+			{
+				self::logRunTimes($starttime,null,'setting eMailListContainsDeletedMessages for Profile:'.$this->profileID.' Folder:'.$_folderName.' to '.$eMailListContainsDeletedMessages[$this->profileID][$_folderName],__METHOD__.' ('.__LINE__.') ');
+			}
+			//error_log(__METHOD__.' ('.__LINE__.') '.' Profile:'.$this->profileID.' Folder:'.$_folderName.' -> EXISTS/SessStat:'.array2string($folderStatus['MESSAGES']).'/'.self::$folderStatusCache[$this->profileID][$_folderName]['messages'].' ListContDelMsg/SessDeleted:'.$eMailListContainsDeletedMessages[$this->profileID][$_folderName].'/'.self::$folderStatusCache[$this->profileID][$_folderName]['deleted']);
 		}
 		$try2useCache = false;
 		//self::$supportsORinQuery[$this->profileID]=true;
 		if (is_null(self::$supportsORinQuery) || !isset(self::$supportsORinQuery[$this->profileID]))
 		{
 			self::$supportsORinQuery = egw_cache::getCache(egw_cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*10);
-			if (!isset(self::$supportsORinQuery[$this->profileID])) self::$supportsORinQuery[$this->profileID]=true;
+			if (!isset(self::$supportsORinQuery[$this->profileID]))
+			{
+				self::$supportsORinQuery[$this->profileID]=true;
+			}
 		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($_filter).' SupportsOrInQuery:'.self::$supportsORinQuery[$this->profileID]);
 		$filter = $this->createIMAPFilter($_folderName, $_filter,self::$supportsORinQuery[$this->profileID]);
@@ -1709,15 +2030,26 @@ 
 		}
 		//_debug_array($filter);
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($filter).'#'.array2string($this->icServer->capability()));
-		if($this->icServer->hasCapability('SORT')) {
+		if($this->icServer->hasCapability('SORT'))
+		{
 			// when using an orQuery and we sort by date. sort seems to fail on certain servers => ZIMBRA with Horde_Imap_Client
 			// thus we translate the search request from date to Horde_Imap_Client::SORT_SEQUENCE (which should be the same, if
 			// there is no messing with the dates)
 			//if (self::$supportsORinQuery[$this->profileID]&&$_sort=='date'&&$_filter['type']=='quick'&&!empty($_filter['string']))$_sort='INTERNALDATE';
-			if (self::$debug) error_log(__METHOD__." Mailserver has SORT Capability, SortBy: ".array2string($_sort)." Reverse: $_reverse");
+			if (self::$debug)
+			{
+				error_log(__METHOD__." Mailserver has SORT Capability, SortBy: ".array2string($_sort)." Reverse: $_reverse");
+			}
 			$sortOrder = $this->_getSortString($_sort, $_reverse);
-			if ($_reverse && in_array(Horde_Imap_Client::SORT_REVERSE,$sortOrder)) $_reverse=false; // as we reversed the result already
-			if (self::$debug) error_log(__METHOD__." Mailserver runs SORT: SortBy:".array2string($_sort)."->".array2string($sortOrder)." Filter: ".array2string($filter));
+			if ($_reverse && in_array(Horde_Imap_Client::SORT_REVERSE,$sortOrder))
+			{
+				$_reverse=false;
+			}
+			// as we reversed the result already
+			if (self::$debug)
+			{
+				error_log(__METHOD__." Mailserver runs SORT: SortBy:".array2string($_sort)."->".array2string($sortOrder)." Filter: ".array2string($filter));
+			}
 			try
 			{
 				$sortResult = $this->icServer->search($_folderName, $filter, array(
@@ -1729,7 +2061,10 @@ 
 				//error_log(__METHOD__.'('.__LINE__.'):'.$e->getMessage());
 				$resultByUid = false;
 				$sortOrder = array(Horde_Imap_Client::SORT_SEQUENCE);
-				if ($_reverse) array_unshift($sortOrder,Horde_Imap_Client::SORT_REVERSE);
+				if ($_reverse)
+				{
+					array_unshift($sortOrder,Horde_Imap_Client::SORT_REVERSE);
+				}
 				try
 				{
 					$sortResult = $this->icServer->search($_folderName, $filter, array(
@@ -1741,9 +2076,17 @@ 
 					$sortResult = self::$folderStatusCache[$this->profileID][$_folderName]['sortResult'];
 				}
 			}
-			if (self::$debug) error_log(__METHOD__.print_r($sortResult,true));
-		} else {
-			if (self::$debug) error_log(__METHOD__." Mailserver has NO SORT Capability");
+			if (self::$debug)
+			{
+				error_log(__METHOD__.print_r($sortResult,true));
+			}
+		}
+		else
+		{
+			if (self::$debug)
+			{
+				error_log(__METHOD__." Mailserver has NO SORT Capability");
+			}
 			//$sortOrder = array(Horde_Imap_Client::SORT_SEQUENCE);
 			//if ($_reverse) array_unshift($sortOrder,Horde_Imap_Client::SORT_REVERSE);
 			try
@@ -1757,7 +2100,10 @@ 
 				// possible error OR Query. But Horde gives no detailed Info :-(
 				self::$supportsORinQuery[$this->profileID]=false;
 				egw_cache::setCache(egw_cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']),self::$supportsORinQuery,60*60*10);
-				if (self::$debug) error_log(__METHOD__.__LINE__." Mailserver seems to have NO OR Capability for Search:".$sortResult->message);
+				if (self::$debug)
+				{
+					error_log(__METHOD__.__LINE__." Mailserver seems to have NO OR Capability for Search:".$sortResult->message);
+				}
 				$filter = $this->createIMAPFilter($_folderName, $_filter, self::$supportsORinQuery[$this->profileID]);
 				try
 				{
@@ -1768,11 +2114,15 @@ 
 				{
 				}
 			}
-			if(is_array($sortResult['match'])) {
+			if(is_array($sortResult['match']))
+			{
 					// not sure that this is going so succeed as $sortResult['match'] is a hordeObject
 					sort($sortResult['match'], SORT_NUMERIC);
 			}
-			if (self::$debug) error_log(__METHOD__." using Filter:".print_r($filter,true)." ->".print_r($sortResult,true));
+			if (self::$debug)
+			{
+				error_log(__METHOD__." using Filter:".print_r($filter,true)." ->".print_r($sortResult,true));
+			}
 		}
 		if ($setSession)
 		{
@@ -1801,7 +2151,8 @@ 
 		$_reverse=false;
 		if (is_numeric($_sort))
 		{
-			switch($_sort) {
+			switch($_sort)
+			{
 				case 2:
 					$retValue = array(Horde_Imap_Client::SORT_FROM);
 					break;
@@ -1823,7 +2174,8 @@ 
 		}
 		else
 		{
-			switch(strtoupper($_sort)) {
+			switch(strtoupper($_sort))
+			{
 				case 'FROMADDRESS':
 					$retValue = array(Horde_Imap_Client::SORT_FROM);
 					break;
@@ -1849,7 +2201,10 @@ 
 					break;
 			}
 		}
-		if ($_reverse) array_unshift($retValue,Horde_Imap_Client::SORT_REVERSE);
+		if ($_reverse)
+		{
+			array_unshift($retValue,Horde_Imap_Client::SORT_REVERSE);
+		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.' '.($_reverse?'REVERSE ':'').$_sort.'->'.$retValue);
 		return $retValue;
 	}
@@ -1868,8 +2223,12 @@ 
 		$imapFilter->charset('UTF-8');
 
 		//_debug_array($_criterias);
-		if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.' Criterias:'.(!is_array($_criterias)?" none -> returning":array2string($_criterias)));
-		if((!is_array($_criterias) || $_criterias['status']=='any') && (!isset($_criterias['string']) || empty($_criterias['string']))) {
+		if (self::$debug)
+		{
+			error_log(__METHOD__.' ('.__LINE__.') '.' Criterias:'.(!is_array($_criterias)?" none -> returning":array2string($_criterias)));
+		}
+		if((!is_array($_criterias) || $_criterias['status']=='any') && (!isset($_criterias['string']) || empty($_criterias['string'])))
+		{
 			$imapFilter->flag('DELETED', $set=false);
 			return $imapFilter;
 		}
@@ -1877,11 +2236,13 @@ 
 		// statusQuery MUST be placed first, as search for subject/mailbody and such is
 		// depending on charset. flagSearch is not BUT messes the charset if called afterwards
 		$statusQueryValid = false;
-		foreach((array)$_criterias['status'] as $k => $criteria) {
+		foreach((array)$_criterias['status'] as $k => $criteria)
+		{
 			$imapStatusFilter = new Horde_Imap_Client_Search_Query();
 			$imapStatusFilter->charset('UTF-8');
 			$criteria = strtoupper($criteria);
-			switch ($criteria) {
+			switch ($criteria)
+			{
 				case 'ANSWERED':
 				case 'DELETED':
 				case 'FLAGGED':
@@ -1964,17 +2325,22 @@ 
 		$imapSearchFilter = new Horde_Imap_Client_Search_Query();
 		$imapSearchFilter->charset('UTF-8');
 
-		if(!empty($_criterias['string'])) {
+		if(!empty($_criterias['string']))
+		{
 			$criteria = strtoupper($_criterias['type']);
-			switch ($criteria) {
+			switch ($criteria)
+			{
 				case 'QUICK':
 					$imapSearchFilter->headerText('SUBJECT', $_criterias['string'], $not=false);
 					//$imapSearchFilter->charset('UTF-8');
 					$imapFilter2 = new Horde_Imap_Client_Search_Query();
 					$imapFilter2->charset('UTF-8');
-					if($this->isSentFolder($_folder)) {
+					if($this->isSentFolder($_folder))
+					{
 						$imapFilter2->headerText('TO', $_criterias['string'], $not=false);
-					} else {
+					}
+					else
+					{
 						$imapFilter2->headerText('FROM', $_criterias['string'], $not=false);
 					}
 					if ($_supportsOrInQuery)
@@ -2016,8 +2382,14 @@ 
 					break;
 			}
 		}
-		if ($statusQueryValid && !$queryValid) $queryValid=true;
-		if ($queryValid) $imapFilter->andSearch($imapSearchFilter);
+		if ($statusQueryValid && !$queryValid)
+		{
+			$queryValid=true;
+		}
+		if ($queryValid)
+		{
+			$imapFilter->andSearch($imapSearchFilter);
+		}
 
 		if (isset($_criterias['range']) && !empty($_criterias['range']))
 		{
@@ -2029,10 +2401,13 @@ 
 			$query_str = $imapFilter->build();
 			error_log(__METHOD__.' ('.__LINE__.') '.' '.$query_str['query']);
 		}
-		if($queryValid==false) {
+		if($queryValid==false)
+		{
 			$imapFilter->flag('DELETED', $set=false);
 			return $imapFilter;
-		} else {
+		}
+		else
+		{
 			return $imapFilter;
 		}
 	}
@@ -2078,7 +2453,10 @@ 
 			if ($_tryIDNConversion===true && stripos($_string,'@')!==false)
 			{
 				$rfcAddr = self::parseAddressList($_string);
-				if (!isset(self::$idna2)) self::$idna2 = new egw_idna;
+				if (!isset(self::$idna2))
+				{
+					self::$idna2 = new egw_idna;
+				}
 				if (isset(self::$idna2))
 				{
 					$stringA = array();
@@ -2092,12 +2470,18 @@ 
 						}
 						$stringA[] = imap_rfc822_write_address($_rfcAddr->mailbox,self::$idna2->decode($_rfcAddr->host),$_rfcAddr->personal);
 					}
-					if (!empty($stringA)) $_string = implode(',',$stringA);
+					if (!empty($stringA))
+					{
+						$_string = implode(',',$stringA);
+					}
 				}
 			}
 			if ($_tryIDNConversion==='FORCE')
 			{
-				if (!isset(self::$idna2)) self::$idna2 = new egw_idna;
+				if (!isset(self::$idna2))
+				{
+					self::$idna2 = new egw_idna;
+				}
 				if (isset(self::$idna2))
 				{
 					//error_log(__METHOD__.' ('.__LINE__.') '.'->'.$_string.'='.self::$idna2->decode($_string));
@@ -2122,7 +2506,10 @@ 
 		{
 			return 'No Subject';
 		}
-		if ($decode) $_string = self::decode_header($_string);
+		if ($decode)
+		{
+			$_string = self::decode_header($_string);
+		}
 		// make sure its utf-8
 		$test = @json_encode($_string);
 		if (($test=="null" || $test === false || is_null($test)) && strlen($_string)>0)
@@ -2160,7 +2547,8 @@ 
 	 * @param string _parent the parent foldername
 	 * @return ISO-8859-1 / UTF7-IMAP encoded string
 	 */
-	function _encodeFolderName($_folderName) {
+	function _encodeFolderName($_folderName)
+	{
 		return translation::convert($_folderName, self::$displayCharset, 'ISO-8859-1');
 		#return translation::convert($_folderName, self::$displayCharset, 'UTF7-IMAP');
 	}
@@ -2176,21 +2564,36 @@ 
 	 */
 	function createFolder($_parent, $_folderName, &$_error)
 	{
-		if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '."->"."$_parent, $_folderName called from:".function_backtrace());
+		if (self::$debug)
+		{
+			error_log(__METHOD__.' ('.__LINE__.') '."->"."$_parent, $_folderName called from:".function_backtrace());
+		}
 		$parent		= $_parent;//$this->_encodeFolderName($_parent);
 		$folderName	= $_folderName;//$this->_encodeFolderName($_folderName);
 
-		if(empty($parent)) {
+		if(empty($parent))
+		{
 			$newFolderName = $folderName;
-		} else {
+		}
+		else
+		{
 			$HierarchyDelimiter = $this->getHierarchyDelimiter();
 			$newFolderName = $parent . $HierarchyDelimiter . $folderName;
 		}
-		if (empty($newFolderName)) return false;
-		if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.'->'.$newFolderName);
+		if (empty($newFolderName))
+		{
+			return false;
+		}
+		if (self::$debug)
+		{
+			error_log(__METHOD__.' ('.__LINE__.') '.'->'.$newFolderName);
+		}
 		if ($this->folderExists($newFolderName,true))
 		{
-			if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '." Folder $newFolderName already exists.");
+			if (self::$debug)
+			{
+				error_log(__METHOD__.' ('.__LINE__.') '." Folder $newFolderName already exists.");
+			}
 			return $newFolderName;
 		}
 		try
@@ -2238,13 +2641,19 @@ 
 		$parent		= $_parent;//$this->_encodeFolderName($_parent);
 		$folderName	= $_folderName;//$this->_encodeFolderName($_folderName);
 
-		if(empty($parent)) {
+		if(empty($parent))
+		{
 			$newFolderName = $folderName;
-		} else {
+		}
+		else
+		{
 			$HierarchyDelimiter = $this->getHierarchyDelimiter();
 			$newFolderName = $parent . $HierarchyDelimiter . $folderName;
 		}
-		if (self::$debug) error_log("create folder: $newFolderName");
+		if (self::$debug)
+		{
+			error_log("create folder: $newFolderName");
+		}
 		try
 		{
 			$this->icServer->renameMailbox($oldFolderName, $newFolderName);
@@ -2318,8 +2727,14 @@ 
 	 */
 	function getFolderObjects($_subscribedOnly=false, $_getCounters=false, $_alwaysGetDefaultFolders=false,$_useCacheIfPossible=true)
 	{
-		if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.' ServerID:'.$this->icServer->ImapServerId.", subscribedOnly:$_subscribedOnly, getCounters:$_getCounters, alwaysGetDefaultFolders:$_alwaysGetDefaultFolders, _useCacheIfPossible:$_useCacheIfPossible");
-		if (self::$debugTimes) $starttime = microtime (true);
+		if (self::$debug)
+		{
+			error_log(__METHOD__.' ('.__LINE__.') '.' ServerID:'.$this->icServer->ImapServerId.", subscribedOnly:$_subscribedOnly, getCounters:$_getCounters, alwaysGetDefaultFolders:$_alwaysGetDefaultFolders, _useCacheIfPossible:$_useCacheIfPossible");
+		}
+		if (self::$debugTimes)
+		{
+			$starttime = microtime (true);
+		}
 		static $folders2return;
 		//$_subscribedOnly=false;
 		// always use static on single request if info is available;
@@ -2327,23 +2742,35 @@ 
 		// set $_useCacheIfPossible to false !
 		if ($_useCacheIfPossible && isset($folders2return[$this->icServer->ImapServerId]) && !empty($folders2return[$this->icServer->ImapServerId]))
 		{
-			if (self::$debugTimes) self::logRunTimes($starttime,null,'using static',__METHOD__.' ('.__LINE__.') ');
+			if (self::$debugTimes)
+			{
+				self::logRunTimes($starttime,null,'using static',__METHOD__.' ('.__LINE__.') ');
+			}
 			return $folders2return[$this->icServer->ImapServerId];
 		}
 
 		if ($_subscribedOnly && $_getCounters===false)
 		{
-			if (is_null($folders2return)) $folders2return = egw_cache::getCache(egw_cache::INSTANCE,'email','folderObjects'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*1);
+			if (is_null($folders2return))
+			{
+				$folders2return = egw_cache::getCache(egw_cache::INSTANCE,'email','folderObjects'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*1);
+			}
 			if ($_useCacheIfPossible && isset($folders2return[$this->icServer->ImapServerId]) && !empty($folders2return[$this->icServer->ImapServerId]))
 			{
 				//error_log(__METHOD__.' ('.__LINE__.') '.' using Cached folderObjects'.array2string($folders2return[$this->icServer->ImapServerId]));
-				if (self::$debugTimes) self::logRunTimes($starttime,null,'from Cache',__METHOD__.' ('.__LINE__.') ');
+				if (self::$debugTimes)
+				{
+					self::logRunTimes($starttime,null,'from Cache',__METHOD__.' ('.__LINE__.') ');
+				}
 				return $folders2return[$this->icServer->ImapServerId];
 			}
 		}
 		// use $folderBasicInfo for holding attributes and other basic folderinfo $folderBasicInfo[$this->icServer->ImapServerId]
 		static $folderBasicInfo;
-		if (is_null($folderBasicInfo)||!isset($folderBasicInfo[$this->icServer->ImapServerId])) $folderBasicInfo = egw_cache::getCache(egw_cache::INSTANCE,'email','folderBasicInfo'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*1);
+		if (is_null($folderBasicInfo)||!isset($folderBasicInfo[$this->icServer->ImapServerId]))
+		{
+			$folderBasicInfo = egw_cache::getCache(egw_cache::INSTANCE,'email','folderBasicInfo'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*1);
+		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string(array_keys($folderBasicInfo[$this->icServer->ImapServerId])));
 
 		$delimiter = $this->getHierarchyDelimiter();
@@ -2356,7 +2783,8 @@ 
 		$inboxData->shortFolderName	= 'INBOX';
 		$inboxData->shortDisplayName	= lang('INBOX');
 		$inboxData->subscribed = true;
-		if($_getCounters == true) {
+		if($_getCounters == true)
+		{
 			$inboxData->counter = $this->getMailBoxCounters('INBOX');
 		}
 		// force unsubscribed by preference showAllFoldersInFolderPane
@@ -2375,12 +2803,14 @@ 
 		//error_log(__METHOD__.__LINE__.array2string($nameSpace));
 		if (is_array($nameSpace))
 		{
-			foreach($nameSpace as $k => $singleNameSpace) {
+			foreach($nameSpace as $k => $singleNameSpace)
+			{
 				$type = $singleNameSpace['type'];
 				// the following line (assumption that for the same namespace the delimiter should be equal) may be wrong
 				$foldersNameSpace[$type]['delimiter']  = $singleNameSpace['delimiter'];
 
-				if(is_array($singleNameSpace)&&$fetchedAllInOneGo==false) {
+				if(is_array($singleNameSpace)&&$fetchedAllInOneGo==false)
+				{
 					// fetch and sort the subscribed folders
 					// we alway fetch the subscribed, as this provides the only way to tell
 					// if a folder is subscribed or not
@@ -2431,8 +2861,12 @@ 
 							}
 						}
 						//error_log(__METHOD__.' ('.__LINE__.') '.' '.$type.'->'.array2string($foldersNameSpace[$type]['subscribed']));
-						if (!is_array($foldersNameSpace[$type]['all'])) $foldersNameSpace[$type]['all'] = array();
-						if ($_subscribedOnly == true && !empty($foldersNameSpace[$type]['subscribed'])) {
+						if (!is_array($foldersNameSpace[$type]['all']))
+						{
+							$foldersNameSpace[$type]['all'] = array();
+						}
+						if ($_subscribedOnly == true && !empty($foldersNameSpace[$type]['subscribed']))
+						{
 							continue;
 						}
 
@@ -2462,7 +2896,8 @@ 
 					}
 
 					//error_log(__METHOD__.' ('.__LINE__.') '.' '.$type.'->'.array2string($allMailboxesExt));
-					foreach ($allMailboxesExt as $mbx) {
+					foreach ($allMailboxesExt as $mbx)
+					{
 						if (!isset($folderBasicInfo[$this->icServer->ImapServerId][$mbx['MAILBOX']]))
 						{
 							$folderBasicInfo[$this->icServer->ImapServerId][$mbx['MAILBOX']]=array(
@@ -2485,20 +2920,33 @@ 
 						if (isset($allMailBoxesExtSorted[$mbx['MAILBOX']])||
 							isset($allMailBoxesExtSorted[$mbx['MAILBOX'].$foldersNameSpace[$type]['delimiter']])||
 							(substr($mbx['MAILBOX'],-1)==$foldersNameSpace[$type]['delimiter'] && isset($allMailBoxesExtSorted[substr($mbx['MAILBOX'],0,-1)]))
-						) continue;
+						)
+						{
+							continue;
+						}
 
 						//echo '#'.$mbx['MAILBOX'].':'.array2string($mbx)."#<br>";
 						$allMailBoxesExtSorted[$mbx['MAILBOX']] = $mbx;
 					}
-					if (is_array($allMailBoxesExtSorted)) ksort($allMailBoxesExtSorted);
+					if (is_array($allMailBoxesExtSorted))
+					{
+						ksort($allMailBoxesExtSorted);
+					}
 					//_debug_array(array_keys($allMailBoxesExtSorted));
 					$allMailboxes = array();
-					foreach ((array)$allMailBoxesExtSorted as $mbx) {
-						if (!in_array($mbx['MAILBOX'],$allMailboxes)) $allMailboxes[] = $mbx['MAILBOX'];
+					foreach ((array)$allMailBoxesExtSorted as $mbx)
+					{
+						if (!in_array($mbx['MAILBOX'],$allMailboxes))
+						{
+							$allMailboxes[] = $mbx['MAILBOX'];
+						}
 						//echo "Result:";_debug_array($allMailboxes);
 					}
 					$foldersNameSpace[$type]['all'] = $allMailboxes;
-					if (is_array($foldersNameSpace[$type]['all'])) sort($foldersNameSpace[$type]['all']);
+					if (is_array($foldersNameSpace[$type]['all']))
+					{
+						sort($foldersNameSpace[$type]['all']);
+					}
 				}
 			}
 		}
@@ -2507,24 +2955,50 @@ 
 		//echo "<br>FolderNameSpace To Process:";_debug_array($foldersNameSpace);
 		$autoFolderObjects = $folders = array();
 		$autofolder_exists = array();
-		foreach( array('personal', 'others', 'shared') as $type) {
-			if(isset($foldersNameSpace[$type])) {
-				if($_subscribedOnly) {
-					if( !empty($foldersNameSpace[$type]['subscribed']) ) $listOfFolders = $foldersNameSpace[$type]['subscribed'];
-				} else {
-					if( !empty($foldersNameSpace[$type]['all'])) $listOfFolders = $foldersNameSpace[$type]['all'];
-				}
-				foreach((array)$listOfFolders as $folderName) {
+		foreach( array('personal', 'others', 'shared') as $type)
+		{
+			if(isset($foldersNameSpace[$type]))
+			{
+				if($_subscribedOnly)
+				{
+					if( !empty($foldersNameSpace[$type]['subscribed']) )
+					{
+						$listOfFolders = $foldersNameSpace[$type]['subscribed'];
+					}
+				}
+				else
+				{
+					if( !empty($foldersNameSpace[$type]['all']))
+					{
+						$listOfFolders = $foldersNameSpace[$type]['all'];
+					}
+				}
+				foreach((array)$listOfFolders as $folderName)
+				{
 					//echo "<br>FolderToCheck:$folderName<br>";
 					//error_log(__METHOD__.__LINE__.'#Delimiter:'.$delimiter.':#'.$folderName);
-					if ($_subscribedOnly && empty($foldersNameSpace[$type]['all'])) continue;//when subscribedonly, we fetch all folders in one go.
-					if($_subscribedOnly && !(in_array($folderName, $foldersNameSpace[$type]['all'])||in_array($folderName.$foldersNameSpace[$type]['delimiter'], $foldersNameSpace[$type]['all']))) {
+					if ($_subscribedOnly && empty($foldersNameSpace[$type]['all']))
+					{
+						continue;
+					}
+					//when subscribedonly, we fetch all folders in one go.
+					if($_subscribedOnly && !(in_array($folderName, $foldersNameSpace[$type]['all'])||in_array($folderName.$foldersNameSpace[$type]['delimiter'], $foldersNameSpace[$type]['all'])))
+					{
 						#echo "$folderName failed to be here <br>";
 						continue;
 					}
-					if (isset($folders[$folderName])) continue;
-					if (isset($autoFolderObjects[$folderName])) continue;
-					if (empty($delimiter)||$delimiter != $foldersNameSpace[$type]['delimiter']) $delimiter = $foldersNameSpace[$type]['delimiter'];
+					if (isset($folders[$folderName]))
+					{
+						continue;
+					}
+					if (isset($autoFolderObjects[$folderName]))
+					{
+						continue;
+					}
+					if (empty($delimiter)||$delimiter != $foldersNameSpace[$type]['delimiter'])
+					{
+						$delimiter = $foldersNameSpace[$type]['delimiter'];
+					}
 					$folderParts = explode($delimiter, $folderName);
 					$shortName = array_pop($folderParts);
 
@@ -2532,17 +3006,20 @@ 
 					$folderObject->delimiter	= $delimiter;
 					$folderObject->folderName	= $folderName;
 					$folderObject->shortFolderName	= $shortName;
-					if(!$_subscribedOnly) {
+					if(!$_subscribedOnly)
+					{
 						#echo $folderName."->".$type."<br>";
 						#_debug_array($foldersNameSpace[$type]['subscribed']);
 						$folderObject->subscribed = in_array($folderName, (array)$foldersNameSpace[$type]['subscribed']);
 					}
 
-					if($_getCounters == true) {
+					if($_getCounters == true)
+					{
 						//error_log(__METHOD__.' ('.__LINE__.') '.' getCounter forFolder:'.$folderName);
 						$folderObject->counter = $this->getMailBoxCounters($folderName);
 					}
-					if(strtoupper($folderName) == 'INBOX') {
+					if(strtoupper($folderName) == 'INBOX')
+					{
 						$folderName = 'INBOX';
 						$folderObject->folderName	= 'INBOX';
 						$folderObject->shortFolderName	= 'INBOX';
@@ -2550,24 +3027,34 @@ 
 						$folderObject->shortDisplayName = lang('INBOX');
 						$folderObject->subscribed	= true;
 					// translate the automatic Folders (Sent, Drafts, ...) like the INBOX
-					} elseif (in_array($shortName,self::$autoFolders)) {
+					}
+					elseif (in_array($shortName,self::$autoFolders))
+					{
 						$tmpfolderparts = explode($delimiter,$folderObject->folderName);
 						array_pop($tmpfolderparts);
 						$folderObject->displayName = implode($delimiter,$tmpfolderparts).$delimiter.lang($shortName);
 						$folderObject->shortDisplayName = lang($shortName);
 						unset($tmpfolderparts);
-					} else {
+					}
+					else
+					{
 						$folderObject->displayName = $folderObject->folderName;
 						$folderObject->shortDisplayName = $shortName;
 					}
 					//$folderName = $folderName;
-					if (in_array($shortName,self::$autoFolders)&&self::searchValueInFolderObjects($shortName,$autoFolderObjects)===false) {
+					if (in_array($shortName,self::$autoFolders)&&self::searchValueInFolderObjects($shortName,$autoFolderObjects)===false)
+					{
 						$autoFolderObjects[$folderName] = $folderObject;
-					} else {
+					}
+					else
+					{
 						$folders[$folderName] = $folderObject;
 					}
 					//error_log(__METHOD__.' ('.__LINE__.') '.':'.$folderObject->folderName);
-					if (!isset(self::$specialUseFolders)) $this->getSpecialUseFolders ();
+					if (!isset(self::$specialUseFolders))
+					{
+						$this->getSpecialUseFolders ();
+					}
 					if (isset(self::$specialUseFolders[$folderName]))
 					{
 						$autofolder_exists[$folderName] = self::$specialUseFolders[$folderName];
@@ -2575,7 +3062,8 @@ 
 				}
 			}
 		}
-		if (is_array($autoFolderObjects) && !empty($autoFolderObjects)) {
+		if (is_array($autoFolderObjects) && !empty($autoFolderObjects))
+		{
 			uasort($autoFolderObjects,array($this,"sortByAutoFolderPos"));
 		}
 		// check if some standard folders are missing and need to be created
@@ -2584,7 +3072,10 @@ 
 			// if new folders have been created, re-read folders ignoring the cache
 			return $this->getFolderObjects($_subscribedOnly, $_getCounters, $_alwaysGetDefaultFolders, false);	// false = do NOT use cache
 		}
-		if (is_array($folders)) uasort($folders,array($this,"sortByDisplayName"));
+		if (is_array($folders))
+		{
+			uasort($folders,array($this,"sortByDisplayName"));
+		}
 		//$folders2return = array_merge($autoFolderObjects,$folders);
 		//_debug_array($folders2return); #exit;
 		$folders2return[$this->icServer->ImapServerId] = array_merge((array)$inboxFolderObject,(array)$autoFolderObjects,(array)$folders);
@@ -2596,7 +3087,10 @@ 
 			egw_cache::setCache(egw_cache::INSTANCE,'email','folderObjects'.trim($GLOBALS['egw_info']['user']['account_id']),$folders2return,$expiration=60*60*1);
 		}
 		egw_cache::setCache(egw_cache::INSTANCE,'email','folderBasicInfo'.trim($GLOBALS['egw_info']['user']['account_id']),$folderBasicInfo,$expiration=60*60*1);
-		if (self::$debugTimes) self::logRunTimes($starttime,null,function_backtrace(),__METHOD__.' ('.__LINE__.') ');
+		if (self::$debugTimes)
+		{
+			self::logRunTimes($starttime,null,function_backtrace(),__METHOD__.' ('.__LINE__.') ');
+		}
 		return $folders2return[$this->icServer->ImapServerId];
 	}
 
@@ -2624,31 +3118,44 @@ 
 
 		$folders = $nameSpace =  array();
 		$nameSpaceTmp = $this->_getNameSpaces();
-		foreach($nameSpaceTmp as $k => $singleNameSpace) {
+		foreach($nameSpaceTmp as $k => $singleNameSpace)
+		{
 			$nameSpace[$singleNameSpace['type']]=$singleNameSpace;
 		}
 		unset($nameSpaceTmp);
 
 		//error_log(__METHOD__.__LINE__.array2string($nameSpace));
 		// Get special use folders
-		if (!isset(self::$specialUseFolders)) $this->getSpecialUseFolders (); // Set self::$specialUseFolders
+		if (!isset(self::$specialUseFolders))
+		{
+			$this->getSpecialUseFolders ();
+		}
+		// Set self::$specialUseFolders
 		// topLevelQueries generally ignore the $_search param. Except for Config::examineNamespace
-		if ($_onlyTopLevel) // top level leaves
+		if ($_onlyTopLevel)
+		{
+			// top level leaves
 		{
 			// Get top mailboxes of icServer
 			$topFolders = $this->icServer->getMailboxes("", 2, true);
+		}
 			// Trigger examination of namespace to retrieve
 			// folders located in other and shared; needed only for some servers
-			if (is_null(self::$mailConfig)) self::$mailConfig = config::read('mail');
+			if (is_null(self::$mailConfig))
+			{
+				self::$mailConfig = config::read('mail');
+			}
 			if (self::$mailConfig['examineNamespace'])
 			{
 				$prefixes=array();
 				if (is_array($nameSpace))
 				{
-					foreach($nameSpace as $k => $singleNameSpace) {
+					foreach($nameSpace as $k => $singleNameSpace)
+					{
 						$type = $singleNameSpace['type'];
 
-						if(is_array($singleNameSpace) && $singleNameSpace['prefix']){
+						if(is_array($singleNameSpace) && $singleNameSpace['prefix'])
+						{
 							$prefixes[$type] = $singleNameSpace['prefix'];
 							//regard extra care for nameSpacequeries when configured AND respect $_search
 							$result = $this->icServer->getMailboxes($singleNameSpace['prefix'], $_search==0?0:2, true);
@@ -2724,7 +3231,10 @@ 
 							$nFolders [$path] = $folder;
 						}
 					}
-					if (is_array($aFolders)) uasort ($aFolders, array($this,'sortByAutofolder'));
+					if (is_array($aFolders))
+					{
+						uasort ($aFolders, array($this,'sortByAutofolder'));
+					}
 					//ksort($aFolders);
 
 					// Sort none auto folders base on mailbox name
@@ -2734,12 +3244,17 @@ 
 				}
 				else
 				{
-					if (is_array($subFolders)) ksort($subFolders);
+					if (is_array($subFolders))
+					{
+						ksort($subFolders);
+					}
 				}
 				$folders = array_merge($folders,(array)$mainFolder, (array)$subFolders);
 			}
 		}
-		elseif ($_nodePath) // single node
+		elseif ($_nodePath)
+		{
+			// single node
 		{
 			switch ($_search)
 			{
@@ -2747,6 +3262,7 @@ 
 				case 0:
 				case 2:
 					$path = $_nodePath.''.$delimiter;
+		}
 					break;
 				// Node itself
 				// shouldn't contain next level delimiter
@@ -2765,11 +3281,14 @@ 
 
 			uasort($folders,array($this,'sortByMailbox'));//ksort($folders);
 		}
-		elseif(!$_nodePath) // all
+		elseif(!$_nodePath)
+		{
+			// all
 		{
 			if ($_subscribedOnly)
 			{
 				$folders = $this->icServer->listSubscribedMailboxes('', 0, true);
+		}
 			}
 			else
 			{
@@ -2781,7 +3300,10 @@ 
 		{
 			// SORTING FOLDERS
 			//self::$debugTimes=true;
-			if (self::$debugTimes) $starttime = microtime (true);
+			if (self::$debugTimes)
+			{
+				$starttime = microtime (true);
+			}
 			// Merge of all auto folders and specialusefolders
 			$autoFoldersTmp = array_unique((array_merge(self::$autoFolders, array_values(self::$specialUseFolders))));
 			uasort($folders,array($this,'sortByMailbox'));//ksort($folders);
@@ -2791,19 +3313,27 @@ 
 			$isGoogleMail=false;
 			foreach($autoFoldersTmp as $afk=>$aF)
 			{
-				if (!isset($mySpecialUseFolders[$aF]) && $aF) $mySpecialUseFolders[$aF]=$this->getFolderByType($aF,false);
+				if (!isset($mySpecialUseFolders[$aF]) && $aF)
+				{
+					$mySpecialUseFolders[$aF]=$this->getFolderByType($aF,false);
+				}
 				//error_log($afk.':'.$aF.'->'.$mySpecialUseFolders[$aF]);
 			}
 			//error_log(array2string($mySpecialUseFolders));
-			foreach ($tmpFolders as $k => $f) {
+			foreach ($tmpFolders as $k => $f)
+			{
 				$sorted=false;
-				if (strtoupper(substr($k,0,5))=='INBOX') {
-					if (strtoupper($k)=='INBOX') {
+				if (strtoupper(substr($k,0,5))=='INBOX')
+				{
+					if (strtoupper($k)=='INBOX')
+					{
 						//error_log(__METHOD__.__LINE__.':'.strtoupper(substr($k,0,5)).':'.$k);
 						$inboxFolderObject[$k]=$f;
 						unset($folders[$k]);
 						$sorted=true;
-					} else {
+					}
+					else
+					{
 						$isAutoFolder=false;
 						foreach($autoFoldersTmp as $afk=>$aF)
 						{
@@ -2817,17 +3347,25 @@ 
 								break;
 							}
 						}
-						if ($isAutoFolder==false) $inboxSubFolderObjects[$k]=$f;
+						if ($isAutoFolder==false)
+						{
+							$inboxSubFolderObjects[$k]=$f;
+						}
 						unset($folders[$k]);
 						$sorted=true;
 					}
-				} elseif (strtoupper(substr($k,0,13))=='[GOOGLE MAIL]') {
+				}
+				elseif (strtoupper(substr($k,0,13))=='[GOOGLE MAIL]')
+				{
 					$isGoogleMail=true;
-					if (strtoupper($k)=='[GOOGLE MAIL]') {
+					if (strtoupper($k)=='[GOOGLE MAIL]')
+					{
 						$googleMailFolderObject[$k]=$f;
 						unset($folders[$k]);
 						$sorted=true;
-					} else {
+					}
+					else
+					{
 						$isAutoFolder=false;
 						foreach($autoFoldersTmp as $afk=>$aF)
 						{
@@ -2841,11 +3379,16 @@ 
 								break;
 							}
 						}
-						if ($isAutoFolder==false) $googleSubFolderObjects[$k]=$f;
+						if ($isAutoFolder==false)
+						{
+							$googleSubFolderObjects[$k]=$f;
+						}
 						unset($folders[$k]);
 						$sorted=true;
 					}
-				} else {
+				}
+				else
+				{
 					$isAutoFolder=false;
 					foreach($autoFoldersTmp as $afk=>$aF)
 					{
@@ -2870,7 +3413,8 @@ 
 						if ($nameSpace[$type]['prefix_present']&&$nameSpace[$type]['prefix'])
 						{
 							if (substr($k,0,strlen($nameSpace[$type]['prefix']))==$nameSpace[$type]['prefix']||
-								substr($k,0,strlen($nameSpace[$type]['prefix'])-strlen($nameSpace[$type]['delimiter']))==substr($nameSpace[$type]['prefix'],0,strlen($nameSpace[$type]['delimiter'])*-1)) {
+								substr($k,0,strlen($nameSpace[$type]['prefix'])-strlen($nameSpace[$type]['delimiter']))==substr($nameSpace[$type]['prefix'],0,strlen($nameSpace[$type]['delimiter'])*-1))
+							{
 								//error_log(__METHOD__.__LINE__.':'.substr($k,0,strlen($nameSpace[$type]['prefix'])).':'.$k);
 								$typeFolderObject[$type][$k]=$f;
 								unset($folders[$k]);
@@ -2895,9 +3439,12 @@ 
 				}
 			}
 			//error_log(__METHOD__.__LINE__.array2string($autoFolderObjects));
-			if (!$isGoogleMail) {
+			if (!$isGoogleMail)
+			{
 				$folders = array_merge($inboxFolderObject,$autoFolderObjects,(array)$inboxSubFolderObjects,(array)$folders,(array)$typeFolderObject['others'],(array)$typeFolderObject['shared']);
-			} else {
+			}
+			else
+			{
 				// avoid calling sortByAutoFolder as it is not regarding subfolders
 				$gAutoFolderObjectsTmp = $googleAutoFolderObjects;
 				unset($googleAutoFolderObjects);
@@ -2914,7 +3461,10 @@ 
 				}
 				$folders = array_merge($inboxFolderObject,$autoFolderObjects,(array)$folders,(array)$googleMailFolderObject,$googleAutoFolderObjects,$googleSubFolderObjects,(array)$typeFolderObject['others'],(array)$typeFolderObject['shared']);
 			}
-			if (self::$debugTimes) self::logRunTimes($starttime,null,function_backtrace(),__METHOD__.' ('.__LINE__.') Sorting:');
+			if (self::$debugTimes)
+			{
+				self::logRunTimes($starttime,null,function_backtrace(),__METHOD__.' ('.__LINE__.') Sorting:');
+			}
 			//self::$debugTimes=false;
 		}
 		// Get counter information and add them to each fetched folders array
@@ -2964,7 +3514,13 @@ 
 		$rv = false;
 		foreach ($haystack as $k => $v)
 		{
-			foreach($v as &$sv) {if (trim($sv)==trim($needle)) return $k;}
+			foreach($v as &$sv)
+			{
+if (trim($sv)==trim($needle))
+			{
+				return $k;
+			}
+			}
 		}
 		return $rv;
 	}
@@ -2997,7 +3553,10 @@ 
 		$b = mail_tree::pathToFolderData($b['MAILBOX'], $b['delimiter']);
 		$pos1 = array_search(trim($a['name']),self::$autoFolders);
 		$pos2 = array_search(trim($b['name']),self::$autoFolders);
-		if ($pos1 == $pos2) return 0;
+		if ($pos1 == $pos2)
+		{
+			return 0;
+		}
 		return ($pos1 < $pos2) ? -1 : 1;
 	}
 
@@ -3028,7 +3587,10 @@ 
 		// 0, 1 und -1
 		$pos1 = array_search(trim($a->shortFolderName),self::$autoFolders);
 		$pos2 = array_search(trim($b->shortFolderName),self::$autoFolders);
-		if ($pos1 == $pos2) return 0;
+		if ($pos1 == $pos2)
+		{
+			return 0;
+		}
 		return ($pos1 < $pos2) ? -1 : 1;
 	}
 
@@ -3049,11 +3611,18 @@ 
 		}
 		catch (Exception $e)
 		{
-			if (self::$debug) error_log(__METHOD__." returned FolderStatus for Folder $folderName:".$e->getMessage());
+			if (self::$debug)
+			{
+				error_log(__METHOD__." returned FolderStatus for Folder $folderName:".$e->getMessage());
+			}
 			return false;
 		}
-		if(is_array($folderStatus)) {
-			if ($_returnObject===false) return $folderStatus;
+		if(is_array($folderStatus))
+		{
+			if ($_returnObject===false)
+			{
+				return $folderStatus;
+			}
 			$status =  new stdClass;
 			$status->messages   = $folderStatus['MESSAGES'];
 			$status->unseen     = $folderStatus['UNSEEN'];
@@ -3080,7 +3649,8 @@ 
 	{
 		#echo __METHOD__." retrieve SubFolders for $_mailbox$delimiter <br>";
 		$maxreclevel=25;
-		if ($reclevel > $maxreclevel) {
+		if ($reclevel > $maxreclevel)
+		{
 			error_log( __METHOD__." Recursion Level Exeeded ($reclevel) while looking up $_mailbox$delimiter ");
 			return array();
 		}
@@ -3094,7 +3664,8 @@ 
 //error_log(__METHOD__.' ('.__LINE__.') '.' Delimiter:'.array2string($delimiter));
 //error_log(__METHOD__.' ('.__LINE__.') '.array2string($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"])))
+		{
 			// if there are children fetch them
 			//echo $mbx[$mbxkeys[0]]['MAILBOX']."<br>";
 
@@ -3102,7 +3673,8 @@ 
 			//$buff = $this->icServer->getMailboxes($mbx[$mbxkeys[0]]['MAILBOX'],2,false);
 			//_debug_array($buff);
 			$allMailboxes = array();
-			foreach ($buff as $mbxname) {
+			foreach ($buff as $mbxname)
+			{
 //error_log(__METHOD__.' ('.__LINE__.') '.array2string($mbxname));
 				$mbxname = preg_replace('~'.($delimiter == '.' ? "\\".$delimiter:$delimiter).'+~s',$delimiter,$mbxname['MAILBOX']);
 				#echo "About to recur in level $reclevel:".$mbxname."<br>";
@@ -3111,9 +3683,14 @@ 
 					$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 {
+		}
+		else
+		{
 			return array($_mailbox);
 		}
 	}
@@ -3136,14 +3713,21 @@ 
 			'Junk'     => array('profileKey'=>'acc_folder_junk','autoFolderName'=>'Junk'),
 			'Outbox'   => array('profileKey'=>'acc_folder_outbox','autoFolderName'=>'Outbox'),
 		);
-		if ($_type == 'Templates') $_type = 'Template';	// for some reason self::$autofolders uses 'Templates'!
+		if ($_type == 'Templates')
+		{
+			$_type = 'Template';
+		}
+		// for some reason self::$autofolders uses 'Templates'!
 		$created = false;
 		if (!isset($types[$_type]))
 		{
 			error_log(__METHOD__.' ('.__LINE__.') '.' '.$_type.' not supported for '.__METHOD__);
 			return false;
 		}
-		if (is_null(self::$specialUseFolders) || empty(self::$specialUseFolders)) self::$specialUseFolders = $this->getSpecialUseFolders();
+		if (is_null(self::$specialUseFolders) || empty(self::$specialUseFolders))
+		{
+			self::$specialUseFolders = $this->getSpecialUseFolders();
+		}
 
 		//highest precedence
 		try
@@ -3153,16 +3737,26 @@ 
 		catch (Exception $e)
 		{
 			// we know that outbox is not supported, but we use this here, as we autocreate expected SpecialUseFolders in this function
-			if ($_type != 'Outbox') error_log(__METHOD__.' ('.__LINE__.') '.' Failed to retrieve Folder'.$_folderName." for ".array2string($types[$_type]).":".$e->getMessage());
+			if ($_type != 'Outbox')
+			{
+				error_log(__METHOD__.' ('.__LINE__.') '.' Failed to retrieve Folder'.$_folderName." for ".array2string($types[$_type]).":".$e->getMessage());
+			}
 			$_folderName = false;
 		}
 		// does the folder exist??? (is configured/preset, but non-existent)
-		if ($_folderName && $_checkexistance && $_folderName !='none' && !$this->folderExists($_folderName,true)) {
+		if ($_folderName && $_checkexistance && $_folderName !='none' && !$this->folderExists($_folderName,true))
+		{
 			try
 			{
 				$error = null;
-				if (($_folderName = $this->createFolder('', $_folderName, $error))) $created = true;
-				if ($error) error_log(__METHOD__.' ('.__LINE__.') '.' Failed to create Folder '.$_folderName." for $_type:".$error);
+				if (($_folderName = $this->createFolder('', $_folderName, $error)))
+				{
+					$created = true;
+				}
+				if ($error)
+				{
+					error_log(__METHOD__.' ('.__LINE__.') '.' Failed to create Folder '.$_folderName." for $_type:".$error);
+				}
 			}
 			catch(Exception $e)
 			{
@@ -3171,9 +3765,16 @@ 
 			}
 		}
 		// not sure yet if false is the correct behavior on none
-		if ($_folderName =='none') return 'none' ; //false;
+		if ($_folderName =='none')
+		{
+			return 'none' ;
+		}
+		//false;
 		//no (valid) folder found yet; try specialUseFolders
-		if (empty($_folderName) && is_array(self::$specialUseFolders) && ($f = array_search($_type,self::$specialUseFolders))) $_folderName = $f;
+		if (empty($_folderName) && is_array(self::$specialUseFolders) && ($f = array_search($_type,self::$specialUseFolders)))
+		{
+			$_folderName = $f;
+		}
 		//no specialUseFolder; try some Defaults
 		if (empty($_folderName) && isset($types[$_type]))
 		{
@@ -3199,7 +3800,10 @@ 
 					$error = null;
 					$this->createFolder('', $prefix.$types[$_type]['autoFolderName'],$error);
 					$_folderName = $prefix.$types[$_type]['autoFolderName'];
-					if ($error) error_log(__METHOD__.' ('.__LINE__.') '.' Failed to create Folder '.$_folderName." for $_type:".$error);
+					if ($error)
+					{
+						error_log(__METHOD__.' ('.__LINE__.') '.' Failed to create Folder '.$_folderName." for $_type:".$error);
+					}
 				}
 				catch(Exception $e)
 				{
@@ -3291,17 +3895,22 @@ 
 	function isSentFolder($_folderName, $_checkexistance=TRUE)
 	{
 		$sentFolder = $this->getSentFolder($_checkexistance);
-		if(empty($sentFolder)) {
+		if(empty($sentFolder))
+		{
 			return false;
 		}
 		// does the folder exist???
-		if ($_checkexistance && !$this->folderExists($_folderName)) {
+		if ($_checkexistance && !$this->folderExists($_folderName))
+		{
 			return false;
 		}
 
-		if(false !== stripos($_folderName, $sentFolder)) {
+		if(false !== stripos($_folderName, $sentFolder))
+		{
 			return true;
-		} else {
+		}
+		else
+		{
 			return false;
 		}
 	}
@@ -3314,15 +3923,20 @@ 
 	 */
 	function isOutbox($_folderName, $_checkexistance=TRUE)
 	{
-		if (stripos($_folderName, 'Outbox')===false) {
+		if (stripos($_folderName, 'Outbox')===false)
+		{
 			return false;
 		}
 		// does the folder exist???
-		if ($_checkexistance && $GLOBALS['egw_info']['user']['apps']['activesync'] && !$this->folderExists($_folderName)) {
+		if ($_checkexistance && $GLOBALS['egw_info']['user']['apps']['activesync'] && !$this->folderExists($_folderName))
+		{
 			$outboxFolder = $this->getOutboxFolder($_checkexistance);
-			if(false !== stripos($_folderName, $outboxFolder)) {
+			if(false !== stripos($_folderName, $outboxFolder))
+			{
 				return true;
-			} else {
+			}
+			else
+			{
 				return false;
 			}
 		}
@@ -3338,17 +3952,25 @@ 
 	function isDraftFolder($_folderName, $_checkexistance=TRUE)
 	{
 		$draftFolder = $this->getDraftFolder($_checkexistance);
-		if(empty($draftFolder)) {
+		if(empty($draftFolder))
+		{
 			return false;
 		}
 		// does the folder exist???
-		if ($_checkexistance && !$this->folderExists($_folderName)) {
+		if ($_checkexistance && !$this->folderExists($_folderName))
+		{
 			return false;
 		}
-		if (is_a($_folderName,"Horde_Imap_Client_Mailbox")) $_folderName = $_folderName->utf8;
-		if(false !== stripos($_folderName, $draftFolder)) {
+		if (is_a($_folderName,"Horde_Imap_Client_Mailbox"))
+		{
+			$_folderName = $_folderName->utf8;
+		}
+		if(false !== stripos($_folderName, $draftFolder))
+		{
 			return true;
-		} else {
+		}
+		else
+		{
 			return false;
 		}
 	}
@@ -3362,17 +3984,22 @@ 
 	function isTrashFolder($_folderName, $_checkexistance=TRUE)
 	{
 		$trashFolder = $this->getTrashFolder($_checkexistance);
-		if(empty($trashFolder)) {
+		if(empty($trashFolder))
+		{
 			return false;
 		}
 		// does the folder exist???
-		if ($_checkexistance && !$this->folderExists($_folderName)) {
+		if ($_checkexistance && !$this->folderExists($_folderName))
+		{
 			return false;
 		}
 
-		if(false !== stripos($_folderName, $trashFolder)) {
+		if(false !== stripos($_folderName, $trashFolder))
+		{
 			return true;
-		} else {
+		}
+		else
+		{
 			return false;
 		}
 	}
@@ -3386,17 +4013,22 @@ 
 	function isTemplateFolder($_folderName, $_checkexistance=TRUE)
 	{
 		$templateFolder = $this->getTemplateFolder($_checkexistance);
-		if(empty($templateFolder)) {
+		if(empty($templateFolder))
+		{
 			return false;
 		}
 		// does the folder exist???
-		if ($_checkexistance && !$this->folderExists($_folderName)) {
+		if ($_checkexistance && !$this->folderExists($_folderName))
+		{
 			return false;
 		}
 
-		if(false !== stripos($_folderName, $templateFolder)) {
+		if(false !== stripos($_folderName, $templateFolder))
+		{
 			return true;
-		} else {
+		}
+		else
+		{
 			return false;
 		}
 	}
@@ -3414,15 +4046,27 @@ 
 		if (empty($_folder))
 		{
 			// this error is more or less without significance, unless we force the check
-			if ($_forceCheck===true) error_log(__METHOD__.' ('.__LINE__.') '.' Called with empty Folder:'.$_folder.function_backtrace());
+			if ($_forceCheck===true)
+			{
+				error_log(__METHOD__.' ('.__LINE__.') '.' Called with empty Folder:'.$_folder.function_backtrace());
+			}
 			return false;
 		}
 		// when check is not enforced , we assume a folder represented as Horde_Imap_Client_Mailbox as existing folder
-		if (is_a($_folder,"Horde_Imap_Client_Mailbox")&&$_forceCheck===false) return true;
-		if (is_a($_folder,"Horde_Imap_Client_Mailbox")) $_folder =  $_folder->utf8;
+		if (is_a($_folder,"Horde_Imap_Client_Mailbox")&&$_forceCheck===false)
+		{
+			return true;
+		}
+		if (is_a($_folder,"Horde_Imap_Client_Mailbox"))
+		{
+			$_folder =  $_folder->utf8;
+		}
 		// reduce traffic within the Instance per User; Expire every 5 hours
 		//error_log(__METHOD__.' ('.__LINE__.') '.' Called with Folder:'.$_folder.function_backtrace());
-		if (is_null($folderInfo)) $folderInfo = egw_cache::getCache(egw_cache::INSTANCE,'email','icServerFolderExistsInfo'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),$expiration=60*60*5);
+		if (is_null($folderInfo))
+		{
+			$folderInfo = egw_cache::getCache(egw_cache::INSTANCE,'email','icServerFolderExistsInfo'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),$expiration=60*60*5);
+		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.'Cached Info on Folder:'.$_folder.' for Profile:'.$this->profileID.($forceCheck?'(forcedCheck)':'').':'.array2string($folderInfo));
 		if (!empty($folderInfo) && isset($folderInfo[$this->profileID]) && isset($folderInfo[$this->profileID][$_folder]) && $forceCheck===false)
 		{
@@ -3440,7 +4084,8 @@ 
 
 		// does the folder exist???
 		//error_log(__METHOD__."->Connected?".$this->icServer->_connected.", ".$_folder.", ".($forceCheck?' forceCheck activated':'dont check on server'));
-		if ( $forceCheck || empty($folderInfo) || !isset($folderInfo[$this->profileID]) || !isset($folderInfo[$this->profileID][$_folder])) {
+		if ( $forceCheck || empty($folderInfo) || !isset($folderInfo[$this->profileID]) || !isset($folderInfo[$this->profileID][$_folder]))
+		{
 			//error_log(__METHOD__."->NotConnected and forceCheck with profile:".$this->profileID);
 			//return false;
 			//try to connect
@@ -3480,9 +4125,12 @@ 
 
 		$this->icServer->openMailbox($folderName);
 
-		if(strtolower($folderName) == strtolower($trashFolder) && $deleteOptions == "move_to_trash") {
+		if(strtolower($folderName) == strtolower($trashFolder) && $deleteOptions == "move_to_trash")
+		{
 			$this->deleteMessages('all',$folderName,'remove_immediately');
-		} else {
+		}
+		else
+		{
 			$this->icServer->expunge($folderName);
 		}
 	}
@@ -3501,10 +4149,16 @@ 
 	{
 		//error_log(__METHOD__.' ('.__LINE__.') '.'->'.array2string($_messageUID).','.array2string($_folder).', '.$_forceDeleteMethod);
 		$oldMailbox = '';
-		if (is_null($_folder) || empty($_folder)) $_folder = $this->sessionData['mailbox'];
+		if (is_null($_folder) || empty($_folder))
+		{
+			$_folder = $this->sessionData['mailbox'];
+		}
 		if (empty($_messageUID))
 		{
-			if (self::$debug) error_log(__METHOD__." no messages Message(s): ".implode(',',$_messageUID));
+			if (self::$debug)
+			{
+				error_log(__METHOD__." no messages Message(s): ".implode(',',$_messageUID));
+			}
 			return false;
 		}
 		elseif ($_messageUID==='all')
@@ -3514,32 +4168,48 @@ 
 		else
 		{
 			$uidsToDelete = new Horde_Imap_Client_Ids();
-			if (!(is_object($_messageUID) || is_array($_messageUID))) $_messageUID = (array)$_messageUID;
+			if (!(is_object($_messageUID) || is_array($_messageUID)))
+			{
+				$_messageUID = (array)$_messageUID;
+			}
 			$uidsToDelete->add($_messageUID);
 		}
 		$deleteOptions = $_forceDeleteMethod; // use forceDeleteMethod if not "no", or unknown method
-		if ($_forceDeleteMethod === 'no' || !in_array($_forceDeleteMethod,array('move_to_trash',"mark_as_deleted","remove_immediately"))) $deleteOptions  = ($this->mailPreferences['deleteOptions']?$this->mailPreferences['deleteOptions']:"mark_as_deleted");
+		if ($_forceDeleteMethod === 'no' || !in_array($_forceDeleteMethod,array('move_to_trash',"mark_as_deleted","remove_immediately")))
+		{
+			$deleteOptions  = ($this->mailPreferences['deleteOptions']?$this->mailPreferences['deleteOptions']:"mark_as_deleted");
+		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.'->'.array2string($_messageUID).','.$_folder.'/'.$this->sessionData['mailbox'].' Option:'.$deleteOptions);
 		$trashFolder    = $this->getTrashFolder();
 		$draftFolder	= $this->getDraftFolder(); //$GLOBALS['egw_info']['user']['preferences']['mail']['draftFolder'];
 		$templateFolder = $this->getTemplateFolder(); //$GLOBALS['egw_info']['user']['preferences']['mail']['templateFolder'];
 		if((strtolower($_folder) == strtolower($trashFolder) && $deleteOptions == "move_to_trash") ||
-		   (strtolower($_folder) == strtolower($draftFolder))) {
+		   (strtolower($_folder) == strtolower($draftFolder)))
+		{
 			$deleteOptions = "remove_immediately";
 		}
-		if($this->icServer->getCurrentMailbox() != $_folder) {
+		if($this->icServer->getCurrentMailbox() != $_folder)
+		{
 			$oldMailbox = $this->icServer->getCurrentMailbox();
 			$this->icServer->openMailbox($_folder);
 		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.'->'.array2string($_messageUID).','.$_folder.'/'.$this->sessionData['mailbox'].' Option:'.$deleteOptions);
 		$updateCache = false;
-		switch($deleteOptions) {
+		switch($deleteOptions)
+		{
 			case "move_to_trash":
 				//error_log(__METHOD__.' ('.__LINE__.') ');
 				$updateCache = true;
-				if(!empty($trashFolder)) {
-					if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.implode(' : ', $_messageUID));
-					if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '."$trashFolder <= $_folder / ". $this->sessionData['mailbox']);
+				if(!empty($trashFolder))
+				{
+					if (self::$debug)
+					{
+						error_log(__METHOD__.' ('.__LINE__.') '.implode(' : ', $_messageUID));
+					}
+					if (self::$debug)
+					{
+						error_log(__METHOD__.' ('.__LINE__.') '."$trashFolder <= $_folder / ". $this->sessionData['mailbox']);
+					}
 					// copy messages
 					try
 					{
@@ -3555,7 +4225,10 @@ 
 			case "mark_as_deleted":
 				//error_log(__METHOD__.' ('.__LINE__.') ');
 				// mark messages as deleted
-				if (is_null($_messageUID)) $_messageUID='all';
+				if (is_null($_messageUID))
+				{
+					$_messageUID='all';
+				}
 				foreach((array)$_messageUID as $key =>$uid)
 				{
 					//flag messages, that are flagged for deletion as seen too
@@ -3563,7 +4236,10 @@ 
 					$flags = $this->getFlags($uid);
 					$this->flagMessages('delete', $uid, $_folder);
 					//error_log(__METHOD__.' ('.__LINE__.') '.array2string($flags));
-					if (strpos( array2string($flags),'Deleted')!==false) $undelete[] = $uid;
+					if (strpos( array2string($flags),'Deleted')!==false)
+					{
+						$undelete[] = $uid;
+					}
 					unset($flags);
 				}
 				foreach((array)$undelete as $key =>$uid)
@@ -3575,7 +4251,10 @@ 
 			case "remove_immediately":
 				//error_log(__METHOD__.' ('.__LINE__.') ');
 				$updateCache = true;
-				if (is_null($_messageUID)) $_messageUID='all';
+				if (is_null($_messageUID))
+				{
+					$_messageUID='all';
+				}
 				if (is_object($_messageUID))
 				{
 					$this->flagMessages('delete', $_messageUID, $_folder);
@@ -3592,7 +4271,8 @@ 
 				$this->icServer->expunge($_folder);
 				break;
 		}
-		if($oldMailbox != '') {
+		if($oldMailbox != '')
+		{
 			$this->icServer->openMailbox($oldMailbox);
 		}
 
@@ -3606,11 +4286,15 @@ 
 	 *
 	 * @return null/array flags
 	 */
-	function getFlags ($_messageUID) {
+	function getFlags ($_messageUID)
+	{
 		try
 		{
 			$uidsToFetch = new Horde_Imap_Client_Ids();
-			if (!(is_object($_messageUID) || is_array($_messageUID))) $_messageUID = (array)$_messageUID;
+			if (!(is_object($_messageUID) || is_array($_messageUID)))
+			{
+				$_messageUID = (array)$_messageUID;
+			}
 			$uidsToFetch->add($_messageUID);
 			$_folderName = $this->icServer->getCurrentMailbox();
 			$fquery = new Horde_Imap_Client_Fetch_Query();
@@ -3618,8 +4302,10 @@ 
 			$headersNew = $this->icServer->fetch($_folderName, $fquery, array(
 				'ids' => $uidsToFetch,
 			));
-			if (is_object($headersNew)) {
-				foreach($headersNew->ids() as $id) {
+			if (is_object($headersNew))
+			{
+				foreach($headersNew->ids() as $id)
+				{
 					$_headerObject = $headersNew->get($id);
 					$flags = $_headerObject->getFlags();
 				}
@@ -3644,10 +4330,16 @@ 
 	 */
 	function getNotifyFlags ($_messageUID, $flags=null)
 	{
-		if (self::$debug) error_log(__METHOD__.$_messageUID.' Flags:'.array2string($flags));
+		if (self::$debug)
+		{
+			error_log(__METHOD__.$_messageUID.' Flags:'.array2string($flags));
+		}
 		try
 		{
-			if($flags===null) $flags =  $this->getFlags($_messageUID);
+			if($flags===null)
+			{
+				$flags =  $this->getFlags($_messageUID);
+			}
 		}
 		catch (Exception $e)
 		{
@@ -3655,10 +4347,14 @@ 
 		}
 
 		if ( stripos( array2string($flags),'MDNSent')!==false)
-			return true;
+		{
+					return true;
+		}
 
 		if ( stripos( array2string($flags),'MDNnotSent')!==false)
-			return false;
+		{
+					return false;
+		}
 
 		return null;
 	}
@@ -3679,7 +4375,10 @@ 
 		//error_log(__METHOD__.' ('.__LINE__.') '.'->' .$_flag." ".array2string($_messageUID).",$_folder /".$this->sessionData['mailbox']);
 		if (empty($_messageUID))
 		{
-			if (self::$debug) error_log(__METHOD__." no messages Message(s): ".implode(',',$_messageUID));
+			if (self::$debug)
+			{
+				error_log(__METHOD__." no messages Message(s): ".implode(',',$_messageUID));
+			}
 			return false;
 		}
 		$this->icServer->openMailbox(($_folder?$_folder:$this->sessionData['mailbox']));
@@ -3687,7 +4386,10 @@ 
 		if (is_array($_messageUID)&& count($_messageUID)>50)
 		{
 			$count = $this->getMailBoxCounters($folder,true);
-			if ($count->messages == count($_messageUID)) $_messageUID='all';
+			if ($count->messages == count($_messageUID))
+			{
+				$_messageUID='all';
+			}
 		}
 
 		if ($_messageUID==='all')
@@ -3696,7 +4398,10 @@ 
 		}
 		else
 		{
-			if (!(is_object($_messageUID) || is_array($_messageUID))) $_messageUID = (array)$_messageUID;
+			if (!(is_object($_messageUID) || is_array($_messageUID)))
+			{
+				$_messageUID = (array)$_messageUID;
+			}
 			$messageUIDs = array_chunk($_messageUID,50,true);
 		}
 		try
@@ -3712,7 +4417,8 @@ 
 					$uidsToModify = new Horde_Imap_Client_Ids();
 					$uidsToModify->add($uids);
 				}
-				switch($_flag) {
+				switch($_flag)
+				{
 					case "delete":
 						$ret = $this->icServer->store($folder, array('add'=>array('\\Deleted'), 'ids'=> $uidsToModify));
 						break;
@@ -3798,7 +4504,10 @@ 
 		{
 			error_log(__METHOD__.__LINE__.' Error, could not flag messages in folder '.$folder.' Reason:'.$e->getMessage());
 		}
-		if ($folder instanceof Horde_Imap_Client_Mailbox) $_folder = $folder->utf8;
+		if ($folder instanceof Horde_Imap_Client_Mailbox)
+		{
+			$_folder = $folder->utf8;
+		}
 		//error_log(__METHOD__.__LINE__.'#'.$this->icServer->ImapServerId.'#'.array2string($_folder).'#');
 		self::$folderStatusCache[$this->icServer->ImapServerId][(!empty($_folder)?$_folder: $this->sessionData['mailbox'])]['uidValidity'] = 0;
 
@@ -3827,7 +4536,10 @@ 
 		//$deleteOptions  = $GLOBALS['egw_info']["user"]["preferences"]["mail"]["deleteOptions"];
 		if (empty($_messageUID))
 		{
-			if (self::$debug) error_log(__METHOD__." no Message(s): ".implode(',',$_messageUID));
+			if (self::$debug)
+			{
+				error_log(__METHOD__." no Message(s): ".implode(',',$_messageUID));
+			}
 			return false;
 		}
 		elseif ($_messageUID==='all')
@@ -3839,7 +4551,10 @@ 
 		{
 			//error_log(__METHOD__." Message(s): ".implode(',',$_messageUID));
 			$uidsToMove = new Horde_Imap_Client_Ids();
-			if (!(is_object($_messageUID) || is_array($_messageUID))) $_messageUID = (array)$_messageUID;
+			if (!(is_object($_messageUID) || is_array($_messageUID)))
+			{
+				$_messageUID = (array)$_messageUID;
+			}
 			$uidsToMove->add($_messageUID);
 		}
 		$sourceFolder = (!empty($currentFolder)?$currentFolder: $this->sessionData['mailbox']);
@@ -3861,12 +4576,14 @@ 
 
 			//error_log(__METHOD__.' ('.__LINE__.') '.' Sourceserver:'.$source->ImapServerId.' mailheaders:'.array2string($headersNew));
 
-			if (is_object($headersNew)) {
+			if (is_object($headersNew))
+			{
 				$c=0;
 				$retUid = new Horde_Imap_Client_Ids();
 				// we copy chunks of 5 to avoid too much memory and/or server stress
 				// some servers seem not to allow/support the appendig of multiple messages. so we are down to one
-				foreach($headersNew as &$_headerObject) {
+				foreach($headersNew as &$_headerObject)
+				{
 					$c++;
 					$flags = $_headerObject->getFlags(); //unseen status seems to be lost when retrieving the full message
 					$date = $_headerObject->getImapDate();
@@ -3950,7 +4667,11 @@ 
 	{
 		try {
 			$date = new egw_time($_date);	// parse date & time including timezone (throws exception, if not parsable)
-			if ($convert2usertime) $date->setUser();	// convert to user-time
+			if ($convert2usertime)
+			{
+				$date->setUser();
+			}
+			// convert to user-time
 			$date2return = $date->format($format);
 		}
 		catch(Exception $e)
@@ -3982,9 +4703,15 @@ 
 	static function htmlentities($_string, $_charset=false)
 	{
 		//setting the charset (if not given)
-		if ($_charset===false) $_charset = self::$displayCharset;
+		if ($_charset===false)
+		{
+			$_charset = self::$displayCharset;
+		}
 		$string = @htmlentities($_string, ENT_QUOTES, $_charset, false);
-		if (empty($string) && !empty($_string)) $string = @htmlentities(translation::convert($_string,translation::detect_encoding($_string),$_charset),ENT_QUOTES | ENT_IGNORE,$_charset, false);
+		if (empty($string) && !empty($_string))
+		{
+			$string = @htmlentities(translation::convert($_string,translation::detect_encoding($_string),$_charset),ENT_QUOTES | ENT_IGNORE,$_charset, false);
+		}
 		return $string;
 	}
 
@@ -4004,18 +4731,41 @@ 
 		$_html = str_replace(array('&amp;amp;','<DIV><BR></DIV>',"<DIV>&nbsp;</DIV>",'<div>&nbsp;</div>','</td></font>','<br><td>','<tr></tr>','<o:p></o:p>','<o:p>','</o:p>'),
 							 array('&amp;',    '<BR>',           '<BR>',             '<BR>',             '</font></td>','<td>',    '',         '',           '',  ''),$_html);
 		//$_html = str_replace(array('&amp;amp;'),array('&amp;'),$_html);
-		if (stripos($_html,'style')!==false) translation::replaceTagsCompletley($_html,'style'); // clean out empty or pagewide style definitions / left over tags
-		if (stripos($_html,'head')!==false) translation::replaceTagsCompletley($_html,'head'); // Strip out stuff in head
+		if (stripos($_html,'style')!==false)
+		{
+			translation::replaceTagsCompletley($_html,'style');
+		}
+		// clean out empty or pagewide style definitions / left over tags
+		if (stripos($_html,'head')!==false)
+		{
+			translation::replaceTagsCompletley($_html,'head');
+		}
+		// Strip out stuff in head
 		//if (stripos($_html,'![if')!==false && stripos($_html,'<![endif]>')!==false) translation::replaceTagsCompletley($_html,'!\[if','<!\[endif\]>',false); // Strip out stuff in ifs
 		//if (stripos($_html,'!--[if')!==false && stripos($_html,'<![endif]-->')!==false) translation::replaceTagsCompletley($_html,'!--\[if','<!\[endif\]-->',false); // Strip out stuff in ifs
 		//error_log(__METHOD__.' ('.__LINE__.') '.$_html);
 
-		if (get_magic_quotes_gpc() === 1) $_html = stripslashes($_html);
+		if (get_magic_quotes_gpc() === 1)
+		{
+			$_html = stripslashes($_html);
+		}
 		// Strip out doctype in head, as htmlLawed cannot handle it TODO: Consider extracting it and adding it afterwards
-		if (stripos($_html,'!doctype')!==false) translation::replaceTagsCompletley($_html,'!doctype');
-		if (stripos($_html,'?xml:namespace')!==false) translation::replaceTagsCompletley($_html,'\?xml:namespace','/>',false);
-		if (stripos($_html,'?xml version')!==false) translation::replaceTagsCompletley($_html,'\?xml version','\?>',false);
-		if (strpos($_html,'!CURSOR')!==false) translation::replaceTagsCompletley($_html,'!CURSOR');
+		if (stripos($_html,'!doctype')!==false)
+		{
+			translation::replaceTagsCompletley($_html,'!doctype');
+		}
+		if (stripos($_html,'?xml:namespace')!==false)
+		{
+			translation::replaceTagsCompletley($_html,'\?xml:namespace','/>',false);
+		}
+		if (stripos($_html,'?xml version')!==false)
+		{
+			translation::replaceTagsCompletley($_html,'\?xml version','\?>',false);
+		}
+		if (strpos($_html,'!CURSOR')!==false)
+		{
+			translation::replaceTagsCompletley($_html,'!CURSOR');
+		}
 		// htmLawed filter only the 'body'
 		//preg_match('`(<htm.+?<body[^>]*>)(.+?)(</body>.*?</html>)`ims', $_html, $matches);
 		//if ($matches[2])
@@ -4054,8 +4804,10 @@ 
 		//$charSet = 'iso-8859-1';//self::$displayCharset; //'iso-8859-1'; // self::displayCharset seems to be asmarter fallback than iso-8859-1
 		$CharsetFound=false;
 		//echo "#".$_mimePartObject->encoding.'#<br>';
-		if(is_array($_mimePartObject->parameters)) {
-			if(isset($_mimePartObject->parameters['CHARSET'])) {
+		if(is_array($_mimePartObject->parameters))
+		{
+			if(isset($_mimePartObject->parameters['CHARSET']))
+			{
 				$charSet = $_mimePartObject->parameters['CHARSET'];
 				$CharsetFound=true;
 			}
@@ -4076,7 +4828,10 @@ 
 	function decodeMimePart($_mimeMessage, $_encoding, $_charset = '')
 	{
 		// decode the part
-		if (self::$debug) error_log(__METHOD__."() with $_encoding and $_charset:".print_r($_mimeMessage,true));
+		if (self::$debug)
+		{
+			error_log(__METHOD__."() with $_encoding and $_charset:".print_r($_mimeMessage,true));
+		}
 		switch (strtoupper($_encoding))
 		{
 			case 'BASE64':
@@ -4116,13 +4871,19 @@ 
 		// sometimes there are 3 parts, when there is an ics/ical attached/included-> we want to show that
 		// as attachment AND as abstracted ical information (we use our notification style here).
 		$partText = $partCalendar = $partHTML = null;
-		if (self::$debug) _debug_array(array("METHOD"=>__METHOD__,"LINE"=>__LINE__,"STRUCTURE"=>$_structure));
+		if (self::$debug)
+		{
+			_debug_array(array("METHOD"=>__METHOD__,"LINE"=>__LINE__,"STRUCTURE"=>$_structure));
+		}
 		//error_log(__METHOD__.' ('.__LINE__.') ');
 		$ignore_first_part = true;
 		foreach($_structure->contentTypeMap() as $mime_id => $mime_type)
 		{
 			//error_log(__METHOD__."($_uid, ".$_structure->getMimeId().") $mime_id: $mime_type"." ignoreFirstPart:".$ignore_first_part);
-			if (self::$debug) echo __METHOD__."($_uid, partID=".$_structure->getMimeId().") $mime_id: $mime_type<br>";
+			if (self::$debug)
+			{
+				echo __METHOD__."($_uid, partID=".$_structure->getMimeId().") $mime_id: $mime_type<br>";
+			}
 
 			if ($ignore_first_part)
 			{
@@ -4138,11 +4899,17 @@ 
 					switch($mimePart->getSubType())
 					{
 						case 'plain':
-							if ($mimePart->getBytes() > 0) $partText = $mimePart;
+							if ($mimePart->getBytes() > 0)
+							{
+								$partText = $mimePart;
+							}
 							break;
 
 						case 'html':
-							if ($mimePart->getBytes() > 0)  $partHTML = $mimePart;
+							if ($mimePart->getBytes() > 0)
+							{
+								$partHTML = $mimePart;
+							}
 							break;
 					}
 					break;
@@ -4155,7 +4922,10 @@ 
 							if (count($mimePart->getParts()) > 1)
 							{
 								// in a multipart alternative we treat the multipart/related as html part
-								if (self::$debug) error_log(__METHOD__." process MULTIPART/".$mimePart->getSubType()." with array as subparts");
+								if (self::$debug)
+								{
+									error_log(__METHOD__." process MULTIPART/".$mimePart->getSubType()." with array as subparts");
+								}
 								$partHTML = $mimePart;
 								break 3; // GET OUT OF LOOP, will be processed according to type
 							}
@@ -4236,9 +5006,15 @@ 
 	 */
 	function getMultipartMixed($_uid, Horde_Mime_Part $_structure, $_htmlMode, $_preserveSeen = false, &$skipParts=array())
 	{
-		if (self::$debug) echo __METHOD__."$_uid, $_htmlMode<br>";
+		if (self::$debug)
+		{
+			echo __METHOD__."$_uid, $_htmlMode<br>";
+		}
 		$bodyPart = array();
-		if (self::$debug) _debug_array($_structure);
+		if (self::$debug)
+		{
+			_debug_array($_structure);
+		}
 
 		$ignore_first_part = true;
 		//$skipParts = array();
@@ -4246,7 +5022,10 @@ 
 		foreach($_structure->contentTypeMap() as $mime_id => $mime_type)
 		{
 			//error_log(__METHOD__."($_uid, ".$_structure->getMimeId().") $mime_id: $mime_type");
-			if (self::$debug) echo __METHOD__."($_uid, partID=".$_structure->getMimeId().") $mime_id: $mime_type<br>";
+			if (self::$debug)
+			{
+				echo __METHOD__."($_uid, partID=".$_structure->getMimeId().") $mime_id: $mime_type<br>";
+			}
 			if ($ignore_first_part)
 			{
 				$ignore_first_part = false;
@@ -4264,7 +5043,10 @@ 
 			switch($part->getPrimaryType())
 			{
 				case 'multipart':
-					if ($part->getDisposition() == 'attachment') continue;
+					if ($part->getDisposition() == 'attachment')
+					{
+						continue;
+					}
 					switch($part->getSubType())
 					{
 						case 'alternative':
@@ -4329,7 +5111,9 @@ 
 					if($part->getSubType() == 'rfc822' || $part->getDisposition() == 'attachment')
 					{
 						$skipParts[$mime_id.'.0'] = $mime_type;
-						foreach($part->contentTypeMap() as $sub_id => $sub_type){ $skipParts[$sub_id] = $sub_type;}
+						foreach($part->contentTypeMap() as $sub_id => $sub_type)
+						{
+$skipParts[$sub_id] = $sub_type;}
 						//error_log(__METHOD__.' ('.__LINE__.') '.' Uid:'.$_uid.' Part:'.$mime_id.':'.array2string($skipParts));
 						//break 2;
 					}
@@ -4372,7 +5156,10 @@ 
 	 */
 	function getBodyPart($_uid, $_partID=null, $_folder=null, $_preserveSeen=false, $_stream=false, &$_encoding=null, $_tryDecodingServerside=true)
 	{
-		if (self::$debug) error_log( __METHOD__."(".array2string($_uid).", $_partID, $_folder, $_preserveSeen)");
+		if (self::$debug)
+		{
+			error_log( __METHOD__."(".array2string($_uid).", $_partID, $_folder, $_preserveSeen)");
+		}
 
 		if (empty($_folder))
 		{
@@ -4381,7 +5168,10 @@ 
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($_folder).'/'.$this->icServer->getCurrentMailbox().'/'. $this->sessionData['mailbox']);
 		// querying contents of body part
 		$uidsToFetch = new Horde_Imap_Client_Ids();
-		if (!(is_object($_uid) || is_array($_uid))) $_uid = (array)$_uid;
+		if (!(is_object($_uid) || is_array($_uid)))
+		{
+			$_uid = (array)$_uid;
+		}
 		$uidsToFetch->add($_uid);
 
 		$fquery = new Horde_Imap_Client_Fetch_Query();
@@ -4389,9 +5179,12 @@ 
 			'peek' => $_preserveSeen,
 			'decode' => true,	// try decode on server, does NOT neccessary work
 		);
-		if ($_tryDecodingServerside===false)// || ($_tryDecodingServerside&&$this->isDraftFolder($_folder)))
+		if ($_tryDecodingServerside===false)
+		{
+			// || ($_tryDecodingServerside&&$this->isDraftFolder($_folder)))
 		{
 			$_tryDecodingServerside=false;
+		}
 			$fetchParams = array(
 				'peek' => $_preserveSeen,
 			);
@@ -4433,7 +5226,10 @@ 
 	{
 		//error_log(__METHOD__.' ('.__LINE__.') '.'->'.$_uid.':'.array2string($_structure).' '.function_backtrace());
 		$bodyPart = array();
-		if (self::$debug) _debug_array(array($_structure,function_backtrace()));
+		if (self::$debug)
+		{
+			_debug_array(array($_structure,function_backtrace()));
+		}
 
 		if($_structure->getSubType() == 'html' && !in_array($_htmlMode, array('html_only', 'always_display', 'only_if_no_text')))
 		{
@@ -4483,8 +5279,12 @@ 
 	 */
 	function getMessageBody($_uid, $_htmlOptions='', $_partID=null, Horde_Mime_Part $_structure=null, $_preserveSeen = false, $_folder = '')
 	{
-		if (self::$debug) echo __METHOD__."$_uid, $_htmlOptions, $_partID<br>";
-		if($_htmlOptions != '') {
+		if (self::$debug)
+		{
+			echo __METHOD__."$_uid, $_htmlOptions, $_partID<br>";
+		}
+		if($_htmlOptions != '')
+		{
 			$this->htmlOptions = $_htmlOptions;
 		}
 		if (empty($_folder))
@@ -4573,7 +5373,9 @@ 
 						default:
 							$bodyPart = array($this->getTextPart($_uid, $_structure, $this->htmlOptions, $_preserveSeen));
 					}
-				} else {
+				}
+				else
+				{
 					// what if the structure->disposition is attachment ,...
 				}
 				return self::normalizeBodyParts($bodyPart);
@@ -4584,13 +5386,18 @@ 
 				{
 					case 'rfc822':
 						$newStructure = $_structure->getParts();
-						if (self::$debug) {echo __METHOD__." Message -> RFC -> NewStructure:"; _debug_array($newStructure[0]);}
+						if (self::$debug)
+						{
+echo __METHOD__." Message -> RFC -> NewStructure:"; _debug_array($newStructure[0]);}
 						return self::normalizeBodyParts($this->getMessageBody($_uid, $_htmlOptions, $newStructure[0]->getMimeId(), $newStructure[0], $_preserveSeen, $_folder));
 				}
 				break;
 
 			default:
-				if (self::$debug) _debug_array($_structure);
+				if (self::$debug)
+				{
+					_debug_array($_structure);
+				}
 				return array(
 					array(
 						'body'		=> lang('The mimeparser can not parse this message.').$_structure->getType(),
@@ -4614,9 +5421,12 @@ 
 		{
 			foreach($_bodyParts as $singleBodyPart)
 			{
-				if (!isset($singleBodyPart['body'])) {
+				if (!isset($singleBodyPart['body']))
+				{
 					$buff = self::normalizeBodyParts($singleBodyPart);
-					foreach ((array)$buff as $val) { $body2return[] = $val;}
+					foreach ((array)$buff as $val)
+					{
+$body2return[] = $val;}
 					continue;
 				}
 				$body2return[] = $singleBodyPart;
@@ -4642,13 +5452,20 @@ 
 		$message='';
 		for($i=0; $i<count($bodyParts); $i++)
 		{
-			if (!isset($bodyParts[$i]['body'])) {
+			if (!isset($bodyParts[$i]['body']))
+			{
 				$bodyParts[$i]['body'] = self::getdisplayableBody($mailClass, $bodyParts[$i], $preserveHTML, $useTidy);
 				$message .= empty($bodyParts[$i]['body'])?'':$bodyParts[$i]['body'];
 				continue;
 			}
-			if (isset($bodyParts[$i]['error'])) continue;
-			if (empty($bodyParts[$i]['body'])) continue;
+			if (isset($bodyParts[$i]['error']))
+			{
+				continue;
+			}
+			if (empty($bodyParts[$i]['body']))
+			{
+				continue;
+			}
 			// some characterreplacements, as they fail to translate
 			$sar = array(
 				'@(\x84|\x93|\x94)@',
@@ -4675,13 +5492,17 @@ 
 				$bodyParts[$i]['body'] = preg_replace($sar,$rar,$bodyParts[$i]['body']);
 			}
 
-			if ($bodyParts[$i]['charSet']===false) $bodyParts[$i]['charSet'] = translation::detect_encoding($bodyParts[$i]['body']);
+			if ($bodyParts[$i]['charSet']===false)
+			{
+				$bodyParts[$i]['charSet'] = translation::detect_encoding($bodyParts[$i]['body']);
+			}
 			// add line breaks to $bodyParts
 			//error_log(__METHOD__.' ('.__LINE__.') '.' Charset:'.$bodyParts[$i]['charSet'].'->'.$bodyParts[$i]['body']);
 			$newBody  = translation::convert_jsonsafe($bodyParts[$i]['body'], $bodyParts[$i]['charSet']);
 			//error_log(__METHOD__.' ('.__LINE__.') '.' MimeType:'.$bodyParts[$i]['mimeType'].'->'.$newBody);
 			$mailClass->activeMimeType = 'text/plain';
-			if ($bodyParts[$i]['mimeType'] == 'text/html') {
+			if ($bodyParts[$i]['mimeType'] == 'text/html')
+			{
 				$mailClass->activeMimeType = $bodyParts[$i]['mimeType'];
 				if (!$preserveHTML)
 				{
@@ -4727,15 +5548,28 @@ 
 						// as we switched off HTMLaweds tidy functionality
 						$newBody = str_replace(array('&amp;amp;','<DIV><BR></DIV>',"<DIV>&nbsp;</DIV>",'<div>&nbsp;</div>'),array('&amp;','<BR>','<BR>','<BR>'),$newBody);
 						$newBody = $htmLawed->egw_htmLawed($newBody,self::$htmLawed_config);
-						if ($hasOther && $preserveHTML) $newBody = $matches[1]. $newBody. $matches[3];
+						if ($hasOther && $preserveHTML)
+						{
+							$newBody = $matches[1]. $newBody. $matches[3];
+						}
 						$alreadyHtmlLawed=true;
 					}
 					//error_log(__METHOD__.' ('.__LINE__.') '.' after purify:'.$newBody);
-					if ($preserveHTML==false) $newBody = translation::convertHTMLToText($newBody,self::$displayCharset,true,true);
+					if ($preserveHTML==false)
+					{
+						$newBody = translation::convertHTMLToText($newBody,self::$displayCharset,true,true);
+					}
 					//error_log(__METHOD__.' ('.__LINE__.') '.' after convertHTMLToText:'.$newBody);
-					if ($preserveHTML==false) $newBody = nl2br($newBody); // we need this, as htmLawed removes \r\n
+					if ($preserveHTML==false)
+					{
+						$newBody = nl2br($newBody);
+					}
+					// we need this, as htmLawed removes \r\n
 					/*if (!$alreadyHtmlLawed) */ $mailClass->getCleanHTML($newBody); // remove stuff we regard as unwanted
-					if ($preserveHTML==false) $newBody = str_replace("<br />","\r\n",$newBody);
+					if ($preserveHTML==false)
+					{
+						$newBody = str_replace("<br />","\r\n",$newBody);
+					}
 					//error_log(__METHOD__.' ('.__LINE__.') '.' after getClean:'.$newBody);
 				}
 				$message .= $newBody;
@@ -4772,12 +5606,12 @@ 
 				  substr($line,0,strlen($dontbreaklinesstartingwith)) != $dontbreaklinesstartingwith
 				 )
 				)
-			   )
-			{
+			   ) {
 				$s=explode(" ", $line);
 				$line = "";
 				$linecnt = 0;
-				foreach ($s as &$v) {
+				foreach ($s as &$v)
+				{
 					$cnt = strlen($v);
 					// only break long words within the wordboundaries,
 					// but it may destroy links, so we check for href and dont do it if we find one
@@ -4787,14 +5621,20 @@ 
 						$v=wordwrap($v, $allowedLength, $cut, true);
 					}
 					// the rest should be broken at the start of the new word that exceeds the limit
-					if ($linecnt+$cnt > $allowedLength) {
+					if ($linecnt+$cnt > $allowedLength)
+					{
 						$v=$cut.$v;
 						#$linecnt = 0;
 						$linecnt =strlen($v)-strlen($cut);
-					} else {
+					}
+					else
+					{
 						$linecnt += $cnt;
 					}
-					if (strlen($v)) $line .= (strlen($line) ? " " : "").$v;
+					if (strlen($v))
+					{
+						$line .= (strlen($line) ? " " : "").$v;
+					}
 				}
 			}
 			$newStr .= $line . "\n";
@@ -4815,11 +5655,18 @@ 
 	function getMessageEnvelope($_uid, $_partID = '',$decode=false, $_folder='', $_useHeaderInsteadOfEnvelope=false)
 	{
 		//error_log(__METHOD__.' ('.__LINE__.') '.":$_uid,$_partID,$decode,$_folder".function_backtrace());
-		if (empty($_folder)) $_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
+		if (empty($_folder))
+		{
+			$_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
+		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.":$_uid,$_partID,$decode,$_folder");
-		if((empty($_partID)||$_partID=='null')&&$_useHeaderInsteadOfEnvelope===false) {
+		if((empty($_partID)||$_partID=='null')&&$_useHeaderInsteadOfEnvelope===false)
+		{
 			$uidsToFetch = new Horde_Imap_Client_Ids();
-			if (!(is_object($_uid) || is_array($_uid))) $_uid = (array)$_uid;
+			if (!(is_object($_uid) || is_array($_uid)))
+			{
+				$_uid = (array)$_uid;
+			}
 			$uidsToFetch->add($_uid);
 
 			$fquery = new Horde_Imap_Client_Fetch_Query();
@@ -4828,8 +5675,10 @@ 
 			$headersNew = $this->icServer->fetch($_folder, $fquery, array(
 				'ids' => $uidsToFetch,
 			));
-			if (is_object($headersNew)) {
-				foreach($headersNew as &$_headerObject) {
+			if (is_object($headersNew))
+			{
+				foreach($headersNew as &$_headerObject)
+				{
 					$env = $_headerObject->getEnvelope();
 					//_debug_array($envFields->singleFields());
 					$singleFields = $envFields->singleFields();
@@ -4846,7 +5695,10 @@ 
 								//error_log(__METHOD__.' ('.__LINE__.') '.$v.'->'.array2string($env->$v->addresses));
 								$envelope[$v]=$env->$v->addresses;
 								$address = array();
-								if (!is_array($envelope[$v])) break;
+								if (!is_array($envelope[$v]))
+								{
+									break;
+								}
 								foreach ($envelope[$v] as $k => $ad)
 								{
 									if (stripos($ad,'@')===false)
@@ -4882,7 +5734,9 @@ 
 				}
 			}
 			return $envelope;
-		} else {
+		}
+		else
+		{
 
 			$headers = $this->getMessageHeader($_uid, $_partID, true,true,$_folder);
 
@@ -4893,18 +5747,39 @@ 
 				'SUBJECT'	=> ($decode ? self::decode_header($headers['SUBJECT']):$headers['SUBJECT']),
 				'MESSAGE_ID'	=> $headers['MESSAGE-ID']
 			);
-			if (isset($headers['IN-REPLY-TO'])) $newData['IN-REPLY-TO'] = $headers['IN-REPLY-TO'];
-			if (isset($headers['REFERENCES'])) $newData['REFERENCES'] = $headers['REFERENCES'];
-			if (isset($headers['THREAD-TOPIC'])) $newData['THREAD-TOPIC'] = $headers['THREAD-TOPIC'];
-			if (isset($headers['THREAD-INDEX'])) $newData['THREAD-INDEX'] = $headers['THREAD-INDEX'];
-			if (isset($headers['LIST-ID'])) $newData['LIST-ID'] = $headers['LIST-ID'];
+			if (isset($headers['IN-REPLY-TO']))
+			{
+				$newData['IN-REPLY-TO'] = $headers['IN-REPLY-TO'];
+			}
+			if (isset($headers['REFERENCES']))
+			{
+				$newData['REFERENCES'] = $headers['REFERENCES'];
+			}
+			if (isset($headers['THREAD-TOPIC']))
+			{
+				$newData['THREAD-TOPIC'] = $headers['THREAD-TOPIC'];
+			}
+			if (isset($headers['THREAD-INDEX']))
+			{
+				$newData['THREAD-INDEX'] = $headers['THREAD-INDEX'];
+			}
+			if (isset($headers['LIST-ID']))
+			{
+				$newData['LIST-ID'] = $headers['LIST-ID'];
+			}
 			//_debug_array($newData);
 			$recepientList = array('FROM', 'TO', 'CC', 'BCC', 'SENDER', 'REPLY-TO');
-			foreach($recepientList as $recepientType) {
-				if(isset($headers[$recepientType])) {
-					if ($decode) $headers[$recepientType] =  self::decode_header($headers[$recepientType],true);
+			foreach($recepientList as $recepientType)
+			{
+				if(isset($headers[$recepientType]))
+				{
+					if ($decode)
+					{
+						$headers[$recepientType] =  self::decode_header($headers[$recepientType],true);
+					}
 					//error_log(__METHOD__.__LINE__." ".$recepientType."->".array2string($headers[$recepientType]));
-					foreach(self::parseAddressList($headers[$recepientType]) as $singleAddress) {
+					foreach(self::parseAddressList($headers[$recepientType]) as $singleAddress)
+					{
 						$addressData = array(
 							'PERSONAL_NAME'		=> $singleAddress->personal ? $singleAddress->personal : 'NIL',
 							'AT_DOMAIN_LIST'	=> $singleAddress->adl ? $singleAddress->adl : 'NIL',
@@ -4912,17 +5787,25 @@ 
 							'HOST_NAME'		=> $singleAddress->host ? $singleAddress->host : 'NIL',
 							'EMAIL'			=> $singleAddress->host ? $singleAddress->mailbox.'@'.$singleAddress->host : $singleAddress->mailbox,
 						);
-						if($addressData['PERSONAL_NAME'] != 'NIL') {
+						if($addressData['PERSONAL_NAME'] != 'NIL')
+						{
 							$addressData['RFC822_EMAIL'] = imap_rfc822_write_address($singleAddress->mailbox, $singleAddress->host, $singleAddress->personal);
-						} else {
+						}
+						else
+						{
 							$addressData['RFC822_EMAIL'] = 'NIL';
 						}
 						$newData[$recepientType][] = ($addressData['RFC822_EMAIL']!='NIL'?$addressData['RFC822_EMAIL']:$addressData['EMAIL']);//$addressData;
 					}
-				} else {
-					if($recepientType == 'SENDER' || $recepientType == 'REPLY-TO') {
+				}
+				else
+				{
+					if($recepientType == 'SENDER' || $recepientType == 'REPLY-TO')
+					{
 						$newData[$recepientType] = $newData['FROM'];
-					} else {
+					}
+					else
+					{
 						$newData[$recepientType] = array();
 					}
 				}
@@ -4945,9 +5828,15 @@ 
 	function getMessageHeader($_uid, $_partID = '',$decode=false, $preserveUnSeen=false, $_folder='')
 	{
 		//error_log(__METHOD__.' ('.__LINE__.') '.':'.$_uid.', '.$_partID.', '.$decode.', '.$preserveUnSeen.', '.$_folder);
-		if (empty($_folder)) $_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
+		if (empty($_folder))
+		{
+			$_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
+		}
 		$uidsToFetch = new Horde_Imap_Client_Ids();
-		if (!(is_object($_uid) || is_array($_uid))) $_uid = (array)$_uid;
+		if (!(is_object($_uid) || is_array($_uid)))
+		{
+			$_uid = (array)$_uid;
+		}
 		$uidsToFetch->add($_uid);
 
 		$fquery = new Horde_Imap_Client_Fetch_Query();
@@ -4963,7 +5852,8 @@ 
 		$headersNew = $this->icServer->fetch($_folder, $fquery, array(
 			'ids' => $uidsToFetch,
 		));
-		if (is_object($headersNew)) {
+		if (is_object($headersNew))
+		{
 			foreach($headersNew as $_fetchObject)
 			{
 				$headers = $_fetchObject->getHeaderText(0,Horde_Imap_Client_Data_Fetch::HEADER_PARSE);
@@ -4983,7 +5873,10 @@ 
 			}
 			if ($decode === 'object')
 			{
-				if (is_object($headers)) $headers->setUserAgent('EGroupware API '.$GLOBALS['egw_info']['server']['versions']['phpgwapi']);
+				if (is_object($headers))
+				{
+					$headers->setUserAgent('EGroupware API '.$GLOBALS['egw_info']['server']['versions']['phpgwapi']);
+				}
 				return $headers;
 			}
 			$retValue = is_object($headers) ? $headers->toArray():array();
@@ -5018,10 +5911,16 @@ 
 	function getMessageRawHeader($_uid, $_partID = '', $_folder = '')
 	{
 		static $rawHeaders;
-		if (empty($_folder)) $_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
+		if (empty($_folder))
+		{
+			$_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
+		}
 		//error_log(__METHOD__.' ('.__LINE__.') '." Try Using Cache for raw Header $_uid, $_partID in Folder $_folder");
 
-		if (is_null($rawHeaders)||!is_array($rawHeaders)) $rawHeaders = egw_cache::getCache(egw_cache::INSTANCE,'email','rawHeadersCache'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*1);
+		if (is_null($rawHeaders)||!is_array($rawHeaders))
+		{
+			$rawHeaders = egw_cache::getCache(egw_cache::INSTANCE,'email','rawHeadersCache'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*1);
+		}
 		if (isset($rawHeaders[$this->icServer->ImapServerId][(string)$_folder][$_uid][(empty($_partID)?'NIL':$_partID)]))
 		{
 			//error_log(__METHOD__.' ('.__LINE__.') '." Using Cache for raw Header $_uid, $_partID in Folder $_folder");
@@ -5029,7 +5928,10 @@ 
 		}
 		$uidsToFetch = new Horde_Imap_Client_Ids();
 		$uid = $_uid;
-		if (!(is_object($_uid) || is_array($_uid))) $uid = (array)$_uid;
+		if (!(is_object($_uid) || is_array($_uid)))
+		{
+			$uid = (array)$_uid;
+		}
 		$uidsToFetch->add($uid);
 
 		$fquery = new Horde_Imap_Client_Fetch_Query();
@@ -5045,8 +5947,10 @@ 
 		$headersNew = $this->icServer->fetch($_folder, $fquery, array(
 			'ids' => $uidsToFetch,
 		));
-		if (is_object($headersNew)) {
-			foreach($headersNew as &$_headerObject) {
+		if (is_object($headersNew))
+		{
+			foreach($headersNew as &$_headerObject)
+			{
 				$retValue = $_headerObject->getHeaderText();
 				if ($_partID != '')
 				{
@@ -5074,22 +5978,33 @@ 
 	static function &getStyles($_bodyParts)
 	{
 		$style = '';
-		if (empty($_bodyParts)) return "";
-		foreach((array)$_bodyParts as $singleBodyPart) {
-			if (!isset($singleBodyPart['body'])) {
+		if (empty($_bodyParts))
+		{
+			return "";
+		}
+		foreach((array)$_bodyParts as $singleBodyPart)
+		{
+			if (!isset($singleBodyPart['body']))
+			{
 				$singleBodyPart['body'] = self::getStyles($singleBodyPart);
 				$style .= $singleBodyPart['body'];
 				continue;
 			}
 
-			if ($singleBodyPart['charSet']===false) $singleBodyPart['charSet'] = translation::detect_encoding($singleBodyPart['body']);
+			if ($singleBodyPart['charSet']===false)
+			{
+				$singleBodyPart['charSet'] = translation::detect_encoding($singleBodyPart['body']);
+			}
 			$singleBodyPart['body'] = translation::convert(
 				$singleBodyPart['body'],
 				strtolower($singleBodyPart['charSet'])
 			);
 			$ct = 0;
 			$newStyle=array();
-			if (stripos($singleBodyPart['body'],'<style')!==false)  $ct = preg_match_all('#<style(?:\s.*)?>(.+)</style>#isU', $singleBodyPart['body'], $newStyle);
+			if (stripos($singleBodyPart['body'],'<style')!==false)
+			{
+				$ct = preg_match_all('#<style(?:\s.*)?>(.+)</style>#isU', $singleBodyPart['body'], $newStyle);
+			}
 			if ($ct>0)
 			{
 				//error_log(__METHOD__.' ('.__LINE__.') '.'#'.$ct.'#'.array2string($newStyle));
@@ -5121,7 +6036,11 @@ 
 		// CSS Security
 		// http://code.google.com/p/browsersec/wiki/Part1#Cascading_stylesheets
 		$css = preg_replace('/(javascript|expression|-moz-binding)/i','',$style);
-		if (stripos($css,'script')!==false) translation::replaceTagsCompletley($css,'script'); // Strip out script that may be included
+		if (stripos($css,'script')!==false)
+		{
+			translation::replaceTagsCompletley($css,'script');
+		}
+		// Strip out script that may be included
 		// we need this, as styledefinitions are enclosed with curly brackets; and template stuff tries to replace everything between curly brackets that is having no horizontal whitespace
 		// as the comments as <!-- styledefinition --> in stylesheet are outdated, and ck-editor does not understand it, we remove it
 		$css = str_replace(array(':','<!--','-->'),array(': ','',''),$css);
@@ -5142,8 +6061,14 @@ 
 	{
 		//TODO: caching einbauen static!
 		static $rawBody;
-		if (is_null($rawBody)) $rawBody = array();
-		if (empty($_folder)) $_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
+		if (is_null($rawBody))
+		{
+			$rawBody = array();
+		}
+		if (empty($_folder))
+		{
+			$_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
+		}
 		if (isset($rawBody[$this->icServer->ImapServerId][$_folder][$_uid][(empty($_partID)?'NIL':$_partID)]))
 		{
 			//error_log(__METHOD__.' ('.__LINE__.') '." Using Cache for raw Body $_uid, $_partID in Folder $_folder");
@@ -5152,7 +6077,10 @@ 
 
 		$uidsToFetch = new Horde_Imap_Client_Ids();
 		$uid = $_uid;
-		if (!(is_object($_uid) || is_array($_uid))) $uid = (array)$_uid;
+		if (!(is_object($_uid) || is_array($_uid)))
+		{
+			$uid = (array)$_uid;
+		}
 		$uidsToFetch->add($uid);
 
 		$fquery = new Horde_Imap_Client_Fetch_Query();
@@ -5165,8 +6093,10 @@ 
 		$headersNew = $this->icServer->fetch($_folder, $fquery, array(
 			'ids' => $uidsToFetch,
 		));
-		if (is_object($headersNew)) {
-			foreach($headersNew as &$_headerObject) {
+		if (is_object($headersNew))
+		{
+			foreach($headersNew as &$_headerObject)
+			{
 				$body = $_headerObject->getFullMsg();
 				if ($_partID != '')
 				{
@@ -5199,14 +6129,20 @@ 
 	 */
 	function getStructure($_uid, $_partID=null, $_folder=null, $_preserveSeen=false)
 	{
-		if (self::$debug) error_log( __METHOD__.' ('.__LINE__.') '.":$_uid, $_partID");
+		if (self::$debug)
+		{
+			error_log( __METHOD__.' ('.__LINE__.') '.":$_uid, $_partID");
+		}
 
 		if (empty($_folder))
 		{
 			$_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
 		}
 		$uidsToFetch = new Horde_Imap_Client_Ids();
-		if (!(is_object($_uid) || is_array($_uid))) $_uid = (array)$_uid;
+		if (!(is_object($_uid) || is_array($_uid)))
+		{
+			$_uid = (array)$_uid;
+		}
 		$uidsToFetch->add($_uid);
 		try
 		{
@@ -5215,7 +6151,10 @@ 
 	//		$fquery->envelope();
 	//		$fquery->size();
 			$_fquery->structure();
-			if ($_partID) $_fquery->bodyPart($_partID, array('peek' => $_preserveSeen));
+			if ($_partID)
+			{
+				$_fquery->bodyPart($_partID, array('peek' => $_preserveSeen));
+			}
 
 			$mail = $this->icServer->fetch($_folder, $_fquery, array(
 				'ids' => $uidsToFetch,
@@ -5246,16 +6185,28 @@ 
 	 */
 	function getMessageAttachments($_uid, $_partID=null, Horde_Mime_Part $_structure=null, $fetchEmbeddedImages=true, $fetchTextCalendar=false, $resolveTNEF=true, $_folder='')
 	{
-		if (self::$debug) error_log( __METHOD__.":$_uid, $_partID");
-		if (empty($_folder)) $_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
+		if (self::$debug)
+		{
+			error_log( __METHOD__.":$_uid, $_partID");
+		}
+		if (empty($_folder))
+		{
+			$_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
+		}
 		$attachments = array();
 		if (!isset($_structure))
 		{
 			$_structure = $this->getStructure($_uid, $_partID,$_folder,true);
 			//error_log(__METHOD__.' ('.__LINE__.') '.':'.print_r($_structure->contentTypeMap(),true));
 		}
-		if (!$_structure || !$_structure->contentTypeMap()) return array();
-		if (!empty($_partID)) $_structure = $_structure->getPart($_partID);
+		if (!$_structure || !$_structure->contentTypeMap())
+		{
+			return array();
+		}
+		if (!empty($_partID))
+		{
+			$_structure = $_structure->getPart($_partID);
+		}
 		$skipParts = array();
 		$tnefParts = array();
 		$skip = 0;
@@ -5273,7 +6224,13 @@ 
 			if ($mime_type=='message/rfc822' && $_partID!=$mime_id)
 			{
 				//error_log(__METHOD__.' ('.__LINE__.') '.' Uid:'.$uid.'->'.$mime_id.':'.array2string($part->contentTypeMap()));
-				foreach($part->contentTypeMap() as $sub_id => $sub_type) {if ($sub_id != $mime_id) $skipParts[$sub_id] = $sub_type;}
+				foreach($part->contentTypeMap() as $sub_id => $sub_type)
+				{
+if ($sub_id != $mime_id)
+				{
+					$skipParts[$sub_id] = $sub_type;
+				}
+				}
 			}
 			if (empty($partDisposition) && $partPrimaryType != 'multipart' && $partPrimaryType != 'text')
 			{
@@ -5284,7 +6241,10 @@ 
 				$partDisposition='attachment';
 			}
 			//error_log(__METHOD__.' ('.__LINE__.') '.' Uid:'.$uid.' Part:'.$_partID.'->'.$mime_id.':'.array2string($skipParts));
-			if (array_key_exists($mime_id,$skipParts)) continue;
+			if (array_key_exists($mime_id,$skipParts))
+			{
+				continue;
+			}
 
 			if ($partDisposition == 'attachment' ||
 				(($partDisposition == 'inline' || empty($partDisposition)) && $partPrimaryType == 'image' && $part->getContentId()=='') ||
@@ -5295,23 +6255,41 @@ 
 			{
 				// if type is message/rfc822 and _partID is given, and MimeID equals partID
 				// we attempt to fetch "ourselves"
-				if ($_partID==$part->getMimeId() && $part->getPrimaryType()=='message') continue;
+				if ($_partID==$part->getMimeId() && $part->getPrimaryType()=='message')
+				{
+					continue;
+				}
 				$attachment = $part->getAllDispositionParameters();
 
 				$attachment['mimeType'] = $mime_type;
 				$attachment['uid'] = $_uid;
 				$attachment['partID'] = $mime_id;
-				if (!isset($attachment['name'])||empty($attachment['name'])) $attachment['name'] = $part->getName();
+				if (!isset($attachment['name'])||empty($attachment['name']))
+				{
+					$attachment['name'] = $part->getName();
+				}
 				if ($fetchTextCalendar)
 				{
 					//error_log(__METHOD__.' ('.__LINE__.') '.array2string($part->getAllContentTypeParameters()));
 					$method = $part->getContentTypeParameter('method');
-					if ($method) $attachment['method'] = $method;
-					if (!isset($attachment['name'])) $attachment['name'] = 'event.ics';
+					if ($method)
+					{
+						$attachment['method'] = $method;
+					}
+					if (!isset($attachment['name']))
+					{
+						$attachment['name'] = 'event.ics';
+					}
 				}
 				$attachment['size'] = $part->getBytes();
-				if (($cid = $part->getContentId())) $attachment['cid'] = $cid;
-				if (empty($attachment['name'])) $attachment['name'] = (isset($attachment['cid'])&&!empty($attachment['cid'])?$attachment['cid']:lang("unknown").'_Uid'.$_uid.'_Part'.$mime_id).'.'.mime_magic::mime2ext($mime_type);
+				if (($cid = $part->getContentId()))
+				{
+					$attachment['cid'] = $cid;
+				}
+				if (empty($attachment['name']))
+				{
+					$attachment['name'] = (isset($attachment['cid'])&&!empty($attachment['cid'])?$attachment['cid']:lang("unknown").'_Uid'.$_uid.'_Part'.$mime_id).'.'.mime_magic::mime2ext($mime_type);
+				}
 				//error_log(__METHOD__.' ('.__LINE__.') '.' Uid:'.$uid.' Part:'.$_partID.'->'.$mime_id.':'.array2string($attachment));
 				//typical winmail.dat attachment is
 				//Array([size] => 1462762[filename] => winmail.dat[mimeType] => application/ms-tnef[uid] => 100[partID] => 2[name] => winmail.dat)
@@ -5347,14 +6325,26 @@ 
 						$attachment['uid'] = $tnp['uid'];
 						$attachment['partID'] = $tnp['partID'];
 						$attachment['is_winmail'] = $tnp['uid'].'@'.$tnp['partID'].'@'.$mime_id;
-						if (!isset($attachment['name'])||empty($attachment['name'])) $attachment['name'] = $part->getName();
+						if (!isset($attachment['name'])||empty($attachment['name']))
+						{
+							$attachment['name'] = $part->getName();
+						}
 						$attachment['size'] = $part->getBytes();
-						if (($cid = $part->getContentId())) $attachment['cid'] = $cid;
-						if (empty($attachment['name'])) $attachment['name'] = (isset($attachment['cid'])&&!empty($attachment['cid'])?$attachment['cid']:lang("unknown").'_Uid'.$_uid.'_Part'.$mime_id).'.'.mime_magic::mime2ext($attachment['mimeType']);
+						if (($cid = $part->getContentId()))
+						{
+							$attachment['cid'] = $cid;
+						}
+						if (empty($attachment['name']))
+						{
+							$attachment['name'] = (isset($attachment['cid'])&&!empty($attachment['cid'])?$attachment['cid']:lang("unknown").'_Uid'.$_uid.'_Part'.$mime_id).'.'.mime_magic::mime2ext($attachment['mimeType']);
+						}
 						$attachments[] = $attachment;
 					}
 				}
-				if ($tnefResolved===false) $attachments[]=$tnp;
+				if ($tnefResolved===false)
+				{
+					$attachments[]=$tnp;
+				}
 			}
 		}
 		//error_log(__METHOD__.__LINE__.array2string($attachments));
@@ -5457,8 +6447,14 @@ 
 
 				$attachment = $part->getAllDispositionParameters();
 				$attachment['mimeType'] = $part->getType();
-				if (!isset($attachment['filename'])||empty($attachment['filename'])) $attachment['filename'] = $part->getName();
-				if (($cid = $part->getContentId())) $attachment['cid'] = $cid;
+				if (!isset($attachment['filename'])||empty($attachment['filename']))
+				{
+					$attachment['filename'] = $part->getName();
+				}
+				if (($cid = $part->getContentId()))
+				{
+					$attachment['cid'] = $cid;
+				}
 				if (empty($attachment['filename']))
 				{
 					$attachment['filename'] = (isset($attachment['cid'])&&!empty($attachment['cid'])?
@@ -5470,7 +6466,10 @@ 
 				$attachments[$_uid.'@'.$_partID.'@'.$mime_id] = $attachment;
 			}
 		}
-		if (!is_array($attachments)) return false;
+		if (!is_array($attachments))
+		{
+			return false;
+		}
 		return $attachments;
 	}
 
@@ -5489,10 +6488,16 @@ 
 	function getAttachment($_uid, $_partID, $_winmail_nr=0, $_returnPart=true, $_stream=false, $_folder=null)
 	{
 		//error_log(__METHOD__.__LINE__."Uid:$_uid, PartId:$_partID, WinMailNr:$_winmail_nr, ReturnPart:$_returnPart, Stream:$_stream, Folder:$_folder".function_backtrace());
-		if (!isset($_folder)) $_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
+		if (!isset($_folder))
+		{
+			$_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
+		}
 
 		$uidsToFetch = new Horde_Imap_Client_Ids();
-		if (!(is_object($_uid) || is_array($_uid))) $_uid = (array)$_uid;
+		if (!(is_object($_uid) || is_array($_uid)))
+		{
+			$_uid = (array)$_uid;
+		}
 		$uidsToFetch->add($_uid);
 
 		$fquery = new Horde_Imap_Client_Fetch_Query();
@@ -5501,8 +6506,10 @@ 
 		$headersNew = $this->icServer->fetch($_folder, $fquery, array(
 			'ids' => $uidsToFetch,
 		));
-		if (is_object($headersNew)) {
-			foreach($headersNew as $id=>$_headerObject) {
+		if (is_object($headersNew))
+		{
+			foreach($headersNew as $id=>$_headerObject)
+			{
 				$body = $_headerObject->getFullMsg();
 				if ($_partID != '')
 				{
@@ -5516,7 +6523,10 @@ 
 					}
 					// if $partDisposition is empty, we assume attachment, and hope that the function
 					// itself is only triggered to fetch attachments
-					if (empty($partDisposition)) $partDisposition='attachment';
+					if (empty($partDisposition))
+					{
+						$partDisposition='attachment';
+					}
 					if ($part && ($partDisposition=='attachment' || $partDisposition=='inline' || ($part->getPrimaryType() == 'text' && $part->getSubType() == 'calendar')))
 					{
 						//$headerObject=$part->getAllDispositionParameters();//not used anywhere around here
@@ -5525,13 +6535,19 @@ 
 						$charset = $part->getContentTypeParameter('charset');
 						//$structure_bytes = $part->getBytes(); $structure_partID=$part->getMimeId(); error_log(__METHOD__.__LINE__." fetchPartContents(".array2string($_uid).", $structure_partID, $_stream, $_preserveSeen,$structure_mime)" );
 						$this->fetchPartContents($_uid, $part, $_stream, $_preserveSeen=true,$structure_mime);
-						if ($_returnPart) return $part;
+						if ($_returnPart)
+						{
+							return $part;
+						}
 					}
 				}
 			}
 		}
 		$ext = mime_magic::mime2ext($structure_mime);
-		if ($ext && stripos($filename,'.')===false && stripos($filename,$ext)===false) $filename = trim($filename).'.'.$ext;
+		if ($ext && stripos($filename,'.')===false && stripos($filename,$ext)===false)
+		{
+			$filename = trim($filename).'.'.$ext;
+		}
 		if (!$part)
 		{
 			throw new egw_exception_wrong_parameter("Error: Could not fetch attachment for Uid=".array2string($_uid).", PartId=$_partID, WinMailNr=$_winmail_nr, folder=$_folder");
@@ -5547,7 +6563,10 @@ 
 		);
 
 		// try guessing the mimetype, if we get the application/octet-stream
-		if (strtolower($attachmentData['type']) == 'application/octet-stream') $attachmentData['type'] = mime_magic::filename2mime($attachmentData['filename']);
+		if (strtolower($attachmentData['type']) == 'application/octet-stream')
+		{
+			$attachmentData['type'] = mime_magic::filename2mime($attachmentData['filename']);
+		}
 		# if the attachment holds a winmail number and is a winmail.dat then we have to handle that.
 		if ( $filename == 'winmail.dat' && $_winmail_nr)
 		{
@@ -5570,9 +6589,18 @@ 
 					if ($_winmail_nr == $wantedPart.'@'.$mime_id)
 					{
 						//error_log(__METHOD__.__LINE__.'#'.$structure_mime.'#'.$filename.'#'.array2string($attachment));
-						if (!isset($attachment['filename'])||empty($attachment['filename'])) $attachment['filename'] = $part->getName();
-						if (($cid = $part->getContentId())) $attachment['cid'] = $cid;
-						if (empty($attachment['filename'])) $attachment['filename'] = (isset($attachment['cid'])&&!empty($attachment['cid'])?$attachment['cid']:lang("unknown").'_Uid'.$_uid.'_Part'.$mime_id).'.'.mime_magic::mime2ext($attachment['mimeType']);
+						if (!isset($attachment['filename'])||empty($attachment['filename']))
+						{
+							$attachment['filename'] = $part->getName();
+						}
+						if (($cid = $part->getContentId()))
+						{
+							$attachment['cid'] = $cid;
+						}
+						if (empty($attachment['filename']))
+						{
+							$attachment['filename'] = (isset($attachment['cid'])&&!empty($attachment['cid'])?$attachment['cid']:lang("unknown").'_Uid'.$_uid.'_Part'.$mime_id).'.'.mime_magic::mime2ext($attachment['mimeType']);
+						}
 						$wmattach = $attachment;
 						$wmattach['attachment'] = $part->getContents(array('stream'=>$_stream));
 
@@ -5582,7 +6610,10 @@ 
 			if ($tnefResolved)
 			{
 				$ext = mime_magic::mime2ext($wmattach['mimeType']);
-				if ($ext && stripos($wmattach['filename'],'.')===false && stripos($wmattach['filename'],$ext)===false) $wmattach['filename'] = trim($wmattach['filename']).'.'.$ext;
+				if ($ext && stripos($wmattach['filename'],'.')===false && stripos($wmattach['filename'],$ext)===false)
+				{
+					$wmattach['filename'] = trim($wmattach['filename']).'.'.$ext;
+				}
 				$attachmentData = array(
 					'type'       => $wmattach['mimeType'],
 					'filename'   => $wmattach['filename'],
@@ -5612,7 +6643,10 @@ 
 		static $uid=null, $part=null, $structure=null;
 		//error_log(__METHOD__.' ('.__LINE__.') '.":$_uid, $_cid, $_part");
 
-		if(empty($_cid)) return false;
+		if(empty($_cid))
+		{
+			return false;
+		}
 
 		if ($_uid != $uid || $_part != $part)
 		{
@@ -5637,13 +6671,19 @@ 
 					$attachment = $part;
 				}
 				// everything else we only consider after we checked all
-				if (!isset($attachment)) $attachment = $part;
+				if (!isset($attachment))
+				{
+					$attachment = $part;
+				}
 				// do we want content fetched, can be done later, if not needed
 				if (isset($_stream))
 				{
 					$this->fetchPartContents($_uid, $attachment, $_stream);
 				}
-				if (isset($attachment)) break;
+				if (isset($attachment))
+				{
+					break;
+				}
 			}
 		}
 		// set name as filename, if not set
@@ -5674,10 +6714,17 @@ 
 	 */
 	public function fetchPartContents($_uid, Horde_Mime_Part $part=null, $_stream=false, $_preserveSeen=false, $_mimetype=null)
 	{
-		if (is_null($part)) return null;//new Horde_Mime_Part;
+		if (is_null($part))
+		{
+			return null;
+		}
+		//new Horde_Mime_Part;
 		$encoding = null;
 		$fetchAsBinary = true;
-		if ($_mimetype && strtolower($_mimetype)=='message/rfc822') $fetchAsBinary = false;
+		if ($_mimetype && strtolower($_mimetype)=='message/rfc822')
+		{
+			$fetchAsBinary = false;
+		}
 		// we need to set content on structure to decode transfer encoding
 		$part->setContents(
 			$this->getBodyPart($_uid, $part->getMimeId(), null, $_preserveSeen, $_stream, $encoding, $fetchAsBinary),
@@ -5714,7 +6761,10 @@ 
 		// the recent flag is the default enforced here ; as we assume the _flags is always set,
 		// we default it to hordes default (Recent) (, other wise we should not pass the parameter
 		// for flags at all)
-		if (empty($_flags)) $_flags = '\\Recent';
+		if (empty($_flags))
+		{
+			$_flags = '\\Recent';
+		}
 		//if (!is_array($_flags) && stripos($_flags,',')!==false) $_flags=explode(',',$_flags);
 		//if (!is_array($_flags)) $_flags = (array) $_flags;
 		try
@@ -5731,18 +6781,27 @@ 
 		}
 		catch (Exception $e)
 		{
-			if (self::$debug) error_log("Could not append Message: ".$e->getMessage());
+			if (self::$debug)
+			{
+				error_log("Could not append Message: ".$e->getMessage());
+			}
 			throw new egw_exception_wrong_userinput(lang("Could not append Message:").' '.$e->getMessage().': '.$e->details);
 			//return false;
 		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.' appended UID:'.$messageid);
 		//$messageid = true; // for debug reasons only
-		if ($messageid === true || empty($messageid)) // try to figure out the message uid
+		if ($messageid === true || empty($messageid))
+		{
+			// try to figure out the message uid
 		{
 			$list = $this->getHeaders($_folderName, $_startMessage=1, 1, 'INTERNALDATE', true, array(),null, false);
+		}
 			if ($list)
 			{
-				if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.' MessageUid:'.$messageid.' but found:'.array2string($list));
+				if (self::$debug)
+				{
+					error_log(__METHOD__.' ('.__LINE__.') '.' MessageUid:'.$messageid.' but found:'.array2string($list));
+				}
 				$messageid = $list['header'][0]['uid'];
 			}
 		}
@@ -5783,7 +6842,10 @@ 
 	{
 			//echo __METHOD__." called for $uid,$partid <br>";
 			$headers = $mailClass->getMessageHeader($uid,$partid,true,false,$mailbox);
-			if (empty($headers)) return false;
+			if (empty($headers))
+			{
+				return false;
+			}
 			// dont force retrieval of the textpart, let mailClass preferences decide
 			$bodyParts = $mailClass->getMessageBody($uid,($preserveHTML?'always_display':'only_if_no_text'),$partid,null,false,$mailbox);
 			// if we do not want HTML but there is no TextRepresentation with the message itself, try converting
@@ -5801,15 +6863,30 @@ 
 			//error_log(array2string($bodyParts));
 			$attachments = $includeAttachments?$mailClass->getMessageAttachments($uid,$partid,null,true,false,true,$mailbox):array();
 
-			if ($mailClass->isSentFolder($mailbox)) $mailaddress = $headers['TO'];
-			elseif (isset($headers['FROM'])) $mailaddress = $headers['FROM'];
-			elseif (isset($headers['SENDER'])) $mailaddress = $headers['SENDER'];
-			if (isset($headers['CC'])) $mailaddress .= ','.$headers['CC'];
+			if ($mailClass->isSentFolder($mailbox))
+			{
+				$mailaddress = $headers['TO'];
+			}
+			elseif (isset($headers['FROM']))
+			{
+				$mailaddress = $headers['FROM'];
+			}
+			elseif (isset($headers['SENDER']))
+			{
+				$mailaddress = $headers['SENDER'];
+			}
+			if (isset($headers['CC']))
+			{
+				$mailaddress .= ','.$headers['CC'];
+			}
 			//_debug_array(array($headers,$mailaddress));
 			$subject = $headers['SUBJECT'];
 
 			$message = self::getdisplayableBody($mailClass, $bodyParts, $preserveHTML);
-			if ($preserveHTML && $mailClass->activeMimeType == 'text/plain') $message = '<pre>'.$message.'</pre>';
+			if ($preserveHTML && $mailClass->activeMimeType == 'text/plain')
+			{
+				$message = '<pre>'.$message.'</pre>';
+			}
 			$headdata = ($addHeaderSection ? self::createHeaderInfoSection($headers, '',$preserveHTML) : '');
 			$message = $headdata.$message;
 			//echo __METHOD__.'<br>';
@@ -5860,7 +6937,8 @@ 
 							$attachments[$num]['attachment'] = $c->getContents();
 						}
 						// no attempt to convert, if we dont know about the charset
-						if (isset($attachments[$num]['charset'])&&!empty($attachments[$num]['charset'])) {
+						if (isset($attachments[$num]['charset'])&&!empty($attachments[$num]['charset']))
+						{
 							// we do not try guessing the charset, if it is not set
 							//if ($attachments[$num]['charset']===false) $attachments[$num]['charset'] = translation::detect_encoding($attachments[$num]['attachment']);
 							translation::convert($attachments[$num]['attachment'],$attachments[$num]['charset']);
@@ -5881,7 +6959,10 @@ 
 						unset($attachments[$num]['attachment']);
 					}
 				}
-				if (is_array($attachedMessages)) $attachments = array_merge($attachments,$attachedMessages);
+				if (is_array($attachedMessages))
+				{
+					$attachments = array_merge($attachments,$attachedMessages);
+				}
 			}
 			return array(
 					'mailaddress'=>$mailaddress,
@@ -5903,10 +6984,17 @@ 
 	{
 		$c = 0;
 		// use the standardIdentity
-		foreach($_identities as $key => $acc) {
-			if ($c==0) $identity = $acc;
+		foreach($_identities as $key => $acc)
+		{
+			if ($c==0)
+			{
+				$identity = $acc;
+			}
 			//error_log(__METHOD__.__LINE__." $key == $_profile_id ");
-			if ($key==$_profile_id) $identity = $acc;
+			if ($key==$_profile_id)
+			{
+				$identity = $acc;
+			}
 			$c++;
 		}
 		return $identity;
@@ -5922,20 +7010,53 @@ 
 	{
 		$headdata = null;
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($header).function_backtrace());
-		if ($header['SUBJECT']) $headdata = lang('subject').': '.$header['SUBJECT'].($createHTML?"<br />":"\n");
-		if ($header['FROM']) $headdata .= lang('from').': '.self::convertAddressArrayToString($header['FROM'], $createHTML).($createHTML?"<br />":"\n");
-		if ($header['SENDER']) $headdata .= lang('sender').': '.self::convertAddressArrayToString($header['SENDER'], $createHTML).($createHTML?"<br />":"\n");
-		if ($header['TO']) $headdata .= lang('to').': '.self::convertAddressArrayToString($header['TO'], $createHTML).($createHTML?"<br />":"\n");
-		if ($header['CC']) $headdata .= lang('cc').': '.self::convertAddressArrayToString($header['CC'], $createHTML).($createHTML?"<br />":"\n");
-		if ($header['BCC']) $headdata .= lang('bcc').': '.self::convertAddressArrayToString($header['BCC'], $createHTML).($createHTML?"<br />":"\n");
-		if ($header['DATE']) $headdata .= lang('date').': '.$header['DATE'].($createHTML?"<br />":"\n");
-		if ($header['PRIORITY'] && $header['PRIORITY'] != 'normal') $headdata .= lang('priority').': '.$header['PRIORITY'].($createHTML?"<br />":"\n");
-		if ($header['IMPORTANCE'] && $header['IMPORTANCE'] !='normal') $headdata .= lang('importance').': '.$header['IMPORTANCE'].($createHTML?"<br />":"\n");
+		if ($header['SUBJECT'])
+		{
+			$headdata = lang('subject').': '.$header['SUBJECT'].($createHTML?"<br />":"\n");
+		}
+		if ($header['FROM'])
+		{
+			$headdata .= lang('from').': '.self::convertAddressArrayToString($header['FROM'], $createHTML).($createHTML?"<br />":"\n");
+		}
+		if ($header['SENDER'])
+		{
+			$headdata .= lang('sender').': '.self::convertAddressArrayToString($header['SENDER'], $createHTML).($createHTML?"<br />":"\n");
+		}
+		if ($header['TO'])
+		{
+			$headdata .= lang('to').': '.self::convertAddressArrayToString($header['TO'], $createHTML).($createHTML?"<br />":"\n");
+		}
+		if ($header['CC'])
+		{
+			$headdata .= lang('cc').': '.self::convertAddressArrayToString($header['CC'], $createHTML).($createHTML?"<br />":"\n");
+		}
+		if ($header['BCC'])
+		{
+			$headdata .= lang('bcc').': '.self::convertAddressArrayToString($header['BCC'], $createHTML).($createHTML?"<br />":"\n");
+		}
+		if ($header['DATE'])
+		{
+			$headdata .= lang('date').': '.$header['DATE'].($createHTML?"<br />":"\n");
+		}
+		if ($header['PRIORITY'] && $header['PRIORITY'] != 'normal')
+		{
+			$headdata .= lang('priority').': '.$header['PRIORITY'].($createHTML?"<br />":"\n");
+		}
+		if ($header['IMPORTANCE'] && $header['IMPORTANCE'] !='normal')
+		{
+			$headdata .= lang('importance').': '.$header['IMPORTANCE'].($createHTML?"<br />":"\n");
+		}
 		//if ($mailcontent['headers']['ORGANIZATION']) $headdata .= lang('organization').': '.$mailcontent['headers']['ORGANIZATION']."\
 		if (!empty($headdata))
 		{
-			if (!empty($headline) && $headline != 'SUPPRESS') $headdata = "---------------------------- $headline ----------------------------".($createHTML?"<br />":"\n").$headdata;
-			if (empty($headline)) $headdata = ($headline != 'SUPPRESS'?"--------------------------------------------------------".($createHTML?"<br />":"\n"):'').$headdata;
+			if (!empty($headline) && $headline != 'SUPPRESS')
+			{
+				$headdata = "---------------------------- $headline ----------------------------".($createHTML?"<br />":"\n").$headdata;
+			}
+			if (empty($headline))
+			{
+				$headdata = ($headline != 'SUPPRESS'?"--------------------------------------------------------".($createHTML?"<br />":"\n"):'').$headdata;
+			}
 			$headdata .= ($headline != 'SUPPRESS'?"--------------------------------------------------------".($createHTML?"<br />":"\n"):'');
 		}
 		else
@@ -5969,12 +7090,15 @@ 
 		$returnAddr ='';
 		if (is_array($rfcAddressArray))
 		{
-			foreach((array)$rfcAddressArray as $addressData) {
+			foreach((array)$rfcAddressArray as $addressData)
+			{
 				//error_log(__METHOD__.' ('.__LINE__.') '.array2string($addressData));
-				if($addressData['MAILBOX_NAME'] == 'NIL') {
+				if($addressData['MAILBOX_NAME'] == 'NIL')
+				{
 					continue;
 				}
-				if(strtolower($addressData['MAILBOX_NAME']) == 'undisclosed-recipients') {
+				if(strtolower($addressData['MAILBOX_NAME']) == 'undisclosed-recipients')
+				{
 					continue;
 				}
 				if ($addressData['RFC822_EMAIL'])
@@ -5988,7 +7112,10 @@ 
 				}
 				$addressObject = $addressObjectA[0];
 				//error_log(__METHOD__.' ('.__LINE__.') '.array2string($addressObject));
-				if (!$addressObject->valid) continue;
+				if (!$addressObject->valid)
+				{
+					continue;
+				}
 				//$mb =(string)$addressObject->mailbox;
 				//$h = (string)$addressObject->host;
 				//$p = (string)$addressObject->personal;
@@ -6005,7 +7132,10 @@ 
 			// do not mess with strings, return them untouched /* ToDo: validate string as Address */
 			$rfcAddressArray = self::decode_header($rfcAddressArray,true);
 			$rfcAddressArray = str_replace(array('<','>','"\'','\'"'),array('[',']','"','"'),$rfcAddressArray);
-			if (is_string($rfcAddressArray)) return $rfcAddressArray;
+			if (is_string($rfcAddressArray))
+			{
+				return $rfcAddressArray;
+			}
 		}
 		return $returnAddr;
 	}
@@ -6022,10 +7152,19 @@ 
 	{
 		$mergeobj = new addressbook_merge();
 
-		if (empty($mimetype)) $mimetype = (strlen(strip_tags($content)) == strlen($content) ?'text/plain':'text/html');
+		if (empty($mimetype))
+		{
+			$mimetype = (strlen(strip_tags($content)) == strlen($content) ?'text/plain':'text/html');
+		}
 		$rv = $mergeobj->merge_string($content,$ids,$err='',$mimetype, array(), self::$displayCharset);
-		if (empty($rv) && !empty($content) && !empty($err)) $rv = $content;
-		if (!empty($err) && !empty($content) && !empty($ids)) error_log(__METHOD__.' ('.__LINE__.') '.' Merge failed for Ids:'.array2string($ids).' ContentType:'.$mimetype.' Content:'.$content.' Reason:'.array2string($err));
+		if (empty($rv) && !empty($content) && !empty($err))
+		{
+			$rv = $content;
+		}
+		if (!empty($err) && !empty($content) && !empty($ids))
+		{
+			error_log(__METHOD__.' ('.__LINE__.') '.' Merge failed for Ids:'.array2string($ids).' ContentType:'.$mimetype.' Content:'.$content.' Reason:'.array2string($err));
+		}
 		return $rv;
 	}
 
@@ -6062,13 +7201,15 @@ 
 			settype($bytes, 'integer');
 			$bytes /= 10;
 		}
-		else
-			settype($bytes, 'integer');
+		else {
+					settype($bytes, 'integer');
+		}
 
 		return $bytes . ' ' . $type ;
 	}
 
-	static function detect_qp(&$sting) {
+	static function detect_qp(&$sting)
+	{
 		$needle = '/(=[0-9][A-F])|(=[A-F][0-9])|(=[A-F][A-F])|(=[0-9][0-9])/';
 		return preg_match("$needle",$string);
 	}
@@ -6085,9 +7226,15 @@ 
 	 */
 	static function logRunTimes($_starttime,$_endtime=null,$_message='',$_methodNline='')
 	{
-		if (is_null($_endtime)) $_endtime = microtime(true);
+		if (is_null($_endtime))
+		{
+			$_endtime = microtime(true);
+		}
 		$usagetime = microtime(true) - $_starttime;
-		if (self::$debugTimes) error_log($_methodNline.' took:'.number_format($usagetime,5).'(s) '.($_message?'Details:'.$_message:''));
+		if (self::$debugTimes)
+		{
+			error_log($_methodNline.' took:'.number_format($usagetime,5).'(s) '.($_message?'Details:'.$_message:''));
+		}
 	}
 
 	/**
@@ -6102,7 +7249,10 @@ 
 	 */
 	static function checkFileBasics(&$_formData, $IDtoAddToFileName='', $reqMimeType='message/rfc822')
 	{
-		if (parse_url($_formData['file'],PHP_URL_SCHEME) == 'egw-data') return $_formData['file'];
+		if (parse_url($_formData['file'],PHP_URL_SCHEME) == 'egw-data')
+		{
+			return $_formData['file'];
+		}
 
 		//error_log(__METHOD__.__FILE__.array2string($_formData).' Id:'.$IDtoAddToFileName.' ReqMimeType:'.$reqMimeType);
 		$importfailed = $tmpFileName = false;
@@ -6151,8 +7301,15 @@ 
 			{
 				$buff = explode('.',$_formData['name']);
 				$suffix = '';
-				if (is_array($buff)) $suffix = array_pop($buff); // take the last extension to check with ext2mime
-				if (!empty($suffix)) $sfxMimeType = mime_magic::ext2mime($suffix);
+				if (is_array($buff))
+				{
+					$suffix = array_pop($buff);
+				}
+				// take the last extension to check with ext2mime
+				if (!empty($suffix))
+				{
+					$sfxMimeType = mime_magic::ext2mime($suffix);
+				}
 				if (!empty($suffix) && !empty($sfxMimeType) &&
 					(strlen(trim($_formData['type']))==0 || (strtolower(trim($_formData['type'])) != $sfxMimeType)))
 				{
@@ -6200,7 +7357,9 @@ 
 			{
 				rename($_formData['file'], $GLOBALS['egw_info']['server']['temp_dir'].SEP.$tmpFileName);
 			}
-		} else {
+		}
+		else
+		{
 			//error_log("Import of message ".$_formData['file']." failes to meet basic restrictions");
 			$importfailed = true;
 			$alert_msg .= lang("Processing of file %1 failed. Failed to meet basic restrictions.",$_formData['name']);
@@ -6246,21 +7405,32 @@ 
 				if (substr($url, 0, 5) !== 'data:')
 				{
 					$filename = basename($url);
-					if (($directory = dirname($url)) == '.') $directory = '';
+					if (($directory = dirname($url)) == '.')
+					{
+						$directory = '';
+					}
 					$ext = pathinfo($filename, PATHINFO_EXTENSION);
 					$mimeType  = mime_magic::ext2mime($ext);
-					if ( strlen($directory) > 1 && substr($directory,-1) != '/') { $directory .= '/'; }
+					if ( strlen($directory) > 1 && substr($directory,-1) != '/')
+					{
+$directory .= '/'; }
 					$myUrl = $directory.$filename;
-					if ($myUrl[0]=='/') // local path -> we only allow path's that are available via http/https (or vfs)
+					if ($myUrl[0]=='/')
+					{
+						// local path -> we only allow path's that are available via http/https (or vfs)
 					{
 						$basedir = ($_SERVER['HTTPS']?'https://':'http://'.$_SERVER['HTTP_HOST']);
 					}
+					}
 					// use vfs instead of url containing webdav.php
 					// ToDo: we should test if the webdav url is of our own scope, as we cannot handle foreign
 					// webdav.php urls as vfs
-					if (strpos($myUrl,'/webdav.php') !== false) // we have a webdav link, so we build a vfs/sqlfs link of it.
+					if (strpos($myUrl,'/webdav.php') !== false)
+					{
+						// we have a webdav link, so we build a vfs/sqlfs link of it.
 					{
 						egw_vfs::load_wrapper('vfs');
+					}
 						list(,$myUrl) = explode('/webdav.php',$myUrl,2);
 						$basedir = 'vfs://default';
 						$needTempFile = false;
@@ -6289,8 +7459,13 @@ 
 						}
 					}
 
-					if ( strlen($basedir) > 1 && substr($basedir,-1) != '/' && $myUrl[0]!='/') { $basedir .= '/'; }
-					if ($needTempFile && !$attachment && substr($myUrl,0,4) !== "http") $data = file_get_contents($basedir.urldecode($myUrl));
+					if ( strlen($basedir) > 1 && substr($basedir,-1) != '/' && $myUrl[0]!='/')
+					{
+$basedir .= '/'; }
+					if ($needTempFile && !$attachment && substr($myUrl,0,4) !== "http")
+					{
+						$data = file_get_contents($basedir.urldecode($myUrl));
+					}
 				}
 				if (substr($url,0,strlen('data:'))=='data:')
 				{
@@ -6391,7 +7566,10 @@ 
 				$_folder = $this->getSentFolder();
 			}
 			$delimiter = $this->getHierarchyDelimiter();
-			if($_folder=='INBOX'.$delimiter) $_folder='INBOX';
+			if($_folder=='INBOX'.$delimiter)
+			{
+				$_folder='INBOX';
+			}
 			if ($importfailed === false)
 			{
 				$Subject = $mailObject->getHeader('Subject');
@@ -6420,7 +7598,9 @@ 
 					//error_log(__METHOD__.' ('.__LINE__.') '.' Id To Merge:'.$val);
 					if (/*$GLOBALS['egw_info']['flags']['currentapp'] == 'addressbook' &&*/
 						count($SendAndMergeTocontacts) > 1 && $val &&
-						(is_numeric($val) || $GLOBALS['egw']->accounts->name2id($val))) // do the merge
+						(is_numeric($val) || $GLOBALS['egw']->accounts->name2id($val)))
+					{
+						// do the merge
 					{
 						//error_log(__METHOD__.' ('.__LINE__.') '.array2string($mailObject));
 
@@ -6429,6 +7609,7 @@ 
 						{
 							//error_log('ID ' . $val . ' ' .$type . ': ' . $mailObject->getHeader(egw_mailer::$type2header[$type]) . ' -> ' .$bo_merge->merge_string($mailObject->getHeader(egw_mailer::$type2header[$type]),$val,$e,'text/plain',array(),self::$displayCharset));
 							$merged = $bo_merge->merge_string($mailObject->getHeader(egw_mailer::$type2header[$type]),$val,$e,'text/plain',array(),self::$displayCharset);
+					}
 							$mailObject->addAddress($merged,'',$type);
 							if($type == 'to')
 							{
@@ -6460,9 +7641,15 @@ 
 						$mailObject->clearCustomHeaders();
 						$mailObject->addHeader('Subject', $bo_merge->merge_string($Subject, $val, $e, 'text/plain', array(), self::$displayCharset));
 						//error_log(__METHOD__.' ('.__LINE__.') '.' ContentType:'.$mailObject->BodyContentType);
-						if($text_body) $text_body->setContents($bo_merge->merge_string($Body, $val, $e, 'text/plain', array(), self::$displayCharset),array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
+						if($text_body)
+						{
+							$text_body->setContents($bo_merge->merge_string($Body, $val, $e, 'text/plain', array(), self::$displayCharset),array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
+						}
 						//error_log(__METHOD__.' ('.__LINE__.') '.' Result:'.$mailObject->Body.' error:'.array2string($e));
-						if($html_body) $html_body->setContents($bo_merge->merge_string($AltBody, $val, $e, 'text/html', array(), self::$displayCharset),array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
+						if($html_body)
+						{
+							$html_body->setContents($bo_merge->merge_string($AltBody, $val, $e, 'text/html', array(), self::$displayCharset),array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
+						}
 
 						//error_log(__METHOD__.' ('.__LINE__.') '.array2string($mailObject));
 						// set a higher timeout for big messages
@@ -6477,9 +7664,12 @@ 
 							//error_log(__METHOD__.' ('.__LINE__.') '.array2string($errorInfo));
 						}
 					}
-					elseif (!$k)	// 1. entry, further entries will fail for apps other then addressbook
+					elseif (!$k)
+					{
+						// 1. entry, further entries will fail for apps other then addressbook
 					{
 						$openAsDraft = true;
+					}
 						$mailObject->removeHeader('Message-ID');
 						$mailObject->removeHeader('Date');
 						$mailObject->clearCustomHeaders();
@@ -6493,9 +7683,12 @@ 
 
 						// No addresses from placeholders?  Treat it as just a contact ID
 						if (count($mailObject->getAddresses('to',true)) == 0 &&
-							is_numeric($val) || $GLOBALS['egw']->accounts->name2id($val)) // do the merge
+							is_numeric($val) || $GLOBALS['egw']->accounts->name2id($val))
+						{
+							// do the merge
 						{
 							$contact = $bo_merge->contacts->read($val);
+						}
 							//error_log(__METHOD__.' ('.__LINE__.') '.array2string($contact));
 							$email = ($contact['email'] ? $contact['email'] : $contact['email_home']);
 							$nfn = ($contact['n_fn'] ? $contact['n_fn'] : $contact['n_given'].' '.$contact['n_family']);
@@ -6506,9 +7699,15 @@ 
 						}
 						$mailObject->addHeader('Subject', $bo_merge->merge_string($Subject, $val, $e, 'text/plain', array(), self::$displayCharset));
 						//error_log(__METHOD__.' ('.__LINE__.') '.' ContentType:'.$mailObject->BodyContentType);
-						if (!empty($Body)) $text_body->setContents($bo_merge->merge_string($Body, $val, $e, 'text/plain', array(), self::$displayCharset),array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
+						if (!empty($Body))
+						{
+							$text_body->setContents($bo_merge->merge_string($Body, $val, $e, 'text/plain', array(), self::$displayCharset),array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
+						}
 						//error_log(__METHOD__.' ('.__LINE__.') '.' Result:'.$mailObject->Body.' error:'.array2string($e));
-						if (!empty($AltBody)) $html_body->setContents($bo_merge->merge_string($AltBody, $val, $e, 'text/html', array(), self::$displayCharset),array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
+						if (!empty($AltBody))
+						{
+							$html_body->setContents($bo_merge->merge_string($AltBody, $val, $e, 'text/html', array(), self::$displayCharset),array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
+						}
 						$_folder = $this->getDraftFolder();
 					}
 					if ($sendOK || $openAsDraft)
@@ -6516,11 +7715,15 @@ 
 						if ($this->folderExists($_folder,true))
 						{
 						    if($this->isSentFolder($_folder))
-							{
+						    {
 						        $flags = '\\Seen';
-						    } elseif($this->isDraftFolder($_folder)) {
+						    }
+						    elseif($this->isDraftFolder($_folder))
+						    {
 						        $flags = '\\Draft';
-						    } else {
+						    }
+						    else
+						    {
 						        $flags = '';
 						    }
 							$savefailed = false;
@@ -6554,7 +7757,10 @@ 
 						}
 						else
 						{
-							if (!$openComposeWindow) $processStats['failed'][$val] = $errorInfo?$errorInfo:'Send failed to '.$nfn.'<'.$email.'> See error_log for details';
+							if (!$openComposeWindow)
+							{
+								$processStats['failed'][$val] = $errorInfo?$errorInfo:'Send failed to '.$nfn.'<'.$email.'> See error_log for details';
+							}
 						}
 					}
 					if (!is_null($sendOK) && $sendOK===false && is_null($openComposeWindow))
@@ -6602,7 +7808,10 @@ 
 				$tmpFileName = $GLOBALS['egw_info']['server']['temp_dir'].SEP.basename($tmpFileName);
 				break;
 		}
-		if (!isset($message)) $message = fopen($tmpFileName, 'r');
+		if (!isset($message))
+		{
+			$message = fopen($tmpFileName, 'r');
+		}
 
 		if (!$message)
 		{
@@ -6633,7 +7842,10 @@ 
 				(fseek($message, 0, SEEK_SET) == -1 ? '' : fread($message, 8192));
 
 			$length = strpos($start, Horde_Mime_Part::RFC_EOL.Horde_Mime_Part::RFC_EOL);
-			if ($length===false) $length = strlen($start);
+			if ($length===false)
+			{
+				$length = strlen($start);
+			}
 			$headers = Horde_Mime_Headers::parseHeaders(substr($start, 0,$length));
 
 			foreach($headers->toArray(array('nowrap' => true)) as $header => $value)
@@ -6662,7 +7874,10 @@ 
 		}
 		else
 		{
-			if (($type = gettype($message)) == 'object') $type = get_class ($message);
+			if (($type = gettype($message)) == 'object')
+			{
+				$type = get_class ($message);
+			}
 			throw new egw_exception_wrong_parameter('Wrong parameter type for message: '.$type);
 		}
 	}
@@ -6686,7 +7901,9 @@ 
 			$matches = array();
 			preg_match_all("/[\w\.,-.,_.,0-9.]+@[\w\.,-.,_.,0-9.]+/",$addresses,$matches);
 			//error_log(__METHOD__.__LINE__.array2string($matches));
-			foreach ($matches[0] as &$match) {$match = trim($match,', ');}
+			foreach ($matches[0] as &$match)
+			{
+$match = trim($match,', ');}
 			$addresses = implode(',',$matches[0]);
 			//error_log(__METHOD__.__LINE__.array2string($addresses));
 			$ret = $rfc822->parseAddressList($addresses, $default_domain ? array('default_domain' => $default_domain) : array());
@@ -6717,7 +7934,10 @@ 
 			}
 			else
 			{
-				if ($previousFailed && $remember) $adr->personal = $remember. ' ' . $adr->personal;
+				if ($previousFailed && $remember)
+				{
+					$adr->personal = $remember. ' ' . $adr->personal;
+				}
 				$remember = '';
 				$previousFailed=false;
 				//error_log(__METHOD__.__LINE__."('$addresses', $default_domain) parsed $i: mailbox=$adr->mailbox, host=$adr->host, personal=$adr->personal");
@@ -6739,7 +7959,10 @@ 
 	{
 		$acc = emailadmin_account::read($this->profileID);
 		$identity = emailadmin_account::read_identity($acc['ident_id'], true, null, $acc);
-		if (self::$debug) error_log(__METHOD__.__LINE__.array2string($identity));
+		if (self::$debug)
+		{
+			error_log(__METHOD__.__LINE__.array2string($identity));
+		}
 		$headers = $this->getMessageHeader($uid, '', 'object', true, $_folder);
 
 		$mdn = new Horde_Mime_Mdn($headers);

Spacing +1066 added lines, -1067 removed lines

@@ -94,7 +94,7 @@ 
 	 *
 	 * @array
 	 */
-	static $tidy_config = array('clean'=>false,'output-html'=>true,'join-classes'=>true,'join-styles'=>true,'show-body-only'=>"auto",'word-2000'=>true,'wrap'=>0);
+	static $tidy_config = array('clean'=>false, 'output-html'=>true, 'join-classes'=>true, 'join-styles'=>true, 'show-body-only'=>"auto", 'word-2000'=>true, 'wrap'=>0);
 
 	/**
 	 * static used to configure htmLawed, for use with emails
@@ -104,9 +104,9 @@ 
 	static $htmLawed_config = array('comment'=>1, //remove comments
 		'make_tag_strict' => 3, // 3 is a new own config value, to indicate that transformation is to be performed, but don't transform font as size transformation of numeric sizes to keywords alters the intended result too much
 		'keep_bad'=>2, //remove tags but keep element content (4 and 6 keep element content only if text (pcdata) is valid in parent element as per specs, this may lead to textloss if balance is switched on)
-		'balance'=>1,//turn off tag-balancing (config['balance']=>0). That will not introduce any security risk; only standards-compliant tag nesting check/filtering will be turned off (basic tag-balance will remain; i.e., there won't be any unclosed tag, etc., after filtering)
+		'balance'=>1, //turn off tag-balancing (config['balance']=>0). That will not introduce any security risk; only standards-compliant tag nesting check/filtering will be turned off (basic tag-balance will remain; i.e., there won't be any unclosed tag, etc., after filtering)
 		'direct_list_nest' => 1,
-		'allow_for_inline' => array('table','div','li','p'),//block elements allowed for nesting when only inline is allowed; Example span does not allow block elements as table; table is the only element tested so far
+		'allow_for_inline' => array('table', 'div', 'li', 'p'), //block elements allowed for nesting when only inline is allowed; Example span does not allow block elements as table; table is the only element tested so far
 		// tidy eats away even some wanted whitespace, so we switch it off;
 		// we used it for its compacting and beautifying capabilities, which resulted in better html for further processing
 		'tidy'=>0,
@@ -121,13 +121,13 @@ 
 	 *
 	 * @array
 	 */
-	static $aclShortCuts = array('' => array('label'=>'none','title'=>'The user has no rights whatsoever.'),
-		'lrs'		=> array('label'=>'readable','title'=>'Allows a user to read the contents of the mailbox.'),
-		'lprs'		=> array('label'=>'post','title'=>'Allows a user to read the mailbox and post to it through the delivery system by sending mail to the submission address of the mailbox.'),
-		'ilprs'		=> array('label'=>'append','title'=>'Allows a user to read the mailbox and append messages to it, either via IMAP or through the delivery system.'),
-		'cdilprsw'	=> array('label'=>'write','title'=>'Allows a user to read the maibox, post to it, append messages to it, and delete messages or the mailbox itself. The only right not given is the right to change the ACL of the mailbox.'),
-		'acdilprsw'	=> array('label'=>'all','title'=>'The user has all possible rights on the mailbox. This is usually granted to users only on the mailboxes they own.'),
-		'custom'	=> array('label'=>'custom','title'=>'User defined combination of rights for the ACL'),
+	static $aclShortCuts = array('' => array('label'=>'none', 'title'=>'The user has no rights whatsoever.'),
+		'lrs'		=> array('label'=>'readable', 'title'=>'Allows a user to read the contents of the mailbox.'),
+		'lprs'		=> array('label'=>'post', 'title'=>'Allows a user to read the mailbox and post to it through the delivery system by sending mail to the submission address of the mailbox.'),
+		'ilprs'		=> array('label'=>'append', 'title'=>'Allows a user to read the mailbox and append messages to it, either via IMAP or through the delivery system.'),
+		'cdilprsw'	=> array('label'=>'write', 'title'=>'Allows a user to read the maibox, post to it, append messages to it, and delete messages or the mailbox itself. The only right not given is the right to change the ACL of the mailbox.'),
+		'acdilprsw'	=> array('label'=>'all', 'title'=>'The user has all possible rights on the mailbox. This is usually granted to users only on the mailboxes they own.'),
+		'custom'	=> array('label'=>'custom', 'title'=>'User defined combination of rights for the ACL'),
 	);
 
 	/**
@@ -175,7 +175,7 @@ 
 	 * @param boolean $_reuseCache = null if null it is set to the value of $_restoreSession
 	 * @return emailadmin_imapbase
 	 */
-	public static function getInstance($_restoreSession=true, &$_profileID=0, $_validate=true, $_oldImapServerObject=false, $_reuseCache=null)
+	public static function getInstance($_restoreSession = true, &$_profileID = 0, $_validate = true, $_oldImapServerObject = false, $_reuseCache = null)
 	{
 		//$_restoreSession=false;
 		if (is_null($_reuseCache)) $_reuseCache = $_restoreSession;
@@ -185,13 +185,13 @@ 
 		{
 			if (!is_object(self::$instances[$_profileID]))
 			{
-				self::$instances[$_profileID] = new emailadmin_imapbase('utf-8',false,$_profileID,false,$_reuseCache);
+				self::$instances[$_profileID] = new emailadmin_imapbase('utf-8', false, $_profileID, false, $_reuseCache);
 			}
 			self::$instances[$_profileID]->icServer = $_oldImapServerObject;
-			self::$instances[$_profileID]->accountid= $_oldImapServerObject->ImapServerId;
-			self::$instances[$_profileID]->profileID= $_oldImapServerObject->ImapServerId;
+			self::$instances[$_profileID]->accountid = $_oldImapServerObject->ImapServerId;
+			self::$instances[$_profileID]->profileID = $_oldImapServerObject->ImapServerId;
 			self::$instances[$_profileID]->mailPreferences = $GLOBALS['egw_info']['user']['preferences']['mail'];
-			self::$instances[$_profileID]->htmlOptions  = self::$instances[$_profileID]->mailPreferences['htmlOptions'];
+			self::$instances[$_profileID]->htmlOptions = self::$instances[$_profileID]->mailPreferences['htmlOptions'];
 			return self::$instances[$_profileID];
 		}
 		if ($_profileID == 0)
@@ -204,14 +204,14 @@ 
 			{
 				$profileID = emailadmin_account::get_default_acc_id();
 			}
-			if ($profileID!=$_profileID) $_restoreSession==false;
-			$_profileID=$profileID;
+			if ($profileID != $_profileID) $_restoreSession == false;
+			$_profileID = $profileID;
 			if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.' called with profileID==0 using '.$profileID.' instead->'.function_backtrace());
 		}
 		// no validation or restoreSession for old ImapServer Object, just fetch it and return it
-		if ($_oldImapServerObject===true)
+		if ($_oldImapServerObject === true)
 		{
-			return new emailadmin_imapbase('utf-8',false,$_profileID,true,$_reuseCache);
+			return new emailadmin_imapbase('utf-8', false, $_profileID, true, $_reuseCache);
 		}
 		if ($_profileID != 0 && $_validate)
 		{
@@ -231,9 +231,9 @@ 
 			//egw_cache::setSession('mail','activeProfileID',$_profileID);
 		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.' RestoreSession:'.$_restoreSession.' ProfileId:'.$_profileID.' called from:'.function_backtrace());
-		if ($_profileID && (!isset(self::$instances[$_profileID]) || $_restoreSession===false))
+		if ($_profileID && (!isset(self::$instances[$_profileID]) || $_restoreSession === false))
 		{
-			self::$instances[$_profileID] = new emailadmin_imapbase('utf-8',$_restoreSession,$_profileID,false,$_reuseCache);
+			self::$instances[$_profileID] = new emailadmin_imapbase('utf-8', $_restoreSession, $_profileID, false, $_reuseCache);
 		}
 		else
 		{
@@ -244,7 +244,7 @@ 
 				self::$instances[$_profileID]->ogServer = emailadmin_account::read($_profileID)->smtpServer();
 				// TODO: merge mailprefs into userprefs, for easy treatment
 				self::$instances[$_profileID]->mailPreferences = $GLOBALS['egw_info']['user']['preferences']['mail'];
-				self::$instances[$_profileID]->htmlOptions  = self::$instances[$_profileID]->mailPreferences['htmlOptions'];
+				self::$instances[$_profileID]->htmlOptions = self::$instances[$_profileID]->mailPreferences['htmlOptions'];
 			} catch (egw_exception $e)
 			{
 				$newprofileID = emailadmin_account::get_default_acc_id();
@@ -252,7 +252,7 @@ 
 				error_log(__METHOD__.' ('.__LINE__.') '." Loading the Profile for ProfileID ".$_profileID.' failed for icServer; '.$e->getMessage().' Trigger new instance for Default-Profile '.$newprofileID.'. called from:'.function_backtrace());
 				if ($newprofileID)
 				{
-					self::$instances[$newprofileID] = new emailadmin_imapbase('utf-8',false,$newprofileID,false,$_reuseCache);
+					self::$instances[$newprofileID] = new emailadmin_imapbase('utf-8', false, $newprofileID, false, $_reuseCache);
 					$_profileID = $newprofileID;
 				}
 				else
@@ -260,7 +260,7 @@ 
 					throw $e;
 				}
 			}
-			self::storeActiveProfileIDToPref(self::$instances[$_profileID]->icServer, $_profileID, $_validate );
+			self::storeActiveProfileIDToPref(self::$instances[$_profileID]->icServer, $_profileID, $_validate);
 		}
 		self::$instances[$_profileID]->profileID = $_profileID;
 		if (!isset(self::$instances[$_profileID]->idna2)) self::$instances[$_profileID]->idna2 = new egw_idna;
@@ -276,7 +276,7 @@ 
 	 * @param boolean $_testConnection = 0
 	 * @return mixed $_profileID or false on failed ConnectionTest
 	 */
-	public static function storeActiveProfileIDToPref($_icServerObject, $_profileID=0, $_testConnection=true)
+	public static function storeActiveProfileIDToPref($_icServerObject, $_profileID = 0, $_testConnection = true)
 	{
 		if (isset($GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID']) && !empty($GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID']))
 		{
@@ -297,12 +297,12 @@ 
 		}
 		if ($oldProfileID != $_profileID)
 		{
-			if ($oldProfileID && $_profileID==0) $_profileID = $oldProfileID;
-			$GLOBALS['egw']->preferences->add('mail','ActiveProfileID',$_profileID,'user');
+			if ($oldProfileID && $_profileID == 0) $_profileID = $oldProfileID;
+			$GLOBALS['egw']->preferences->add('mail', 'ActiveProfileID', $_profileID, 'user');
 			// save prefs
 			$GLOBALS['egw']->preferences->save_repository(true);
 			$GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'] = $_profileID;
-			egw_cache::setSession('mail','activeProfileID',$_profileID);
+			egw_cache::setSession('mail', 'activeProfileID', $_profileID);
 		}
 		return $_profileID;
 	}
@@ -317,7 +317,7 @@ 
 	 * @param int $_acc_id = 0
 	 * @return int validated acc_id -> either acc_id given, or first valid one
 	 */
-	public static function validateProfileID($_acc_id=0)
+	public static function validateProfileID($_acc_id = 0)
 	{
 		if ($_acc_id)
 		{
@@ -336,7 +336,7 @@ 
 		}
 		// no account specified or specified account not found or not valid
 		// --> search existing account for first valid one and return that
-		foreach(emailadmin_account::search($only_current_user=true, 'acc_imap_host') as $acc_id => $imap_host)
+		foreach (emailadmin_account::search($only_current_user = true, 'acc_imap_host') as $acc_id => $imap_host)
 		{
 			if (!empty($imap_host) && ($account = emailadmin_account::read($acc_id)) && $account->is_imap())
 			{
@@ -358,7 +358,7 @@ 
 	 * @param boolean $_oldImapServerObject = false
 	 * @param boolean $_reuseCache = null if null it is set to the value of $_restoreSession
 	 */
-	private function __construct($_displayCharset='utf-8',$_restoreSession=true, $_profileID=0, $_oldImapServerObject=false, $_reuseCache=null)
+	private function __construct($_displayCharset = 'utf-8', $_restoreSession = true, $_profileID = 0, $_oldImapServerObject = false, $_reuseCache = null)
 	{
 		if (is_null($_reuseCache)) $_reuseCache = $_restoreSession;
 		if (!empty($_displayCharset)) self::$displayCharset = $_displayCharset;
@@ -378,7 +378,7 @@ 
 			$firstMessage = $this->sessionData['previewMessage'];
 			$this->sessionData = array();
 		}
-		if (!$_reuseCache) $this->forcePrefReload($_profileID,!$_reuseCache);
+		if (!$_reuseCache) $this->forcePrefReload($_profileID, !$_reuseCache);
 		try
 		{
 			$this->profileID = self::validateProfileID($_profileID);
@@ -389,14 +389,14 @@ 
 		}
 		catch (Exception $e)
 		{
-			throw new egw_exception(__METHOD__." failed to instanciate emailadmin_imapbase for $_profileID / ".$this->profileID." with error:".$e->getMessage());;
+			throw new egw_exception(__METHOD__." failed to instanciate emailadmin_imapbase for $_profileID / ".$this->profileID." with error:".$e->getMessage()); ;
 		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($acc->imapServer()));
-		$this->icServer = ($_oldImapServerObject?$acc->oldImapServer():$acc->imapServer());
+		$this->icServer = ($_oldImapServerObject ? $acc->oldImapServer() : $acc->imapServer());
 		$this->ogServer = $acc->smtpServer();
 		// TODO: merge mailprefs into userprefs, for easy treatment
 		$this->mailPreferences = $GLOBALS['egw_info']['user']['preferences']['mail'];
-		$this->htmlOptions  = $this->mailPreferences['htmlOptions'];
+		$this->htmlOptions = $this->mailPreferences['htmlOptions'];
 		if (isset($this->icServer->ImapServerId) && !empty($this->icServer->ImapServerId))
 		{
 			$_profileID = $this->profileID = $GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'] = $this->icServer->ImapServerId;
@@ -415,7 +415,7 @@ 
 	public static function &forceEAProfileLoad($_profile_id)
 	{
 		self::unsetCachedObjects($_profile_id);
-		$mail = emailadmin_imapbase::getInstance(false, $_profile_id,false);
+		$mail = emailadmin_imapbase::getInstance(false, $_profile_id, false);
 		//_debug_array( $_profile_id);
 		$mail->icServer = emailadmin_account::read($_profile_id)->imapServer();
 		$mail->ogServer = emailadmin_account::read($_profile_id)->smtpServer();
@@ -427,11 +427,11 @@ 
 	 * @param int $_profile_id
 	 * @param boolean $_resetFolderObjects
 	 */
-	public static function forcePrefReload($_profile_id=null,$_resetFolderObjects=true)
+	public static function forcePrefReload($_profile_id = null, $_resetFolderObjects = true)
 	{
 		// unset the mail_preferences session object, to force the reload/rebuild
-		$GLOBALS['egw']->session->appsession('mail_preferences','mail',serialize(array()));
-		$GLOBALS['egw']->session->appsession('session_data','emailadmin',serialize(array()));
+		$GLOBALS['egw']->session->appsession('mail_preferences', 'mail', serialize(array()));
+		$GLOBALS['egw']->session->appsession('session_data', 'emailadmin', serialize(array()));
 		if ($_resetFolderObjects) emailadmin_imapbase::resetFolderObjectCache($_profile_id);
 	}
 
@@ -440,8 +440,8 @@ 
 	 */
 	function restoreSessionData()
 	{
-		$this->sessionData = array();//egw_cache::getCache(egw_cache::SESSION,'mail','session_data',$callback=null,$callback_params=array(),$expiration=60*60*1);
-		self::$activeFolderCache = egw_cache::getCache(egw_cache::INSTANCE,'email','activeMailbox'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*10);
+		$this->sessionData = array(); //egw_cache::getCache(egw_cache::SESSION,'mail','session_data',$callback=null,$callback_params=array(),$expiration=60*60*1);
+		self::$activeFolderCache = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'activeMailbox'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60 * 60 * 10);
 		if (!empty(self::$activeFolderCache[$this->profileID])) $this->sessionData['mailbox'] = self::$activeFolderCache[$this->profileID];
 	}
 
@@ -451,10 +451,10 @@ 
 	function saveSessionData()
 	{
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string(array_keys($this->sessionData)));
-		if (!empty($this->sessionData['mailbox'])) self::$activeFolderCache[$this->profileID]=$this->sessionData['mailbox'];
+		if (!empty($this->sessionData['mailbox'])) self::$activeFolderCache[$this->profileID] = $this->sessionData['mailbox'];
 		if (isset(self::$activeFolderCache) && is_array(self::$activeFolderCache))
 		{
-			egw_cache::setCache(egw_cache::INSTANCE,'email','activeMailbox'.trim($GLOBALS['egw_info']['user']['account_id']),self::$activeFolderCache, 60*60*10);
+			egw_cache::setCache(egw_cache::INSTANCE, 'email', 'activeMailbox'.trim($GLOBALS['egw_info']['user']['account_id']), self::$activeFolderCache, 60 * 60 * 10);
 		}
 	}
 
@@ -470,40 +470,40 @@ 
 	 * @param int $_profileID = null default profile of user as returned by getUserDefaultProfileID
 	 * @return void
 	 */
-	static function unsetCachedObjects($_profileID=null)
+	static function unsetCachedObjects($_profileID = null)
 	{
 		if (is_null($_profileID)) $_profileID = emailadmin_account::get_default_acc_id();
 		if (is_array($_profileID) && $_profileID['account_id']) $account_id = $_profileID['account_id'];
 		//error_log(__METHOD__.__LINE__.' called with ProfileID:'.array2string($_profileID).' from '.function_backtrace());
-		if (!is_array($_profileID) && (is_numeric($_profileID) || !(stripos($_profileID,'tracker_')===false)))
+		if (!is_array($_profileID) && (is_numeric($_profileID) || !(stripos($_profileID, 'tracker_') === false)))
 		{
 			self::resetConnectionErrorCache($_profileID);
-			$rawHeadersCache = egw_cache::getCache(egw_cache::INSTANCE,'email','rawHeadersCache'.trim($account_id),$callback=null,$callback_params=array(),$expiration=60*60*1);
+			$rawHeadersCache = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'rawHeadersCache'.trim($account_id), $callback = null, $callback_params = array(), $expiration = 60 * 60 * 1);
 			if (isset($rawHeadersCache[$_profileID]))
 			{
 				unset($rawHeadersCache[$_profileID]);
-				egw_cache::setCache(egw_cache::INSTANCE,'email','rawHeadersCache'.trim($account_id),$rawHeadersCache, $expiration=60*60*1);
+				egw_cache::setCache(egw_cache::INSTANCE, 'email', 'rawHeadersCache'.trim($account_id), $rawHeadersCache, $expiration = 60 * 60 * 1);
 			}
-			$HierarchyDelimiterCache = egw_cache::getCache(egw_cache::INSTANCE,'email','HierarchyDelimiter'.trim($account_id),$callback=null,$callback_params=array(),$expiration=60*60*24*5);
+			$HierarchyDelimiterCache = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'HierarchyDelimiter'.trim($account_id), $callback = null, $callback_params = array(), $expiration = 60 * 60 * 24 * 5);
 			if (isset($HierarchyDelimiterCache[$_profileID]))
 			{
 				unset($HierarchyDelimiterCache[$_profileID]);
-				egw_cache::setCache(egw_cache::INSTANCE,'email','HierarchyDelimiter'.trim($account_id),$HierarchyDelimiterCache, $expiration=60*60*24*5);
+				egw_cache::setCache(egw_cache::INSTANCE, 'email', 'HierarchyDelimiter'.trim($account_id), $HierarchyDelimiterCache, $expiration = 60 * 60 * 24 * 5);
 			}
 			//reset folderObject cache, to trigger reload
 			self::resetFolderObjectCache($_profileID);
 			//reset counter of deleted messages per folder
-			$eMailListContainsDeletedMessages = egw_cache::getCache(egw_cache::INSTANCE,'email','eMailListContainsDeletedMessages'.trim($account_id),$callback=null,$callback_params=array(),$expiration=60*60*1);
+			$eMailListContainsDeletedMessages = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'eMailListContainsDeletedMessages'.trim($account_id), $callback = null, $callback_params = array(), $expiration = 60 * 60 * 1);
 			if (isset($eMailListContainsDeletedMessages[$_profileID]))
 			{
 				unset($eMailListContainsDeletedMessages[$_profileID]);
-				egw_cache::setCache(egw_cache::INSTANCE,'email','eMailListContainsDeletedMessages'.trim($account_id),$eMailListContainsDeletedMessages, $expiration=60*60*1);
+				egw_cache::setCache(egw_cache::INSTANCE, 'email', 'eMailListContainsDeletedMessages'.trim($account_id), $eMailListContainsDeletedMessages, $expiration = 60 * 60 * 1);
 			}
-			$vacationCached = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'vacationNotice'.trim($account_id),$callback=null,$callback_params=array(),$expiration=60*60*24*1);
+			$vacationCached = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'vacationNotice'.trim($account_id), $callback = null, $callback_params = array(), $expiration = 60 * 60 * 24 * 1);
 			if (isset($vacationCached[$_profileID]))
 			{
 				unset($vacationCached[$_profileID]);
-				egw_cache::setCache(egw_cache::INSTANCE,'email','vacationNotice'.trim($account_id),$vacationCached, $expiration=60*60*24*1);
+				egw_cache::setCache(egw_cache::INSTANCE, 'email', 'vacationNotice'.trim($account_id), $vacationCached, $expiration = 60 * 60 * 24 * 1);
 			}
 
 			if (isset(self::$instances[$_profileID])) unset(self::$instances[$_profileID]);
@@ -511,17 +511,17 @@ 
 		if (is_array($_profileID) && $_profileID['location'] == 'clear_cache')
 		{
 			// called via hook
-			foreach($GLOBALS['egw']->accounts->search(array('type' => 'accounts','order' => 'account_lid')) as $account)
+			foreach ($GLOBALS['egw']->accounts->search(array('type' => 'accounts', 'order' => 'account_lid')) as $account)
 			{
 				//error_log(__METHOD__.__LINE__.array2string($account));
 				$account_id = $account['account_id'];
 				$_profileID = null;
-				self::resetConnectionErrorCache($_profileID,$account_id);
-				self::resetFolderObjectCache($_profileID,$account_id);
-				egw_cache::setCache(egw_cache::INSTANCE,'email','rawHeadersCache'.trim($account_id),array(), 60*60*1);
-				egw_cache::setCache(egw_cache::INSTANCE,'email','HierarchyDelimiter'.trim($account_id),array(), 60*60*24*5);
-				egw_cache::setCache(egw_cache::INSTANCE,'email','eMailListContainsDeletedMessages'.trim($account_id),array(), 60*60*1);
-				egw_cache::setCache(egw_cache::INSTANCE,'email','vacationNotice'.trim($account_id),array(), 60*60*24*1);
+				self::resetConnectionErrorCache($_profileID, $account_id);
+				self::resetFolderObjectCache($_profileID, $account_id);
+				egw_cache::setCache(egw_cache::INSTANCE, 'email', 'rawHeadersCache'.trim($account_id), array(), 60 * 60 * 1);
+				egw_cache::setCache(egw_cache::INSTANCE, 'email', 'HierarchyDelimiter'.trim($account_id), array(), 60 * 60 * 24 * 5);
+				egw_cache::setCache(egw_cache::INSTANCE, 'email', 'eMailListContainsDeletedMessages'.trim($account_id), array(), 60 * 60 * 1);
+				egw_cache::setCache(egw_cache::INSTANCE, 'email', 'vacationNotice'.trim($account_id), array(), 60 * 60 * 24 * 1);
 			}
 		}
 	}
@@ -532,7 +532,7 @@ 
 	 * @param int $_ImapServerId the profileID to look for
 	 * @param int $account_id the egw account to look for
 	 */
-	static function resetConnectionErrorCache($_ImapServerId=null,$account_id=null)
+	static function resetConnectionErrorCache($_ImapServerId = null, $account_id = null)
 	{
 		//error_log(__METHOD__.' ('.__LINE__.') '.' for Profile:'.array2string($_ImapServerId) .' for user:'.trim($account_id));
 		if (is_null($account_id)) $account_id = $GLOBALS['egw_info']['user']['account_id'];
@@ -550,19 +550,19 @@ 
 		}
 		else
 		{
-			$isConError = egw_cache::getCache(egw_cache::INSTANCE,'email','icServerSIEVE_connectionError'.trim($account_id));
+			$isConError = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'icServerSIEVE_connectionError'.trim($account_id));
 			if (isset($isConError[$_ImapServerId]))
 			{
 				unset($isConError[$_ImapServerId]);
 			}
-			$waitOnFailure = egw_cache::getCache(egw_cache::INSTANCE,'email','ActiveSyncWaitOnFailure'.trim($account_id),null,array(),60*60*2);
+			$waitOnFailure = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'ActiveSyncWaitOnFailure'.trim($account_id), null, array(), 60 * 60 * 2);
 			if (isset($waitOnFailure[$_ImapServerId]))
 			{
 				unset($waitOnFailure[$_ImapServerId]);
 			}
 		}
-		egw_cache::setCache(egw_cache::INSTANCE,'email','icServerSIEVE_connectionError'.trim($account_id),$isConError,60*15);
-		egw_cache::setCache(egw_cache::INSTANCE,'email','ActiveSyncWaitOnFailure'.trim($account_id),$waitOnFailure,60*60*2);
+		egw_cache::setCache(egw_cache::INSTANCE, 'email', 'icServerSIEVE_connectionError'.trim($account_id), $isConError, 60 * 15);
+		egw_cache::setCache(egw_cache::INSTANCE, 'email', 'ActiveSyncWaitOnFailure'.trim($account_id), $waitOnFailure, 60 * 60 * 2);
 	}
 
 	/**
@@ -571,13 +571,13 @@ 
 	 * @param int $_ImapServerId the profileID to look for
 	 * @param int $account_id the egw account to look for
 	 */
-	static function resetFolderObjectCache($_ImapServerId=null,$account_id=null)
+	static function resetFolderObjectCache($_ImapServerId = null, $account_id = null)
 	{
 		//error_log(__METHOD__.' ('.__LINE__.') '.' called for Profile:'.array2string($_ImapServerId).'->'.function_backtrace());
 		if (is_null($account_id)) $account_id = $GLOBALS['egw_info']['user']['account_id'];
 		// on [location] => verify_settings we coud either use [prefs] => Array([ActiveProfileID] => 9, .. as $_ImapServerId
 		// or treat it as not given. we try that path
-		if (is_null($_ImapServerId)||is_array($_ImapServerId))
+		if (is_null($_ImapServerId) || is_array($_ImapServerId))
 		{
 			$folders2return = array();
 			$folderInfo = array();
@@ -586,12 +586,12 @@ 
 		}
 		else
 		{
-			$folders2return = egw_cache::getCache(egw_cache::INSTANCE,'email','folderObjects'.trim($account_id),null,array(),60*60*1);
+			$folders2return = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'folderObjects'.trim($account_id), null, array(), 60 * 60 * 1);
 			if (!empty($folders2return) && isset($folders2return[$_ImapServerId]))
 			{
 				unset($folders2return[$_ImapServerId]);
 			}
-			$folderInfo = egw_cache::getCache(egw_cache::INSTANCE,'email','icServerFolderExistsInfo'.trim($account_id),null,array(),60*60*5);
+			$folderInfo = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'icServerFolderExistsInfo'.trim($account_id), null, array(), 60 * 60 * 5);
 			if (!empty($folderInfo) && isset($folderInfo[$_ImapServerId]))
 			{
 				unset($folderInfo[$_ImapServerId]);
@@ -603,23 +603,23 @@ 
 				unset($lastFolderUsedForMove[$_ImapServerId]);
 			}
 			*/
-			$folderBasicInfo = egw_cache::getCache(egw_cache::INSTANCE,'email','folderBasicInfo'.trim($account_id),null,array(),60*60*1);
+			$folderBasicInfo = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'folderBasicInfo'.trim($account_id), null, array(), 60 * 60 * 1);
 			if (!empty($folderBasicInfo) && isset($folderBasicInfo[$_ImapServerId]))
 			{
 				unset($folderBasicInfo[$_ImapServerId]);
 			}
-			$_specialUseFolders = egw_cache::getCache(egw_cache::INSTANCE,'email','specialUseFolders'.trim($account_id),null,array(),60*60*12);
+			$_specialUseFolders = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'specialUseFolders'.trim($account_id), null, array(), 60 * 60 * 12);
 			if (!empty($_specialUseFolders) && isset($_specialUseFolders[$_ImapServerId]))
 			{
 				unset($_specialUseFolders[$_ImapServerId]);
-				self::$specialUseFolders=null;
+				self::$specialUseFolders = null;
 			}
 		}
-		egw_cache::setCache(egw_cache::INSTANCE,'email','folderObjects'.trim($account_id),$folders2return, 60*60*1);
-		egw_cache::setCache(egw_cache::INSTANCE,'email','icServerFolderExistsInfo'.trim($account_id),$folderInfo,60*60*5);
+		egw_cache::setCache(egw_cache::INSTANCE, 'email', 'folderObjects'.trim($account_id), $folders2return, 60 * 60 * 1);
+		egw_cache::setCache(egw_cache::INSTANCE, 'email', 'icServerFolderExistsInfo'.trim($account_id), $folderInfo, 60 * 60 * 5);
 		//egw_cache::setCache(egw_cache::INSTANCE,'email','lastFolderUsedForMove'.trim($account_id),$lastFolderUsedForMove,$expiration=60*60*1);
-		egw_cache::setCache(egw_cache::INSTANCE,'email','folderBasicInfo'.trim($account_id),$folderBasicInfo,60*60*1);
-		egw_cache::setCache(egw_cache::INSTANCE,'email','specialUseFolders'.trim($account_id),$_specialUseFolders,60*60*12);
+		egw_cache::setCache(egw_cache::INSTANCE, 'email', 'folderBasicInfo'.trim($account_id), $folderBasicInfo, 60 * 60 * 1);
+		egw_cache::setCache(egw_cache::INSTANCE, 'email', 'specialUseFolders'.trim($account_id), $_specialUseFolders, 60 * 60 * 12);
 	}
 
 	/**
@@ -640,14 +640,14 @@ 
 	 * @param string $_profileID the ID of the mailaccount to check for identities, if null current mail-account is used
 	 * @return array - array(email=>realname)
 	 */
-	function getUserEMailAddresses($_profileID=null) {
-		$acc = emailadmin_account::read((!empty($_profileID)?$_profileID:$this->profileID));
+	function getUserEMailAddresses($_profileID = null) {
+		$acc = emailadmin_account::read((!empty($_profileID) ? $_profileID : $this->profileID));
 		//error_log(__METHOD__.' ('.__LINE__.') '.':'.array2string($acc));
 		$identities = $acc->identities();
 
 		$userEMailAdresses = array($acc['ident_email']=>$acc['ident_realname']);
 
-		foreach($identities as $ik => $ident) {
+		foreach ($identities as $ik => $ident) {
 			//error_log(__METHOD__.' ('.__LINE__.') '.':'.$ik.'->'.array2string($ident));
 			$identity = emailadmin_account::read_identity($ik);
 			if (!empty($identity['ident_email']) && !isset($userEMailAdresses[$identity['ident_email']])) $userEMailAdresses[$identity['ident_email']] = $identity['ident_realname'];
@@ -662,19 +662,19 @@ 
 	 * @param boolean $resolve_placeholders wether or not resolve possible placeholders in identities
 	 * @return array - array(email=>realname)
 	 */
-	static function getAllIdentities($_accountToSearch=null,$resolve_placeholders=false) {
+	static function getAllIdentities($_accountToSearch = null, $resolve_placeholders = false) {
 		$userEMailAdresses = array();
-		foreach(emailadmin_account::search($only_current_user=($_accountToSearch?$_accountToSearch:true), $just_name=true) as $acc_id => $identity_name)
+		foreach (emailadmin_account::search($only_current_user = ($_accountToSearch ? $_accountToSearch : true), $just_name = true) as $acc_id => $identity_name)
 		{
-			$acc = emailadmin_account::read($acc_id,($_accountToSearch?$_accountToSearch:null));
-			if (!$resolve_placeholders) $userEMailAdresses[$acc['ident_id']] = array('acc_id'=>$acc_id,'ident_id'=>$acc['ident_id'],'ident_email'=>$acc['ident_email'],'ident_org'=>$acc['ident_org'],'ident_realname'=>$acc['ident_realname'],'ident_signature'=>$acc['ident_signature'],'ident_name'=>$acc['ident_name']);
+			$acc = emailadmin_account::read($acc_id, ($_accountToSearch ? $_accountToSearch : null));
+			if (!$resolve_placeholders) $userEMailAdresses[$acc['ident_id']] = array('acc_id'=>$acc_id, 'ident_id'=>$acc['ident_id'], 'ident_email'=>$acc['ident_email'], 'ident_org'=>$acc['ident_org'], 'ident_realname'=>$acc['ident_realname'], 'ident_signature'=>$acc['ident_signature'], 'ident_name'=>$acc['ident_name']);
 			$identities = $acc->identities($acc_id);
 
-			foreach($identities as $ik => $ident) {
+			foreach ($identities as $ik => $ident) {
 				//error_log(__METHOD__.' ('.__LINE__.') '.':'.$ik.'->'.array2string($ident));
-				$identity = emailadmin_account::read_identity($ik,$resolve_placeholders);
+				$identity = emailadmin_account::read_identity($ik, $resolve_placeholders);
 				//error_log(__METHOD__.' ('.__LINE__.') '.':'.$ik.'->'.array2string($identity));
-				if (!isset($userEMailAdresses[$identity['ident_id']])) $userEMailAdresses[$identity['ident_id']] = array('acc_id'=>$acc_id,'ident_id'=>$identity['ident_id'],'ident_email'=>$identity['ident_email'],'ident_org'=>$identity['ident_org'],'ident_realname'=>$identity['ident_realname'],'ident_signature'=>$identity['ident_signature'],'ident_name'=>$identity['ident_name']);
+				if (!isset($userEMailAdresses[$identity['ident_id']])) $userEMailAdresses[$identity['ident_id']] = array('acc_id'=>$acc_id, 'ident_id'=>$identity['ident_id'], 'ident_email'=>$identity['ident_email'], 'ident_org'=>$identity['ident_org'], 'ident_realname'=>$identity['ident_realname'], 'ident_signature'=>$identity['ident_signature'], 'ident_name'=>$identity['ident_name']);
 			}
 		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($userEMailAdresses));
@@ -694,9 +694,9 @@ 
 		}
 		$userEMailAdresses = array();
 		$identities = $account->identities(null, true, 'params');
-		foreach($identities as $ik => $ident) {
+		foreach ($identities as $ik => $ident) {
 			//error_log(__METHOD__.' ('.__LINE__.') '.':'.$ik.'->'.array2string($ident));
-			$identity = emailadmin_account::read_identity($ik,true,null,$account);
+			$identity = emailadmin_account::read_identity($ik, true, null, $account);
 			//error_log(__METHOD__.' ('.__LINE__.') '.':'.$ik.'->'.array2string($identity));
 			// standardIdentity has ident_id==acc_id (as it is done within account->identities)
 			if (empty($identity['ident_id'])) $identity['ident_id'] = $identity['acc_id'];
@@ -721,10 +721,10 @@ 
 	 */
 	function getDefaultIdentity() {
 		// retrieve the signature accociated with the identity
-		$id = $this->getIdentitiesWithAccounts($_accountData=array());
+		$id = $this->getIdentitiesWithAccounts($_accountData = array());
 		$acc = emailadmin_account::read($this->profileID);
-		$accountDataIT = ($_accountData[$this->profileID]?$acc->identities($this->profileID,false,'ident_id'):$acc->identities($_accountData[$id],false,'ident_id'));
-		foreach($accountDataIT as $it => $accountData)
+		$accountDataIT = ($_accountData[$this->profileID] ? $acc->identities($this->profileID, false, 'ident_id') : $acc->identities($_accountData[$id], false, 'ident_id'));
+		foreach ($accountDataIT as $it => $accountData)
 		{
 			return $accountData;
 		}
@@ -740,13 +740,13 @@ 
 	{
 		// account select box
 		$selectedID = $this->profileID;
-		$allAccountData = emailadmin_account::search($only_current_user=true, false, null);
+		$allAccountData = emailadmin_account::search($only_current_user = true, false, null);
 		if ($allAccountData) {
-			$rememberFirst=$selectedFound=null;
+			$rememberFirst = $selectedFound = null;
 			foreach ($allAccountData as $tmpkey => $icServers)
 			{
 				if (is_null($rememberFirst)) $rememberFirst = $tmpkey;
-				if ($tmpkey == $selectedID) $selectedFound=true;
+				if ($tmpkey == $selectedID) $selectedFound = true;
 				//error_log(__METHOD__.' ('.__LINE__.') '.' Key:'.$tmpkey.'->'.array2string($icServers->acc_imap_host));
 				$host = $icServers->acc_imap_host;
 				if (empty($host)) continue;
@@ -754,7 +754,7 @@ 
 				//error_log(__METHOD__.' ('.__LINE__.') '.' Key:'.$tmpkey.'->'.array2string($identities[$icServers->acc_id]));
 			}
 		}
-		return ($selectedFound?$selectedID:$rememberFirst);
+		return ($selectedFound ? $selectedID : $rememberFirst);
 	}
 
 	/**
@@ -764,7 +764,7 @@ 
 	 * @var boolean $fullString full or false=NamePart only is returned
 	 * @return string - constructed of identity object data as defined in mailConfig
 	 */
-	static function generateIdentityString($identity, $fullString=true)
+	static function generateIdentityString($identity, $fullString = true)
 	{
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($identity));
 		//if (is_null(self::$mailConfig)) self::$mailConfig = config::read('mail');
@@ -775,16 +775,16 @@ 
 		{
 			case 'email';
 				//$retData = str_replace('@',' ',$identity->emailAddress).($fullString===true?' <'.$identity->emailAddress.'>':'');
-				$retData = $identity['ident_email'].($fullString===true?' <'.$identity['ident_email'].'>':'');
+				$retData = $identity['ident_email'].($fullString === true ? ' <'.$identity['ident_email'].'>' : '');
 				break;
 			case 'nameNemail';
-				$retData = (!empty($identity['ident_realname'])?$identity['ident_realname']:substr_replace($identity['ident_email'],'',strpos($identity['ident_email'],'@'))).($fullString===true?' <'.$identity['ident_email'].'>':'');
+				$retData = (!empty($identity['ident_realname']) ? $identity['ident_realname'] : substr_replace($identity['ident_email'], '', strpos($identity['ident_email'], '@'))).($fullString === true ? ' <'.$identity['ident_email'].'>' : '');
 				break;
 			case 'orgNemail';
-				$retData = (!empty($identity['ident_org'])?$identity['ident_org']:substr_replace($identity['ident_email'],'',0,strpos($identity['ident_email'],'@')+1)).($fullString===true?' <'.$identity['ident_email'].'>':'');
+				$retData = (!empty($identity['ident_org']) ? $identity['ident_org'] : substr_replace($identity['ident_email'], '', 0, strpos($identity['ident_email'], '@') + 1)).($fullString === true ? ' <'.$identity['ident_email'].'>' : '');
 				break;
 			default:
-				$retData = $identity['ident_realname'].(!empty($identity['ident_org'])?' '.$identity['ident_org']:'').($fullString===true?' <'.$identity['ident_email'].'>':'');
+				$retData = $identity['ident_realname'].(!empty($identity['ident_org']) ? ' '.$identity['ident_org'] : '').($fullString === true ? ' <'.$identity['ident_email'].'>' : '');
 		}
 		return $retData;
 	}
@@ -808,7 +808,7 @@ 
 	 */
 	function reopen($_foldername)
 	{
-		if (self::$debugTimes) $starttime = microtime (true);
+		if (self::$debugTimes) $starttime = microtime(true);
 
 		//error_log(__METHOD__.' ('.__LINE__.') '."('$_foldername') ".function_backtrace());
 		// TODO: trying to reduce traffic to the IMAP Server here, introduces problems with fetching the bodies of
@@ -823,7 +823,7 @@ 
 			}
 			$folderOpened = $_foldername;
 		//}
-		if (self::$debugTimes) self::logRunTimes($starttime,null,'Folder:'.$_foldername,__METHOD__.' ('.__LINE__.') ');
+		if (self::$debugTimes) self::logRunTimes($starttime, null, 'Folder:'.$_foldername, __METHOD__.' ('.__LINE__.') ');
 	}
 
 
@@ -834,15 +834,15 @@ 
 	 * @throws Horde_Imap_Client_Exception on connection error or authentication failure
 	 * @throws InvalidArgumentException on missing credentials
 	 */
-	function openConnection($_icServerID=0)
+	function openConnection($_icServerID = 0)
 	{
 		//error_log( "-------------------------->open connection ".function_backtrace());
 		//error_log(__METHOD__.' ('.__LINE__.') '.' ->'.array2string($this->icServer));
-		if (self::$debugTimes) $starttime = microtime (true);
-		$mailbox=null;
+		if (self::$debugTimes) $starttime = microtime(true);
+		$mailbox = null;
 		try
 		{
-			if(isset($this->sessionData['mailbox'])&&$this->folderExists($this->sessionData['mailbox'])) $mailbox = $this->sessionData['mailbox'];
+			if (isset($this->sessionData['mailbox']) && $this->folderExists($this->sessionData['mailbox'])) $mailbox = $this->sessionData['mailbox'];
 			if (empty($mailbox)) $mailbox = $this->icServer->getCurrentMailbox();
 /*
 			if (isset(emailadmin_imap::$supports_keywords[$_icServerID]))
@@ -869,7 +869,7 @@ 
 			error_log(__METHOD__.' ('.__LINE__.') '."->open connection for Server with profileID:".$_icServerID." failed!".$e->getMessage());
 			throw new egw_exception(__METHOD__." failed to ".__METHOD__." on Profile to $_icServerID :".$e->getMessage());
 		}
-		if (self::$debugTimes) self::logRunTimes($starttime,null,'ProfileID:'.$_icServerID,__METHOD__.' ('.__LINE__.') ');
+		if (self::$debugTimes) self::logRunTimes($starttime, null, 'ProfileID:'.$_icServerID, __METHOD__.' ('.__LINE__.') ');
 	}
 
 	/**
@@ -883,13 +883,13 @@ 
 		static $quota;
 		if (isset($quota)) return $quota;
 		$this->icServer->getCurrentMailbox();
-		if(!$this->icServer->hasCapability('QUOTA')) {
+		if (!$this->icServer->hasCapability('QUOTA')) {
 			$quota = false;
 			return false;
 		}
 		$quota = $this->icServer->getStorageQuotaRoot('INBOX');
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($quota));
-		if(is_array($quota)) {
+		if (is_array($quota)) {
 			$quota = array(
 				'usage'	=> $quota['USED'],
 				'limit'	=> $quota['QMAX'],
@@ -907,10 +907,10 @@ 
 	 *
 	 * @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 = ($_use=='SIEVE'?10:20); // this is the default value
+		if (empty($timeout)) $timeout = ($_use == 'SIEVE' ? 10 : 20); // this is the default value
 		return $timeout;
 	}
 
@@ -929,18 +929,18 @@ 
 		if (is_null($nameSpace)) $nameSpace = $this->icServer->getNameSpaceArray();
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($nameSpace));
 		if (is_array($nameSpace)) {
-			foreach($nameSpace as $type => $singleNameSpaceArray)
+			foreach ($nameSpace as $type => $singleNameSpaceArray)
 			{
 				foreach ($singleNameSpaceArray as $k => $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
@@ -949,9 +949,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;
 				}
 				//echo "############## $type->".print_r($foldersNameSpace[$type],true)." ###################<br>";
 			}
@@ -968,10 +968,10 @@ 
 	 */
 	function getFolderPrefixFromNamespace($nameSpace, $folderName)
 	{
-		foreach($nameSpace as &$singleNameSpace)
+		foreach ($nameSpace as &$singleNameSpace)
 		{
 			//if (substr($singleNameSpace['prefix'],0,strlen($folderName))==$folderName) return $singleNameSpace['prefix'];
-			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 "";
 	}
@@ -981,12 +981,12 @@ 
 	 * @var boolean $_useCache
 	 * @return string the hierarchyDelimiter
 	 */
-	function getHierarchyDelimiter($_useCache=true)
+	function getHierarchyDelimiter($_useCache = true)
 	{
 		static $HierarchyDelimiter;
-		if (is_null($HierarchyDelimiter)) $HierarchyDelimiter = egw_cache::getCache(egw_cache::INSTANCE,'email','HierarchyDelimiter'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*24*5);
-		if ($_useCache===false) unset($HierarchyDelimiter[$this->icServer->ImapServerId]);
-		if (isset($HierarchyDelimiter[$this->icServer->ImapServerId])&&!empty($HierarchyDelimiter[$this->icServer->ImapServerId]))
+		if (is_null($HierarchyDelimiter)) $HierarchyDelimiter = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'HierarchyDelimiter'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60 * 60 * 24 * 5);
+		if ($_useCache === false) unset($HierarchyDelimiter[$this->icServer->ImapServerId]);
+		if (isset($HierarchyDelimiter[$this->icServer->ImapServerId]) && !empty($HierarchyDelimiter[$this->icServer->ImapServerId]))
 		{
 			return $HierarchyDelimiter[$this->icServer->ImapServerId];
 		}
@@ -996,11 +996,11 @@ 
 			$this->icServer->getCurrentMailbox();
 			$HierarchyDelimiter[$this->icServer->ImapServerId] = $this->icServer->getDelimiter();
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			$HierarchyDelimiter[$this->icServer->ImapServerId] = '/';
 		}
-		egw_cache::setCache(egw_cache::INSTANCE,'email','HierarchyDelimiter'.trim($GLOBALS['egw_info']['user']['account_id']),$HierarchyDelimiter, 60*60*24*5);
+		egw_cache::setCache(egw_cache::INSTANCE, 'email', 'HierarchyDelimiter'.trim($GLOBALS['egw_info']['user']['account_id']), $HierarchyDelimiter, 60 * 60 * 24 * 5);
 		return $HierarchyDelimiter[$this->icServer->ImapServerId];
 	}
 
@@ -1013,7 +1013,7 @@ 
 	{
 		//error_log(__METHOD__.' ('.__LINE__.') '.':'.$this->icServer->ImapServerId.' Connected:'.$this->icServer->_connected);
 		static $_specialUseFolders;
-		if (is_null($_specialUseFolders)||empty($_specialUseFolders)) $_specialUseFolders = egw_cache::getCache(egw_cache::INSTANCE,'email','specialUseFolders'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*24*5);
+		if (is_null($_specialUseFolders) || empty($_specialUseFolders)) $_specialUseFolders = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'specialUseFolders'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60 * 60 * 24 * 5);
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($this->icServer->acc_folder_trash));
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($this->icServer->acc_folder_sent));
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($this->icServer->acc_folder_draft));
@@ -1021,19 +1021,19 @@ 
 		self::$specialUseFolders = $_specialUseFolders[$this->icServer->ImapServerId];
 		if (isset($_specialUseFolders[$this->icServer->ImapServerId]) && !empty($_specialUseFolders[$this->icServer->ImapServerId]))
 			return $_specialUseFolders[$this->icServer->ImapServerId];
-		$_specialUseFolders[$this->icServer->ImapServerId]=array();
+		$_specialUseFolders[$this->icServer->ImapServerId] = array();
 		//if (!empty($this->icServer->acc_folder_trash) && !isset($_specialUseFolders[$this->icServer->ImapServerId][$this->icServer->acc_folder_trash]))
-			$_specialUseFolders[$this->icServer->ImapServerId][$this->icServer->acc_folder_trash]='Trash';
+			$_specialUseFolders[$this->icServer->ImapServerId][$this->icServer->acc_folder_trash] = 'Trash';
 		//if (!empty($this->icServer->acc_folder_draft) && !isset($_specialUseFolders[$this->icServer->ImapServerId][$this->icServer->acc_folder_draft]))
-			$_specialUseFolders[$this->icServer->ImapServerId][$this->icServer->acc_folder_draft]='Drafts';
+			$_specialUseFolders[$this->icServer->ImapServerId][$this->icServer->acc_folder_draft] = 'Drafts';
 		//if (!empty($this->icServer->acc_folder_sent) && !isset($_specialUseFolders[$this->icServer->ImapServerId][$this->icServer->acc_folder_sent]))
-			$_specialUseFolders[$this->icServer->ImapServerId][$this->icServer->acc_folder_sent]='Sent';
+			$_specialUseFolders[$this->icServer->ImapServerId][$this->icServer->acc_folder_sent] = 'Sent';
 		//if (!empty($this->icServer->acc_folder_template) && !isset($_specialUseFolders[$this->icServer->ImapServerId][$this->icServer->acc_folder_template]))
-			$_specialUseFolders[$this->icServer->ImapServerId][$this->icServer->acc_folder_template]='Templates';
-		$_specialUseFolders[$this->icServer->ImapServerId][$this->icServer->acc_folder_junk]='Junk';
+			$_specialUseFolders[$this->icServer->ImapServerId][$this->icServer->acc_folder_template] = 'Templates';
+		$_specialUseFolders[$this->icServer->ImapServerId][$this->icServer->acc_folder_junk] = 'Junk';
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($_specialUseFolders));//.'<->'.array2string($this->icServer));
 		self::$specialUseFolders = $_specialUseFolders[$this->icServer->ImapServerId];
-		egw_cache::setCache(egw_cache::INSTANCE,'email','specialUseFolders'.trim($GLOBALS['egw_info']['user']['account_id']),$_specialUseFolders, 60*60*24*5);
+		egw_cache::setCache(egw_cache::INSTANCE, 'email', 'specialUseFolders'.trim($GLOBALS['egw_info']['user']['account_id']), $_specialUseFolders, 60 * 60 * 24 * 5);
 		return $_specialUseFolders[$this->icServer->ImapServerId];
 	}
 
@@ -1049,8 +1049,8 @@ 
 	function folderIsSelectable($folderToSelect)
 	{
 		$retval = true;
-		if($folderToSelect && ($folderStatus = $this->getFolderStatus($folderToSelect,false,true))) {
-			if (!empty($folderStatus['attributes']) && stripos(array2string($folderStatus['attributes']),'noselect')!==false)
+		if ($folderToSelect && ($folderStatus = $this->getFolderStatus($folderToSelect, false, true))) {
+			if (!empty($folderStatus['attributes']) && stripos(array2string($folderStatus['attributes']), 'noselect') !== false)
 			{
 				$retval = false;
 			}
@@ -1070,7 +1070,7 @@ 
 	 *
 	 * @throws egw_exception
 	 */
-	function _getStatus($folderName,$ignoreStatusCache=false)
+	function _getStatus($folderName, $ignoreStatusCache = false)
 	{
 		static $folderStatus;
 		if (!$ignoreStatusCache && isset($folderStatus[$this->icServer->ImapServerId][$folderName]))
@@ -1080,7 +1080,7 @@ 
 		}
 		try
 		{
-			$folderStatus[$this->icServer->ImapServerId][$folderName] = $this->icServer->getStatus($folderName,$ignoreStatusCache);
+			$folderStatus[$this->icServer->ImapServerId][$folderName] = $this->icServer->getStatus($folderName, $ignoreStatusCache);
 		}
 		catch (Exception $e)
 		{
@@ -1100,7 +1100,7 @@ 
 	 * @param fetchSubscribedInfo bool fetch Subscribed Info on folder
 	 * @return array
 	 */
-	function getFolderStatus($_folderName,$ignoreStatusCache=false,$basicInfoOnly=false,$fetchSubscribedInfo=true)
+	function getFolderStatus($_folderName, $ignoreStatusCache = false, $basicInfoOnly = false, $fetchSubscribedInfo = true)
 	{
 		if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '." called with:$_folderName,$ignoreStatusCache,$basicInfoOnly");
 		if (!is_string($_folderName) || empty($_folderName)) // something is wrong. Do not proceed
@@ -1113,7 +1113,7 @@ 
 		{
 			$folderInfoCache = $folderBasicInfo[$this->profileID];
 		}
-		if (isset($folderInfoCache[$_folderName]) && $ignoreStatusCache==false && $basicInfoOnly) return $folderInfoCache[$_folderName];
+		if (isset($folderInfoCache[$_folderName]) && $ignoreStatusCache == false && $basicInfoOnly) return $folderInfoCache[$_folderName];
 		$retValue = array();
 		$retValue['subscribed'] = false;
 /*
@@ -1131,28 +1131,28 @@ 
 			if (is_array($ret))
 			{
 				$retkeys = array_keys($ret);
-				if ($retkeys[0]==$_folderName) $folderInfoCache[$_folderName] = $ret[$retkeys[0]];
+				if ($retkeys[0] == $_folderName) $folderInfoCache[$_folderName] = $ret[$retkeys[0]];
 			}
 			else
 			{
-				$folderInfoCache[$_folderName]=false;
+				$folderInfoCache[$_folderName] = false;
 			}
 		}
 		$folderInfo = $folderInfoCache[$_folderName];
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($folderInfo).'->'.function_backtrace());
-		if(!$folderInfo|| !is_array($folderInfo)) {
+		if (!$folderInfo || !is_array($folderInfo)) {
 			try
 			{
-				$folderInfo = $this->_getStatus($_folderName,$ignoreStatusCache);
+				$folderInfo = $this->_getStatus($_folderName, $ignoreStatusCache);
 			}
 			catch (Exception $e)
 			{
-				$folderInfo=null;
+				$folderInfo = null;
 			}
 			if (!is_array($folderInfo))
 			{
 				// no folder info, but there is a status returned for the folder: something is wrong, try to cope with it
-				$folderInfo = is_array($folderInfo)?$folderInfo:array('HIERACHY_DELIMITER'=>$this->getHierarchyDelimiter(),
+				$folderInfo = is_array($folderInfo) ? $folderInfo : array('HIERACHY_DELIMITER'=>$this->getHierarchyDelimiter(),
 					'ATTRIBUTES' => '');
 				if (!isset($folderInfo['HIERACHY_DELIMITER']) || empty($folderInfo['HIERACHY_DELIMITER']) || (isset($folderInfo['delimiter']) && empty($folderInfo['delimiter'])))
 				{
@@ -1164,24 +1164,24 @@ 
 		#if(!is_array($folderInfo)) {
 		#	return false;
 		#}
-		$retValue['delimiter']		= (isset($folderInfo['HIERACHY_DELIMITER']) && $folderInfo['HIERACHY_DELIMITER']?$folderInfo['HIERACHY_DELIMITER']:$folderInfo['delimiter']);
-		$retValue['attributes']		= (isset($folderInfo['ATTRIBUTES']) && $folderInfo['ATTRIBUTES']?$folderInfo['ATTRIBUTES']:$folderInfo['attributes']);
-		$shortNameParts			= explode($retValue['delimiter'], $_folderName);
+		$retValue['delimiter']		= (isset($folderInfo['HIERACHY_DELIMITER']) && $folderInfo['HIERACHY_DELIMITER'] ? $folderInfo['HIERACHY_DELIMITER'] : $folderInfo['delimiter']);
+		$retValue['attributes']		= (isset($folderInfo['ATTRIBUTES']) && $folderInfo['ATTRIBUTES'] ? $folderInfo['ATTRIBUTES'] : $folderInfo['attributes']);
+		$shortNameParts = explode($retValue['delimiter'], $_folderName);
 		$retValue['shortName']		= array_pop($shortNameParts);
 		$retValue['displayName']	= $_folderName;
-		$retValue['shortDisplayName']	= $retValue['shortName'];
-		if(strtoupper($retValue['shortName']) == 'INBOX') {
-			$retValue['displayName']	= lang('INBOX');
-			$retValue['shortDisplayName']	= lang('INBOX');
+		$retValue['shortDisplayName'] = $retValue['shortName'];
+		if (strtoupper($retValue['shortName']) == 'INBOX') {
+			$retValue['displayName'] = lang('INBOX');
+			$retValue['shortDisplayName'] = lang('INBOX');
 		}
 		// translate the automatic Folders (Sent, Drafts, ...) like the INBOX
-		elseif (in_array($retValue['shortName'],self::$autoFolders))
+		elseif (in_array($retValue['shortName'], self::$autoFolders))
 		{
 			$retValue['displayName'] = $retValue['shortDisplayName'] = lang($retValue['shortName']);
 		}
-		if ($folderInfo) $folderBasicInfo[$this->profileID][$_folderName]=$retValue;
+		if ($folderInfo) $folderBasicInfo[$this->profileID][$_folderName] = $retValue;
 		//error_log(__METHOD__.' ('.__LINE__.') '.' '.$_folderName.array2string($retValue['attributes']));
-		if ($basicInfoOnly || (isset($retValue['attributes']) && stripos(array2string($retValue['attributes']),'noselect')!==false))
+		if ($basicInfoOnly || (isset($retValue['attributes']) && stripos(array2string($retValue['attributes']), 'noselect') !== false))
 		{
 			return $retValue;
 		}
@@ -1194,12 +1194,12 @@ 
 		if (is_null($nameSpace) || empty($nameSpace[$this->profileID])) $nameSpace[$this->profileID] = $this->_getNameSpaces();
 		if (!empty($nameSpace[$this->profileID]))
 		{
-			$nsNoPersonal=array();
-			foreach($nameSpace[$this->profileID] as &$ns)
+			$nsNoPersonal = array();
+			foreach ($nameSpace[$this->profileID] as &$ns)
 			{
-				if ($ns['type']!='personal') $nsNoPersonal[]=$ns;
+				if ($ns['type'] != 'personal') $nsNoPersonal[] = $ns;
 			}
-			$nameSpace[$this->profileID]=$nsNoPersonal;
+			$nameSpace[$this->profileID] = $nsNoPersonal;
 		}
 		if (is_null($prefix) || empty($prefix[$this->profileID]) || empty($prefix[$this->profileID][$_folderName])) $prefix[$this->profileID][$_folderName] = $this->getFolderPrefixFromNamespace($nameSpace[$this->profileID], $_folderName);
 
@@ -1208,32 +1208,32 @@ 
 			$subscribedFolders[$this->profileID] = $this->icServer->listSubscribedMailboxes();
 		}
 
-		if($fetchSubscribedInfo && is_array($subscribedFolders[$this->profileID]) && in_array($_folderName,$subscribedFolders[$this->profileID])) {
+		if ($fetchSubscribedInfo && is_array($subscribedFolders[$this->profileID]) && in_array($_folderName, $subscribedFolders[$this->profileID])) {
 			$retValue['subscribed'] = true;
 		}
 
 		try
 		{
 			//$folderStatus = $this->_getStatus($_folderName,$ignoreStatusCache);
-			$folderStatus = $this->getMailBoxCounters($_folderName,false);
-			$retValue['messages']		= $folderStatus['MESSAGES'];
+			$folderStatus = $this->getMailBoxCounters($_folderName, false);
+			$retValue['messages'] = $folderStatus['MESSAGES'];
 			$retValue['recent']		= $folderStatus['RECENT'];
-			$retValue['uidnext']		= $folderStatus['UIDNEXT'];
-			$retValue['uidvalidity']	= $folderStatus['UIDVALIDITY'];
+			$retValue['uidnext'] = $folderStatus['UIDNEXT'];
+			$retValue['uidvalidity'] = $folderStatus['UIDVALIDITY'];
 			$retValue['unseen']		= $folderStatus['UNSEEN'];
 			if (//$retValue['unseen']==0 &&
 				(isset($this->mailPreferences['trustServersUnseenInfo']) && // some servers dont serve the UNSEEN information
-				$this->mailPreferences['trustServersUnseenInfo']==false) ||
+				$this->mailPreferences['trustServersUnseenInfo'] == false) ||
 				(isset($this->mailPreferences['trustServersUnseenInfo']) &&
-				$this->mailPreferences['trustServersUnseenInfo']==2 &&
-				$prefix[$this->profileID][$_folderName] != '' && stripos($_folderName,$prefix[$this->profileID][$_folderName]) !== false)
+				$this->mailPreferences['trustServersUnseenInfo'] == 2 &&
+				$prefix[$this->profileID][$_folderName] != '' && stripos($_folderName, $prefix[$this->profileID][$_folderName]) !== false)
 			)
 			{
 				//error_log(__METHOD__." returned folderStatus for Folder $_folderName:".print_r($prefix,true).' TS:'.$this->mailPreferences['trustServersUnseenInfo']);
 				// we filter for the combined status of unseen and undeleted, as this is what we show in list
 				try
 				{
-					$sortResult = $this->getSortedList($_folderName, $_sort=0, $_reverse=1, array('status'=>array('UNSEEN','UNDELETED')),$byUid=true,false);
+					$sortResult = $this->getSortedList($_folderName, $_sort = 0, $_reverse = 1, array('status'=>array('UNSEEN', 'UNDELETED')), $byUid = true, false);
 					$retValue['unseen'] = $sortResult['count'];
 				}
 				catch (Exception $ee)
@@ -1244,7 +1244,7 @@ 
 		}
 		catch (Exception $e)
 		{
-			if (self::$debug) error_log(__METHOD__." returned folderStatus for Folder $_folderName:".print_r($e->getMessage(),true));
+			if (self::$debug) error_log(__METHOD__." returned folderStatus for Folder $_folderName:".print_r($e->getMessage(), true));
 		}
 
 		return $retValue;
@@ -1265,7 +1265,7 @@ 
 	 * @param boolean $_cacheResult = true try touse the cache of getSortedList
 	 * @return array result as array(header=>array,total=>int,first=>int,last=>int)
 	 */
-	function getHeaders($_folderName, $_startMessage, $_numberOfMessages, $_sort, $_reverse, $_filter, $_thisUIDOnly=null, $_cacheResult=true)
+	function getHeaders($_folderName, $_startMessage, $_numberOfMessages, $_sort, $_reverse, $_filter, $_thisUIDOnly = null, $_cacheResult = true)
 	{
 		//self::$debug=true;
 		if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.function_backtrace());
@@ -1278,7 +1278,7 @@ 
 		$rByUid = true; // try searching by uid. this var will be passed by reference to getSortedList, and may be set to false, if UID retrieval fails
 		#print "<pre>";
 		#$this->icServer->setDebug(true);
-		$total=0;
+		$total = 0;
 		if ($_thisUIDOnly === null)
 		{
 			if (($_startMessage || $_numberOfMessages) && !isset($_filter['range']))
@@ -1291,24 +1291,24 @@ 
 				//$_filter['range'] ="$_startMessage:*";
 			}
 			if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '."$_folderName, $_sort, $reverse, ".array2string($_filter).", $rByUid");
-			if (self::$debug||self::$debugTimes) $starttime = microtime (true);
+			if (self::$debug || self::$debugTimes) $starttime = microtime(true);
 			//see this example below for a 12 week datefilter (since)
 			//$_filter = array('status'=>array('UNDELETED'),'type'=>"SINCE",'string'=> date("d-M-Y", $starttime-(3600*24*7*12)));
 			$_sortResult = $this->getSortedList($_folderName, $_sort, $reverse, $_filter, $rByUid, $_cacheResult);
 			$sortResult = $_sortResult['match']->ids;
 			//$modseq = $_sortResult['modseq'];
 			//error_log(__METHOD__.' ('.__LINE__.') '.'Modsequence:'.$modseq);
-			if (self::$debug||self::$debugTimes) self::logRunTimes($starttime,null,' call getSortedList for Folder:'.$_folderName.' Filter:'.array2string($_filter).' Ids:'.array2string($_thisUIDOnly),__METHOD__.' ('.__LINE__.') ');
+			if (self::$debug || self::$debugTimes) self::logRunTimes($starttime, null, ' call getSortedList for Folder:'.$_folderName.' Filter:'.array2string($_filter).' Ids:'.array2string($_thisUIDOnly), __METHOD__.' ('.__LINE__.') ');
 
 			if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.array2string($sortResult));
 			#$this->icServer->setDebug(false);
 			#print "</pre>";
 			// nothing found
-			if(!is_array($sortResult) || empty($sortResult)) {
+			if (!is_array($sortResult) || empty($sortResult)) {
 				$retValue = array();
 				$retValue['info']['total']	= 0;
 				$retValue['info']['first']	= 0;
-				$retValue['info']['last']	= 0;
+				$retValue['info']['last'] = 0;
 				return $retValue;
 			}
 
@@ -1316,54 +1316,54 @@ 
 			#_debug_array($sortResult);
 			#_debug_array(array_slice($sortResult, -5, -2));
 			//error_log("REVERSE: $reverse");
-			if($reverse === true) {
-				if  ($_startMessage<=$total)
+			if ($reverse === true) {
+				if ($_startMessage <= $total)
 				{
-					$startMessage = $_startMessage-1;
+					$startMessage = $_startMessage - 1;
 				}
 				else
 				{
 					//error_log(__METHOD__.' ('.__LINE__.') '.' Start:'.$_startMessage.' NumberOfMessages:'.$_numberOfMessages.' Total:'.$total);
-					if ($_startMessage+$_numberOfMessages>$total)
+					if ($_startMessage + $_numberOfMessages > $total)
 					{
-						$numberOfMessages = $total%$_numberOfMessages;
+						$numberOfMessages = $total % $_numberOfMessages;
 						//$numberOfMessages = abs($_startMessage-$total-1);
-						if ($numberOfMessages>0 && $numberOfMessages<=$_numberOfMessages) $_numberOfMessages = $numberOfMessages;
+						if ($numberOfMessages > 0 && $numberOfMessages <= $_numberOfMessages) $_numberOfMessages = $numberOfMessages;
 						//error_log(__METHOD__.' ('.__LINE__.') '.' Start:'.$_startMessage.' NumberOfMessages:'.$_numberOfMessages.' Total:'.$total);
 					}
-					$startMessage=($total-$_numberOfMessages)-1;
+					$startMessage = ($total - $_numberOfMessages) - 1;
 					//$retValue['info']['first'] = $startMessage;
 					//$retValue['info']['last'] = $total;
 
 				}
-				if ($startMessage+$_numberOfMessages>$total)
+				if ($startMessage + $_numberOfMessages > $total)
 				{
-					$_numberOfMessages = $_numberOfMessages-($total-($startMessage+$_numberOfMessages));
+					$_numberOfMessages = $_numberOfMessages - ($total - ($startMessage + $_numberOfMessages));
 					//$retValue['info']['first'] = $startMessage;
 					//$retValue['info']['last'] = $total;
 				}
-				if($startMessage > 0) {
-					if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.' StartMessage:'.(-($_numberOfMessages+$startMessage)).', '.-$startMessage.' Number of Messages:'.count($sortResult));
-					$sortResult = array_slice($sortResult, -($_numberOfMessages+$startMessage), -$startMessage);
+				if ($startMessage > 0) {
+					if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.' StartMessage:'.(-($_numberOfMessages + $startMessage)).', '.-$startMessage.' Number of Messages:'.count($sortResult));
+					$sortResult = array_slice($sortResult, -($_numberOfMessages + $startMessage), -$startMessage);
 				} else {
-					if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.' StartMessage:'.(-($_numberOfMessages+($_startMessage-1))).', AllTheRest, Number of Messages:'.count($sortResult));
-					$sortResult = array_slice($sortResult, -($_numberOfMessages+($_startMessage-1)));
+					if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.' StartMessage:'.(-($_numberOfMessages + ($_startMessage - 1))).', AllTheRest, Number of Messages:'.count($sortResult));
+					$sortResult = array_slice($sortResult, -($_numberOfMessages + ($_startMessage - 1)));
 				}
 				$sortResult = array_reverse($sortResult);
 			} else {
-				if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.' StartMessage:'.($_startMessage-1).', '.$_numberOfMessages.' Number of Messages:'.count($sortResult));
-				$sortResult = array_slice($sortResult, $_startMessage-1, $_numberOfMessages);
+				if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.' StartMessage:'.($_startMessage - 1).', '.$_numberOfMessages.' Number of Messages:'.count($sortResult));
+				$sortResult = array_slice($sortResult, $_startMessage - 1, $_numberOfMessages);
 			}
 			if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.array2string($sortResult));
 		}
 		else
 		{
-			$sortResult = (is_array($_thisUIDOnly) ? $_thisUIDOnly:(array)$_thisUIDOnly);
+			$sortResult = (is_array($_thisUIDOnly) ? $_thisUIDOnly : (array)$_thisUIDOnly);
 		}
 
 
 		// fetch the data for the selected messages
-		if (self::$debug||self::$debugTimes) $starttime = microtime(true);
+		if (self::$debug || self::$debugTimes) $starttime = microtime(true);
 		try
 		{
 			$uidsToFetch = new Horde_Imap_Client_Ids();
@@ -1372,20 +1372,20 @@ 
 			$fquery = new Horde_Imap_Client_Fetch_Query();
 
 			// Pre-cache the headers we want, 'fetchHeaders' is a label into the cache
-			$fquery->headers('fetchHeaders',array(
-				'DISPOSITION-NOTIFICATION-TO','RETURN-RECEIPT-TO','X-CONFIRM-READING-TO',
-				'DATE','SUBJECT','FROM','TO','CC',
+			$fquery->headers('fetchHeaders', array(
+				'DISPOSITION-NOTIFICATION-TO', 'RETURN-RECEIPT-TO', 'X-CONFIRM-READING-TO',
+				'DATE', 'SUBJECT', 'FROM', 'TO', 'CC',
 				'X-PRIORITY'
-			),array(
+			), array(
 				// Cache headers, we'll look at them below
-				'cache' => true,//$_cacheResult,
+				'cache' => true, //$_cacheResult,
 				// Set peek so messages are not flagged as read
 				'peek' => true
 			));
 			$fquery->size();
 			$fquery->structure();
 			$fquery->flags();
-			$fquery->imapDate();// needed to ensure getImapDate fetches the internaldate, not the current time
+			$fquery->imapDate(); // needed to ensure getImapDate fetches the internaldate, not the current time
 			$headersNew = $this->icServer->fetch($_folderName, $fquery, array(
 				'ids' => $uidsToFetch,
 			));
@@ -1396,9 +1396,9 @@ 
 			$headersNew = array();
 			$sortResult = array();
 		}
-		if (self::$debug||self::$debugTimes)
+		if (self::$debug || self::$debugTimes)
 		{
-			self::logRunTimes($starttime,null,'HordeFetch: for Folder:'.$_folderName.' Filter:'.array2string($_filter),__METHOD__.' ('.__LINE__.') ');
+			self::logRunTimes($starttime, null, 'HordeFetch: for Folder:'.$_folderName.' Filter:'.array2string($_filter), __METHOD__.' ('.__LINE__.') ');
 			if (self::$debug)
 			{
 				$queryString = implode(',', $sortResult);
@@ -1408,28 +1408,28 @@ 
 
 		$count = 0;
 
-		foreach((array)$sortResult as $uid) {
+		foreach ((array)$sortResult as $uid) {
 			$sortOrder[$uid] = $count++;
 		}
 
 		$count = 0;
 		if (is_object($headersNew)) {
-			if (self::$debug||self::$debugTimes) $starttime = microtime(true);
-			foreach($headersNew->ids() as $id) {
+			if (self::$debug || self::$debugTimes) $starttime = microtime(true);
+			foreach ($headersNew->ids() as $id) {
 				$_headerObject = $headersNew->get($id);
 				//error_log(__METHOD__.' ('.__LINE__.') '.array2string($_headerObject));
 				$headerObject = array();
-				$uid = $headerObject['UID']= ($_headerObject->getUid()?$_headerObject->getUid():$id);
+				$uid = $headerObject['UID'] = ($_headerObject->getUid() ? $_headerObject->getUid() : $id);
 				$headerObject['MSG_NUM'] = $_headerObject->getSeq();
 				$headerObject['SIZE'] = $_headerObject->getSize();
 				$headerObject['INTERNALDATE'] = $_headerObject->getImapDate();
 
 				// Get already cached headers, 'fetchHeaders' is a label matchimg above
-				$headerForPrio = array_change_key_case($_headerObject->getHeaders('fetchHeaders',Horde_Imap_Client_Data_Fetch::HEADER_PARSE)->toArray(), CASE_UPPER);
+				$headerForPrio = array_change_key_case($_headerObject->getHeaders('fetchHeaders', Horde_Imap_Client_Data_Fetch::HEADER_PARSE)->toArray(), CASE_UPPER);
 				// Try to fetch header with key='' as some servers might have no fetchHeaders index. e.g. yandex.com
-				if (empty($headerForPrio)) $headerForPrio = array_change_key_case($_headerObject->getHeaders('',Horde_Imap_Client_Data_Fetch::HEADER_PARSE)->toArray(), CASE_UPPER);
+				if (empty($headerForPrio)) $headerForPrio = array_change_key_case($_headerObject->getHeaders('', Horde_Imap_Client_Data_Fetch::HEADER_PARSE)->toArray(), CASE_UPPER);
 				if (self::$debug) {
-					error_log(__METHOD__.' ('.__LINE__.') '.array2string($_headerObject).'UID:'.$_headerObject->getUid().' Size:'.$_headerObject->getSize().' Date:'.$_headerObject->getImapDate().'/'.egw_time::to($_headerObject->getImapDate(),'Y-m-d H:i:s'));
+					error_log(__METHOD__.' ('.__LINE__.') '.array2string($_headerObject).'UID:'.$_headerObject->getUid().' Size:'.$_headerObject->getSize().' Date:'.$_headerObject->getImapDate().'/'.egw_time::to($_headerObject->getImapDate(), 'Y-m-d H:i:s'));
 					error_log(__METHOD__.' ('.__LINE__.') '.array2string($headerForPrio));
 				}
 
@@ -1439,24 +1439,24 @@ 
 					$total--;
 					continue;
 				}
-				if ( isset($headerForPrio['DISPOSITION-NOTIFICATION-TO']) ) {
+				if (isset($headerForPrio['DISPOSITION-NOTIFICATION-TO'])) {
 					$headerObject['DISPOSITION-NOTIFICATION-TO'] = self::decode_header(trim($headerForPrio['DISPOSITION-NOTIFICATION-TO']));
-				} else if ( isset($headerForPrio['RETURN-RECEIPT-TO']) ) {
+				} else if (isset($headerForPrio['RETURN-RECEIPT-TO'])) {
 					$headerObject['DISPOSITION-NOTIFICATION-TO'] = self::decode_header(trim($headerForPrio['RETURN-RECEIPT-TO']));
-				} else if ( isset($headerForPrio['X-CONFIRM-READING-TO']) ) {
+				} else if (isset($headerForPrio['X-CONFIRM-READING-TO'])) {
 					$headerObject['DISPOSITION-NOTIFICATION-TO'] = self::decode_header(trim($headerForPrio['X-CONFIRM-READING-TO']));
 				} /*else $sent_not = "";*/
 				//error_log(__METHOD__.' ('.__LINE__.') '.array2string($headerObject));
 				$headerObject['DATE'] = $headerForPrio['DATE'];
-				$headerObject['SUBJECT'] = (is_array($headerForPrio['SUBJECT'])?$headerForPrio['SUBJECT'][0]:$headerForPrio['SUBJECT']);
-				$headerObject['FROM'] = (array)($headerForPrio['FROM']?$headerForPrio['FROM']:($headerForPrio['REPLY-TO']?$headerForPrio['REPLY-TO']:$headerForPrio['RETURN-PATH']));
+				$headerObject['SUBJECT'] = (is_array($headerForPrio['SUBJECT']) ? $headerForPrio['SUBJECT'][0] : $headerForPrio['SUBJECT']);
+				$headerObject['FROM'] = (array)($headerForPrio['FROM'] ? $headerForPrio['FROM'] : ($headerForPrio['REPLY-TO'] ? $headerForPrio['REPLY-TO'] : $headerForPrio['RETURN-PATH']));
 				$headerObject['TO'] = (array)$headerForPrio['TO'];
-				$headerObject['CC'] = isset($headerForPrio['CC'])?(array)$headerForPrio['CC']:array();
-				$headerObject['PRIORITY'] = isset($headerForPrio['X-PRIORITY'])?$headerForPrio['X-PRIORITY']:null;
-				foreach (array('FROM','TO','CC') as $_k => $key)
+				$headerObject['CC'] = isset($headerForPrio['CC']) ? (array)$headerForPrio['CC'] : array();
+				$headerObject['PRIORITY'] = isset($headerForPrio['X-PRIORITY']) ? $headerForPrio['X-PRIORITY'] : null;
+				foreach (array('FROM', 'TO', 'CC') as $_k => $key)
 				{
 					$address = array();
-					$remember=null;
+					$remember = null;
 					foreach ($headerObject[$key] as $k => $ad)
 					{
 						//the commented section below IS a simplified version of the section "make sure ..."
@@ -1476,7 +1476,7 @@ 
 						foreach ($rfcAddr as $_rfcAddr)
 						{
 							if (!$_rfcAddr->valid)	continue; // skip. not a valid address
-							$address[] = imap_rfc822_write_address($_rfcAddr->mailbox,$_rfcAddr->host,$_rfcAddr->personal);
+							$address[] = imap_rfc822_write_address($_rfcAddr->mailbox, $_rfcAddr->host, $_rfcAddr->personal);
 						}
 					}
 					$headerObject[$key] = $address;
@@ -1486,12 +1486,12 @@ 
 				//error_log(__METHOD__.' ('.__LINE__.') '.array2string($headerObject));
 				//error_log(__METHOD__.' ('.__LINE__.') '.' MimeMap:'.array2string($mailStructureObject->contentTypeMap()));
 				//foreach ($_headerObject->getStructure()->getParts() as $p => $part)
-				$headerObject['ATTACHMENTS']=null;
-				$skipParts=array();
-				$messageMimeType='';
+				$headerObject['ATTACHMENTS'] = null;
+				$skipParts = array();
+				$messageMimeType = '';
 				foreach ($mailStructureObject->contentTypeMap() as $mime_id => $mime_type)
 				{
-					if ($mime_id==0 || $messageMimeType==='') $messageMimeType = $mime_type;
+					if ($mime_id == 0 || $messageMimeType === '') $messageMimeType = $mime_type;
 					$part = $mailStructureObject->getPart($mime_id);
 					$partdisposition = $part->getDisposition();
 					$partPrimaryType = $part->getPrimaryType();
@@ -1502,28 +1502,28 @@ 
 						// the presence of an cid does not necessarily indicate its inline. it may lack the needed
 						// link to show the image. Considering this: we "list" everything that matches the above criteria
 						// as attachment in order to not loose/miss information on our data
-						$partdisposition='attachment';//($partPrimaryType == 'image'&&!empty($cid)?'inline':'attachment');
+						$partdisposition = 'attachment'; //($partPrimaryType == 'image'&&!empty($cid)?'inline':'attachment');
 					}
-					if ($mime_type=='message/rfc822')
+					if ($mime_type == 'message/rfc822')
 					{
 						//error_log(__METHOD__.' ('.__LINE__.') '.' Uid:'.$uid.'->'.$mime_id.':'.array2string($part->contentTypeMap()));
-						foreach($part->contentTypeMap() as $sub_id => $sub_type) { if ($sub_id != $mime_id) $skipParts[$sub_id] = $sub_type;}
+						foreach ($part->contentTypeMap() as $sub_id => $sub_type) { if ($sub_id != $mime_id) $skipParts[$sub_id] = $sub_type; }
 					}
 					//error_log(__METHOD__.' ('.__LINE__.') '.' Uid:'.$uid.'->'.$mime_id.' Disp:'.$partdisposition.' Type:'.$partPrimaryType.' Skip:'.array2string($skipParts));
-					if (array_key_exists($mime_id,$skipParts)) continue;
-					if ($partdisposition=='attachment' ||
-						($partdisposition=='inline'&&$partPrimaryType == 'image'&&$mime_type=='image/tiff') || // as we are not able to display tiffs
-						($partdisposition=='inline'&&$partPrimaryType == 'image'&&empty($cid)) ||
-						($partdisposition=='inline' && $partPrimaryType != 'image' && $partPrimaryType != 'multipart' && $partPrimaryType != 'text'))
+					if (array_key_exists($mime_id, $skipParts)) continue;
+					if ($partdisposition == 'attachment' ||
+						($partdisposition == 'inline' && $partPrimaryType == 'image' && $mime_type == 'image/tiff') || // as we are not able to display tiffs
+						($partdisposition == 'inline' && $partPrimaryType == 'image' && empty($cid)) ||
+						($partdisposition == 'inline' && $partPrimaryType != 'image' && $partPrimaryType != 'multipart' && $partPrimaryType != 'text'))
 					{
-						$headerObject['ATTACHMENTS'][$mime_id]=$part->getAllDispositionParameters();
-						$headerObject['ATTACHMENTS'][$mime_id]['mimeType']=$mime_type;
-						$headerObject['ATTACHMENTS'][$mime_id]['uid']=$uid;
+						$headerObject['ATTACHMENTS'][$mime_id] = $part->getAllDispositionParameters();
+						$headerObject['ATTACHMENTS'][$mime_id]['mimeType'] = $mime_type;
+						$headerObject['ATTACHMENTS'][$mime_id]['uid'] = $uid;
 						$headerObject['ATTACHMENTS'][$mime_id]['cid'] = $cid;
-						$headerObject['ATTACHMENTS'][$mime_id]['partID']=$mime_id;
-						if (!isset($headerObject['ATTACHMENTS'][$mime_id]['name']))$headerObject['ATTACHMENTS'][$mime_id]['name']=$part->getName();
-						if (!strcasecmp($headerObject['ATTACHMENTS'][$mime_id]['name'],'winmail.dat') ||
-							$headerObject['ATTACHMENTS'][$mime_id]['mimeType']=='application/ms-tnef')
+						$headerObject['ATTACHMENTS'][$mime_id]['partID'] = $mime_id;
+						if (!isset($headerObject['ATTACHMENTS'][$mime_id]['name']))$headerObject['ATTACHMENTS'][$mime_id]['name'] = $part->getName();
+						if (!strcasecmp($headerObject['ATTACHMENTS'][$mime_id]['name'], 'winmail.dat') ||
+							$headerObject['ATTACHMENTS'][$mime_id]['mimeType'] == 'application/ms-tnef')
 						{
 							$headerObject['ATTACHMENTS'][$mime_id]['is_winmail'] = true;
 						}
@@ -1538,53 +1538,53 @@ 
 				if (empty($headerObject['UID'])) continue;
 				//$uid = ($rByUid ? $headerObject['UID'] : $headerObject['MSG_NUM']);
 				// make dates like "Mon, 23 Apr 2007 10:11:06 UT" working with strtotime
-				if(substr($headerObject['DATE'],-2) === 'UT') {
+				if (substr($headerObject['DATE'], -2) === 'UT') {
 					$headerObject['DATE'] .= 'C';
 				}
-				if(substr($headerObject['INTERNALDATE'],-2) === 'UT') {
+				if (substr($headerObject['INTERNALDATE'], -2) === 'UT') {
 					$headerObject['INTERNALDATE'] .= 'C';
 				}
 				//error_log(__METHOD__.' ('.__LINE__.') '.' '.$headerObject['SUBJECT'].'->'.$headerObject['DATE'].'<->'.$headerObject['INTERNALDATE'] .'#');
 				//error_log(__METHOD__.' ('.__LINE__.') '.' '.$this->decode_subject($headerObject['SUBJECT']).'->'.$headerObject['DATE']);
-				if (isset($headerObject['ATTACHMENTS']) && count($headerObject['ATTACHMENTS'])) foreach ($headerObject['ATTACHMENTS'] as &$a) { $retValue['header'][$sortOrder[$uid]]['attachments'][]=$a;}
-				$retValue['header'][$sortOrder[$uid]]['subject']	= $this->decode_subject($headerObject['SUBJECT']);
-				$retValue['header'][$sortOrder[$uid]]['size'] 		= $headerObject['SIZE'];
-				$retValue['header'][$sortOrder[$uid]]['date']		= self::_strtotime(($headerObject['DATE']&&!($headerObject['DATE']=='NIL')?$headerObject['DATE']:$headerObject['INTERNALDATE']),'ts',true);
-				$retValue['header'][$sortOrder[$uid]]['internaldate']= self::_strtotime($headerObject['INTERNALDATE'],'ts',true);
-				$retValue['header'][$sortOrder[$uid]]['mimetype']	= $messageMimeType;
-				$retValue['header'][$sortOrder[$uid]]['id']		= $headerObject['MSG_NUM'];
-				$retValue['header'][$sortOrder[$uid]]['uid']		= $headerObject['UID'];
-				$retValue['header'][$sortOrder[$uid]]['priority']		= ($headerObject['PRIORITY']?$headerObject['PRIORITY']:3);
+				if (isset($headerObject['ATTACHMENTS']) && count($headerObject['ATTACHMENTS'])) foreach ($headerObject['ATTACHMENTS'] as &$a) { $retValue['header'][$sortOrder[$uid]]['attachments'][] = $a; }
+				$retValue['header'][$sortOrder[$uid]]['subject'] = $this->decode_subject($headerObject['SUBJECT']);
+				$retValue['header'][$sortOrder[$uid]]['size'] = $headerObject['SIZE'];
+				$retValue['header'][$sortOrder[$uid]]['date'] = self::_strtotime(($headerObject['DATE'] && !($headerObject['DATE'] == 'NIL') ? $headerObject['DATE'] : $headerObject['INTERNALDATE']), 'ts', true);
+				$retValue['header'][$sortOrder[$uid]]['internaldate'] = self::_strtotime($headerObject['INTERNALDATE'], 'ts', true);
+				$retValue['header'][$sortOrder[$uid]]['mimetype'] = $messageMimeType;
+				$retValue['header'][$sortOrder[$uid]]['id'] = $headerObject['MSG_NUM'];
+				$retValue['header'][$sortOrder[$uid]]['uid'] = $headerObject['UID'];
+				$retValue['header'][$sortOrder[$uid]]['priority'] = ($headerObject['PRIORITY'] ? $headerObject['PRIORITY'] : 3);
 				//error_log(__METHOD__.' ('.__LINE__.') '.' '.array2string($retValue['header'][$sortOrder[$uid]]));
 				if (isset($headerObject['DISPOSITION-NOTIFICATION-TO'])) $retValue['header'][$sortOrder[$uid]]['disposition-notification-to'] = $headerObject['DISPOSITION-NOTIFICATION-TO'];
 				if (is_array($headerObject['FLAGS'])) {
-					$retValue['header'][$sortOrder[$uid]] = array_merge($retValue['header'][$sortOrder[$uid]],self::prepareFlagsArray($headerObject));
+					$retValue['header'][$sortOrder[$uid]] = array_merge($retValue['header'][$sortOrder[$uid]], self::prepareFlagsArray($headerObject));
 				}
 				//error_log(__METHOD__.' ('.__LINE__.') '.$headerObject['SUBJECT'].'->'.array2string($_headerObject->getEnvelope()->__get('from')));
-				if(is_array($headerObject['FROM']) && $headerObject['FROM'][0]) {
-					$retValue['header'][$sortOrder[$uid]]['sender_address'] = self::decode_header($headerObject['FROM'][0],true);
+				if (is_array($headerObject['FROM']) && $headerObject['FROM'][0]) {
+					$retValue['header'][$sortOrder[$uid]]['sender_address'] = self::decode_header($headerObject['FROM'][0], true);
 				}
-				if(is_array($headerObject['TO']) && $headerObject['TO'][0]) {
-					$retValue['header'][$sortOrder[$uid]]['to_address'] = self::decode_header($headerObject['TO'][0],true);
-					if (count($headerObject['TO'])>1)
+				if (is_array($headerObject['TO']) && $headerObject['TO'][0]) {
+					$retValue['header'][$sortOrder[$uid]]['to_address'] = self::decode_header($headerObject['TO'][0], true);
+					if (count($headerObject['TO']) > 1)
 					{
-						$ki=0;
-						foreach($headerObject['TO'] as $k => $add)
+						$ki = 0;
+						foreach ($headerObject['TO'] as $k => $add)
 						{
-							if ($k==0) continue;
+							if ($k == 0) continue;
 							//error_log(__METHOD__.' ('.__LINE__.') '."-> $k:".array2string($add));
-							$retValue['header'][$sortOrder[$uid]]['additional_to_addresses'][$ki] = self::decode_header($add,true);
+							$retValue['header'][$sortOrder[$uid]]['additional_to_addresses'][$ki] = self::decode_header($add, true);
 							//error_log(__METHOD__.' ('.__LINE__.') '.array2string($retValue['header'][$sortOrder[$uid]]['additional_to_addresses'][$ki]));
 							$ki++;
 						}
 					}
 				}
-				if(is_array($headerObject['CC']) && count($headerObject['CC'])>0) {
-					$ki=0;
-					foreach($headerObject['CC'] as $k => $add)
+				if (is_array($headerObject['CC']) && count($headerObject['CC']) > 0) {
+					$ki = 0;
+					foreach ($headerObject['CC'] as $k => $add)
 					{
 						//error_log(__METHOD__.' ('.__LINE__.') '."-> $k:".array2string($add));
-						$retValue['header'][$sortOrder[$uid]]['cc_addresses'][$ki] = self::decode_header($add,true);
+						$retValue['header'][$sortOrder[$uid]]['cc_addresses'][$ki] = self::decode_header($add, true);
 						//error_log(__METHOD__.' ('.__LINE__.') '.array2string($retValue['header'][$sortOrder[$uid]]['additional_to_addresses'][$ki]));
 						$ki++;
 					}
@@ -1593,27 +1593,27 @@ 
 
 				$count++;
 			}
-			if (self::$debug||self::$debugTimes) self::logRunTimes($starttime,null,' fetching Headers and stuff for Folder:'.$_folderName,__METHOD__.' ('.__LINE__.') ');
+			if (self::$debug || self::$debugTimes) self::logRunTimes($starttime, null, ' fetching Headers and stuff for Folder:'.$_folderName, __METHOD__.' ('.__LINE__.') ');
 			//self::$debug=false;
 			// sort the messages to the requested displayorder
-			if(is_array($retValue['header'])) {
+			if (is_array($retValue['header'])) {
 				$countMessages = $total;
 				if (isset($_filter['range'])) $countMessages = self::$folderStatusCache[$this->profileID][$_folderName]['messages'];
 				ksort($retValue['header']);
 				$retValue['info']['total']	= $total;
 				//if ($_startMessage>$total) $_startMessage = $total-($count-1);
 				$retValue['info']['first']	= $_startMessage;
-				$retValue['info']['last']	= $_startMessage + $count - 1 ;
+				$retValue['info']['last'] = $_startMessage + $count - 1;
 				return $retValue;
 			} else {
 				$retValue = array();
 				$retValue['info']['total']	= 0;
 				$retValue['info']['first']	= 0;
-				$retValue['info']['last']	= 0;
+				$retValue['info']['last'] = 0;
 				return $retValue;
 			}
 		} else {
-			if ($headersNew == null && empty($_thisUIDOnly)) error_log(__METHOD__." -> retrieval of Message Details to Query $queryString failed: ".print_r($headersNew,TRUE));
+			if ($headersNew == null && empty($_thisUIDOnly)) error_log(__METHOD__." -> retrieval of Message Details to Query $queryString failed: ".print_r($headersNew, TRUE));
 			$retValue = array();
 			$retValue['info']['total']  = 0;
 			$retValue['info']['first']  = 0;
@@ -1630,17 +1630,17 @@ 
 	 */
 	static function prepareFlagsArray($headerObject)
 	{
-		if (is_array($headerObject['FLAGS'])) $headerFlags = array_map('strtolower',$headerObject['FLAGS']);
+		if (is_array($headerObject['FLAGS'])) $headerFlags = array_map('strtolower', $headerObject['FLAGS']);
 		$retValue = array();
 		$retValue['recent']		= in_array('\\recent', $headerFlags);
 		$retValue['flagged']	= in_array('\\flagged', $headerFlags);
-		$retValue['answered']	= in_array('\\answered', $headerFlags);
-		$retValue['forwarded']   = in_array('$forwarded', $headerFlags);
+		$retValue['answered'] = in_array('\\answered', $headerFlags);
+		$retValue['forwarded'] = in_array('$forwarded', $headerFlags);
 		$retValue['deleted']	= in_array('\\deleted', $headerFlags);
-		$retValue['seen']		= in_array('\\seen', $headerFlags);
-		$retValue['draft']		= in_array('\\draft', $headerFlags);
-		$retValue['mdnsent']	= in_array('$mdnsent', $headerFlags)||in_array('mdnsent', $headerFlags);
-		$retValue['mdnnotsent']	= in_array('$mdnnotsent', $headerFlags)||in_array('mdnnotsent', $headerFlags);
+		$retValue['seen'] = in_array('\\seen', $headerFlags);
+		$retValue['draft'] = in_array('\\draft', $headerFlags);
+		$retValue['mdnsent']	= in_array('$mdnsent', $headerFlags) || in_array('mdnsent', $headerFlags);
+		$retValue['mdnnotsent'] = in_array('$mdnnotsent', $headerFlags) || in_array('mdnnotsent', $headerFlags);
 		$retValue['label1']   = in_array('$label1', $headerFlags);
 		$retValue['label2']   = in_array('$label2', $headerFlags);
 		$retValue['label3']   = in_array('$label3', $headerFlags);
@@ -1664,12 +1664,12 @@ 
 	 * @param bool $setSession if set to true the session will be populated with the result of the query
 	 * @return mixed bool/array false or array of ids
 	 */
-	function getSortedList($_folderName, $_sort, &$_reverse, $_filter, &$resultByUid=true, $setSession=true)
+	function getSortedList($_folderName, $_sort, &$_reverse, $_filter, &$resultByUid = true, $setSession = true)
 	{
 		static $cachedFolderStatus;
 		// in the past we needed examineMailbox to figure out if the server with the serverID support keywords
 		// this information is filled/provided by examineMailbox; but caching within one request seems o.k.
-		if (is_null($cachedFolderStatus) || !isset($cachedFolderStatus[$this->profileID][$_folderName]) )
+		if (is_null($cachedFolderStatus) || !isset($cachedFolderStatus[$this->profileID][$_folderName]))
 		{
 			$folderStatus = $cachedFolderStatus[$this->profileID][$_folderName] = $this->icServer->examineMailbox($_folderName);
 		}
@@ -1681,27 +1681,27 @@ 
 		//error_log(__METHOD__.' ('.__LINE__.') '.' Filter:'.array2string($_filter));
 		$try2useCache = true;
 		static $eMailListContainsDeletedMessages;
-		if (is_null($eMailListContainsDeletedMessages)) $eMailListContainsDeletedMessages = egw_cache::getCache(egw_cache::INSTANCE,'email','eMailListContainsDeletedMessages'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*1);
+		if (is_null($eMailListContainsDeletedMessages)) $eMailListContainsDeletedMessages = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'eMailListContainsDeletedMessages'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60 * 60 * 1);
 		// this indicates, that there is no Filter set, and the returned set/subset should not contain DELETED Messages, nor filtered for UNDELETED
-		if ($setSession==true && ((strpos(array2string($_filter), 'UNDELETED') === false && strpos(array2string($_filter), 'DELETED') === false)))
+		if ($setSession == true && ((strpos(array2string($_filter), 'UNDELETED') === false && strpos(array2string($_filter), 'DELETED') === false)))
 		{
 			if (self::$debugTimes) $starttime = microtime(true);
-			if (is_null($eMailListContainsDeletedMessages) || empty($eMailListContainsDeletedMessages[$this->profileID]) || empty($eMailListContainsDeletedMessages[$this->profileID][$_folderName])) $eMailListContainsDeletedMessages = egw_cache::getCache(egw_cache::INSTANCE,'email','eMailListContainsDeletedMessages'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*1);
-			$deletedMessages = $this->getSortedList($_folderName, 0, $three=1, array('status'=>array('DELETED')),$five=true,false);
+			if (is_null($eMailListContainsDeletedMessages) || empty($eMailListContainsDeletedMessages[$this->profileID]) || empty($eMailListContainsDeletedMessages[$this->profileID][$_folderName])) $eMailListContainsDeletedMessages = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'eMailListContainsDeletedMessages'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60 * 60 * 1);
+			$deletedMessages = $this->getSortedList($_folderName, 0, $three = 1, array('status'=>array('DELETED')), $five = true, false);
 			if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') Found DeletedMessages:'.array2string($eMailListContainsDeletedMessages));
-			$eMailListContainsDeletedMessages[$this->profileID][$_folderName] =$deletedMessages['count'];
-			egw_cache::setCache(egw_cache::INSTANCE,'email','eMailListContainsDeletedMessages'.trim($GLOBALS['egw_info']['user']['account_id']),$eMailListContainsDeletedMessages, 60*60*1);
-			if (self::$debugTimes) self::logRunTimes($starttime,null,'setting eMailListContainsDeletedMessages for Profile:'.$this->profileID.' Folder:'.$_folderName.' to '.$eMailListContainsDeletedMessages[$this->profileID][$_folderName],__METHOD__.' ('.__LINE__.') ');			//error_log(__METHOD__.' ('.__LINE__.') '.' Profile:'.$this->profileID.' Folder:'.$_folderName.' -> EXISTS/SessStat:'.array2string($folderStatus['MESSAGES']).'/'.self::$folderStatusCache[$this->profileID][$_folderName]['messages'].' ListContDelMsg/SessDeleted:'.$eMailListContainsDeletedMessages[$this->profileID][$_folderName].'/'.self::$folderStatusCache[$this->profileID][$_folderName]['deleted']);
+			$eMailListContainsDeletedMessages[$this->profileID][$_folderName] = $deletedMessages['count'];
+			egw_cache::setCache(egw_cache::INSTANCE, 'email', 'eMailListContainsDeletedMessages'.trim($GLOBALS['egw_info']['user']['account_id']), $eMailListContainsDeletedMessages, 60 * 60 * 1);
+			if (self::$debugTimes) self::logRunTimes($starttime, null, 'setting eMailListContainsDeletedMessages for Profile:'.$this->profileID.' Folder:'.$_folderName.' to '.$eMailListContainsDeletedMessages[$this->profileID][$_folderName], __METHOD__.' ('.__LINE__.') '); //error_log(__METHOD__.' ('.__LINE__.') '.' Profile:'.$this->profileID.' Folder:'.$_folderName.' -> EXISTS/SessStat:'.array2string($folderStatus['MESSAGES']).'/'.self::$folderStatusCache[$this->profileID][$_folderName]['messages'].' ListContDelMsg/SessDeleted:'.$eMailListContainsDeletedMessages[$this->profileID][$_folderName].'/'.self::$folderStatusCache[$this->profileID][$_folderName]['deleted']);
 		}
 		$try2useCache = false;
 		//self::$supportsORinQuery[$this->profileID]=true;
 		if (is_null(self::$supportsORinQuery) || !isset(self::$supportsORinQuery[$this->profileID]))
 		{
-			self::$supportsORinQuery = egw_cache::getCache(egw_cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*10);
-			if (!isset(self::$supportsORinQuery[$this->profileID])) self::$supportsORinQuery[$this->profileID]=true;
+			self::$supportsORinQuery = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60 * 60 * 10);
+			if (!isset(self::$supportsORinQuery[$this->profileID])) self::$supportsORinQuery[$this->profileID] = true;
 		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($_filter).' SupportsOrInQuery:'.self::$supportsORinQuery[$this->profileID]);
-		$filter = $this->createIMAPFilter($_folderName, $_filter,self::$supportsORinQuery[$this->profileID]);
+		$filter = $this->createIMAPFilter($_folderName, $_filter, self::$supportsORinQuery[$this->profileID]);
 		if (self::$debug)
 		{
 			$query_str = $filter->build();
@@ -1709,14 +1709,14 @@ 
 		}
 		//_debug_array($filter);
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($filter).'#'.array2string($this->icServer->capability()));
-		if($this->icServer->hasCapability('SORT')) {
+		if ($this->icServer->hasCapability('SORT')) {
 			// when using an orQuery and we sort by date. sort seems to fail on certain servers => ZIMBRA with Horde_Imap_Client
 			// thus we translate the search request from date to Horde_Imap_Client::SORT_SEQUENCE (which should be the same, if
 			// there is no messing with the dates)
 			//if (self::$supportsORinQuery[$this->profileID]&&$_sort=='date'&&$_filter['type']=='quick'&&!empty($_filter['string']))$_sort='INTERNALDATE';
 			if (self::$debug) error_log(__METHOD__." Mailserver has SORT Capability, SortBy: ".array2string($_sort)." Reverse: $_reverse");
 			$sortOrder = $this->_getSortString($_sort, $_reverse);
-			if ($_reverse && in_array(Horde_Imap_Client::SORT_REVERSE,$sortOrder)) $_reverse=false; // as we reversed the result already
+			if ($_reverse && in_array(Horde_Imap_Client::SORT_REVERSE, $sortOrder)) $_reverse = false; // as we reversed the result already
 			if (self::$debug) error_log(__METHOD__." Mailserver runs SORT: SortBy:".array2string($_sort)."->".array2string($sortOrder)." Filter: ".array2string($filter));
 			try
 			{
@@ -1724,24 +1724,24 @@ 
 					'sort' => $sortOrder,));
 			// if there is an Error, we assume that the server is not capable of sorting
 			}
-			catch(Exception $e)
+			catch (Exception $e)
 			{
 				//error_log(__METHOD__.'('.__LINE__.'):'.$e->getMessage());
 				$resultByUid = false;
 				$sortOrder = array(Horde_Imap_Client::SORT_SEQUENCE);
-				if ($_reverse) array_unshift($sortOrder,Horde_Imap_Client::SORT_REVERSE);
+				if ($_reverse) array_unshift($sortOrder, Horde_Imap_Client::SORT_REVERSE);
 				try
 				{
 					$sortResult = $this->icServer->search($_folderName, $filter, array(
 						'sort' => $sortOrder));
 				}
-				catch(Exception $e)
+				catch (Exception $e)
 				{
 					error_log(__METHOD__.'('.__LINE__.'):'.$e->getMessage());
 					$sortResult = self::$folderStatusCache[$this->profileID][$_folderName]['sortResult'];
 				}
 			}
-			if (self::$debug) error_log(__METHOD__.print_r($sortResult,true));
+			if (self::$debug) error_log(__METHOD__.print_r($sortResult, true));
 		} else {
 			if (self::$debug) error_log(__METHOD__." Mailserver has NO SORT Capability");
 			//$sortOrder = array(Horde_Imap_Client::SORT_SEQUENCE);
@@ -1751,12 +1751,12 @@ 
 				$sortResult = $this->icServer->search($_folderName, $filter, array()/*array(
 					'sort' => $sortOrder)*/);
 			}
-			catch(Exception $e)
+			catch (Exception $e)
 			{
 				//error_log(__METHOD__.'('.__LINE__.'):'.$e->getMessage());
 				// possible error OR Query. But Horde gives no detailed Info :-(
-				self::$supportsORinQuery[$this->profileID]=false;
-				egw_cache::setCache(egw_cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']),self::$supportsORinQuery,60*60*10);
+				self::$supportsORinQuery[$this->profileID] = false;
+				egw_cache::setCache(egw_cache::INSTANCE, 'email', 'supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), self::$supportsORinQuery, 60 * 60 * 10);
 				if (self::$debug) error_log(__METHOD__.__LINE__." Mailserver seems to have NO OR Capability for Search:".$sortResult->message);
 				$filter = $this->createIMAPFilter($_folderName, $_filter, self::$supportsORinQuery[$this->profileID]);
 				try
@@ -1764,25 +1764,25 @@ 
 					$sortResult = $this->icServer->search($_folderName, $filter, array()/*array(
 						'sort' => $sortOrder)*/);
 				}
-				catch(Exception $e)
+				catch (Exception $e)
 				{
 				}
 			}
-			if(is_array($sortResult['match'])) {
+			if (is_array($sortResult['match'])) {
 					// not sure that this is going so succeed as $sortResult['match'] is a hordeObject
 					sort($sortResult['match'], SORT_NUMERIC);
 			}
-			if (self::$debug) error_log(__METHOD__." using Filter:".print_r($filter,true)." ->".print_r($sortResult,true));
+			if (self::$debug) error_log(__METHOD__." using Filter:".print_r($filter, true)." ->".print_r($sortResult, true));
 		}
 		if ($setSession)
 		{
 			self::$folderStatusCache[$this->profileID][$_folderName]['uidValidity'] = $folderStatus['UIDVALIDITY'];
-			self::$folderStatusCache[$this->profileID][$_folderName]['messages']	= $folderStatus['MESSAGES'];
+			self::$folderStatusCache[$this->profileID][$_folderName]['messages'] = $folderStatus['MESSAGES'];
 			self::$folderStatusCache[$this->profileID][$_folderName]['deleted']	= $eMailListContainsDeletedMessages[$this->profileID][$_folderName];
 			self::$folderStatusCache[$this->profileID][$_folderName]['uidnext']	= $folderStatus['UIDNEXT'];
-			self::$folderStatusCache[$this->profileID][$_folderName]['filter']	= $_filter;
+			self::$folderStatusCache[$this->profileID][$_folderName]['filter'] = $_filter;
 			self::$folderStatusCache[$this->profileID][$_folderName]['sortResult'] = $sortResult;
-			self::$folderStatusCache[$this->profileID][$_folderName]['sort']	= $_sort;
+			self::$folderStatusCache[$this->profileID][$_folderName]['sort'] = $_sort;
 		}
 		//error_log(__METHOD__." using Filter:".print_r($filter,true)." ->".print_r($sortResult,true));
 		//_debug_array($sortResult['match']->ids);
@@ -1796,12 +1796,12 @@ 
 	 * @param bool _reverse wether to add REVERSE to the Sort String or not
 	 * @return the sort sequence for horde search
 	 */
-	function _getSortString($_sort, $_reverse=false)
+	function _getSortString($_sort, $_reverse = false)
 	{
-		$_reverse=false;
+		$_reverse = false;
 		if (is_numeric($_sort))
 		{
-			switch($_sort) {
+			switch ($_sort) {
 				case 2:
 					$retValue = array(Horde_Imap_Client::SORT_FROM);
 					break;
@@ -1823,7 +1823,7 @@ 
 		}
 		else
 		{
-			switch(strtoupper($_sort)) {
+			switch (strtoupper($_sort)) {
 				case 'FROMADDRESS':
 					$retValue = array(Horde_Imap_Client::SORT_FROM);
 					break;
@@ -1849,7 +1849,7 @@ 
 					break;
 			}
 		}
-		if ($_reverse) array_unshift($retValue,Horde_Imap_Client::SORT_REVERSE);
+		if ($_reverse) array_unshift($retValue, Horde_Imap_Client::SORT_REVERSE);
 		//error_log(__METHOD__.' ('.__LINE__.') '.' '.($_reverse?'REVERSE ':'').$_sort.'->'.$retValue);
 		return $retValue;
 	}
@@ -1862,22 +1862,22 @@ 
 	 * @param boolean $_supportsOrInQuery wether to use the OR Query on QuickSearch
 	 * @return Horde_Imap_Client_Search_Query the IMAP filter
 	 */
-	function createIMAPFilter($_folder, $_criterias, $_supportsOrInQuery=true)
+	function createIMAPFilter($_folder, $_criterias, $_supportsOrInQuery = true)
 	{
 		$imapFilter = new Horde_Imap_Client_Search_Query();
 		$imapFilter->charset('UTF-8');
 
 		//_debug_array($_criterias);
-		if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.' Criterias:'.(!is_array($_criterias)?" none -> returning":array2string($_criterias)));
-		if((!is_array($_criterias) || $_criterias['status']=='any') && (!isset($_criterias['string']) || empty($_criterias['string']))) {
-			$imapFilter->flag('DELETED', $set=false);
+		if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.' Criterias:'.(!is_array($_criterias) ? " none -> returning" : array2string($_criterias)));
+		if ((!is_array($_criterias) || $_criterias['status'] == 'any') && (!isset($_criterias['string']) || empty($_criterias['string']))) {
+			$imapFilter->flag('DELETED', $set = false);
 			return $imapFilter;
 		}
 		$queryValid = false;
 		// statusQuery MUST be placed first, as search for subject/mailbody and such is
 		// depending on charset. flagSearch is not BUT messes the charset if called afterwards
 		$statusQueryValid = false;
-		foreach((array)$_criterias['status'] as $k => $criteria) {
+		foreach ((array)$_criterias['status'] as $k => $criteria) {
 			$imapStatusFilter = new Horde_Imap_Client_Search_Query();
 			$imapStatusFilter->charset('UTF-8');
 			$criteria = strtoupper($criteria);
@@ -1887,12 +1887,12 @@ 
 				case 'FLAGGED':
 				case 'RECENT':
 				case 'SEEN':
-					$imapStatusFilter->flag($criteria, $set=true);
-					$queryValid = $statusQueryValid =true;
+					$imapStatusFilter->flag($criteria, $set = true);
+					$queryValid = $statusQueryValid = true;
 					break;
 				case 'READ':
-					$imapStatusFilter->flag('SEEN', $set=true);
-					$queryValid = $statusQueryValid =true;
+					$imapStatusFilter->flag('SEEN', $set = true);
+					$queryValid = $statusQueryValid = true;
 					break;
 				case 'LABEL1':
 				case 'KEYWORD1':
@@ -1904,38 +1904,38 @@ 
 				case 'KEYWORD4':
 				case 'LABEL5':
 				case 'KEYWORD5':
-					$imapStatusFilter->flag(str_ireplace('KEYWORD','$LABEL',$criteria), $set=true);
-					$queryValid = $statusQueryValid =true;
+					$imapStatusFilter->flag(str_ireplace('KEYWORD', '$LABEL', $criteria), $set = true);
+					$queryValid = $statusQueryValid = true;
 					break;
 				case 'NEW':
-					$imapStatusFilter->flag('RECENT', $set=true);
-					$imapStatusFilter->flag('SEEN', $set=false);
-					$queryValid = $statusQueryValid =true;
+					$imapStatusFilter->flag('RECENT', $set = true);
+					$imapStatusFilter->flag('SEEN', $set = false);
+					$queryValid = $statusQueryValid = true;
 					break;
 				case 'OLD':
-					$imapStatusFilter->flag('RECENT', $set=false);
-					$queryValid = $statusQueryValid =true;
+					$imapStatusFilter->flag('RECENT', $set = false);
+					$queryValid = $statusQueryValid = true;
 					break;
 // operate only on system flags
 //        $systemflags = array(
 //            'ANSWERED', 'DELETED', 'DRAFT', 'FLAGGED', 'RECENT', 'SEEN'
 //        );
 				case 'UNANSWERED':
-					$imapStatusFilter->flag('ANSWERED', $set=false);
-					$queryValid = $statusQueryValid =true;
+					$imapStatusFilter->flag('ANSWERED', $set = false);
+					$queryValid = $statusQueryValid = true;
 					break;
 				case 'UNDELETED':
-					$imapFilter->flag('DELETED', $set=false);
+					$imapFilter->flag('DELETED', $set = false);
 					$queryValid = true;
 					break;
 				case 'UNFLAGGED':
-					$imapStatusFilter->flag('FLAGGED', $set=false);
-					$queryValid = $statusQueryValid =true;
+					$imapStatusFilter->flag('FLAGGED', $set = false);
+					$queryValid = $statusQueryValid = true;
 					break;
 				case 'UNREAD':
 				case 'UNSEEN':
-					$imapStatusFilter->flag('SEEN', $set=false);
-					$queryValid = $statusQueryValid =true;
+					$imapStatusFilter->flag('SEEN', $set = false);
+					$queryValid = $statusQueryValid = true;
 					break;
 				case 'UNLABEL1':
 				case 'UNKEYWORD1':
@@ -1947,8 +1947,8 @@ 
 				case 'UNKEYWORD4':
 				case 'UNLABEL5':
 				case 'UNKEYWORD5':
-					$imapStatusFilter->flag(str_ireplace(array('UNKEYWORD','UNLABEL'),'$LABEL',$criteria), $set=false);
-					$queryValid = $statusQueryValid =true;
+					$imapStatusFilter->flag(str_ireplace(array('UNKEYWORD', 'UNLABEL'), '$LABEL', $criteria), $set = false);
+					$queryValid = $statusQueryValid = true;
 					break;
 				default:
 					$statusQueryValid = false;
@@ -1964,18 +1964,18 @@ 
 		$imapSearchFilter = new Horde_Imap_Client_Search_Query();
 		$imapSearchFilter->charset('UTF-8');
 
-		if(!empty($_criterias['string'])) {
+		if (!empty($_criterias['string'])) {
 			$criteria = strtoupper($_criterias['type']);
 			switch ($criteria) {
 				case 'QUICK':
-					$imapSearchFilter->headerText('SUBJECT', $_criterias['string'], $not=false);
+					$imapSearchFilter->headerText('SUBJECT', $_criterias['string'], $not = false);
 					//$imapSearchFilter->charset('UTF-8');
 					$imapFilter2 = new Horde_Imap_Client_Search_Query();
 					$imapFilter2->charset('UTF-8');
-					if($this->isSentFolder($_folder)) {
-						$imapFilter2->headerText('TO', $_criterias['string'], $not=false);
+					if ($this->isSentFolder($_folder)) {
+						$imapFilter2->headerText('TO', $_criterias['string'], $not = false);
 					} else {
-						$imapFilter2->headerText('FROM', $_criterias['string'], $not=false);
+						$imapFilter2->headerText('FROM', $_criterias['string'], $not = false);
 					}
 					if ($_supportsOrInQuery)
 					{
@@ -1992,31 +1992,31 @@ 
 				case 'CC':
 				case 'BCC':
 				case 'SUBJECT':
-					$imapSearchFilter->headerText($criteria, $_criterias['string'], $not=false);
+					$imapSearchFilter->headerText($criteria, $_criterias['string'], $not = false);
 					//$imapSearchFilter->charset('UTF-8');
 					$queryValid = true;
 					break;
 				case 'BODY':
 				case 'TEXT':
-					$imapSearchFilter->text($_criterias['string'],($criteria=='BODY'?true:false), $not=false);
+					$imapSearchFilter->text($_criterias['string'], ($criteria == 'BODY' ? true : false), $not = false);
 					//$imapSearchFilter->charset('UTF-8');
 					$queryValid = true;
 					break;
 				case 'SINCE':
-					$imapSearchFilter->dateSearch(new DateTime($_criterias['string']), Horde_Imap_Client_Search_Query::DATE_SINCE, $header=true, $not=false);
+					$imapSearchFilter->dateSearch(new DateTime($_criterias['string']), Horde_Imap_Client_Search_Query::DATE_SINCE, $header = true, $not = false);
 					$queryValid = true;
 					break;
 				case 'BEFORE':
-					$imapSearchFilter->dateSearch(new DateTime($_criterias['string']), Horde_Imap_Client_Search_Query::DATE_BEFORE, $header=true, $not=false);
+					$imapSearchFilter->dateSearch(new DateTime($_criterias['string']), Horde_Imap_Client_Search_Query::DATE_BEFORE, $header = true, $not = false);
 					$queryValid = true;
 					break;
 				case 'ON':
-					$imapSearchFilter->dateSearch(new DateTime($_criterias['string']), Horde_Imap_Client_Search_Query::DATE_ON, $header=true, $not=false);
+					$imapSearchFilter->dateSearch(new DateTime($_criterias['string']), Horde_Imap_Client_Search_Query::DATE_ON, $header = true, $not = false);
 					$queryValid = true;
 					break;
 			}
 		}
-		if ($statusQueryValid && !$queryValid) $queryValid=true;
+		if ($statusQueryValid && !$queryValid) $queryValid = true;
 		if ($queryValid) $imapFilter->andSearch($imapSearchFilter);
 
 		if (isset($_criterias['range']) && !empty($_criterias['range']))
@@ -2029,8 +2029,8 @@ 
 			$query_str = $imapFilter->build();
 			error_log(__METHOD__.' ('.__LINE__.') '.' '.$query_str['query']);
 		}
-		if($queryValid==false) {
-			$imapFilter->flag('DELETED', $set=false);
+		if ($queryValid == false) {
+			$imapFilter->flag('DELETED', $set = false);
 			return $imapFilter;
 		} else {
 			return $imapFilter;
@@ -2044,11 +2044,11 @@ 
 	 * @param  mixed/boolean $_tryIDNConversion (true/false AND FORCE): try IDN Conversion on domainparts of emailADRESSES
 	 * @return mixed - based on the input type
 	 */
-	static function decode_header($_string, $_tryIDNConversion=false)
+	static function decode_header($_string, $_tryIDNConversion = false)
 	{
 		if (is_array($_string))
 		{
-			foreach($_string as $k=>$v)
+			foreach ($_string as $k=>$v)
 			{
 				$_string[$k] = self::decode_header($v, $_tryIDNConversion);
 			}
@@ -2056,18 +2056,18 @@ 
 		}
 		else
 		{
-			$_string = translation::decodeMailHeader($_string,self::$displayCharset);
+			$_string = translation::decodeMailHeader($_string, self::$displayCharset);
 			$test = @json_encode($_string);
 			//error_log(__METHOD__.__LINE__.' ->'.strlen($singleBodyPart['body']).' Error:'.json_last_error().'<- BodyPart:#'.$test.'#');
-			if (($test=="null" || $test === false || is_null($test)) && strlen($_string)>0)
+			if (($test == "null" || $test === false || is_null($test)) && strlen($_string) > 0)
 			{
 				// try to fix broken utf8
 				$x = utf8_encode($_string);
 				$test = @json_encode($x);
-				if (($test=="null" || $test === false || is_null($test)) && strlen($_string)>0)
+				if (($test == "null" || $test === false || is_null($test)) && strlen($_string) > 0)
 				{
 					// this should not be needed, unless something fails with charset detection/ wrong charset passed
-					$_string = (function_exists('mb_convert_encoding')?mb_convert_encoding($_string,'UTF-8','UTF-8'):(function_exists('iconv')?@iconv("UTF-8","UTF-8//IGNORE",$_string):$_string));
+					$_string = (function_exists('mb_convert_encoding') ? mb_convert_encoding($_string, 'UTF-8', 'UTF-8') : (function_exists('iconv') ? @iconv("UTF-8", "UTF-8//IGNORE", $_string) : $_string));
 				}
 				else
 				{
@@ -2075,7 +2075,7 @@ 
 				}
 			}
 
-			if ($_tryIDNConversion===true && stripos($_string,'@')!==false)
+			if ($_tryIDNConversion === true && stripos($_string, '@') !== false)
 			{
 				$rfcAddr = self::parseAddressList($_string);
 				if (!isset(self::$idna2)) self::$idna2 = new egw_idna;
@@ -2090,12 +2090,12 @@ 
 							$stringA = array();
 							break; // skip idna conversion if we encounter an error here
 						}
-						$stringA[] = imap_rfc822_write_address($_rfcAddr->mailbox,self::$idna2->decode($_rfcAddr->host),$_rfcAddr->personal);
+						$stringA[] = imap_rfc822_write_address($_rfcAddr->mailbox, self::$idna2->decode($_rfcAddr->host), $_rfcAddr->personal);
 					}
-					if (!empty($stringA)) $_string = implode(',',$stringA);
+					if (!empty($stringA)) $_string = implode(',', $stringA);
 				}
 			}
-			if ($_tryIDNConversion==='FORCE')
+			if ($_tryIDNConversion === 'FORCE')
 			{
 				if (!isset(self::$idna2)) self::$idna2 = new egw_idna;
 				if (isset(self::$idna2))
@@ -2115,17 +2115,17 @@ 
 	 * @param  boolean $decode try decoding
 	 * @return mixed - based on the input type
 	 */
-	function decode_subject($_string,$decode=true)
+	function decode_subject($_string, $decode = true)
 	{
 		#$string = $_string;
-		if($_string=='NIL')
+		if ($_string == 'NIL')
 		{
 			return 'No Subject';
 		}
 		if ($decode) $_string = self::decode_header($_string);
 		// make sure its utf-8
 		$test = @json_encode($_string);
-		if (($test=="null" || $test === false || is_null($test)) && strlen($_string)>0)
+		if (($test == "null" || $test === false || is_null($test)) && strlen($_string) > 0)
 		{
 			$_string = utf8_encode($_string);
 		}
@@ -2177,18 +2177,18 @@ 
 	function createFolder($_parent, $_folderName, &$_error)
 	{
 		if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '."->"."$_parent, $_folderName called from:".function_backtrace());
-		$parent		= $_parent;//$this->_encodeFolderName($_parent);
-		$folderName	= $_folderName;//$this->_encodeFolderName($_folderName);
+		$parent = $_parent; //$this->_encodeFolderName($_parent);
+		$folderName = $_folderName; //$this->_encodeFolderName($_folderName);
 
-		if(empty($parent)) {
+		if (empty($parent)) {
 			$newFolderName = $folderName;
 		} else {
 			$HierarchyDelimiter = $this->getHierarchyDelimiter();
-			$newFolderName = $parent . $HierarchyDelimiter . $folderName;
+			$newFolderName = $parent.$HierarchyDelimiter.$folderName;
 		}
 		if (empty($newFolderName)) return false;
 		if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.'->'.$newFolderName);
-		if ($this->folderExists($newFolderName,true))
+		if ($this->folderExists($newFolderName, true))
 		{
 			if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '." Folder $newFolderName already exists.");
 			return $newFolderName;
@@ -2205,7 +2205,7 @@ 
 		}
 		catch (Exception $e)
 		{
-			$_error = lang('Could not create Folder %1 Reason: %2',$newFolderName,$e->getMessage());
+			$_error = lang('Could not create Folder %1 Reason: %2', $newFolderName, $e->getMessage());
 			error_log(__METHOD__.' ('.__LINE__.') '.' create Folder '.$newFolderName.'->'.$e->getMessage().' ('.$e->details.') Namespace:'.array2string($this->icServer->getNameSpaces()).function_backtrace());
 			return false;
 		}
@@ -2234,15 +2234,15 @@ 
 	 */
 	function renameFolder($_oldFolderName, $_parent, $_folderName)
 	{
-		$oldFolderName	= $_oldFolderName;//$this->_encodeFolderName($_oldFolderName);
-		$parent		= $_parent;//$this->_encodeFolderName($_parent);
-		$folderName	= $_folderName;//$this->_encodeFolderName($_folderName);
+		$oldFolderName = $_oldFolderName; //$this->_encodeFolderName($_oldFolderName);
+		$parent = $_parent; //$this->_encodeFolderName($_parent);
+		$folderName = $_folderName; //$this->_encodeFolderName($_folderName);
 
-		if(empty($parent)) {
+		if (empty($parent)) {
 			$newFolderName = $folderName;
 		} else {
 			$HierarchyDelimiter = $this->getHierarchyDelimiter();
-			$newFolderName = $parent . $HierarchyDelimiter . $folderName;
+			$newFolderName = $parent.$HierarchyDelimiter.$folderName;
 		}
 		if (self::$debug) error_log("create folder: $newFolderName");
 		try
@@ -2251,10 +2251,10 @@ 
 		}
 		catch (Exception $e)
 		{
-			throw new egw_exception(__METHOD__." failed for $oldFolderName (rename to: $newFolderName) with error:".$e->getMessage());;
+			throw new egw_exception(__METHOD__." failed for $oldFolderName (rename to: $newFolderName) with error:".$e->getMessage()); ;
 		}
 		// clear FolderExistsInfoCache
-		egw_cache::setCache(egw_cache::INSTANCE,'email','icServerFolderExistsInfo'.trim($GLOBALS['egw_info']['user']['account_id']),$folderInfo,60*60*5);
+		egw_cache::setCache(egw_cache::INSTANCE, 'email', 'icServerFolderExistsInfo'.trim($GLOBALS['egw_info']['user']['account_id']), $folderInfo, 60 * 60 * 5);
 
 		return $newFolderName;
 
@@ -2273,15 +2273,15 @@ 
 		//$folderName = $this->_encodeFolderName($_folderName);
 		try
 		{
-			$this->icServer->subscribeMailbox($_folderName,false);
+			$this->icServer->subscribeMailbox($_folderName, false);
 			$this->icServer->deleteMailbox($_folderName);
 		}
 		catch (Exception $e)
 		{
-			throw new egw_exception("Deleting Folder $_folderName failed! Error:".$e->getMessage());;
+			throw new egw_exception("Deleting Folder $_folderName failed! Error:".$e->getMessage()); ;
 		}
 		// clear FolderExistsInfoCache
-		egw_cache::setCache(egw_cache::INSTANCE,'email','icServerFolderExistsInfo'.trim($GLOBALS['egw_info']['user']['account_id']),$folderInfo,60*60*5);
+		egw_cache::setCache(egw_cache::INSTANCE, 'email', 'icServerFolderExistsInfo'.trim($GLOBALS['egw_info']['user']['account_id']), $folderInfo, 60 * 60 * 5);
 
 		return true;
 	}
@@ -2316,10 +2316,10 @@ 
 	 *
 	 * @return array with folder objects. eg.: INBOX => {inbox object}
 	 */
-	function getFolderObjects($_subscribedOnly=false, $_getCounters=false, $_alwaysGetDefaultFolders=false,$_useCacheIfPossible=true)
+	function getFolderObjects($_subscribedOnly = false, $_getCounters = false, $_alwaysGetDefaultFolders = false, $_useCacheIfPossible = true)
 	{
 		if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.' ServerID:'.$this->icServer->ImapServerId.", subscribedOnly:$_subscribedOnly, getCounters:$_getCounters, alwaysGetDefaultFolders:$_alwaysGetDefaultFolders, _useCacheIfPossible:$_useCacheIfPossible");
-		if (self::$debugTimes) $starttime = microtime (true);
+		if (self::$debugTimes) $starttime = microtime(true);
 		static $folders2return;
 		//$_subscribedOnly=false;
 		// always use static on single request if info is available;
@@ -2327,42 +2327,42 @@ 
 		// set $_useCacheIfPossible to false !
 		if ($_useCacheIfPossible && isset($folders2return[$this->icServer->ImapServerId]) && !empty($folders2return[$this->icServer->ImapServerId]))
 		{
-			if (self::$debugTimes) self::logRunTimes($starttime,null,'using static',__METHOD__.' ('.__LINE__.') ');
+			if (self::$debugTimes) self::logRunTimes($starttime, null, 'using static', __METHOD__.' ('.__LINE__.') ');
 			return $folders2return[$this->icServer->ImapServerId];
 		}
 
-		if ($_subscribedOnly && $_getCounters===false)
+		if ($_subscribedOnly && $_getCounters === false)
 		{
-			if (is_null($folders2return)) $folders2return = egw_cache::getCache(egw_cache::INSTANCE,'email','folderObjects'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*1);
+			if (is_null($folders2return)) $folders2return = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'folderObjects'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60 * 60 * 1);
 			if ($_useCacheIfPossible && isset($folders2return[$this->icServer->ImapServerId]) && !empty($folders2return[$this->icServer->ImapServerId]))
 			{
 				//error_log(__METHOD__.' ('.__LINE__.') '.' using Cached folderObjects'.array2string($folders2return[$this->icServer->ImapServerId]));
-				if (self::$debugTimes) self::logRunTimes($starttime,null,'from Cache',__METHOD__.' ('.__LINE__.') ');
+				if (self::$debugTimes) self::logRunTimes($starttime, null, 'from Cache', __METHOD__.' ('.__LINE__.') ');
 				return $folders2return[$this->icServer->ImapServerId];
 			}
 		}
 		// use $folderBasicInfo for holding attributes and other basic folderinfo $folderBasicInfo[$this->icServer->ImapServerId]
 		static $folderBasicInfo;
-		if (is_null($folderBasicInfo)||!isset($folderBasicInfo[$this->icServer->ImapServerId])) $folderBasicInfo = egw_cache::getCache(egw_cache::INSTANCE,'email','folderBasicInfo'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*1);
+		if (is_null($folderBasicInfo) || !isset($folderBasicInfo[$this->icServer->ImapServerId])) $folderBasicInfo = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'folderBasicInfo'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60 * 60 * 1);
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string(array_keys($folderBasicInfo[$this->icServer->ImapServerId])));
 
 		$delimiter = $this->getHierarchyDelimiter();
 
 		$inboxData = new stdClass;
-		$inboxData->name 		= 'INBOX';
+		$inboxData->name = 'INBOX';
 		$inboxData->folderName		= 'INBOX';
-		$inboxData->displayName		= lang('INBOX');
+		$inboxData->displayName = lang('INBOX');
 		$inboxData->delimiter 		= $delimiter;
-		$inboxData->shortFolderName	= 'INBOX';
-		$inboxData->shortDisplayName	= lang('INBOX');
+		$inboxData->shortFolderName = 'INBOX';
+		$inboxData->shortDisplayName = lang('INBOX');
 		$inboxData->subscribed = true;
-		if($_getCounters == true) {
+		if ($_getCounters == true) {
 			$inboxData->counter = $this->getMailBoxCounters('INBOX');
 		}
 		// force unsubscribed by preference showAllFoldersInFolderPane
 		if ($_subscribedOnly == true &&
 			isset($this->mailPreferences['showAllFoldersInFolderPane']) &&
-			$this->mailPreferences['showAllFoldersInFolderPane']==1)
+			$this->mailPreferences['showAllFoldersInFolderPane'] == 1)
 		{
 			$_subscribedOnly = false;
 		}
@@ -2375,12 +2375,12 @@ 
 		//error_log(__METHOD__.__LINE__.array2string($nameSpace));
 		if (is_array($nameSpace))
 		{
-			foreach($nameSpace as $k => $singleNameSpace) {
+			foreach ($nameSpace as $k => $singleNameSpace) {
 				$type = $singleNameSpace['type'];
 				// the following line (assumption that for the same namespace the delimiter should be equal) may be wrong
-				$foldersNameSpace[$type]['delimiter']  = $singleNameSpace['delimiter'];
+				$foldersNameSpace[$type]['delimiter'] = $singleNameSpace['delimiter'];
 
-				if(is_array($singleNameSpace)&&$fetchedAllInOneGo==false) {
+				if (is_array($singleNameSpace) && $fetchedAllInOneGo == false) {
 					// fetch and sort the subscribed folders
 					// we alway fetch the subscribed, as this provides the only way to tell
 					// if a folder is subscribed or not
@@ -2388,22 +2388,22 @@ 
 					{
 						try
 						{
-							$subscribedMailboxes = $this->icServer->listSubscribedMailboxes('',0,true);
+							$subscribedMailboxes = $this->icServer->listSubscribedMailboxes('', 0, true);
 							if (!empty($subscribedMailboxes))
 							{
 								$fetchedAllInOneGo = true;
 							}
 							else
 							{
-								$subscribedMailboxes = $this->icServer->listSubscribedMailboxes($singleNameSpace['prefix'],0,true);
+								$subscribedMailboxes = $this->icServer->listSubscribedMailboxes($singleNameSpace['prefix'], 0, true);
 							}
 						}
-						catch(Exception $e)
+						catch (Exception $e)
 						{
 							continue;
 						}
 						//echo "subscribedMailboxes";_debug_array($subscribedMailboxes);
-						$subscribedFoldersPerNS = (!empty($subscribedMailboxes)?array_keys($subscribedMailboxes):array());
+						$subscribedFoldersPerNS = (!empty($subscribedMailboxes) ? array_keys($subscribedMailboxes) : array());
 						//if (is_array($foldersNameSpace[$type]['subscribed'])) sort($foldersNameSpace[$type]['subscribed']);
 						//_debug_array($foldersNameSpace);
 						//error_log(__METHOD__.__LINE__.array2string($singleNameSpace).':#:'.array2string($subscribedFoldersPerNS));
@@ -2413,18 +2413,18 @@ 
 							foreach ($subscribedMailboxes as $k => $finfo)
 							{
 								//error_log(__METHOD__.__LINE__.$k.':#:'.array2string($finfo));
-								$subscribedFoldersForCache[$this->icServer->ImapServerId][$k]=
-								$folderBasicInfo[$this->icServer->ImapServerId][$k]=array(
+								$subscribedFoldersForCache[$this->icServer->ImapServerId][$k] =
+								$folderBasicInfo[$this->icServer->ImapServerId][$k] = array(
 									'MAILBOX'=>$finfo['MAILBOX'],
 									'ATTRIBUTES'=>$finfo['ATTRIBUTES'],
-									'delimiter'=>$finfo['delimiter'],//lowercase for some reason???
-									'SUBSCRIBED'=>$finfo['SUBSCRIBED'],//seeded by getMailboxes
+									'delimiter'=>$finfo['delimiter'], //lowercase for some reason???
+									'SUBSCRIBED'=>$finfo['SUBSCRIBED'], //seeded by getMailboxes
 								);
-								if (empty($foldersNameSpace[$type]['subscribed']) || !in_array($k,$foldersNameSpace[$type]['subscribed']))
+								if (empty($foldersNameSpace[$type]['subscribed']) || !in_array($k, $foldersNameSpace[$type]['subscribed']))
 								{
 									$foldersNameSpace[$type]['subscribed'][] = $k;
 								}
-								if (empty($foldersNameSpace[$type]['all']) || !in_array($k,$foldersNameSpace[$type]['all']))
+								if (empty($foldersNameSpace[$type]['all']) || !in_array($k, $foldersNameSpace[$type]['all']))
 								{
 									$foldersNameSpace[$type]['all'][] = $k;
 								}
@@ -2447,7 +2447,7 @@ 
 						// that may produce problems, when encountering recursions probably
 						// horde is handling that, so we do not; keep that in mind!
 						//$allMailboxesExt = $this->icServer->getMailboxes($singleNameSpace['prefix'],2,true);
-						$allMailboxesExt = $this->icServer->getMailboxes($singleNameSpace['prefix'],0,true);
+						$allMailboxesExt = $this->icServer->getMailboxes($singleNameSpace['prefix'], 0, true);
 					}
 					catch (Exception $e)
 					{
@@ -2465,26 +2465,26 @@ 
 					foreach ($allMailboxesExt as $mbx) {
 						if (!isset($folderBasicInfo[$this->icServer->ImapServerId][$mbx['MAILBOX']]))
 						{
-							$folderBasicInfo[$this->icServer->ImapServerId][$mbx['MAILBOX']]=array(
+							$folderBasicInfo[$this->icServer->ImapServerId][$mbx['MAILBOX']] = array(
 								'MAILBOX'=>$mbx['MAILBOX'],
 								'ATTRIBUTES'=>$mbx['ATTRIBUTES'],
-								'delimiter'=>$mbx['delimiter'],//lowercase for some reason???
-								'SUBSCRIBED'=>$mbx['SUBSCRIBED'],//seeded by getMailboxes
+								'delimiter'=>$mbx['delimiter'], //lowercase for some reason???
+								'SUBSCRIBED'=>$mbx['SUBSCRIBED'], //seeded by getMailboxes
 							);
 							if ($mbx['SUBSCRIBED'] && !isset($subscribedFoldersForCache[$this->icServer->ImapServerId][$mbx['MAILBOX']]))
 							{
 								$subscribedFoldersForCache[$this->icServer->ImapServerId][$mbx['MAILBOX']] = $folderBasicInfo[$this->icServer->ImapServerId][$mbx['MAILBOX']];
 							}
 						}
-						if ($mbx['SUBSCRIBED'] && (empty($foldersNameSpace[$type]['subscribed']) || !in_array($mbx['MAILBOX'],$foldersNameSpace[$type]['subscribed'])))
+						if ($mbx['SUBSCRIBED'] && (empty($foldersNameSpace[$type]['subscribed']) || !in_array($mbx['MAILBOX'], $foldersNameSpace[$type]['subscribed'])))
 						{
 							$foldersNameSpace[$type]['subscribed'][] = $mbx['MAILBOX'];
 						}
 						//echo __METHOD__;_debug_array($mbx);
 						//error_log(__METHOD__.' ('.__LINE__.') '.array2string($mbx));
-						if (isset($allMailBoxesExtSorted[$mbx['MAILBOX']])||
-							isset($allMailBoxesExtSorted[$mbx['MAILBOX'].$foldersNameSpace[$type]['delimiter']])||
-							(substr($mbx['MAILBOX'],-1)==$foldersNameSpace[$type]['delimiter'] && isset($allMailBoxesExtSorted[substr($mbx['MAILBOX'],0,-1)]))
+						if (isset($allMailBoxesExtSorted[$mbx['MAILBOX']]) ||
+							isset($allMailBoxesExtSorted[$mbx['MAILBOX'].$foldersNameSpace[$type]['delimiter']]) ||
+							(substr($mbx['MAILBOX'], -1) == $foldersNameSpace[$type]['delimiter'] && isset($allMailBoxesExtSorted[substr($mbx['MAILBOX'], 0, -1)]))
 						) continue;
 
 						//echo '#'.$mbx['MAILBOX'].':'.array2string($mbx)."#<br>";
@@ -2494,7 +2494,7 @@ 
 					//_debug_array(array_keys($allMailBoxesExtSorted));
 					$allMailboxes = array();
 					foreach ((array)$allMailBoxesExtSorted as $mbx) {
-						if (!in_array($mbx['MAILBOX'],$allMailboxes)) $allMailboxes[] = $mbx['MAILBOX'];
+						if (!in_array($mbx['MAILBOX'], $allMailboxes)) $allMailboxes[] = $mbx['MAILBOX'];
 						//echo "Result:";_debug_array($allMailboxes);
 					}
 					$foldersNameSpace[$type]['all'] = $allMailboxes;
@@ -2503,57 +2503,57 @@ 
 			}
 		}
 		//subscribed folders may be used in getFolderStatus
-		egw_cache::setCache(egw_cache::INSTANCE,'email','subscribedFolders'.trim($GLOBALS['egw_info']['user']['account_id']),$subscribedFoldersForCache,$expiration=60*60*1);
+		egw_cache::setCache(egw_cache::INSTANCE, 'email', 'subscribedFolders'.trim($GLOBALS['egw_info']['user']['account_id']), $subscribedFoldersForCache, $expiration = 60 * 60 * 1);
 		//echo "<br>FolderNameSpace To Process:";_debug_array($foldersNameSpace);
 		$autoFolderObjects = $folders = array();
 		$autofolder_exists = array();
-		foreach( array('personal', 'others', 'shared') as $type) {
-			if(isset($foldersNameSpace[$type])) {
-				if($_subscribedOnly) {
-					if( !empty($foldersNameSpace[$type]['subscribed']) ) $listOfFolders = $foldersNameSpace[$type]['subscribed'];
+		foreach (array('personal', 'others', 'shared') as $type) {
+			if (isset($foldersNameSpace[$type])) {
+				if ($_subscribedOnly) {
+					if (!empty($foldersNameSpace[$type]['subscribed'])) $listOfFolders = $foldersNameSpace[$type]['subscribed'];
 				} else {
-					if( !empty($foldersNameSpace[$type]['all'])) $listOfFolders = $foldersNameSpace[$type]['all'];
+					if (!empty($foldersNameSpace[$type]['all'])) $listOfFolders = $foldersNameSpace[$type]['all'];
 				}
-				foreach((array)$listOfFolders as $folderName) {
+				foreach ((array)$listOfFolders as $folderName) {
 					//echo "<br>FolderToCheck:$folderName<br>";
 					//error_log(__METHOD__.__LINE__.'#Delimiter:'.$delimiter.':#'.$folderName);
-					if ($_subscribedOnly && empty($foldersNameSpace[$type]['all'])) continue;//when subscribedonly, we fetch all folders in one go.
-					if($_subscribedOnly && !(in_array($folderName, $foldersNameSpace[$type]['all'])||in_array($folderName.$foldersNameSpace[$type]['delimiter'], $foldersNameSpace[$type]['all']))) {
+					if ($_subscribedOnly && empty($foldersNameSpace[$type]['all'])) continue; //when subscribedonly, we fetch all folders in one go.
+					if ($_subscribedOnly && !(in_array($folderName, $foldersNameSpace[$type]['all']) || in_array($folderName.$foldersNameSpace[$type]['delimiter'], $foldersNameSpace[$type]['all']))) {
 						#echo "$folderName failed to be here <br>";
 						continue;
 					}
 					if (isset($folders[$folderName])) continue;
 					if (isset($autoFolderObjects[$folderName])) continue;
-					if (empty($delimiter)||$delimiter != $foldersNameSpace[$type]['delimiter']) $delimiter = $foldersNameSpace[$type]['delimiter'];
+					if (empty($delimiter) || $delimiter != $foldersNameSpace[$type]['delimiter']) $delimiter = $foldersNameSpace[$type]['delimiter'];
 					$folderParts = explode($delimiter, $folderName);
 					$shortName = array_pop($folderParts);
 
 					$folderObject = new stdClass;
-					$folderObject->delimiter	= $delimiter;
-					$folderObject->folderName	= $folderName;
-					$folderObject->shortFolderName	= $shortName;
-					if(!$_subscribedOnly) {
+					$folderObject->delimiter = $delimiter;
+					$folderObject->folderName = $folderName;
+					$folderObject->shortFolderName = $shortName;
+					if (!$_subscribedOnly) {
 						#echo $folderName."->".$type."<br>";
 						#_debug_array($foldersNameSpace[$type]['subscribed']);
 						$folderObject->subscribed = in_array($folderName, (array)$foldersNameSpace[$type]['subscribed']);
 					}
 
-					if($_getCounters == true) {
+					if ($_getCounters == true) {
 						//error_log(__METHOD__.' ('.__LINE__.') '.' getCounter forFolder:'.$folderName);
 						$folderObject->counter = $this->getMailBoxCounters($folderName);
 					}
-					if(strtoupper($folderName) == 'INBOX') {
+					if (strtoupper($folderName) == 'INBOX') {
 						$folderName = 'INBOX';
-						$folderObject->folderName	= 'INBOX';
-						$folderObject->shortFolderName	= 'INBOX';
-						$folderObject->displayName	= lang('INBOX');
+						$folderObject->folderName = 'INBOX';
+						$folderObject->shortFolderName = 'INBOX';
+						$folderObject->displayName = lang('INBOX');
 						$folderObject->shortDisplayName = lang('INBOX');
-						$folderObject->subscribed	= true;
+						$folderObject->subscribed = true;
 					// translate the automatic Folders (Sent, Drafts, ...) like the INBOX
-					} elseif (in_array($shortName,self::$autoFolders)) {
-						$tmpfolderparts = explode($delimiter,$folderObject->folderName);
+					} elseif (in_array($shortName, self::$autoFolders)) {
+						$tmpfolderparts = explode($delimiter, $folderObject->folderName);
 						array_pop($tmpfolderparts);
-						$folderObject->displayName = implode($delimiter,$tmpfolderparts).$delimiter.lang($shortName);
+						$folderObject->displayName = implode($delimiter, $tmpfolderparts).$delimiter.lang($shortName);
 						$folderObject->shortDisplayName = lang($shortName);
 						unset($tmpfolderparts);
 					} else {
@@ -2561,13 +2561,13 @@ 
 						$folderObject->shortDisplayName = $shortName;
 					}
 					//$folderName = $folderName;
-					if (in_array($shortName,self::$autoFolders)&&self::searchValueInFolderObjects($shortName,$autoFolderObjects)===false) {
+					if (in_array($shortName, self::$autoFolders) && self::searchValueInFolderObjects($shortName, $autoFolderObjects) === false) {
 						$autoFolderObjects[$folderName] = $folderObject;
 					} else {
 						$folders[$folderName] = $folderObject;
 					}
 					//error_log(__METHOD__.' ('.__LINE__.') '.':'.$folderObject->folderName);
-					if (!isset(self::$specialUseFolders)) $this->getSpecialUseFolders ();
+					if (!isset(self::$specialUseFolders)) $this->getSpecialUseFolders();
 					if (isset(self::$specialUseFolders[$folderName]))
 					{
 						$autofolder_exists[$folderName] = self::$specialUseFolders[$folderName];
@@ -2576,27 +2576,27 @@ 
 			}
 		}
 		if (is_array($autoFolderObjects) && !empty($autoFolderObjects)) {
-			uasort($autoFolderObjects,array($this,"sortByAutoFolderPos"));
+			uasort($autoFolderObjects, array($this, "sortByAutoFolderPos"));
 		}
 		// check if some standard folders are missing and need to be created
 		if (count($autofolder_exists) < count(self::$autoFolders) && $this->check_create_autofolders($autofolder_exists))
 		{
 			// if new folders have been created, re-read folders ignoring the cache
-			return $this->getFolderObjects($_subscribedOnly, $_getCounters, $_alwaysGetDefaultFolders, false);	// false = do NOT use cache
+			return $this->getFolderObjects($_subscribedOnly, $_getCounters, $_alwaysGetDefaultFolders, false); // false = do NOT use cache
 		}
-		if (is_array($folders)) uasort($folders,array($this,"sortByDisplayName"));
+		if (is_array($folders)) uasort($folders, array($this, "sortByDisplayName"));
 		//$folders2return = array_merge($autoFolderObjects,$folders);
 		//_debug_array($folders2return); #exit;
-		$folders2return[$this->icServer->ImapServerId] = array_merge((array)$inboxFolderObject,(array)$autoFolderObjects,(array)$folders);
-		if (($_subscribedOnly && $_getCounters===false) ||
-			($_subscribedOnly == false && $_getCounters===false &&
+		$folders2return[$this->icServer->ImapServerId] = array_merge((array)$inboxFolderObject, (array)$autoFolderObjects, (array)$folders);
+		if (($_subscribedOnly && $_getCounters === false) ||
+			($_subscribedOnly == false && $_getCounters === false &&
 			isset($this->mailPreferences['showAllFoldersInFolderPane']) &&
-			$this->mailPreferences['showAllFoldersInFolderPane']==1))
+			$this->mailPreferences['showAllFoldersInFolderPane'] == 1))
 		{
-			egw_cache::setCache(egw_cache::INSTANCE,'email','folderObjects'.trim($GLOBALS['egw_info']['user']['account_id']),$folders2return,$expiration=60*60*1);
+			egw_cache::setCache(egw_cache::INSTANCE, 'email', 'folderObjects'.trim($GLOBALS['egw_info']['user']['account_id']), $folders2return, $expiration = 60 * 60 * 1);
 		}
-		egw_cache::setCache(egw_cache::INSTANCE,'email','folderBasicInfo'.trim($GLOBALS['egw_info']['user']['account_id']),$folderBasicInfo,$expiration=60*60*1);
-		if (self::$debugTimes) self::logRunTimes($starttime,null,function_backtrace(),__METHOD__.' ('.__LINE__.') ');
+		egw_cache::setCache(egw_cache::INSTANCE, 'email', 'folderBasicInfo'.trim($GLOBALS['egw_info']['user']['account_id']), $folderBasicInfo, $expiration = 60 * 60 * 1);
+		if (self::$debugTimes) self::logRunTimes($starttime, null, function_backtrace(), __METHOD__.' ('.__LINE__.') ');
 		return $folders2return[$this->icServer->ImapServerId];
 	}
 
@@ -2617,21 +2617,21 @@ 
 	 *
 	 * @return array arrays of folders
 	 */
-	function getFolderArrays ($_nodePath = null, $_onlyTopLevel = false, $_search= 2, $_subscribedOnly = false, $_getCounter = false)
+	function getFolderArrays($_nodePath = null, $_onlyTopLevel = false, $_search = 2, $_subscribedOnly = false, $_getCounter = false)
 	{
 		// delimiter
 		$delimiter = $this->getHierarchyDelimiter();
 
-		$folders = $nameSpace =  array();
+		$folders = $nameSpace = array();
 		$nameSpaceTmp = $this->_getNameSpaces();
-		foreach($nameSpaceTmp as $k => $singleNameSpace) {
-			$nameSpace[$singleNameSpace['type']]=$singleNameSpace;
+		foreach ($nameSpaceTmp as $k => $singleNameSpace) {
+			$nameSpace[$singleNameSpace['type']] = $singleNameSpace;
 		}
 		unset($nameSpaceTmp);
 
 		//error_log(__METHOD__.__LINE__.array2string($nameSpace));
 		// Get special use folders
-		if (!isset(self::$specialUseFolders)) $this->getSpecialUseFolders (); // Set self::$specialUseFolders
+		if (!isset(self::$specialUseFolders)) $this->getSpecialUseFolders(); // Set self::$specialUseFolders
 		// topLevelQueries generally ignore the $_search param. Except for Config::examineNamespace
 		if ($_onlyTopLevel) // top level leaves
 		{
@@ -2642,20 +2642,20 @@ 
 			if (is_null(self::$mailConfig)) self::$mailConfig = config::read('mail');
 			if (self::$mailConfig['examineNamespace'])
 			{
-				$prefixes=array();
+				$prefixes = array();
 				if (is_array($nameSpace))
 				{
-					foreach($nameSpace as $k => $singleNameSpace) {
+					foreach ($nameSpace as $k => $singleNameSpace) {
 						$type = $singleNameSpace['type'];
 
-						if(is_array($singleNameSpace) && $singleNameSpace['prefix']){
+						if (is_array($singleNameSpace) && $singleNameSpace['prefix']) {
 							$prefixes[$type] = $singleNameSpace['prefix'];
 							//regard extra care for nameSpacequeries when configured AND respect $_search
-							$result = $this->icServer->getMailboxes($singleNameSpace['prefix'], $_search==0?0:2, true);
+							$result = $this->icServer->getMailboxes($singleNameSpace['prefix'], $_search == 0 ? 0 : 2, true);
 							if (is_array($result))
 							{
 								ksort($result);
-								$topFolders = array_merge($topFolders,$result);
+								$topFolders = array_merge($topFolders, $result);
 							}
 						}
 					}
@@ -2664,7 +2664,7 @@ 
 
 			$autofolders = array();
 
-			foreach(self::$specialUseFolders as $path => $folder)
+			foreach (self::$specialUseFolders as $path => $folder)
 			{
 				if ($this->folderExists($path))
 				{
@@ -2672,9 +2672,9 @@ 
 				}
 			}
 			// Check if the special use folders are there, otherwise try to create them
-			if (count($autofolders) < count(self::$autoFolders) && $this->check_create_autofolders ($autofolders))
+			if (count($autofolders) < count(self::$autoFolders) && $this->check_create_autofolders($autofolders))
 			{
-				return $this->getFolderArrays ($_nodePath, $_onlyTopLevel, $_search, $_subscribedOnly, $_getCounter);
+				return $this->getFolderArrays($_nodePath, $_onlyTopLevel, $_search, $_subscribedOnly, $_getCounter);
 			}
 
 			// now process topFolders for next level
@@ -2682,13 +2682,13 @@ 
 			{
 				$pattern = "/\\".$delimiter."/";
 				$reference = preg_replace($pattern, '', $node['MAILBOX']);
-				if(!empty($prefixes))
+				if (!empty($prefixes))
 				{
 					$reference = '';
-					$tmpArray = explode($delimiter,$node['MAILBOX']);
-					foreach($tmpArray as $p)
+					$tmpArray = explode($delimiter, $node['MAILBOX']);
+					foreach ($tmpArray as $p)
 					{
-						$reference = empty($reference)?$p:$reference.$delimiter.$p;
+						$reference = empty($reference) ? $p : $reference.$delimiter.$p;
 					}
 				}
 				$mainFolder = $subFolders = array();
@@ -2724,19 +2724,19 @@ 
 							$nFolders [$path] = $folder;
 						}
 					}
-					if (is_array($aFolders)) uasort ($aFolders, array($this,'sortByAutofolder'));
+					if (is_array($aFolders)) uasort($aFolders, array($this, 'sortByAutofolder'));
 					//ksort($aFolders);
 
 					// Sort none auto folders base on mailbox name
-					uasort($nFolders,array($this,'sortByMailbox'));
+					uasort($nFolders, array($this, 'sortByMailbox'));
 
-					$subFolders = array_merge($aFolders,$nFolders);
+					$subFolders = array_merge($aFolders, $nFolders);
 				}
 				else
 				{
 					if (is_array($subFolders)) ksort($subFolders);
 				}
-				$folders = array_merge($folders,(array)$mainFolder, (array)$subFolders);
+				$folders = array_merge($folders, (array)$mainFolder, (array)$subFolders);
 			}
 		}
 		elseif ($_nodePath) // single node
@@ -2763,9 +2763,9 @@ 
 				$folders = $this->icServer->getMailboxes($path, $_search, true);
 			}
 
-			uasort($folders,array($this,'sortByMailbox'));//ksort($folders);
+			uasort($folders, array($this, 'sortByMailbox')); //ksort($folders);
 		}
-		elseif(!$_nodePath) // all
+		elseif (!$_nodePath) // all
 		{
 			if ($_subscribedOnly)
 			{
@@ -2781,98 +2781,98 @@ 
 		{
 			// SORTING FOLDERS
 			//self::$debugTimes=true;
-			if (self::$debugTimes) $starttime = microtime (true);
+			if (self::$debugTimes) $starttime = microtime(true);
 			// Merge of all auto folders and specialusefolders
 			$autoFoldersTmp = array_unique((array_merge(self::$autoFolders, array_values(self::$specialUseFolders))));
-			uasort($folders,array($this,'sortByMailbox'));//ksort($folders);
+			uasort($folders, array($this, 'sortByMailbox')); //ksort($folders);
 			$tmpFolders = $folders;
-			$inboxFolderObject=$inboxSubFolderObjects=$autoFolderObjects=$typeFolderObject=$mySpecialUseFolders=array();
-			$googleMailFolderObject=$googleAutoFolderObjects=$googleSubFolderObjects=array();
-			$isGoogleMail=false;
-			foreach($autoFoldersTmp as $afk=>$aF)
+			$inboxFolderObject = $inboxSubFolderObjects = $autoFolderObjects = $typeFolderObject = $mySpecialUseFolders = array();
+			$googleMailFolderObject = $googleAutoFolderObjects = $googleSubFolderObjects = array();
+			$isGoogleMail = false;
+			foreach ($autoFoldersTmp as $afk=>$aF)
 			{
-				if (!isset($mySpecialUseFolders[$aF]) && $aF) $mySpecialUseFolders[$aF]=$this->getFolderByType($aF,false);
+				if (!isset($mySpecialUseFolders[$aF]) && $aF) $mySpecialUseFolders[$aF] = $this->getFolderByType($aF, false);
 				//error_log($afk.':'.$aF.'->'.$mySpecialUseFolders[$aF]);
 			}
 			//error_log(array2string($mySpecialUseFolders));
 			foreach ($tmpFolders as $k => $f) {
-				$sorted=false;
-				if (strtoupper(substr($k,0,5))=='INBOX') {
-					if (strtoupper($k)=='INBOX') {
+				$sorted = false;
+				if (strtoupper(substr($k, 0, 5)) == 'INBOX') {
+					if (strtoupper($k) == 'INBOX') {
 						//error_log(__METHOD__.__LINE__.':'.strtoupper(substr($k,0,5)).':'.$k);
-						$inboxFolderObject[$k]=$f;
+						$inboxFolderObject[$k] = $f;
 						unset($folders[$k]);
-						$sorted=true;
+						$sorted = true;
 					} else {
-						$isAutoFolder=false;
-						foreach($autoFoldersTmp as $afk=>$aF)
+						$isAutoFolder = false;
+						foreach ($autoFoldersTmp as $afk=>$aF)
 						{
 							//error_log($k.':'.$aF.'->'.$mySpecialUseFolders[$aF]);
-							if($aF && strlen($mySpecialUseFolders[$aF])&&/*strlen($k)>=strlen($mySpecialUseFolders[$aF])&&*/
-								($mySpecialUseFolders[$aF]==$k || substr($k,0,strlen($mySpecialUseFolders[$aF].$delimiter))==$mySpecialUseFolders[$aF].$delimiter))
+							if ($aF && strlen($mySpecialUseFolders[$aF]) && /*strlen($k)>=strlen($mySpecialUseFolders[$aF])&&*/
+								($mySpecialUseFolders[$aF] == $k || substr($k, 0, strlen($mySpecialUseFolders[$aF].$delimiter)) == $mySpecialUseFolders[$aF].$delimiter))
 							{
 								//error_log($k.'->'.$mySpecialUseFolders[$aF]);
-								$isAutoFolder=true;
-								$autoFolderObjects[$k]=$f;
+								$isAutoFolder = true;
+								$autoFolderObjects[$k] = $f;
 								break;
 							}
 						}
-						if ($isAutoFolder==false) $inboxSubFolderObjects[$k]=$f;
+						if ($isAutoFolder == false) $inboxSubFolderObjects[$k] = $f;
 						unset($folders[$k]);
-						$sorted=true;
+						$sorted = true;
 					}
-				} elseif (strtoupper(substr($k,0,13))=='[GOOGLE MAIL]') {
-					$isGoogleMail=true;
-					if (strtoupper($k)=='[GOOGLE MAIL]') {
-						$googleMailFolderObject[$k]=$f;
+				} elseif (strtoupper(substr($k, 0, 13)) == '[GOOGLE MAIL]') {
+					$isGoogleMail = true;
+					if (strtoupper($k) == '[GOOGLE MAIL]') {
+						$googleMailFolderObject[$k] = $f;
 						unset($folders[$k]);
-						$sorted=true;
+						$sorted = true;
 					} else {
-						$isAutoFolder=false;
-						foreach($autoFoldersTmp as $afk=>$aF)
+						$isAutoFolder = false;
+						foreach ($autoFoldersTmp as $afk=>$aF)
 						{
 							//error_log($k.':'.$aF.'->'.$mySpecialUseFolders[$aF]);
-							if($aF && strlen($mySpecialUseFolders[$aF])&&/*strlen($k)>=strlen($mySpecialUseFolders[$aF])&&*/
-								($mySpecialUseFolders[$aF]==$k || substr($k,0,strlen($mySpecialUseFolders[$aF].$delimiter))==$mySpecialUseFolders[$aF].$delimiter))
+							if ($aF && strlen($mySpecialUseFolders[$aF]) && /*strlen($k)>=strlen($mySpecialUseFolders[$aF])&&*/
+								($mySpecialUseFolders[$aF] == $k || substr($k, 0, strlen($mySpecialUseFolders[$aF].$delimiter)) == $mySpecialUseFolders[$aF].$delimiter))
 							{
 								//error_log($k.'->'.$mySpecialUseFolders[$aF]);
-								$isAutoFolder=true;
-								$googleAutoFolderObjects[$k]=$f;
+								$isAutoFolder = true;
+								$googleAutoFolderObjects[$k] = $f;
 								break;
 							}
 						}
-						if ($isAutoFolder==false) $googleSubFolderObjects[$k]=$f;
+						if ($isAutoFolder == false) $googleSubFolderObjects[$k] = $f;
 						unset($folders[$k]);
-						$sorted=true;
+						$sorted = true;
 					}
 				} else {
-					$isAutoFolder=false;
-					foreach($autoFoldersTmp as $afk=>$aF)
+					$isAutoFolder = false;
+					foreach ($autoFoldersTmp as $afk=>$aF)
 					{
 						//error_log($k.':'.$aF.'->'.$mySpecialUseFolders[$aF]);
-						if($aF && strlen($mySpecialUseFolders[$aF])&&/*strlen($k)>=strlen($mySpecialUseFolders[$aF])&&*/
-								($mySpecialUseFolders[$aF]==$k || substr($k,0,strlen($mySpecialUseFolders[$aF].$delimiter))==$mySpecialUseFolders[$aF].$delimiter))
+						if ($aF && strlen($mySpecialUseFolders[$aF]) && /*strlen($k)>=strlen($mySpecialUseFolders[$aF])&&*/
+								($mySpecialUseFolders[$aF] == $k || substr($k, 0, strlen($mySpecialUseFolders[$aF].$delimiter)) == $mySpecialUseFolders[$aF].$delimiter))
 						{
 							//error_log($k.'->'.$mySpecialUseFolders[$aF]);
-							$isAutoFolder=true;
-							$autoFolderObjects[$k]=$f;
+							$isAutoFolder = true;
+							$autoFolderObjects[$k] = $f;
 							unset($folders[$k]);
-							$sorted=true;
+							$sorted = true;
 							break;
 						}
 					}
 				}
 
-				if ($sorted==false)
+				if ($sorted == false)
 				{
-					foreach(array('others','shared') as $type)
+					foreach (array('others', 'shared') as $type)
 					{
-						if ($nameSpace[$type]['prefix_present']&&$nameSpace[$type]['prefix'])
+						if ($nameSpace[$type]['prefix_present'] && $nameSpace[$type]['prefix'])
 						{
-							if (substr($k,0,strlen($nameSpace[$type]['prefix']))==$nameSpace[$type]['prefix']||
-								substr($k,0,strlen($nameSpace[$type]['prefix'])-strlen($nameSpace[$type]['delimiter']))==substr($nameSpace[$type]['prefix'],0,strlen($nameSpace[$type]['delimiter'])*-1)) {
+							if (substr($k, 0, strlen($nameSpace[$type]['prefix'])) == $nameSpace[$type]['prefix'] ||
+								substr($k, 0, strlen($nameSpace[$type]['prefix']) - strlen($nameSpace[$type]['delimiter'])) == substr($nameSpace[$type]['prefix'], 0, strlen($nameSpace[$type]['delimiter']) * -1)) {
 								//error_log(__METHOD__.__LINE__.':'.substr($k,0,strlen($nameSpace[$type]['prefix'])).':'.$k);
-								$typeFolderObject[$type][$k]=$f;
+								$typeFolderObject[$type][$k] = $f;
 								unset($folders[$k]);
 							}
 						}
@@ -2883,38 +2883,38 @@ 
 			// avoid calling sortByAutoFolder as it is not regarding subfolders
 			$autoFolderObjectsTmp = $autoFolderObjects;
 			unset($autoFolderObjects);
-			uasort($autoFolderObjectsTmp, array($this,'sortByMailbox'));
-			foreach($autoFoldersTmp as $afk=>$aF)
+			uasort($autoFolderObjectsTmp, array($this, 'sortByMailbox'));
+			foreach ($autoFoldersTmp as $afk=>$aF)
 			{
-				foreach($autoFolderObjectsTmp as $k => $f)
+				foreach ($autoFolderObjectsTmp as $k => $f)
 				{
-					if($aF && ($mySpecialUseFolders[$aF]==$k || substr($k,0,strlen($mySpecialUseFolders[$aF].$delimiter))==$mySpecialUseFolders[$aF].$delimiter))
+					if ($aF && ($mySpecialUseFolders[$aF] == $k || substr($k, 0, strlen($mySpecialUseFolders[$aF].$delimiter)) == $mySpecialUseFolders[$aF].$delimiter))
 					{
-						$autoFolderObjects[$k]=$f;
+						$autoFolderObjects[$k] = $f;
 					}
 				}
 			}
 			//error_log(__METHOD__.__LINE__.array2string($autoFolderObjects));
 			if (!$isGoogleMail) {
-				$folders = array_merge($inboxFolderObject,$autoFolderObjects,(array)$inboxSubFolderObjects,(array)$folders,(array)$typeFolderObject['others'],(array)$typeFolderObject['shared']);
+				$folders = array_merge($inboxFolderObject, $autoFolderObjects, (array)$inboxSubFolderObjects, (array)$folders, (array)$typeFolderObject['others'], (array)$typeFolderObject['shared']);
 			} else {
 				// avoid calling sortByAutoFolder as it is not regarding subfolders
 				$gAutoFolderObjectsTmp = $googleAutoFolderObjects;
 				unset($googleAutoFolderObjects);
-				uasort($gAutoFolderObjectsTmp, array($this,'sortByMailbox'));
-				foreach($autoFoldersTmp as $afk=>$aF)
+				uasort($gAutoFolderObjectsTmp, array($this, 'sortByMailbox'));
+				foreach ($autoFoldersTmp as $afk=>$aF)
 				{
-					foreach($gAutoFolderObjectsTmp as $k => $f)
+					foreach ($gAutoFolderObjectsTmp as $k => $f)
 					{
-						if($aF && ($mySpecialUseFolders[$aF]==$k || substr($k,0,strlen($mySpecialUseFolders[$aF].$delimiter))==$mySpecialUseFolders[$aF].$delimiter))
+						if ($aF && ($mySpecialUseFolders[$aF] == $k || substr($k, 0, strlen($mySpecialUseFolders[$aF].$delimiter)) == $mySpecialUseFolders[$aF].$delimiter))
 						{
-							$googleAutoFolderObjects[$k]=$f;
+							$googleAutoFolderObjects[$k] = $f;
 						}
 					}
 				}
-				$folders = array_merge($inboxFolderObject,$autoFolderObjects,(array)$folders,(array)$googleMailFolderObject,$googleAutoFolderObjects,$googleSubFolderObjects,(array)$typeFolderObject['others'],(array)$typeFolderObject['shared']);
+				$folders = array_merge($inboxFolderObject, $autoFolderObjects, (array)$folders, (array)$googleMailFolderObject, $googleAutoFolderObjects, $googleSubFolderObjects, (array)$typeFolderObject['others'], (array)$typeFolderObject['shared']);
 			}
-			if (self::$debugTimes) self::logRunTimes($starttime,null,function_backtrace(),__METHOD__.' ('.__LINE__.') Sorting:');
+			if (self::$debugTimes) self::logRunTimes($starttime, null, function_backtrace(), __METHOD__.' ('.__LINE__.') Sorting:');
 			//self::$debugTimes=false;
 		}
 		// Get counter information and add them to each fetched folders array
@@ -2936,10 +2936,10 @@ 
 	 * @param array $autofolders_exists existing folders, no need to check their existance again
 	 * @return int number of new folders created
 	 */
-	function check_create_autofolders(array $autofolders_exists=array())
+	function check_create_autofolders(array $autofolders_exists = array())
 	{
 		$num_created = 0;
-		foreach(self::$autoFolders as $folder)
+		foreach (self::$autoFolders as $folder)
 		{
 			$created = false;
 			if (!in_array($folder, $autofolders_exists) && $this->_getSpecialUseFolder($folder, true, $created) &&
@@ -2964,7 +2964,7 @@ 
 		$rv = false;
 		foreach ($haystack as $k => $v)
 		{
-			foreach($v as &$sv) {if (trim($sv)==trim($needle)) return $k;}
+			foreach ($v as &$sv) {if (trim($sv) == trim($needle)) return $k; }
 		}
 		return $rv;
 	}
@@ -2977,9 +2977,9 @@ 
 	 * @param array $b array of folders
 	 * @return int expect values (0, 1 or -1)
 	 */
-	function sortByMailbox($a,$b)
+	function sortByMailbox($a, $b)
 	{
-		return strcasecmp($a['MAILBOX'],$b['MAILBOX']);
+		return strcasecmp($a['MAILBOX'], $b['MAILBOX']);
 	}
 
 	/**
@@ -2990,13 +2990,13 @@ 
 	 * @param array $b
 	 * @return int expect values (0, 1 or -1)
 	 */
-	function sortByAutoFolder($a,$b)
+	function sortByAutoFolder($a, $b)
 	{
 		// 0, 1 und -1
 		$a = mail_tree::pathToFolderData($a['MAILBOX'], $a['delimiter']);
 		$b = mail_tree::pathToFolderData($b['MAILBOX'], $b['delimiter']);
-		$pos1 = array_search(trim($a['name']),self::$autoFolders);
-		$pos2 = array_search(trim($b['name']),self::$autoFolders);
+		$pos1 = array_search(trim($a['name']), self::$autoFolders);
+		$pos2 = array_search(trim($b['name']), self::$autoFolders);
 		if ($pos1 == $pos2) return 0;
 		return ($pos1 < $pos2) ? -1 : 1;
 	}
@@ -3009,10 +3009,10 @@ 
 	 * @param object $b array of folderobjects
 	 * @return int expect values (0, 1 or -1)
 	 */
-	function sortByDisplayName($a,$b)
+	function sortByDisplayName($a, $b)
 	{
 		// 0, 1 und -1
-		return strcasecmp($a->displayName,$b->displayName);
+		return strcasecmp($a->displayName, $b->displayName);
 	}
 
 	/**
@@ -3023,11 +3023,11 @@ 
 	 * @param object $b array of folderobjects
 	 * @return int expect values (0, 1 or -1)
 	 */
-	function sortByAutoFolderPos($a,$b)
+	function sortByAutoFolderPos($a, $b)
 	{
 		// 0, 1 und -1
-		$pos1 = array_search(trim($a->shortFolderName),self::$autoFolders);
-		$pos2 = array_search(trim($b->shortFolderName),self::$autoFolders);
+		$pos1 = array_search(trim($a->shortFolderName), self::$autoFolders);
+		$pos2 = array_search(trim($b->shortFolderName), self::$autoFolders);
 		if ($pos1 == $pos2) return 0;
 		return ($pos1 < $pos2) ? -1 : 1;
 	}
@@ -3040,7 +3040,7 @@ 
 	 * @param boolean $_returnObject return the counters as object rather than an array
 	 * @return mixed false or array of counters array(MESSAGES,UNSEEN,RECENT,UIDNEXT,UIDVALIDITY) or object
 	 */
-	function getMailBoxCounters($folderName,$_returnObject=true)
+	function getMailBoxCounters($folderName, $_returnObject = true)
 	{
 		try
 		{
@@ -3052,9 +3052,9 @@ 
 			if (self::$debug) error_log(__METHOD__." returned FolderStatus for Folder $folderName:".$e->getMessage());
 			return false;
 		}
-		if(is_array($folderStatus)) {
-			if ($_returnObject===false) return $folderStatus;
-			$status =  new stdClass;
+		if (is_array($folderStatus)) {
+			if ($_returnObject === false) return $folderStatus;
+			$status = new stdClass;
 			$status->messages   = $folderStatus['MESSAGES'];
 			$status->unseen     = $folderStatus['UNSEEN'];
 			$status->recent     = $folderStatus['RECENT'];
@@ -3076,42 +3076,42 @@ 
 	 * @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)
 	{
 		#echo __METHOD__." retrieve SubFolders for $_mailbox$delimiter <br>";
-		$maxreclevel=25;
+		$maxreclevel = 25;
 		if ($reclevel > $maxreclevel) {
-			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->icServer->getMailboxes($_mailbox,1,true);
+		$mbx = $this->icServer->getMailboxes($_mailbox, 1, true);
 		$mbxkeys = array_keys($mbx);
 		#_debug_array($mbx);
 //error_log(__METHOD__.' ('.__LINE__.') '.' Delimiter:'.array2string($delimiter));
 //error_log(__METHOD__.' ('.__LINE__.') '.array2string($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"]))) {
 			// if there are children fetch them
 			//echo $mbx[$mbxkeys[0]]['MAILBOX']."<br>";
 
-			$buff = $this->icServer->getMailboxes($mbx[$mbxkeys[0]]['MAILBOX'].($mbx[$mbxkeys[0]]['MAILBOX'] == $prefix ? '':$delimiter),2,false);
+			$buff = $this->icServer->getMailboxes($mbx[$mbxkeys[0]]['MAILBOX'].($mbx[$mbxkeys[0]]['MAILBOX'] == $prefix ? '' : $delimiter), 2, false);
 			//$buff = $this->icServer->getMailboxes($mbx[$mbxkeys[0]]['MAILBOX'],2,false);
 			//_debug_array($buff);
 			$allMailboxes = array();
 			foreach ($buff as $mbxname) {
 //error_log(__METHOD__.' ('.__LINE__.') '.array2string($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 {
 			return array($_mailbox);
@@ -3126,17 +3126,17 @@ 
 	 * @param boolean& $created =null on return true: if folder was just created, false if not
 	 * @return mixed string or false
 	 */
-	function _getSpecialUseFolder($_type, $_checkexistance=TRUE, &$created=null)
+	function _getSpecialUseFolder($_type, $_checkexistance = TRUE, &$created = null)
 	{
 		static $types = array(
-			'Drafts'   => array('profileKey'=>'acc_folder_draft','autoFolderName'=>'Drafts'),
-			'Template' => array('profileKey'=>'acc_folder_template','autoFolderName'=>'Templates'),
-			'Trash'    => array('profileKey'=>'acc_folder_trash','autoFolderName'=>'Trash'),
-			'Sent'     => array('profileKey'=>'acc_folder_sent','autoFolderName'=>'Sent'),
-			'Junk'     => array('profileKey'=>'acc_folder_junk','autoFolderName'=>'Junk'),
-			'Outbox'   => array('profileKey'=>'acc_folder_outbox','autoFolderName'=>'Outbox'),
+			'Drafts'   => array('profileKey'=>'acc_folder_draft', 'autoFolderName'=>'Drafts'),
+			'Template' => array('profileKey'=>'acc_folder_template', 'autoFolderName'=>'Templates'),
+			'Trash'    => array('profileKey'=>'acc_folder_trash', 'autoFolderName'=>'Trash'),
+			'Sent'     => array('profileKey'=>'acc_folder_sent', 'autoFolderName'=>'Sent'),
+			'Junk'     => array('profileKey'=>'acc_folder_junk', 'autoFolderName'=>'Junk'),
+			'Outbox'   => array('profileKey'=>'acc_folder_outbox', 'autoFolderName'=>'Outbox'),
 		);
-		if ($_type == 'Templates') $_type = 'Template';	// for some reason self::$autofolders uses 'Templates'!
+		if ($_type == 'Templates') $_type = 'Template'; // for some reason self::$autofolders uses 'Templates'!
 		$created = false;
 		if (!isset($types[$_type]))
 		{
@@ -3157,38 +3157,38 @@ 
 			$_folderName = false;
 		}
 		// does the folder exist??? (is configured/preset, but non-existent)
-		if ($_folderName && $_checkexistance && $_folderName !='none' && !$this->folderExists($_folderName,true)) {
+		if ($_folderName && $_checkexistance && $_folderName != 'none' && !$this->folderExists($_folderName, true)) {
 			try
 			{
 				$error = null;
 				if (($_folderName = $this->createFolder('', $_folderName, $error))) $created = true;
 				if ($error) error_log(__METHOD__.' ('.__LINE__.') '.' Failed to create Folder '.$_folderName." for $_type:".$error);
 			}
-			catch(Exception $e)
+			catch (Exception $e)
 			{
 				error_log(__METHOD__.' ('.__LINE__.') '.' Failed to create Folder '.$_folderName." for $_type:".$e->getMessage().':'.function_backtrace());
 				$_folderName = false;
 			}
 		}
 		// not sure yet if false is the correct behavior on none
-		if ($_folderName =='none') return 'none' ; //false;
+		if ($_folderName == 'none') return 'none'; //false;
 		//no (valid) folder found yet; try specialUseFolders
-		if (empty($_folderName) && is_array(self::$specialUseFolders) && ($f = array_search($_type,self::$specialUseFolders))) $_folderName = $f;
+		if (empty($_folderName) && is_array(self::$specialUseFolders) && ($f = array_search($_type, self::$specialUseFolders))) $_folderName = $f;
 		//no specialUseFolder; try some Defaults
 		if (empty($_folderName) && isset($types[$_type]))
 		{
 			$nameSpace = $this->_getNameSpaces();
-			$prefix='';
+			$prefix = '';
 			foreach ($nameSpace as $nSp)
 			{
-				if ($nSp['type']=='personal')
+				if ($nSp['type'] == 'personal')
 				{
 					//error_log(__METHOD__.__LINE__.array2string($nSp));
 					$prefix = $nSp['prefix'];
 					break;
 				}
 			}
-			if ($this->folderExists($prefix.$types[$_type]['autoFolderName'],true))
+			if ($this->folderExists($prefix.$types[$_type]['autoFolderName'], true))
 			{
 				$_folderName = $prefix.$types[$_type]['autoFolderName'];
 			}
@@ -3197,11 +3197,11 @@ 
 				try
 				{
 					$error = null;
-					$this->createFolder('', $prefix.$types[$_type]['autoFolderName'],$error);
+					$this->createFolder('', $prefix.$types[$_type]['autoFolderName'], $error);
 					$_folderName = $prefix.$types[$_type]['autoFolderName'];
 					if ($error) error_log(__METHOD__.' ('.__LINE__.') '.' Failed to create Folder '.$_folderName." for $_type:".$error);
 				}
-				catch(Exception $e)
+				catch (Exception $e)
 				{
 					error_log(__METHOD__.' ('.__LINE__.') '.' Failed to create Folder '.$_folderName." for $_type:".$e->getMessage());
 					$_folderName = false;
@@ -3217,7 +3217,7 @@ 
 	 * @param boolean $_checkexistance trigger check for existance
 	 * @return mixed string or false
 	 */
-	function getFolderByType($type, $_checkexistance=false)
+	function getFolderByType($type, $_checkexistance = false)
 	{
 		return $this->_getSpecialUseFolder($type, $_checkexistance);
 	}
@@ -3227,7 +3227,7 @@ 
 	 * @param boolean $_checkexistance trigger check for existance
 	 * @return mixed string or false
 	 */
-	function getJunkFolder($_checkexistance=TRUE)
+	function getJunkFolder($_checkexistance = TRUE)
 	{
 		return $this->_getSpecialUseFolder('Junk', $_checkexistance);
 	}
@@ -3237,7 +3237,7 @@ 
 	 * @param boolean $_checkexistance trigger check for existance
 	 * @return mixed string or false
 	 */
-	function getDraftFolder($_checkexistance=TRUE)
+	function getDraftFolder($_checkexistance = TRUE)
 	{
 		return $this->_getSpecialUseFolder('Drafts', $_checkexistance);
 	}
@@ -3247,7 +3247,7 @@ 
 	 * @param boolean $_checkexistance trigger check for existance
 	 * @return mixed string or false
 	 */
-	function getTemplateFolder($_checkexistance=TRUE)
+	function getTemplateFolder($_checkexistance = TRUE)
 	{
 		return $this->_getSpecialUseFolder('Template', $_checkexistance);
 	}
@@ -3257,7 +3257,7 @@ 
 	 * @param boolean $_checkexistance trigger check for existance
 	 * @return mixed string or false
 	 */
-	function getTrashFolder($_checkexistance=TRUE)
+	function getTrashFolder($_checkexistance = TRUE)
 	{
 		return $this->_getSpecialUseFolder('Trash', $_checkexistance);
 	}
@@ -3267,7 +3267,7 @@ 
 	 * @param boolean $_checkexistance trigger check for existance
 	 * @return mixed string or false
 	 */
-	function getSentFolder($_checkexistance=TRUE)
+	function getSentFolder($_checkexistance = TRUE)
 	{
 		return $this->_getSpecialUseFolder('Sent', $_checkexistance);
 	}
@@ -3277,7 +3277,7 @@ 
 	 * @param boolean $_checkexistance trigger check for existance
 	 * @return mixed string or false
 	 */
-	function getOutboxFolder($_checkexistance=TRUE)
+	function getOutboxFolder($_checkexistance = TRUE)
 	{
 		return $this->_getSpecialUseFolder('Outbox', $_checkexistance);
 	}
@@ -3288,10 +3288,10 @@ 
 	 * @param boolean $_checkexistance trigger check for existance
 	 * @return boolean
 	 */
-	function isSentFolder($_folderName, $_checkexistance=TRUE)
+	function isSentFolder($_folderName, $_checkexistance = TRUE)
 	{
 		$sentFolder = $this->getSentFolder($_checkexistance);
-		if(empty($sentFolder)) {
+		if (empty($sentFolder)) {
 			return false;
 		}
 		// does the folder exist???
@@ -3299,7 +3299,7 @@ 
 			return false;
 		}
 
-		if(false !== stripos($_folderName, $sentFolder)) {
+		if (false !== stripos($_folderName, $sentFolder)) {
 			return true;
 		} else {
 			return false;
@@ -3312,15 +3312,15 @@ 
 	 * @param boolean $_checkexistance trigger check for existance
 	 * @return boolean
 	 */
-	function isOutbox($_folderName, $_checkexistance=TRUE)
+	function isOutbox($_folderName, $_checkexistance = TRUE)
 	{
-		if (stripos($_folderName, 'Outbox')===false) {
+		if (stripos($_folderName, 'Outbox') === false) {
 			return false;
 		}
 		// does the folder exist???
 		if ($_checkexistance && $GLOBALS['egw_info']['user']['apps']['activesync'] && !$this->folderExists($_folderName)) {
 			$outboxFolder = $this->getOutboxFolder($_checkexistance);
-			if(false !== stripos($_folderName, $outboxFolder)) {
+			if (false !== stripos($_folderName, $outboxFolder)) {
 				return true;
 			} else {
 				return false;
@@ -3335,18 +3335,18 @@ 
 	 * @param boolean $_checkexistance trigger check for existance
 	 * @return boolean
 	 */
-	function isDraftFolder($_folderName, $_checkexistance=TRUE)
+	function isDraftFolder($_folderName, $_checkexistance = TRUE)
 	{
 		$draftFolder = $this->getDraftFolder($_checkexistance);
-		if(empty($draftFolder)) {
+		if (empty($draftFolder)) {
 			return false;
 		}
 		// does the folder exist???
 		if ($_checkexistance && !$this->folderExists($_folderName)) {
 			return false;
 		}
-		if (is_a($_folderName,"Horde_Imap_Client_Mailbox")) $_folderName = $_folderName->utf8;
-		if(false !== stripos($_folderName, $draftFolder)) {
+		if (is_a($_folderName, "Horde_Imap_Client_Mailbox")) $_folderName = $_folderName->utf8;
+		if (false !== stripos($_folderName, $draftFolder)) {
 			return true;
 		} else {
 			return false;
@@ -3359,10 +3359,10 @@ 
 	 * @param boolean $_checkexistance trigger check for existance
 	 * @return boolean
 	 */
-	function isTrashFolder($_folderName, $_checkexistance=TRUE)
+	function isTrashFolder($_folderName, $_checkexistance = TRUE)
 	{
 		$trashFolder = $this->getTrashFolder($_checkexistance);
-		if(empty($trashFolder)) {
+		if (empty($trashFolder)) {
 			return false;
 		}
 		// does the folder exist???
@@ -3370,7 +3370,7 @@ 
 			return false;
 		}
 
-		if(false !== stripos($_folderName, $trashFolder)) {
+		if (false !== stripos($_folderName, $trashFolder)) {
 			return true;
 		} else {
 			return false;
@@ -3383,10 +3383,10 @@ 
 	 * @param boolean $_checkexistance trigger check for existance
 	 * @return boolean
 	 */
-	function isTemplateFolder($_folderName, $_checkexistance=TRUE)
+	function isTemplateFolder($_folderName, $_checkexistance = TRUE)
 	{
 		$templateFolder = $this->getTemplateFolder($_checkexistance);
-		if(empty($templateFolder)) {
+		if (empty($templateFolder)) {
 			return false;
 		}
 		// does the folder exist???
@@ -3394,7 +3394,7 @@ 
 			return false;
 		}
 
-		if(false !== stripos($_folderName, $templateFolder)) {
+		if (false !== stripos($_folderName, $templateFolder)) {
 			return true;
 		} else {
 			return false;
@@ -3407,24 +3407,24 @@ 
 	 * @param boolean $_forceCheck trigger check for existance on icServer
 	 * @return mixed string or false
 	 */
-	function folderExists($_folder, $_forceCheck=false)
+	function folderExists($_folder, $_forceCheck = false)
 	{
 		static $folderInfo;
 		$forceCheck = $_forceCheck;
 		if (empty($_folder))
 		{
 			// this error is more or less without significance, unless we force the check
-			if ($_forceCheck===true) error_log(__METHOD__.' ('.__LINE__.') '.' Called with empty Folder:'.$_folder.function_backtrace());
+			if ($_forceCheck === true) error_log(__METHOD__.' ('.__LINE__.') '.' Called with empty Folder:'.$_folder.function_backtrace());
 			return false;
 		}
 		// when check is not enforced , we assume a folder represented as Horde_Imap_Client_Mailbox as existing folder
-		if (is_a($_folder,"Horde_Imap_Client_Mailbox")&&$_forceCheck===false) return true;
-		if (is_a($_folder,"Horde_Imap_Client_Mailbox")) $_folder =  $_folder->utf8;
+		if (is_a($_folder, "Horde_Imap_Client_Mailbox") && $_forceCheck === false) return true;
+		if (is_a($_folder, "Horde_Imap_Client_Mailbox")) $_folder = $_folder->utf8;
 		// reduce traffic within the Instance per User; Expire every 5 hours
 		//error_log(__METHOD__.' ('.__LINE__.') '.' Called with Folder:'.$_folder.function_backtrace());
-		if (is_null($folderInfo)) $folderInfo = egw_cache::getCache(egw_cache::INSTANCE,'email','icServerFolderExistsInfo'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),$expiration=60*60*5);
+		if (is_null($folderInfo)) $folderInfo = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'icServerFolderExistsInfo'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), $expiration = 60 * 60 * 5);
 		//error_log(__METHOD__.' ('.__LINE__.') '.'Cached Info on Folder:'.$_folder.' for Profile:'.$this->profileID.($forceCheck?'(forcedCheck)':'').':'.array2string($folderInfo));
-		if (!empty($folderInfo) && isset($folderInfo[$this->profileID]) && isset($folderInfo[$this->profileID][$_folder]) && $forceCheck===false)
+		if (!empty($folderInfo) && isset($folderInfo[$this->profileID]) && isset($folderInfo[$this->profileID][$_folder]) && $forceCheck === false)
 		{
 			//error_log(__METHOD__.' ('.__LINE__.') '.' Using cached Info on Folder:'.$_folder.' for Profile:'.$this->profileID);
 			return $folderInfo[$this->profileID][$_folder];
@@ -3440,7 +3440,7 @@ 
 
 		// does the folder exist???
 		//error_log(__METHOD__."->Connected?".$this->icServer->_connected.", ".$_folder.", ".($forceCheck?' forceCheck activated':'dont check on server'));
-		if ( $forceCheck || empty($folderInfo) || !isset($folderInfo[$this->profileID]) || !isset($folderInfo[$this->profileID][$_folder])) {
+		if ($forceCheck || empty($folderInfo) || !isset($folderInfo[$this->profileID]) || !isset($folderInfo[$this->profileID][$_folder])) {
 			//error_log(__METHOD__."->NotConnected and forceCheck with profile:".$this->profileID);
 			//return false;
 			//try to connect
@@ -3456,12 +3456,12 @@ 
 		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.' Folder Exists:'.$folderInfo[$this->profileID][$_folder].function_backtrace());
 
-		if(!empty($folderInfo) && isset($folderInfo[$this->profileID][$_folder]) &&
+		if (!empty($folderInfo) && isset($folderInfo[$this->profileID][$_folder]) &&
 			$folderInfo[$this->profileID][$_folder] !== true)
 		{
 			$folderInfo[$this->profileID][$_folder] = false; // set to false, whatever it was (to have a valid returnvalue for the static return)
 		}
-		egw_cache::setCache(egw_cache::INSTANCE,'email','icServerFolderExistsInfo'.trim($GLOBALS['egw_info']['user']['account_id']),$folderInfo,$expiration=60*60*5);
+		egw_cache::setCache(egw_cache::INSTANCE, 'email', 'icServerFolderExistsInfo'.trim($GLOBALS['egw_info']['user']['account_id']), $folderInfo, $expiration = 60 * 60 * 5);
 		return (!empty($folderInfo) && isset($folderInfo[$this->profileID][$_folder]) ? $folderInfo[$this->profileID][$_folder] : false);
 	}
 
@@ -3474,14 +3474,14 @@ 
 	 */
 	function compressFolder($_folderName = false)
 	{
-		$folderName	= ($_folderName ? $_folderName : $this->sessionData['mailbox']);
-		$deleteOptions	= $GLOBALS['egw_info']['user']['preferences']['mail']['deleteOptions'];
-		$trashFolder	= $this->getTrashFolder();
+		$folderName = ($_folderName ? $_folderName : $this->sessionData['mailbox']);
+		$deleteOptions = $GLOBALS['egw_info']['user']['preferences']['mail']['deleteOptions'];
+		$trashFolder = $this->getTrashFolder();
 
 		$this->icServer->openMailbox($folderName);
 
-		if(strtolower($folderName) == strtolower($trashFolder) && $deleteOptions == "move_to_trash") {
-			$this->deleteMessages('all',$folderName,'remove_immediately');
+		if (strtolower($folderName) == strtolower($trashFolder) && $deleteOptions == "move_to_trash") {
+			$this->deleteMessages('all', $folderName, 'remove_immediately');
 		} else {
 			$this->icServer->expunge($folderName);
 		}
@@ -3497,19 +3497,19 @@ 
 	 * @return bool true, as we do not handle return values yet
 	 * @throws egw_exception
 	 */
-	function deleteMessages($_messageUID, $_folder=NULL, $_forceDeleteMethod='no')
+	function deleteMessages($_messageUID, $_folder = NULL, $_forceDeleteMethod = 'no')
 	{
 		//error_log(__METHOD__.' ('.__LINE__.') '.'->'.array2string($_messageUID).','.array2string($_folder).', '.$_forceDeleteMethod);
 		$oldMailbox = '';
 		if (is_null($_folder) || empty($_folder)) $_folder = $this->sessionData['mailbox'];
 		if (empty($_messageUID))
 		{
-			if (self::$debug) error_log(__METHOD__." no messages Message(s): ".implode(',',$_messageUID));
+			if (self::$debug) error_log(__METHOD__." no messages Message(s): ".implode(',', $_messageUID));
 			return false;
 		}
-		elseif ($_messageUID==='all')
+		elseif ($_messageUID === 'all')
 		{
-			$_messageUID= null;
+			$_messageUID = null;
 		}
 		else
 		{
@@ -3518,32 +3518,32 @@ 
 			$uidsToDelete->add($_messageUID);
 		}
 		$deleteOptions = $_forceDeleteMethod; // use forceDeleteMethod if not "no", or unknown method
-		if ($_forceDeleteMethod === 'no' || !in_array($_forceDeleteMethod,array('move_to_trash',"mark_as_deleted","remove_immediately"))) $deleteOptions  = ($this->mailPreferences['deleteOptions']?$this->mailPreferences['deleteOptions']:"mark_as_deleted");
+		if ($_forceDeleteMethod === 'no' || !in_array($_forceDeleteMethod, array('move_to_trash', "mark_as_deleted", "remove_immediately"))) $deleteOptions = ($this->mailPreferences['deleteOptions'] ? $this->mailPreferences['deleteOptions'] : "mark_as_deleted");
 		//error_log(__METHOD__.' ('.__LINE__.') '.'->'.array2string($_messageUID).','.$_folder.'/'.$this->sessionData['mailbox'].' Option:'.$deleteOptions);
 		$trashFolder    = $this->getTrashFolder();
-		$draftFolder	= $this->getDraftFolder(); //$GLOBALS['egw_info']['user']['preferences']['mail']['draftFolder'];
+		$draftFolder = $this->getDraftFolder(); //$GLOBALS['egw_info']['user']['preferences']['mail']['draftFolder'];
 		$templateFolder = $this->getTemplateFolder(); //$GLOBALS['egw_info']['user']['preferences']['mail']['templateFolder'];
-		if((strtolower($_folder) == strtolower($trashFolder) && $deleteOptions == "move_to_trash") ||
+		if ((strtolower($_folder) == strtolower($trashFolder) && $deleteOptions == "move_to_trash") ||
 		   (strtolower($_folder) == strtolower($draftFolder))) {
 			$deleteOptions = "remove_immediately";
 		}
-		if($this->icServer->getCurrentMailbox() != $_folder) {
+		if ($this->icServer->getCurrentMailbox() != $_folder) {
 			$oldMailbox = $this->icServer->getCurrentMailbox();
 			$this->icServer->openMailbox($_folder);
 		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.'->'.array2string($_messageUID).','.$_folder.'/'.$this->sessionData['mailbox'].' Option:'.$deleteOptions);
 		$updateCache = false;
-		switch($deleteOptions) {
+		switch ($deleteOptions) {
 			case "move_to_trash":
 				//error_log(__METHOD__.' ('.__LINE__.') ');
 				$updateCache = true;
-				if(!empty($trashFolder)) {
+				if (!empty($trashFolder)) {
 					if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.implode(' : ', $_messageUID));
-					if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '."$trashFolder <= $_folder / ". $this->sessionData['mailbox']);
+					if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '."$trashFolder <= $_folder / ".$this->sessionData['mailbox']);
 					// copy messages
 					try
 					{
-						$this->icServer->copy($_folder, $trashFolder, array('ids'=>$uidsToDelete,'move'=>true));
+						$this->icServer->copy($_folder, $trashFolder, array('ids'=>$uidsToDelete, 'move'=>true));
 					}
 					catch (Exception $e)
 					{
@@ -3555,18 +3555,18 @@ 
 			case "mark_as_deleted":
 				//error_log(__METHOD__.' ('.__LINE__.') ');
 				// mark messages as deleted
-				if (is_null($_messageUID)) $_messageUID='all';
-				foreach((array)$_messageUID as $key =>$uid)
+				if (is_null($_messageUID)) $_messageUID = 'all';
+				foreach ((array)$_messageUID as $key =>$uid)
 				{
 					//flag messages, that are flagged for deletion as seen too
 					$this->flagMessages('read', $uid, $_folder);
 					$flags = $this->getFlags($uid);
 					$this->flagMessages('delete', $uid, $_folder);
 					//error_log(__METHOD__.' ('.__LINE__.') '.array2string($flags));
-					if (strpos( array2string($flags),'Deleted')!==false) $undelete[] = $uid;
+					if (strpos(array2string($flags), 'Deleted') !== false) $undelete[] = $uid;
 					unset($flags);
 				}
-				foreach((array)$undelete as $key =>$uid)
+				foreach ((array)$undelete as $key =>$uid)
 				{
 					$this->flagMessages('undelete', $uid, $_folder);
 				}
@@ -3575,14 +3575,14 @@ 
 			case "remove_immediately":
 				//error_log(__METHOD__.' ('.__LINE__.') ');
 				$updateCache = true;
-				if (is_null($_messageUID)) $_messageUID='all';
+				if (is_null($_messageUID)) $_messageUID = 'all';
 				if (is_object($_messageUID))
 				{
 					$this->flagMessages('delete', $_messageUID, $_folder);
 				}
 				else
 				{
-					foreach((array)$_messageUID as $key =>$uid)
+					foreach ((array)$_messageUID as $key =>$uid)
 					{
 						//flag messages, that are flagged for deletion as seen too
 						$this->flagMessages('delete', $uid, $_folder);
@@ -3592,7 +3592,7 @@ 
 				$this->icServer->expunge($_folder);
 				break;
 		}
-		if($oldMailbox != '') {
+		if ($oldMailbox != '') {
 			$this->icServer->openMailbox($oldMailbox);
 		}
 
@@ -3606,7 +3606,7 @@ 
 	 *
 	 * @return null/array flags
 	 */
-	function getFlags ($_messageUID) {
+	function getFlags($_messageUID) {
 		try
 		{
 			$uidsToFetch = new Horde_Imap_Client_Ids();
@@ -3619,7 +3619,7 @@ 
 				'ids' => $uidsToFetch,
 			));
 			if (is_object($headersNew)) {
-				foreach($headersNew->ids() as $id) {
+				foreach ($headersNew->ids() as $id) {
 					$_headerObject = $headersNew->get($id);
 					$flags = $_headerObject->getFlags();
 				}
@@ -3642,22 +3642,22 @@ 
 	 *
 	 * @return null/boolean
 	 */
-	function getNotifyFlags ($_messageUID, $flags=null)
+	function getNotifyFlags($_messageUID, $flags = null)
 	{
 		if (self::$debug) error_log(__METHOD__.$_messageUID.' Flags:'.array2string($flags));
 		try
 		{
-			if($flags===null) $flags =  $this->getFlags($_messageUID);
+			if ($flags === null) $flags = $this->getFlags($_messageUID);
 		}
 		catch (Exception $e)
 		{
 			return null;
 		}
 
-		if ( stripos( array2string($flags),'MDNSent')!==false)
+		if (stripos(array2string($flags), 'MDNSent') !== false)
 			return true;
 
-		if ( stripos( array2string($flags),'MDNnotSent')!==false)
+		if (stripos(array2string($flags), 'MDNnotSent') !== false)
 			return false;
 
 		return null;
@@ -3674,45 +3674,45 @@ 
 	 *
 	 * @return bool true, as we do not handle icserver->setFlags returnValue
 	 */
-	function flagMessages($_flag, $_messageUID,$_folder=NULL)
+	function flagMessages($_flag, $_messageUID, $_folder = NULL)
 	{
 		//error_log(__METHOD__.' ('.__LINE__.') '.'->' .$_flag." ".array2string($_messageUID).",$_folder /".$this->sessionData['mailbox']);
 		if (empty($_messageUID))
 		{
-			if (self::$debug) error_log(__METHOD__." no messages Message(s): ".implode(',',$_messageUID));
+			if (self::$debug) error_log(__METHOD__." no messages Message(s): ".implode(',', $_messageUID));
 			return false;
 		}
-		$this->icServer->openMailbox(($_folder?$_folder:$this->sessionData['mailbox']));
+		$this->icServer->openMailbox(($_folder ? $_folder : $this->sessionData['mailbox']));
 		$folder = $this->icServer->getCurrentMailbox();
-		if (is_array($_messageUID)&& count($_messageUID)>50)
+		if (is_array($_messageUID) && count($_messageUID) > 50)
 		{
-			$count = $this->getMailBoxCounters($folder,true);
-			if ($count->messages == count($_messageUID)) $_messageUID='all';
+			$count = $this->getMailBoxCounters($folder, true);
+			if ($count->messages == count($_messageUID)) $_messageUID = 'all';
 		}
 
-		if ($_messageUID==='all')
+		if ($_messageUID === 'all')
 		{
 			$messageUIDs = array('all');
 		}
 		else
 		{
 			if (!(is_object($_messageUID) || is_array($_messageUID))) $_messageUID = (array)$_messageUID;
-			$messageUIDs = array_chunk($_messageUID,50,true);
+			$messageUIDs = array_chunk($_messageUID, 50, true);
 		}
 		try
 		{
-			foreach($messageUIDs as &$uids)
+			foreach ($messageUIDs as &$uids)
 			{
-				if ($uids==='all')
+				if ($uids === 'all')
 				{
-					$uidsToModify=null;
+					$uidsToModify = null;
 				}
 				else
 				{
 					$uidsToModify = new Horde_Imap_Client_Ids();
 					$uidsToModify->add($uids);
 				}
-				switch($_flag) {
+				switch ($_flag) {
 					case "delete":
 						$ret = $this->icServer->store($folder, array('add'=>array('\\Deleted'), 'ids'=> $uidsToModify));
 						break;
@@ -3736,7 +3736,7 @@ 
 						break;
 					case "unread":
 					case "unseen":
-						$ret = $this->icServer->store($folder, array('remove'=>array('\\Seen','\\Answered','$Forwarded'), 'ids'=> $uidsToModify));
+						$ret = $this->icServer->store($folder, array('remove'=>array('\\Seen', '\\Answered', '$Forwarded'), 'ids'=> $uidsToModify));
 						break;
 					case "mdnsent":
 						$ret = $this->icServer->store($folder, array('add'=>array('MDNSent'), 'ids'=> $uidsToModify));
@@ -3794,13 +3794,13 @@ 
 				}
 			}
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			error_log(__METHOD__.__LINE__.' Error, could not flag messages in folder '.$folder.' Reason:'.$e->getMessage());
 		}
 		if ($folder instanceof Horde_Imap_Client_Mailbox) $_folder = $folder->utf8;
 		//error_log(__METHOD__.__LINE__.'#'.$this->icServer->ImapServerId.'#'.array2string($_folder).'#');
-		self::$folderStatusCache[$this->icServer->ImapServerId][(!empty($_folder)?$_folder: $this->sessionData['mailbox'])]['uidValidity'] = 0;
+		self::$folderStatusCache[$this->icServer->ImapServerId][(!empty($_folder) ? $_folder : $this->sessionData['mailbox'])]['uidValidity'] = 0;
 
 		//error_log(__METHOD__.' ('.__LINE__.') '.'->' .$_flag." ".array2string($_messageUID).",".($_folder?$_folder:$this->sessionData['mailbox']));
 		return true; // as we do not catch/examine setFlags returnValue
@@ -3821,19 +3821,19 @@ 
 	 * @return mixed/bool true,false or new uid
 	 * @throws egw_exception
 	 */
-	function moveMessages($_foldername, $_messageUID, $deleteAfterMove=true, $currentFolder = Null, $returnUIDs = false, $_sourceProfileID = Null, $_targetProfileID = Null)
+	function moveMessages($_foldername, $_messageUID, $deleteAfterMove = true, $currentFolder = Null, $returnUIDs = false, $_sourceProfileID = Null, $_targetProfileID = Null)
 	{
-		$source = emailadmin_account::read(($_sourceProfileID?$_sourceProfileID:$this->icServer->ImapServerId))->imapServer();
+		$source = emailadmin_account::read(($_sourceProfileID ? $_sourceProfileID : $this->icServer->ImapServerId))->imapServer();
 		//$deleteOptions  = $GLOBALS['egw_info']["user"]["preferences"]["mail"]["deleteOptions"];
 		if (empty($_messageUID))
 		{
-			if (self::$debug) error_log(__METHOD__." no Message(s): ".implode(',',$_messageUID));
+			if (self::$debug) error_log(__METHOD__." no Message(s): ".implode(',', $_messageUID));
 			return false;
 		}
-		elseif ($_messageUID==='all')
+		elseif ($_messageUID === 'all')
 		{
 			//error_log(__METHOD__." all Message(s): ".implode(',',$_messageUID));
-			$uidsToMove= null;
+			$uidsToMove = null;
 		}
 		else
 		{
@@ -3842,7 +3842,7 @@ 
 			if (!(is_object($_messageUID) || is_array($_messageUID))) $_messageUID = (array)$_messageUID;
 			$uidsToMove->add($_messageUID);
 		}
-		$sourceFolder = (!empty($currentFolder)?$currentFolder: $this->sessionData['mailbox']);
+		$sourceFolder = (!empty($currentFolder) ? $currentFolder : $this->sessionData['mailbox']);
 		//error_log(__METHOD__.__LINE__."$_targetProfileID !== ".array2string($source->ImapServerId));
 		if (!is_null($_targetProfileID) && $_targetProfileID !== $source->ImapServerId)
 		{
@@ -3862,19 +3862,19 @@ 
 			//error_log(__METHOD__.' ('.__LINE__.') '.' Sourceserver:'.$source->ImapServerId.' mailheaders:'.array2string($headersNew));
 
 			if (is_object($headersNew)) {
-				$c=0;
+				$c = 0;
 				$retUid = new Horde_Imap_Client_Ids();
 				// we copy chunks of 5 to avoid too much memory and/or server stress
 				// some servers seem not to allow/support the appendig of multiple messages. so we are down to one
-				foreach($headersNew as &$_headerObject) {
+				foreach ($headersNew as &$_headerObject) {
 					$c++;
 					$flags = $_headerObject->getFlags(); //unseen status seems to be lost when retrieving the full message
 					$date = $_headerObject->getImapDate();
-					$currentDate =  new Horde_Imap_Client_DateTime();
+					$currentDate = new Horde_Imap_Client_DateTime();
 					// if the internal Date of the message equals the current date; try using the header date
-					if ($date==$currentDate)
+					if ($date == $currentDate)
 					{
-						$headerForPrio = array_change_key_case($_headerObject->getHeaderText(0,Horde_Imap_Client_Data_Fetch::HEADER_PARSE)->toArray(), CASE_UPPER);
+						$headerForPrio = array_change_key_case($_headerObject->getHeaderText(0, Horde_Imap_Client_Data_Fetch::HEADER_PARSE)->toArray(), CASE_UPPER);
 						//error_log(__METHOD__.__LINE__.'#'.array2string($date).'#'.array2string($currentDate).'#'.$headerForPrio['DATE']);
 						$date = new Horde_Imap_Client_DateTime($headerForPrio['DATE']);
 						//error_log(__METHOD__.__LINE__.'#'.array2string($date).'#'.array2string($currentDate).'#');
@@ -3883,20 +3883,20 @@ 
 					//error_log(__METHOD__.' ('.__LINE__.') '.array2string($flags));
 					$body = $_headerObject->getFullMsg();
 					$dataNflags[] = array('data'=>$body, 'flags'=>$flags, 'internaldate'=>$date);
-					if ($c==1)
+					if ($c == 1)
 					{
 						$target = emailadmin_account::read($_targetProfileID)->imapServer();
 						//error_log(__METHOD__.' ('.__LINE__.') '.' Sourceserver:'.$source->ImapServerId.' TargetServer:'.$_targetProfileID.' TargetFolderObject:'.array2string($_foldername));
 						$foldername = $target->getMailbox($_foldername);
 						// make sure the target folder is open and ready
 						$target->openMailbox($foldername);
-						$ret = $target->append($foldername,$dataNflags);
+						$ret = $target->append($foldername, $dataNflags);
 						$retUid->add($ret);
 						unset($dataNflags);
 						// sleep 500 miliseconds; AS some sERVERs seem not to be capable of the load this is
 						// inflicting in them. they "reply" with an unspecific IMAP Error
-						time_nanosleep(0,500000);
-						$c=0;
+						time_nanosleep(0, 500000);
+						$c = 0;
 					}
 				}
 				if (isset($dataNflags))
@@ -3906,7 +3906,7 @@ 
 					$foldername = $target->getMailbox($_foldername);
 					// make sure the target folder is open and ready
 					$target->openMailbox($foldername);
-					$ret = $target->append($foldername,$dataNflags);
+					$ret = $target->append($foldername, $dataNflags);
 					$retUid->add($ret);
 					unset($dataNflags);
 				}
@@ -3917,7 +3917,7 @@ 
 				{
 					$remember = $this->icServer;
 					$this->icServer = $source;
-					$this->deleteMessages($_messageUID, $sourceFolder, $_forceDeleteMethod='remove_immediately');
+					$this->deleteMessages($_messageUID, $sourceFolder, $_forceDeleteMethod = 'remove_immediately');
 					$this->icServer = $remember;
 				}
 			}
@@ -3926,7 +3926,7 @@ 
 		{
 			try
 			{
-				$retUid = $source->copy($sourceFolder, $_foldername, array('ids'=>$uidsToMove,'move'=>$deleteAfterMove));
+				$retUid = $source->copy($sourceFolder, $_foldername, array('ids'=>$uidsToMove, 'move'=>$deleteAfterMove));
 			}
 			catch (exception $e)
 			{
@@ -3946,19 +3946,19 @@ 
 	 * @param string $format ='' if none is passed, use user prefs
 	 * @return string returns the date as it is parseable by strtotime, or current timestamp if everything fails
 	 */
-	static function _strtotime($_date='', $format='', $convert2usertime=false)
+	static function _strtotime($_date = '', $format = '', $convert2usertime = false)
 	{
 		try {
-			$date = new egw_time($_date);	// parse date & time including timezone (throws exception, if not parsable)
-			if ($convert2usertime) $date->setUser();	// convert to user-time
+			$date = new egw_time($_date); // parse date & time including timezone (throws exception, if not parsable)
+			if ($convert2usertime) $date->setUser(); // convert to user-time
 			$date2return = $date->format($format);
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
-			unset($e);	// not used
+			unset($e); // not used
 
 			// remove last space-separated part and retry
-			$parts = explode(' ',$_date);
+			$parts = explode(' ', $_date);
 			if (count($parts) > 1)
 			{
 				array_pop($parts);
@@ -3979,12 +3979,12 @@ 
 	 * @param mixed $_charset false or string -> Target charset, if false emailadmin_imapbase displayCharset will be used
 	 * @return string
 	 */
-	static function htmlentities($_string, $_charset=false)
+	static function htmlentities($_string, $_charset = false)
 	{
 		//setting the charset (if not given)
-		if ($_charset===false) $_charset = self::$displayCharset;
+		if ($_charset === false) $_charset = self::$displayCharset;
 		$string = @htmlentities($_string, ENT_QUOTES, $_charset, false);
-		if (empty($string) && !empty($_string)) $string = @htmlentities(translation::convert($_string,translation::detect_encoding($_string),$_charset),ENT_QUOTES | ENT_IGNORE,$_charset, false);
+		if (empty($string) && !empty($_string)) $string = @htmlentities(translation::convert($_string, translation::detect_encoding($_string), $_charset), ENT_QUOTES|ENT_IGNORE, $_charset, false);
 		return $string;
 	}
 
@@ -4001,21 +4001,21 @@ 
 		//$_html = str_replace("\t",' ',$_html);
 		//error_log($_html);
 		//repair doubleencoded ampersands, and some stuff htmLawed stumbles upon with balancing switched on
-		$_html = str_replace(array('&amp;amp;','<DIV><BR></DIV>',"<DIV>&nbsp;</DIV>",'<div>&nbsp;</div>','</td></font>','<br><td>','<tr></tr>','<o:p></o:p>','<o:p>','</o:p>'),
-							 array('&amp;',    '<BR>',           '<BR>',             '<BR>',             '</font></td>','<td>',    '',         '',           '',  ''),$_html);
+		$_html = str_replace(array('&amp;amp;', '<DIV><BR></DIV>', "<DIV>&nbsp;</DIV>", '<div>&nbsp;</div>', '</td></font>', '<br><td>', '<tr></tr>', '<o:p></o:p>', '<o:p>', '</o:p>'),
+							 array('&amp;', '<BR>', '<BR>', '<BR>', '</font></td>', '<td>', '', '', '', ''), $_html);
 		//$_html = str_replace(array('&amp;amp;'),array('&amp;'),$_html);
-		if (stripos($_html,'style')!==false) translation::replaceTagsCompletley($_html,'style'); // clean out empty or pagewide style definitions / left over tags
-		if (stripos($_html,'head')!==false) translation::replaceTagsCompletley($_html,'head'); // Strip out stuff in head
+		if (stripos($_html, 'style') !== false) translation::replaceTagsCompletley($_html, 'style'); // clean out empty or pagewide style definitions / left over tags
+		if (stripos($_html, 'head') !== false) translation::replaceTagsCompletley($_html, 'head'); // Strip out stuff in head
 		//if (stripos($_html,'![if')!==false && stripos($_html,'<![endif]>')!==false) translation::replaceTagsCompletley($_html,'!\[if','<!\[endif\]>',false); // Strip out stuff in ifs
 		//if (stripos($_html,'!--[if')!==false && stripos($_html,'<![endif]-->')!==false) translation::replaceTagsCompletley($_html,'!--\[if','<!\[endif\]-->',false); // Strip out stuff in ifs
 		//error_log(__METHOD__.' ('.__LINE__.') '.$_html);
 
 		if (get_magic_quotes_gpc() === 1) $_html = stripslashes($_html);
 		// Strip out doctype in head, as htmlLawed cannot handle it TODO: Consider extracting it and adding it afterwards
-		if (stripos($_html,'!doctype')!==false) translation::replaceTagsCompletley($_html,'!doctype');
-		if (stripos($_html,'?xml:namespace')!==false) translation::replaceTagsCompletley($_html,'\?xml:namespace','/>',false);
-		if (stripos($_html,'?xml version')!==false) translation::replaceTagsCompletley($_html,'\?xml version','\?>',false);
-		if (strpos($_html,'!CURSOR')!==false) translation::replaceTagsCompletley($_html,'!CURSOR');
+		if (stripos($_html, '!doctype') !== false) translation::replaceTagsCompletley($_html, '!doctype');
+		if (stripos($_html, '?xml:namespace') !== false) translation::replaceTagsCompletley($_html, '\?xml:namespace', '/>', false);
+		if (stripos($_html, '?xml version') !== false) translation::replaceTagsCompletley($_html, '\?xml version', '\?>', false);
+		if (strpos($_html, '!CURSOR') !== false) translation::replaceTagsCompletley($_html, '!CURSOR');
 		// htmLawed filter only the 'body'
 		//preg_match('`(<htm.+?<body[^>]*>)(.+?)(</body>.*?</html>)`ims', $_html, $matches);
 		//if ($matches[2])
@@ -4026,16 +4026,16 @@ 
 		// purify got switched to htmLawed
 		// some testcode to test purifying / htmlawed
 		//$_html = "<BLOCKQUOTE>hi <div> there </div> kram <br> </blockquote>".$_html;
-		$_html = html::purify($_html,self::$htmLawed_config,array(),true);
+		$_html = html::purify($_html, self::$htmLawed_config, array(), true);
 		//if ($hasOther) $_html = $matches[1]. $_html. $matches[3];
 		// clean out comments , should not be needed as purify should do the job.
 		$search = array(
-			'@url\(http:\/\/[^\)].*?\)@si',  // url calls e.g. in style definitions
-			'@<!--[\s\S]*?[ \t\n\r]*-->@',         // Strip multi-line comments including CDATA
+			'@url\(http:\/\/[^\)].*?\)@si', // url calls e.g. in style definitions
+			'@<!--[\s\S]*?[ \t\n\r]*-->@', // Strip multi-line comments including CDATA
 		);
-		$_html = preg_replace($search,"",$_html);
+		$_html = preg_replace($search, "", $_html);
 		// remove non printable chars
-		$_html = preg_replace('/([\000-\011])/','',$_html);
+		$_html = preg_replace('/([\000-\011])/', '', $_html);
 		//error_log(__METHOD__.':'.__LINE__.':'.$_html);
 	}
 
@@ -4052,12 +4052,12 @@ 
 	function getMimePartCharset($_mimePartObject)
 	{
 		//$charSet = 'iso-8859-1';//self::$displayCharset; //'iso-8859-1'; // self::displayCharset seems to be asmarter fallback than iso-8859-1
-		$CharsetFound=false;
+		$CharsetFound = false;
 		//echo "#".$_mimePartObject->encoding.'#<br>';
-		if(is_array($_mimePartObject->parameters)) {
-			if(isset($_mimePartObject->parameters['CHARSET'])) {
+		if (is_array($_mimePartObject->parameters)) {
+			if (isset($_mimePartObject->parameters['CHARSET'])) {
 				$charSet = $_mimePartObject->parameters['CHARSET'];
-				$CharsetFound=true;
+				$CharsetFound = true;
 			}
 		}
 		// this one is dirty, but until I find something that does the trick of detecting the encoding, ....
@@ -4076,7 +4076,7 @@ 
 	function decodeMimePart($_mimeMessage, $_encoding, $_charset = '')
 	{
 		// decode the part
-		if (self::$debug) error_log(__METHOD__."() with $_encoding and $_charset:".print_r($_mimeMessage,true));
+		if (self::$debug) error_log(__METHOD__."() with $_encoding and $_charset:".print_r($_mimeMessage, true));
 		switch (strtoupper($_encoding))
 		{
 			case 'BASE64':
@@ -4116,10 +4116,10 @@ 
 		// sometimes there are 3 parts, when there is an ics/ical attached/included-> we want to show that
 		// as attachment AND as abstracted ical information (we use our notification style here).
 		$partText = $partCalendar = $partHTML = null;
-		if (self::$debug) _debug_array(array("METHOD"=>__METHOD__,"LINE"=>__LINE__,"STRUCTURE"=>$_structure));
+		if (self::$debug) _debug_array(array("METHOD"=>__METHOD__, "LINE"=>__LINE__, "STRUCTURE"=>$_structure));
 		//error_log(__METHOD__.' ('.__LINE__.') ');
 		$ignore_first_part = true;
-		foreach($_structure->contentTypeMap() as $mime_id => $mime_type)
+		foreach ($_structure->contentTypeMap() as $mime_id => $mime_type)
 		{
 			//error_log(__METHOD__."($_uid, ".$_structure->getMimeId().") $mime_id: $mime_type"." ignoreFirstPart:".$ignore_first_part);
 			if (self::$debug) echo __METHOD__."($_uid, partID=".$_structure->getMimeId().") $mime_id: $mime_type<br>";
@@ -4127,15 +4127,15 @@ 
 			if ($ignore_first_part)
 			{
 				$ignore_first_part = false;
-				continue;	// ignore multipart/alternative itself
+				continue; // ignore multipart/alternative itself
 			}
 
 			$mimePart = $_structure->getPart($mime_id);
 
-			switch($mimePart->getPrimaryType())
+			switch ($mimePart->getPrimaryType())
 			{
 				case 'text':
-					switch($mimePart->getSubType())
+					switch ($mimePart->getSubType())
 					{
 						case 'plain':
 							if ($mimePart->getBytes() > 0) $partText = $mimePart;
@@ -4148,7 +4148,7 @@ 
 					break;
 
 				case 'multipart':
-					switch($mimePart->getSubType())
+					switch ($mimePart->getSubType())
 					{
 						case 'related':
 						case 'mixed':
@@ -4170,13 +4170,13 @@ 
 			}
 		}
 
-		switch($_htmlMode)
+		switch ($_htmlMode)
 		{
 			case 'html_only':
 			case 'always_display':
 				if ($partHTML)
 				{
-					switch($partHTML->getSubType())
+					switch ($partHTML->getSubType())
 					{
 						case 'related':
 							return $this->getMultipartRelated($_uid, $partHTML, $_htmlMode, $_preserveSeen);
@@ -4188,7 +4188,7 @@ 
 							return $this->getTextPart($_uid, $partHTML, $_htmlMode, $_preserveSeen);
 					}
 				}
-				elseif ($partText && $_htmlMode=='always_display')
+				elseif ($partText && $_htmlMode == 'always_display')
 				{
 					return $this->getTextPart($_uid, $partText, $_htmlMode, $_preserveSeen);
 				}
@@ -4234,7 +4234,7 @@ 
 	 * @param array	&$skipParts - passed by reference to have control/knowledge which parts are already fetched
 	 * @return array containing the desired part
 	 */
-	function getMultipartMixed($_uid, Horde_Mime_Part $_structure, $_htmlMode, $_preserveSeen = false, &$skipParts=array())
+	function getMultipartMixed($_uid, Horde_Mime_Part $_structure, $_htmlMode, $_preserveSeen = false, &$skipParts = array())
 	{
 		if (self::$debug) echo __METHOD__."$_uid, $_htmlMode<br>";
 		$bodyPart = array();
@@ -4243,7 +4243,7 @@ 
 		$ignore_first_part = true;
 		//$skipParts = array();
 		//error_log(__METHOD__.__LINE__.array2string($_structure->contentTypeMap()));
-		foreach($_structure->contentTypeMap() as $mime_id => $mime_type)
+		foreach ($_structure->contentTypeMap() as $mime_id => $mime_type)
 		{
 			//error_log(__METHOD__."($_uid, ".$_structure->getMimeId().") $mime_id: $mime_type");
 			if (self::$debug) echo __METHOD__."($_uid, partID=".$_structure->getMimeId().") $mime_id: $mime_type<br>";
@@ -4251,9 +4251,9 @@ 
 			{
 				$ignore_first_part = false;
 				//error_log(__METHOD__."($_uid, ".$_structure->getMimeId().") SKIPPED FirstPart $mime_id: $mime_type");
-				continue;	// ignore multipart/mixed itself
+				continue; // ignore multipart/mixed itself
 			}
-			if (array_key_exists($mime_id,$skipParts))
+			if (array_key_exists($mime_id, $skipParts))
 			{
 				//error_log(__METHOD__."($_uid, ".$_structure->getMimeId().") SKIPPED $mime_id: $mime_type");
 				continue;
@@ -4261,11 +4261,11 @@ 
 
 			$part = $_structure->getPart($mime_id);
 
-			switch($part->getPrimaryType())
+			switch ($part->getPrimaryType())
 			{
 				case 'multipart':
 					if ($part->getDisposition() == 'attachment') continue;
-					switch($part->getSubType())
+					switch ($part->getSubType())
 					{
 						case 'alternative':
 							return array($this->getMultipartAlternative($_uid, $part, $_htmlMode, $_preserveSeen));
@@ -4281,15 +4281,15 @@ 
 					}
 					break;
 				case 'application':
-					switch($part->getSubType())
+					switch ($part->getSubType())
 					{
 						case 'pgp-encrypted':
-							if (($part = $_structure->getPart($mime_id+1)) &&
+							if (($part = $_structure->getPart($mime_id + 1)) &&
 								$part->getType() == 'application/octet-stream')
 							{
 								$this->fetchPartContents($_uid, $part);
-								$skipParts[$mime_id]=$mime_type;
-								$skipParts[$mime_id+1]=$part->getType();
+								$skipParts[$mime_id] = $mime_type;
+								$skipParts[$mime_id + 1] = $part->getType();
 								$bodyPart[] = array(
 									'body'		=> $part->getContents(array(
 										'stream' => false,
@@ -4303,15 +4303,15 @@ 
 					break;
 
 				case 'text':
-					switch($part->getSubType())
+					switch ($part->getSubType())
 					{
 						case 'plain':
 						case 'html':
 						case 'calendar': // inline ics/ical files
-							if($part->getDisposition() != 'attachment')
+							if ($part->getDisposition() != 'attachment')
 							{
 								$bodyPart[] = $this->getTextPart($_uid, $part, $_htmlMode, $_preserveSeen);
-								$skipParts[$mime_id]=$mime_type;
+								$skipParts[$mime_id] = $mime_type;
 							}
 							//error_log(__METHOD__.' ('.__LINE__.') '.' ->'.$part->type."/".$part->subType.' -> BodyPart:'.array2string($bodyPart[count($bodyPart)-1]));
 							break;
@@ -4320,16 +4320,16 @@ 
 
 				case 'message':
 					//skip attachments
-					if($part->getSubType() == 'delivery-status' && $part->getDisposition() != 'attachment')
+					if ($part->getSubType() == 'delivery-status' && $part->getDisposition() != 'attachment')
 					{
 						$bodyPart[] = $this->getTextPart($_uid, $part, $_htmlMode, $_preserveSeen);
-						$skipParts[$mime_id]=$mime_type;
+						$skipParts[$mime_id] = $mime_type;
 					}
 					// do not descend into attached Messages
-					if($part->getSubType() == 'rfc822' || $part->getDisposition() == 'attachment')
+					if ($part->getSubType() == 'rfc822' || $part->getDisposition() == 'attachment')
 					{
 						$skipParts[$mime_id.'.0'] = $mime_type;
-						foreach($part->contentTypeMap() as $sub_id => $sub_type){ $skipParts[$sub_id] = $sub_type;}
+						foreach ($part->contentTypeMap() as $sub_id => $sub_type) { $skipParts[$sub_id] = $sub_type; }
 						//error_log(__METHOD__.' ('.__LINE__.') '.' Uid:'.$_uid.' Part:'.$mime_id.':'.array2string($skipParts));
 						//break 2;
 					}
@@ -4370,13 +4370,13 @@ 
 	 * @param boolean $_tryDecodingServerside = true; wether to try to fetch Data with BINARY instead of BODY
 	 * @return string|resource
 	 */
-	function getBodyPart($_uid, $_partID=null, $_folder=null, $_preserveSeen=false, $_stream=false, &$_encoding=null, $_tryDecodingServerside=true)
+	function getBodyPart($_uid, $_partID = null, $_folder = null, $_preserveSeen = false, $_stream = false, &$_encoding = null, $_tryDecodingServerside = true)
 	{
-		if (self::$debug) error_log( __METHOD__."(".array2string($_uid).", $_partID, $_folder, $_preserveSeen)");
+		if (self::$debug) error_log(__METHOD__."(".array2string($_uid).", $_partID, $_folder, $_preserveSeen)");
 
 		if (empty($_folder))
 		{
-			$_folder = (isset($this->sessionData['mailbox'])&&$this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
+			$_folder = (isset($this->sessionData['mailbox']) && $this->sessionData['mailbox'] ? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
 		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($_folder).'/'.$this->icServer->getCurrentMailbox().'/'. $this->sessionData['mailbox']);
 		// querying contents of body part
@@ -4387,11 +4387,11 @@ 
 		$fquery = new Horde_Imap_Client_Fetch_Query();
 		$fetchParams = array(
 			'peek' => $_preserveSeen,
-			'decode' => true,	// try decode on server, does NOT neccessary work
+			'decode' => true, // try decode on server, does NOT neccessary work
 		);
-		if ($_tryDecodingServerside===false)// || ($_tryDecodingServerside&&$this->isDraftFolder($_folder)))
+		if ($_tryDecodingServerside === false)// || ($_tryDecodingServerside&&$this->isDraftFolder($_folder)))
 		{
-			$_tryDecodingServerside=false;
+			$_tryDecodingServerside = false;
 			$fetchParams = array(
 				'peek' => $_preserveSeen,
 			);
@@ -4411,12 +4411,12 @@ 
 		}
 		// if we get an empty result, server may have trouble fetching data with UID FETCH $_uid (BINARY.PEEK[$_partID])
 		// thus we trigger a second go with UID FETCH $_uid (BODY.PEEK[$_partID])
-		if (empty($partToReturn)&&$_tryDecodingServerside===true)
+		if (empty($partToReturn) && $_tryDecodingServerside === true)
 		{
 			error_log(__METHOD__.__LINE__.' failed to fetch bodyPart in  BINARY. Try BODY');
 			$partToReturn = $this->getBodyPart($_uid, $_partID, $_folder, $_preserveSeen, $_stream, $_encoding, false);
 		}
-		return ($partToReturn?$partToReturn:null);
+		return ($partToReturn ? $partToReturn : null);
 	}
 
 	/**
@@ -4429,13 +4429,13 @@ 
 	 * @param boolean $_stream = false true return a stream, false return string
 	 * @return array containing the desired text part, mimeType and charset
 	 */
-	function getTextPart($_uid, Horde_Mime_Part $_structure, $_htmlMode='', $_preserveSeen=false, $_stream=false)
+	function getTextPart($_uid, Horde_Mime_Part $_structure, $_htmlMode = '', $_preserveSeen = false, $_stream = false)
 	{
 		//error_log(__METHOD__.' ('.__LINE__.') '.'->'.$_uid.':'.array2string($_structure).' '.function_backtrace());
 		$bodyPart = array();
-		if (self::$debug) _debug_array(array($_structure,function_backtrace()));
+		if (self::$debug) _debug_array(array($_structure, function_backtrace()));
 
-		if($_structure->getSubType() == 'html' && !in_array($_htmlMode, array('html_only', 'always_display', 'only_if_no_text')))
+		if ($_structure->getSubType() == 'html' && !in_array($_htmlMode, array('html_only', 'always_display', 'only_if_no_text')))
 		{
 			$bodyPart = array(
 				'error'		=> 1,
@@ -4481,10 +4481,10 @@ 
 	 * @param string $_folder folder to work on
 	 * @return array containing the message body, mimeType and charset
 	 */
-	function getMessageBody($_uid, $_htmlOptions='', $_partID=null, Horde_Mime_Part $_structure=null, $_preserveSeen = false, $_folder = '')
+	function getMessageBody($_uid, $_htmlOptions = '', $_partID = null, Horde_Mime_Part $_structure = null, $_preserveSeen = false, $_folder = '')
 	{
 		if (self::$debug) echo __METHOD__."$_uid, $_htmlOptions, $_partID<br>";
-		if($_htmlOptions != '') {
+		if ($_htmlOptions != '') {
 			$this->htmlOptions = $_htmlOptions;
 		}
 		if (empty($_folder))
@@ -4505,7 +4505,7 @@ 
 			return array(
 				array(
 					'error'		=> 1,
-					'body'		=> 'Error: Could not fetch structure on mail:'.$_uid." as $_htmlOptions". 'for Mailprofile'.$this->icServer->ImapServerId.' User:'.$GLOBALS['egw_info']['user']['account_lid'],
+					'body'		=> 'Error: Could not fetch structure on mail:'.$_uid." as $_htmlOptions".'for Mailprofile'.$this->icServer->ImapServerId.' User:'.$GLOBALS['egw_info']['user']['account_lid'],
 					'mimeType'	=> 'text/plain',
 					'charSet'	=> self::$displayCharset,
 				)
@@ -4518,7 +4518,7 @@ 
 			//_debug_array($_structure->getMimeId()); exit;
 		}
 
-		switch($_structure->getPrimaryType())
+		switch ($_structure->getPrimaryType())
 		{
 			case 'application':
 				return array(
@@ -4530,7 +4530,7 @@ 
 				);
 
 			case 'multipart':
-				switch($_structure->getSubType())
+				switch ($_structure->getSubType())
 				{
 					case 'alternative':
 						$bodyParts = array($this->getMultipartAlternative($_uid, $_structure, $this->htmlOptions, $_preserveSeen));
@@ -4564,7 +4564,7 @@ 
 				$bodyPart = array();
 				if ($_structure->getDisposition() != 'attachment')
 				{
-					switch($_structure->getSubType())
+					switch ($_structure->getSubType())
 					{
 						case 'calendar':
 							// this is handeled in getTextPart
@@ -4580,11 +4580,11 @@ 
 
 			case 'attachment':
 			case 'message':
-				switch($_structure->getSubType())
+				switch ($_structure->getSubType())
 				{
 					case 'rfc822':
 						$newStructure = $_structure->getParts();
-						if (self::$debug) {echo __METHOD__." Message -> RFC -> NewStructure:"; _debug_array($newStructure[0]);}
+						if (self::$debug) {echo __METHOD__." Message -> RFC -> NewStructure:"; _debug_array($newStructure[0]); }
 						return self::normalizeBodyParts($this->getMessageBody($_uid, $_htmlOptions, $newStructure[0]->getMimeId(), $newStructure[0], $_preserveSeen, $_folder));
 				}
 				break;
@@ -4612,11 +4612,11 @@ 
 	{
 		if (is_array($_bodyParts))
 		{
-			foreach($_bodyParts as $singleBodyPart)
+			foreach ($_bodyParts as $singleBodyPart)
 			{
 				if (!isset($singleBodyPart['body'])) {
 					$buff = self::normalizeBodyParts($singleBodyPart);
-					foreach ((array)$buff as $val) { $body2return[] = $val;}
+					foreach ((array)$buff as $val) { $body2return[] = $val; }
 					continue;
 				}
 				$body2return[] = $singleBodyPart;
@@ -4637,14 +4637,14 @@ 
 	 * @param boolean $useTidy  switch to use tidy
 	 * @return string a preformatted string with the mails converted to text
 	 */
-	static function &getdisplayableBody(&$mailClass, $bodyParts, $preserveHTML = false,  $useTidy = true)
+	static function &getdisplayableBody(&$mailClass, $bodyParts, $preserveHTML = false, $useTidy = true)
 	{
-		$message='';
-		for($i=0; $i<count($bodyParts); $i++)
+		$message = '';
+		for ($i = 0; $i < count($bodyParts); $i++)
 		{
 			if (!isset($bodyParts[$i]['body'])) {
 				$bodyParts[$i]['body'] = self::getdisplayableBody($mailClass, $bodyParts[$i], $preserveHTML, $useTidy);
-				$message .= empty($bodyParts[$i]['body'])?'':$bodyParts[$i]['body'];
+				$message .= empty($bodyParts[$i]['body']) ? '' : $bodyParts[$i]['body'];
 				continue;
 			}
 			if (isset($bodyParts[$i]['error'])) continue;
@@ -4669,32 +4669,32 @@ 
 				'(R)',
 			);
 
-			if(($bodyParts[$i]['mimeType'] == 'text/html' || $bodyParts[$i]['mimeType'] == 'text/plain') &&
+			if (($bodyParts[$i]['mimeType'] == 'text/html' || $bodyParts[$i]['mimeType'] == 'text/plain') &&
 				strtoupper($bodyParts[$i]['charSet']) != 'UTF-8')
 			{
-				$bodyParts[$i]['body'] = preg_replace($sar,$rar,$bodyParts[$i]['body']);
+				$bodyParts[$i]['body'] = preg_replace($sar, $rar, $bodyParts[$i]['body']);
 			}
 
-			if ($bodyParts[$i]['charSet']===false) $bodyParts[$i]['charSet'] = translation::detect_encoding($bodyParts[$i]['body']);
+			if ($bodyParts[$i]['charSet'] === false) $bodyParts[$i]['charSet'] = translation::detect_encoding($bodyParts[$i]['body']);
 			// add line breaks to $bodyParts
 			//error_log(__METHOD__.' ('.__LINE__.') '.' Charset:'.$bodyParts[$i]['charSet'].'->'.$bodyParts[$i]['body']);
-			$newBody  = translation::convert_jsonsafe($bodyParts[$i]['body'], $bodyParts[$i]['charSet']);
+			$newBody = translation::convert_jsonsafe($bodyParts[$i]['body'], $bodyParts[$i]['charSet']);
 			//error_log(__METHOD__.' ('.__LINE__.') '.' MimeType:'.$bodyParts[$i]['mimeType'].'->'.$newBody);
 			$mailClass->activeMimeType = 'text/plain';
 			if ($bodyParts[$i]['mimeType'] == 'text/html') {
 				$mailClass->activeMimeType = $bodyParts[$i]['mimeType'];
 				if (!$preserveHTML)
 				{
-					$alreadyHtmlLawed=false;
+					$alreadyHtmlLawed = false;
 					// as translation::convert reduces \r\n to \n and purifier eats \n -> peplace it with a single space
-					$newBody = str_replace("\n"," ",$newBody);
+					$newBody = str_replace("\n", " ", $newBody);
 					// convert HTML to text, as we dont want HTML in infologs
 					if ($useTidy && extension_loaded('tidy'))
 					{
 						$tidy = new tidy();
-						$cleaned = $tidy->repairString($newBody, self::$tidy_config,'utf8');
+						$cleaned = $tidy->repairString($newBody, self::$tidy_config, 'utf8');
 						// Found errors. Strip it all so there's some output
-						if($tidy->getStatus() == 2)
+						if ($tidy->getStatus() == 2)
 						{
 							error_log(__METHOD__.' ('.__LINE__.') '.' ->'.$tidy->errorBuffer);
 						}
@@ -4705,7 +4705,7 @@ 
 						if (!$preserveHTML)
 						{
 							// filter only the 'body', as we only want that part, if we throw away the html
-							preg_match('`(<htm.+?<body[^>]*>)(.+?)(</body>.*?</html>)`ims', $newBody, $matches=array());
+							preg_match('`(<htm.+?<body[^>]*>)(.+?)(</body>.*?</html>)`ims', $newBody, $matches = array());
 							if ($matches[2])
 							{
 								$hasOther = true;
@@ -4716,7 +4716,7 @@ 
 					else
 					{
 						// htmLawed filter only the 'body'
-						preg_match('`(<htm.+?<body[^>]*>)(.+?)(</body>.*?</html>)`ims', $newBody, $matches=array());
+						preg_match('`(<htm.+?<body[^>]*>)(.+?)(</body>.*?</html>)`ims', $newBody, $matches = array());
 						if ($matches[2])
 						{
 							$hasOther = true;
@@ -4725,17 +4725,17 @@ 
 						$htmLawed = new egw_htmLawed();
 						// the next line should not be needed, but produces better results on HTML 2 Text conversion,
 						// as we switched off HTMLaweds tidy functionality
-						$newBody = str_replace(array('&amp;amp;','<DIV><BR></DIV>',"<DIV>&nbsp;</DIV>",'<div>&nbsp;</div>'),array('&amp;','<BR>','<BR>','<BR>'),$newBody);
-						$newBody = $htmLawed->egw_htmLawed($newBody,self::$htmLawed_config);
-						if ($hasOther && $preserveHTML) $newBody = $matches[1]. $newBody. $matches[3];
-						$alreadyHtmlLawed=true;
+						$newBody = str_replace(array('&amp;amp;', '<DIV><BR></DIV>', "<DIV>&nbsp;</DIV>", '<div>&nbsp;</div>'), array('&amp;', '<BR>', '<BR>', '<BR>'), $newBody);
+						$newBody = $htmLawed->egw_htmLawed($newBody, self::$htmLawed_config);
+						if ($hasOther && $preserveHTML) $newBody = $matches[1].$newBody.$matches[3];
+						$alreadyHtmlLawed = true;
 					}
 					//error_log(__METHOD__.' ('.__LINE__.') '.' after purify:'.$newBody);
-					if ($preserveHTML==false) $newBody = translation::convertHTMLToText($newBody,self::$displayCharset,true,true);
+					if ($preserveHTML == false) $newBody = translation::convertHTMLToText($newBody, self::$displayCharset, true, true);
 					//error_log(__METHOD__.' ('.__LINE__.') '.' after convertHTMLToText:'.$newBody);
-					if ($preserveHTML==false) $newBody = nl2br($newBody); // we need this, as htmLawed removes \r\n
+					if ($preserveHTML == false) $newBody = nl2br($newBody); // we need this, as htmLawed removes \r\n
 					/*if (!$alreadyHtmlLawed) */ $mailClass->getCleanHTML($newBody); // remove stuff we regard as unwanted
-					if ($preserveHTML==false) $newBody = str_replace("<br />","\r\n",$newBody);
+					if ($preserveHTML == false) $newBody = str_replace("<br />", "\r\n", $newBody);
 					//error_log(__METHOD__.' ('.__LINE__.') '.' after getClean:'.$newBody);
 				}
 				$message .= $newBody;
@@ -4744,9 +4744,9 @@ 
 			//error_log(__METHOD__.' ('.__LINE__.') '.' Body(after specialchars):'.$newBody);
 			//use translation::convertHTMLToText instead of strip_tags, (even message is plain text) as strip_tags eats away too much
 			//$newBody = strip_tags($newBody); //we need to fix broken tags (or just stuff like "<800 USD/p" )
-			$newBody = translation::convertHTMLToText($newBody,self::$displayCharset,false,false);
+			$newBody = translation::convertHTMLToText($newBody, self::$displayCharset, false, false);
 			//error_log(__METHOD__.' ('.__LINE__.') '.' Body(after strip tags):'.$newBody);
-			$newBody = htmlspecialchars_decode($newBody,ENT_QUOTES);
+			$newBody = htmlspecialchars_decode($newBody, ENT_QUOTES);
 			//error_log(__METHOD__.' ('.__LINE__.') '.' Body (after hmlspc_decode):'.$newBody);
 			$message .= $newBody;
 			//continue;
@@ -4754,27 +4754,27 @@ 
 		return $message;
 	}
 
-	static function wordwrap($str, $cols, $cut, $dontbreaklinesstartingwith=false)
+	static function wordwrap($str, $cols, $cut, $dontbreaklinesstartingwith = false)
 	{
 		$lines = explode("\n", $str);
 		$newStr = '';
-		foreach($lines as $line)
+		foreach ($lines as $line)
 		{
 			// replace tabs by 8 space chars, or any tab only counts one char
 			//$line = str_replace("\t","        ",$line);
 			//$newStr .= wordwrap($line, $cols, $cut);
-			$allowedLength = $cols-strlen($cut);
+			$allowedLength = $cols - strlen($cut);
 			//dont try to break lines with links, chance is we mess up the text is way too big
-			if (strlen($line) > $allowedLength && stripos($line,'href=')===false &&
-				($dontbreaklinesstartingwith==false ||
+			if (strlen($line) > $allowedLength && stripos($line, 'href=') === false &&
+				($dontbreaklinesstartingwith == false ||
 				 ($dontbreaklinesstartingwith &&
-				  strlen($dontbreaklinesstartingwith)>=1 &&
-				  substr($line,0,strlen($dontbreaklinesstartingwith)) != $dontbreaklinesstartingwith
+				  strlen($dontbreaklinesstartingwith) >= 1 &&
+				  substr($line, 0, strlen($dontbreaklinesstartingwith)) != $dontbreaklinesstartingwith
 				 )
 				)
 			   )
 			{
-				$s=explode(" ", $line);
+				$s = explode(" ", $line);
 				$line = "";
 				$linecnt = 0;
 				foreach ($s as &$v) {
@@ -4782,22 +4782,22 @@ 
 					// only break long words within the wordboundaries,
 					// but it may destroy links, so we check for href and dont do it if we find one
 					// we check for any html within the word, because we do not want to break html by accident
-					if($cnt > $allowedLength && stripos($v,'href=')===false && stripos($v,'onclick=')===false && $cnt == strlen(html_entity_decode($v)))
+					if ($cnt > $allowedLength && stripos($v, 'href=') === false && stripos($v, 'onclick=') === false && $cnt == strlen(html_entity_decode($v)))
 					{
-						$v=wordwrap($v, $allowedLength, $cut, true);
+						$v = wordwrap($v, $allowedLength, $cut, true);
 					}
 					// the rest should be broken at the start of the new word that exceeds the limit
-					if ($linecnt+$cnt > $allowedLength) {
-						$v=$cut.$v;
+					if ($linecnt + $cnt > $allowedLength) {
+						$v = $cut.$v;
 						#$linecnt = 0;
-						$linecnt =strlen($v)-strlen($cut);
+						$linecnt = strlen($v) - strlen($cut);
 					} else {
 						$linecnt += $cnt;
 					}
 					if (strlen($v)) $line .= (strlen($line) ? " " : "").$v;
 				}
 			}
-			$newStr .= $line . "\n";
+			$newStr .= $line."\n";
 		}
 		return $newStr;
 	}
@@ -4812,12 +4812,12 @@ 
 	 * @param boolean $_useHeaderInsteadOfEnvelope - force getMessageHeader method to be used for fetching Envelope Information
 	 * @return array the message header
 	 */
-	function getMessageEnvelope($_uid, $_partID = '',$decode=false, $_folder='', $_useHeaderInsteadOfEnvelope=false)
+	function getMessageEnvelope($_uid, $_partID = '', $decode = false, $_folder = '', $_useHeaderInsteadOfEnvelope = false)
 	{
 		//error_log(__METHOD__.' ('.__LINE__.') '.":$_uid,$_partID,$decode,$_folder".function_backtrace());
-		if (empty($_folder)) $_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
+		if (empty($_folder)) $_folder = ($this->sessionData['mailbox'] ? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
 		//error_log(__METHOD__.' ('.__LINE__.') '.":$_uid,$_partID,$decode,$_folder");
-		if((empty($_partID)||$_partID=='null')&&$_useHeaderInsteadOfEnvelope===false) {
+		if ((empty($_partID) || $_partID == 'null') && $_useHeaderInsteadOfEnvelope === false) {
 			$uidsToFetch = new Horde_Imap_Client_Ids();
 			if (!(is_object($_uid) || is_array($_uid))) $_uid = (array)$_uid;
 			$uidsToFetch->add($_uid);
@@ -4829,7 +4829,7 @@ 
 				'ids' => $uidsToFetch,
 			));
 			if (is_object($headersNew)) {
-				foreach($headersNew as &$_headerObject) {
+				foreach ($headersNew as &$_headerObject) {
 					$env = $_headerObject->getEnvelope();
 					//_debug_array($envFields->singleFields());
 					$singleFields = $envFields->singleFields();
@@ -4844,33 +4844,33 @@ 
 							case 'bcc':
 							case 'sender':
 								//error_log(__METHOD__.' ('.__LINE__.') '.$v.'->'.array2string($env->$v->addresses));
-								$envelope[$v]=$env->$v->addresses;
+								$envelope[$v] = $env->$v->addresses;
 								$address = array();
 								if (!is_array($envelope[$v])) break;
 								foreach ($envelope[$v] as $k => $ad)
 								{
-									if (stripos($ad,'@')===false)
+									if (stripos($ad, '@') === false)
 									{
-										$remember=$k;
+										$remember = $k;
 									}
 									else
 									{
-										$address[] = (!is_null($remember)?$envelope[$v][$remember].' ':'').$ad;
-										$remember=null;
+										$address[] = (!is_null($remember) ? $envelope[$v][$remember].' ' : '').$ad;
+										$remember = null;
 									}
 								}
 								$envelope[$v] = $address;
 								break;
 							case 'date':
-								$envelope[$v]=egw_time::to($env->$v);
+								$envelope[$v] = egw_time::to($env->$v);
 								break;
 							default:
-								$envelope[$v]=$env->$v;
+								$envelope[$v] = $env->$v;
 						}
 					}
 				}
 			}
-			$envelope = array_change_key_case($envelope,CASE_UPPER);
+			$envelope = array_change_key_case($envelope, CASE_UPPER);
 			//if ($decode) _debug_array($envelope);
 			//error_log(__METHOD__.' ('.__LINE__.') '.array2string($envelope));
 			if ($decode)
@@ -4878,19 +4878,19 @@ 
 				foreach ($envelope as $key => $rvV)
 				{
 					//try idn conversion only on 'FROM', 'TO', 'CC', 'BCC', 'SENDER', 'REPLY-TO'
-					$envelope[$key]=self::decode_header($rvV,in_array($key,array('FROM', 'TO', 'CC', 'BCC', 'SENDER', 'REPLY-TO')));
+					$envelope[$key] = self::decode_header($rvV, in_array($key, array('FROM', 'TO', 'CC', 'BCC', 'SENDER', 'REPLY-TO')));
 				}
 			}
 			return $envelope;
 		} else {
 
-			$headers = $this->getMessageHeader($_uid, $_partID, true,true,$_folder);
+			$headers = $this->getMessageHeader($_uid, $_partID, true, true, $_folder);
 
 			//error_log(__METHOD__.' ('.__LINE__.') '.':'.array2string($headers));
 			//_debug_array($headers);
 			$newData = array(
 				'DATE'		=> $headers['DATE'],
-				'SUBJECT'	=> ($decode ? self::decode_header($headers['SUBJECT']):$headers['SUBJECT']),
+				'SUBJECT'	=> ($decode ? self::decode_header($headers['SUBJECT']) : $headers['SUBJECT']),
 				'MESSAGE_ID'	=> $headers['MESSAGE-ID']
 			);
 			if (isset($headers['IN-REPLY-TO'])) $newData['IN-REPLY-TO'] = $headers['IN-REPLY-TO'];
@@ -4900,11 +4900,11 @@ 
 			if (isset($headers['LIST-ID'])) $newData['LIST-ID'] = $headers['LIST-ID'];
 			//_debug_array($newData);
 			$recepientList = array('FROM', 'TO', 'CC', 'BCC', 'SENDER', 'REPLY-TO');
-			foreach($recepientList as $recepientType) {
-				if(isset($headers[$recepientType])) {
-					if ($decode) $headers[$recepientType] =  self::decode_header($headers[$recepientType],true);
+			foreach ($recepientList as $recepientType) {
+				if (isset($headers[$recepientType])) {
+					if ($decode) $headers[$recepientType] = self::decode_header($headers[$recepientType], true);
 					//error_log(__METHOD__.__LINE__." ".$recepientType."->".array2string($headers[$recepientType]));
-					foreach(self::parseAddressList($headers[$recepientType]) as $singleAddress) {
+					foreach (self::parseAddressList($headers[$recepientType]) as $singleAddress) {
 						$addressData = array(
 							'PERSONAL_NAME'		=> $singleAddress->personal ? $singleAddress->personal : 'NIL',
 							'AT_DOMAIN_LIST'	=> $singleAddress->adl ? $singleAddress->adl : 'NIL',
@@ -4912,15 +4912,15 @@ 
 							'HOST_NAME'		=> $singleAddress->host ? $singleAddress->host : 'NIL',
 							'EMAIL'			=> $singleAddress->host ? $singleAddress->mailbox.'@'.$singleAddress->host : $singleAddress->mailbox,
 						);
-						if($addressData['PERSONAL_NAME'] != 'NIL') {
+						if ($addressData['PERSONAL_NAME'] != 'NIL') {
 							$addressData['RFC822_EMAIL'] = imap_rfc822_write_address($singleAddress->mailbox, $singleAddress->host, $singleAddress->personal);
 						} else {
 							$addressData['RFC822_EMAIL'] = 'NIL';
 						}
-						$newData[$recepientType][] = ($addressData['RFC822_EMAIL']!='NIL'?$addressData['RFC822_EMAIL']:$addressData['EMAIL']);//$addressData;
+						$newData[$recepientType][] = ($addressData['RFC822_EMAIL'] != 'NIL' ? $addressData['RFC822_EMAIL'] : $addressData['EMAIL']); //$addressData;
 					}
 				} else {
-					if($recepientType == 'SENDER' || $recepientType == 'REPLY-TO') {
+					if ($recepientType == 'SENDER' || $recepientType == 'REPLY-TO') {
 						$newData[$recepientType] = $newData['FROM'];
 					} else {
 						$newData[$recepientType] = array();
@@ -4942,10 +4942,10 @@ 
 	 * @param string $_folder folder to work on
 	 * @return array|Horde_Mime_Headers message header as array or object
 	 */
-	function getMessageHeader($_uid, $_partID = '',$decode=false, $preserveUnSeen=false, $_folder='')
+	function getMessageHeader($_uid, $_partID = '', $decode = false, $preserveUnSeen = false, $_folder = '')
 	{
 		//error_log(__METHOD__.' ('.__LINE__.') '.':'.$_uid.', '.$_partID.', '.$decode.', '.$preserveUnSeen.', '.$_folder);
-		if (empty($_folder)) $_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
+		if (empty($_folder)) $_folder = ($this->sessionData['mailbox'] ? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
 		$uidsToFetch = new Horde_Imap_Client_Ids();
 		if (!(is_object($_uid) || is_array($_uid))) $_uid = (array)$_uid;
 		$uidsToFetch->add($_uid);
@@ -4953,7 +4953,7 @@ 
 		$fquery = new Horde_Imap_Client_Fetch_Query();
 		if ($_partID != '')
 		{
-			$fquery->headerText(array('id'=>$_partID,'peek'=>$preserveUnSeen));
+			$fquery->headerText(array('id'=>$_partID, 'peek'=>$preserveUnSeen));
 			$fquery->structure();
 		}
 		else
@@ -4964,18 +4964,18 @@ 
 			'ids' => $uidsToFetch,
 		));
 		if (is_object($headersNew)) {
-			foreach($headersNew as $_fetchObject)
+			foreach ($headersNew as $_fetchObject)
 			{
-				$headers = $_fetchObject->getHeaderText(0,Horde_Imap_Client_Data_Fetch::HEADER_PARSE);
+				$headers = $_fetchObject->getHeaderText(0, Horde_Imap_Client_Data_Fetch::HEADER_PARSE);
 				if ($_partID != '')
 				{
 					$mailStructureObject = $_fetchObject->getStructure();
 					foreach ($mailStructureObject->contentTypeMap() as $mime_id => $mime_type)
 					{
-						if ($mime_id==$_partID)
+						if ($mime_id == $_partID)
 						{
 							//error_log(__METHOD__.' ('.__LINE__.') '."$mime_id == $_partID".array2string($_headerObject->getHeaderText($mime_id,Horde_Imap_Client_Data_Fetch::HEADER_PARSE)->toArray()));
-							$headers = $_fetchObject->getHeaderText($mime_id,Horde_Imap_Client_Data_Fetch::HEADER_PARSE);
+							$headers = $_fetchObject->getHeaderText($mime_id, Horde_Imap_Client_Data_Fetch::HEADER_PARSE);
 							break;
 						}
 					}
@@ -4986,14 +4986,14 @@ 
 				if (is_object($headers)) $headers->setUserAgent('EGroupware API '.$GLOBALS['egw_info']['server']['versions']['phpgwapi']);
 				return $headers;
 			}
-			$retValue = is_object($headers) ? $headers->toArray():array();
+			$retValue = is_object($headers) ? $headers->toArray() : array();
 		}
-		$retValue = array_change_key_case($retValue,CASE_UPPER);
+		$retValue = array_change_key_case($retValue, CASE_UPPER);
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($retValue));
 		// if SUBJECT is an array, use thelast one, as we assume something with the unfolding for the subject did not work
 		if (is_array($retValue['SUBJECT']))
 		{
-			$retValue['SUBJECT'] = $retValue['SUBJECT'][count($retValue['SUBJECT'])-1];
+			$retValue['SUBJECT'] = $retValue['SUBJECT'][count($retValue['SUBJECT']) - 1];
 		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.':'.array2string($decode ? self::decode_header($retValue,true):$retValue));
 		if ($decode)
@@ -5001,7 +5001,7 @@ 
 			foreach ($retValue as $key => $rvV)
 			{
 				//try idn conversion only on 'FROM', 'TO', 'CC', 'BCC', 'SENDER', 'REPLY-TO'
-				$retValue[$key]=self::decode_header($rvV,in_array($key,array('FROM', 'TO', 'CC', 'BCC', 'SENDER', 'REPLY-TO')));
+				$retValue[$key] = self::decode_header($rvV, in_array($key, array('FROM', 'TO', 'CC', 'BCC', 'SENDER', 'REPLY-TO')));
 			}
 		}
 		return $retValue;
@@ -5018,14 +5018,14 @@ 
 	function getMessageRawHeader($_uid, $_partID = '', $_folder = '')
 	{
 		static $rawHeaders;
-		if (empty($_folder)) $_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
+		if (empty($_folder)) $_folder = ($this->sessionData['mailbox'] ? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
 		//error_log(__METHOD__.' ('.__LINE__.') '." Try Using Cache for raw Header $_uid, $_partID in Folder $_folder");
 
-		if (is_null($rawHeaders)||!is_array($rawHeaders)) $rawHeaders = egw_cache::getCache(egw_cache::INSTANCE,'email','rawHeadersCache'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*1);
-		if (isset($rawHeaders[$this->icServer->ImapServerId][(string)$_folder][$_uid][(empty($_partID)?'NIL':$_partID)]))
+		if (is_null($rawHeaders) || !is_array($rawHeaders)) $rawHeaders = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'rawHeadersCache'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60 * 60 * 1);
+		if (isset($rawHeaders[$this->icServer->ImapServerId][(string)$_folder][$_uid][(empty($_partID) ? 'NIL' : $_partID)]))
 		{
 			//error_log(__METHOD__.' ('.__LINE__.') '." Using Cache for raw Header $_uid, $_partID in Folder $_folder");
-			return $rawHeaders[$this->icServer->ImapServerId][(string)$_folder][$_uid][(empty($_partID)?'NIL':$_partID)];
+			return $rawHeaders[$this->icServer->ImapServerId][(string)$_folder][$_uid][(empty($_partID) ? 'NIL' : $_partID)];
 		}
 		$uidsToFetch = new Horde_Imap_Client_Ids();
 		$uid = $_uid;
@@ -5035,7 +5035,7 @@ 
 		$fquery = new Horde_Imap_Client_Fetch_Query();
 		if ($_partID != '')
 		{
-			$fquery->headerText(array('id'=>$_partID,'peek'=>true));
+			$fquery->headerText(array('id'=>$_partID, 'peek'=>true));
 			$fquery->structure();
 		}
 		else
@@ -5046,14 +5046,14 @@ 
 			'ids' => $uidsToFetch,
 		));
 		if (is_object($headersNew)) {
-			foreach($headersNew as &$_headerObject) {
+			foreach ($headersNew as &$_headerObject) {
 				$retValue = $_headerObject->getHeaderText();
 				if ($_partID != '')
 				{
 					$mailStructureObject = $_headerObject->getStructure();
 					foreach ($mailStructureObject->contentTypeMap() as $mime_id => $mime_type)
 					{
-						if ($mime_id==$_partID)
+						if ($mime_id == $_partID)
 						{
 							$retValue = $_headerObject->getHeaderText($mime_id);
 						}
@@ -5061,8 +5061,8 @@ 
 				}
 			}
 		}
-		$rawHeaders[$this->icServer->ImapServerId][(string)$_folder][$_uid][(empty($_partID)?'NIL':$_partID)]=$retValue;
-		egw_cache::setCache(egw_cache::INSTANCE,'email','rawHeadersCache'.trim($GLOBALS['egw_info']['user']['account_id']),$rawHeaders,60*60*1);
+		$rawHeaders[$this->icServer->ImapServerId][(string)$_folder][$_uid][(empty($_partID) ? 'NIL' : $_partID)] = $retValue;
+		egw_cache::setCache(egw_cache::INSTANCE, 'email', 'rawHeadersCache'.trim($GLOBALS['egw_info']['user']['account_id']), $rawHeaders, 60 * 60 * 1);
 		return $retValue;
 	}
 
@@ -5075,25 +5075,25 @@ 
 	{
 		$style = '';
 		if (empty($_bodyParts)) return "";
-		foreach((array)$_bodyParts as $singleBodyPart) {
+		foreach ((array)$_bodyParts as $singleBodyPart) {
 			if (!isset($singleBodyPart['body'])) {
 				$singleBodyPart['body'] = self::getStyles($singleBodyPart);
 				$style .= $singleBodyPart['body'];
 				continue;
 			}
 
-			if ($singleBodyPart['charSet']===false) $singleBodyPart['charSet'] = translation::detect_encoding($singleBodyPart['body']);
+			if ($singleBodyPart['charSet'] === false) $singleBodyPart['charSet'] = translation::detect_encoding($singleBodyPart['body']);
 			$singleBodyPart['body'] = translation::convert(
 				$singleBodyPart['body'],
 				strtolower($singleBodyPart['charSet'])
 			);
 			$ct = 0;
-			$newStyle=array();
-			if (stripos($singleBodyPart['body'],'<style')!==false)  $ct = preg_match_all('#<style(?:\s.*)?>(.+)</style>#isU', $singleBodyPart['body'], $newStyle);
-			if ($ct>0)
+			$newStyle = array();
+			if (stripos($singleBodyPart['body'], '<style') !== false)  $ct = preg_match_all('#<style(?:\s.*)?>(.+)</style>#isU', $singleBodyPart['body'], $newStyle);
+			if ($ct > 0)
 			{
 				//error_log(__METHOD__.' ('.__LINE__.') '.'#'.$ct.'#'.array2string($newStyle));
-				$style2buffer = implode('',$newStyle[0]);
+				$style2buffer = implode('', $newStyle[0]);
 			}
 			if ($style2buffer && strtoupper(self::$displayCharset) == 'UTF-8')
 			{
@@ -5101,7 +5101,7 @@ 
 				$test = json_encode($style2buffer);
 				//error_log(__METHOD__.' ('.__LINE__.') '.'#'.$test.'# ->'.strlen($style2buffer).' Error:'.json_last_error());
 				//if (json_last_error() != JSON_ERROR_NONE && strlen($style2buffer)>0)
-				if ($test=="null" && strlen($style2buffer)>0)
+				if ($test == "null" && strlen($style2buffer) > 0)
 				{
 					// this should not be needed, unless something fails with charset detection/ wrong charset passed
 					error_log(__METHOD__.' ('.__LINE__.') '.' Found Invalid sequence for utf-8 in CSS:'.$style2buffer.' Charset Reported:'.$singleBodyPart['charSet'].' Carset Detected:'.translation::detect_encoding($style2buffer));
@@ -5112,19 +5112,19 @@ 
 		}
 		// clean out comments and stuff
 		$search = array(
-			'@url\(http:\/\/[^\)].*?\)@si',  // url calls e.g. in style definitions
+			'@url\(http:\/\/[^\)].*?\)@si', // url calls e.g. in style definitions
 //			'@<!--[\s\S]*?[ \t\n\r]*-->@',   // Strip multi-line comments including CDATA
 //			'@<!--[\s\S]*?[ \t\n\r]*--@',    // Strip broken multi-line comments including CDATA
 		);
-		$style = preg_replace($search,"",$style);
+		$style = preg_replace($search, "", $style);
 
 		// CSS Security
 		// http://code.google.com/p/browsersec/wiki/Part1#Cascading_stylesheets
-		$css = preg_replace('/(javascript|expression|-moz-binding)/i','',$style);
-		if (stripos($css,'script')!==false) translation::replaceTagsCompletley($css,'script'); // Strip out script that may be included
+		$css = preg_replace('/(javascript|expression|-moz-binding)/i', '', $style);
+		if (stripos($css, 'script') !== false) translation::replaceTagsCompletley($css, 'script'); // Strip out script that may be included
 		// we need this, as styledefinitions are enclosed with curly brackets; and template stuff tries to replace everything between curly brackets that is having no horizontal whitespace
 		// as the comments as <!-- styledefinition --> in stylesheet are outdated, and ck-editor does not understand it, we remove it
-		$css = str_replace(array(':','<!--','-->'),array(': ','',''),$css);
+		$css = str_replace(array(':', '<!--', '-->'), array(': ', '', ''), $css);
 		//error_log(__METHOD__.' ('.__LINE__.') '.$css);
 		// TODO: we may have to strip urls and maybe comments and ifs
 		return $css;
@@ -5138,16 +5138,16 @@ 
 	 * @param string $_folder folder to work on
 	 * @return string the message body
 	 */
-	function getMessageRawBody($_uid, $_partID = '', $_folder='')
+	function getMessageRawBody($_uid, $_partID = '', $_folder = '')
 	{
 		//TODO: caching einbauen static!
 		static $rawBody;
 		if (is_null($rawBody)) $rawBody = array();
-		if (empty($_folder)) $_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
-		if (isset($rawBody[$this->icServer->ImapServerId][$_folder][$_uid][(empty($_partID)?'NIL':$_partID)]))
+		if (empty($_folder)) $_folder = ($this->sessionData['mailbox'] ? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
+		if (isset($rawBody[$this->icServer->ImapServerId][$_folder][$_uid][(empty($_partID) ? 'NIL' : $_partID)]))
 		{
 			//error_log(__METHOD__.' ('.__LINE__.') '." Using Cache for raw Body $_uid, $_partID in Folder $_folder");
-			return $rawBody[$this->icServer->ImapServerId][$_folder][$_uid][(empty($_partID)?'NIL':$_partID)];
+			return $rawBody[$this->icServer->ImapServerId][$_folder][$_uid][(empty($_partID) ? 'NIL' : $_partID)];
 		}
 
 		$uidsToFetch = new Horde_Imap_Client_Ids();
@@ -5160,13 +5160,13 @@ 
 		if ($_partID != '')
 		{
 			$fquery->structure();
-			$fquery->bodyPart($_partID,array('peek'=>true));
+			$fquery->bodyPart($_partID, array('peek'=>true));
 		}
 		$headersNew = $this->icServer->fetch($_folder, $fquery, array(
 			'ids' => $uidsToFetch,
 		));
 		if (is_object($headersNew)) {
-			foreach($headersNew as &$_headerObject) {
+			foreach ($headersNew as &$_headerObject) {
 				$body = $_headerObject->getFullMsg();
 				if ($_partID != '')
 				{
@@ -5174,7 +5174,7 @@ 
 					//_debug_array($mailStructureObject->contentTypeMap());
 					foreach ($mailStructureObject->contentTypeMap() as $mime_id => $mime_type)
 					{
-						if ($mime_id==$_partID)
+						if ($mime_id == $_partID)
 						{
 							$body = $_headerObject->getBodyPart($mime_id);
 						}
@@ -5183,7 +5183,7 @@ 
 			}
 		}
 		//error_log(__METHOD__.' ('.__LINE__.') '."[$this->icServer->ImapServerId][$_folder][$_uid][".(empty($_partID)?'NIL':$_partID)."]");
-		$rawBody[$this->icServer->ImapServerId][$_folder][$_uid][(empty($_partID)?'NIL':$_partID)] = $body;
+		$rawBody[$this->icServer->ImapServerId][$_folder][$_uid][(empty($_partID) ? 'NIL' : $_partID)] = $body;
 		return $body;
 	}
 
@@ -5197,13 +5197,13 @@ 
 	 * @param Horde_Imap_Client_Fetch_Query $fquery=null default query just structure
 	 * @return Horde_Mime_Part
 	 */
-	function getStructure($_uid, $_partID=null, $_folder=null, $_preserveSeen=false)
+	function getStructure($_uid, $_partID = null, $_folder = null, $_preserveSeen = false)
 	{
-		if (self::$debug) error_log( __METHOD__.' ('.__LINE__.') '.":$_uid, $_partID");
+		if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.":$_uid, $_partID");
 
 		if (empty($_folder))
 		{
-			$_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
+			$_folder = ($this->sessionData['mailbox'] ? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
 		}
 		$uidsToFetch = new Horde_Imap_Client_Ids();
 		if (!(is_object($_uid) || is_array($_uid))) $_uid = (array)$_uid;
@@ -5221,7 +5221,7 @@ 
 				'ids' => $uidsToFetch,
 			))->first();
 
-			return is_object($mail)?$mail->getStructure():null;
+			return is_object($mail) ? $mail->getStructure() : null;
 		}
 		catch (Exception $e)
 		{
@@ -5244,14 +5244,14 @@ 
 	 * @param string $_folder folder to work on
 	 * @return array  an array of information about the attachment: array of array(name, size, mimeType, partID, encoding)
 	 */
-	function getMessageAttachments($_uid, $_partID=null, Horde_Mime_Part $_structure=null, $fetchEmbeddedImages=true, $fetchTextCalendar=false, $resolveTNEF=true, $_folder='')
+	function getMessageAttachments($_uid, $_partID = null, Horde_Mime_Part $_structure = null, $fetchEmbeddedImages = true, $fetchTextCalendar = false, $resolveTNEF = true, $_folder = '')
 	{
-		if (self::$debug) error_log( __METHOD__.":$_uid, $_partID");
-		if (empty($_folder)) $_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
+		if (self::$debug) error_log(__METHOD__.":$_uid, $_partID");
+		if (empty($_folder)) $_folder = ($this->sessionData['mailbox'] ? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
 		$attachments = array();
 		if (!isset($_structure))
 		{
-			$_structure = $this->getStructure($_uid, $_partID,$_folder,true);
+			$_structure = $this->getStructure($_uid, $_partID, $_folder, true);
 			//error_log(__METHOD__.' ('.__LINE__.') '.':'.print_r($_structure->contentTypeMap(),true));
 		}
 		if (!$_structure || !$_structure->contentTypeMap()) return array();
@@ -5259,7 +5259,7 @@ 
 		$skipParts = array();
 		$tnefParts = array();
 		$skip = 0;
-		foreach($_structure->contentTypeMap() as $mime_id => $mime_type)
+		foreach ($_structure->contentTypeMap() as $mime_id => $mime_type)
 		{
 			$part = $_structure->getPart($mime_id);
 			//error_log(__METHOD__.' ('.__LINE__.') '.':'.' Uid:'.$uid.' Part:'.$_partID.'->'.array2string($part->getMimeId()));
@@ -5270,10 +5270,10 @@ 
 			$partPrimaryType = $part->getPrimaryType();
 			// we only want to retrieve the attachments of the current mail, not those of possible
 			// attached mails
-			if ($mime_type=='message/rfc822' && $_partID!=$mime_id)
+			if ($mime_type == 'message/rfc822' && $_partID != $mime_id)
 			{
 				//error_log(__METHOD__.' ('.__LINE__.') '.' Uid:'.$uid.'->'.$mime_id.':'.array2string($part->contentTypeMap()));
-				foreach($part->contentTypeMap() as $sub_id => $sub_type) {if ($sub_id != $mime_id) $skipParts[$sub_id] = $sub_type;}
+				foreach ($part->contentTypeMap() as $sub_id => $sub_type) {if ($sub_id != $mime_id) $skipParts[$sub_id] = $sub_type; }
 			}
 			if (empty($partDisposition) && $partPrimaryType != 'multipart' && $partPrimaryType != 'text')
 			{
@@ -5281,27 +5281,27 @@ 
 				// attachment with no link to show the attachment inline.
 				// Considering this: we "list" everything that matches the above criteria
 				// as attachment in order to not loose/miss information on our data
-				$partDisposition='attachment';
+				$partDisposition = 'attachment';
 			}
 			//error_log(__METHOD__.' ('.__LINE__.') '.' Uid:'.$uid.' Part:'.$_partID.'->'.$mime_id.':'.array2string($skipParts));
-			if (array_key_exists($mime_id,$skipParts)) continue;
+			if (array_key_exists($mime_id, $skipParts)) continue;
 
 			if ($partDisposition == 'attachment' ||
-				(($partDisposition == 'inline' || empty($partDisposition)) && $partPrimaryType == 'image' && $part->getContentId()=='') ||
+				(($partDisposition == 'inline' || empty($partDisposition)) && $partPrimaryType == 'image' && $part->getContentId() == '') ||
 				(($partDisposition == 'inline' || empty($partDisposition)) && $partPrimaryType != 'image' && $partPrimaryType != 'text' && $partPrimaryType != 'multipart') ||
-				($mime_type=='image/tiff') || //always fetch. even if $fetchEmbeddedImages is false. as we cannot display tiffs
+				($mime_type == 'image/tiff') || //always fetch. even if $fetchEmbeddedImages is false. as we cannot display tiffs
 				($fetchEmbeddedImages && ($partDisposition == 'inline' || empty($partDisposition)) && $partPrimaryType == 'image') ||
 				($fetchTextCalendar && $partPrimaryType == 'text' && $part->getSubType() == 'calendar'))
 			{
 				// if type is message/rfc822 and _partID is given, and MimeID equals partID
 				// we attempt to fetch "ourselves"
-				if ($_partID==$part->getMimeId() && $part->getPrimaryType()=='message') continue;
+				if ($_partID == $part->getMimeId() && $part->getPrimaryType() == 'message') continue;
 				$attachment = $part->getAllDispositionParameters();
 
 				$attachment['mimeType'] = $mime_type;
 				$attachment['uid'] = $_uid;
 				$attachment['partID'] = $mime_id;
-				if (!isset($attachment['name'])||empty($attachment['name'])) $attachment['name'] = $part->getName();
+				if (!isset($attachment['name']) || empty($attachment['name'])) $attachment['name'] = $part->getName();
 				if ($fetchTextCalendar)
 				{
 					//error_log(__METHOD__.' ('.__LINE__.') '.array2string($part->getAllContentTypeParameters()));
@@ -5311,11 +5311,11 @@ 
 				}
 				$attachment['size'] = $part->getBytes();
 				if (($cid = $part->getContentId())) $attachment['cid'] = $cid;
-				if (empty($attachment['name'])) $attachment['name'] = (isset($attachment['cid'])&&!empty($attachment['cid'])?$attachment['cid']:lang("unknown").'_Uid'.$_uid.'_Part'.$mime_id).'.'.mime_magic::mime2ext($mime_type);
+				if (empty($attachment['name'])) $attachment['name'] = (isset($attachment['cid']) && !empty($attachment['cid']) ? $attachment['cid'] : lang("unknown").'_Uid'.$_uid.'_Part'.$mime_id).'.'.mime_magic::mime2ext($mime_type);
 				//error_log(__METHOD__.' ('.__LINE__.') '.' Uid:'.$uid.' Part:'.$_partID.'->'.$mime_id.':'.array2string($attachment));
 				//typical winmail.dat attachment is
 				//Array([size] => 1462762[filename] => winmail.dat[mimeType] => application/ms-tnef[uid] => 100[partID] => 2[name] => winmail.dat)
-				if ($resolveTNEF && ($attachment['mimeType']=='application/ms-tnef' || !strcasecmp($attachment['name'],'winmail.dat')))
+				if ($resolveTNEF && ($attachment['mimeType'] == 'application/ms-tnef' || !strcasecmp($attachment['name'], 'winmail.dat')))
 				{
 					$tnefParts[] = $attachment;
 				}
@@ -5330,31 +5330,31 @@ 
 			//error_log(__METHOD__.__LINE__.array2string($tnefParts));
 			foreach ($tnefParts as $k => $tnp)
 			{
-				$tnefResolved=false;
-				$tnef_data = $this->getAttachment($tnp['uid'],$tnp['partID'],$k,false);
+				$tnefResolved = false;
+				$tnef_data = $this->getAttachment($tnp['uid'], $tnp['partID'], $k, false);
 				$myTnef = $this->tnef_decoder($tnef_data['attachment']);
 				//error_log(__METHOD__.__LINE__.array2string($myTnef->getParts()));
 				// Note: MimeId starts with 0, almost always, we cannot use that as winmail_id
 				// we need to build Something that meets the needs
 				if ($myTnef)
 				{
-					foreach($myTnef->getParts() as $mime_id => $part)
+					foreach ($myTnef->getParts() as $mime_id => $part)
 					{
-						$tnefResolved=true;
+						$tnefResolved = true;
 						$attachment = $part->getAllDispositionParameters();
 
 						$attachment['mimeType'] = $part->getType();
 						$attachment['uid'] = $tnp['uid'];
 						$attachment['partID'] = $tnp['partID'];
 						$attachment['is_winmail'] = $tnp['uid'].'@'.$tnp['partID'].'@'.$mime_id;
-						if (!isset($attachment['name'])||empty($attachment['name'])) $attachment['name'] = $part->getName();
+						if (!isset($attachment['name']) || empty($attachment['name'])) $attachment['name'] = $part->getName();
 						$attachment['size'] = $part->getBytes();
 						if (($cid = $part->getContentId())) $attachment['cid'] = $cid;
-						if (empty($attachment['name'])) $attachment['name'] = (isset($attachment['cid'])&&!empty($attachment['cid'])?$attachment['cid']:lang("unknown").'_Uid'.$_uid.'_Part'.$mime_id).'.'.mime_magic::mime2ext($attachment['mimeType']);
+						if (empty($attachment['name'])) $attachment['name'] = (isset($attachment['cid']) && !empty($attachment['cid']) ? $attachment['cid'] : lang("unknown").'_Uid'.$_uid.'_Part'.$mime_id).'.'.mime_magic::mime2ext($attachment['mimeType']);
 						$attachments[] = $attachment;
 					}
 				}
-				if ($tnefResolved===false) $attachments[]=$tnp;
+				if ($tnefResolved === false) $attachments[] = $tnp;
 			}
 		}
 		//error_log(__METHOD__.__LINE__.array2string($attachments));
@@ -5369,9 +5369,9 @@ 
 	 * @return boolean|Horde_Mime_part Multipart/Mixed part decoded attachments |
 	 *	return false if there's no attachments or failure
 	 */
-	public function tnef_decoder( $data )
+	public function tnef_decoder($data)
 	{
-		foreach(array('Horde_Compress', 'Horde_Icalendar', 'Horde_Mapi') as $class)
+		foreach (array('Horde_Compress', 'Horde_Icalendar', 'Horde_Mapi') as $class)
 		{
 			if (!class_exists($class))
 			{
@@ -5402,7 +5402,7 @@ 
 				$tmp_part->setContents($data['stream']);
 				$tmp_part->setDescription($data['name']);
 
-				$type = $data['type'] . '/' . $data['subtype'];
+				$type = $data['type'].'/'.$data['subtype'];
 				if (in_array($type, array('application/octet-stream', 'application/base64')))
 				{
 					$type = Horde_Mime_Magic::filenameToMIME($data['name']);
@@ -5445,24 +5445,24 @@ 
 	 *
 	 * @return array returns an array of all resolved embeded attachments from winmail.dat
 	 */
-	function getTnefAttachments ($_uid, $_partID, $_stream=false)
+	function getTnefAttachments($_uid, $_partID, $_stream = false)
 	{
-		$tnef_data = $this->getAttachment($_uid, $_partID,0,false);
+		$tnef_data = $this->getAttachment($_uid, $_partID, 0, false);
 		$tnef_parts = $this->tnef_decoder($tnef_data['attachment']);
 		$attachments = array();
 		if ($tnef_parts)
 		{
-			foreach($tnef_parts->getParts() as $mime_id => $part)
+			foreach ($tnef_parts->getParts() as $mime_id => $part)
 			{
 
 				$attachment = $part->getAllDispositionParameters();
 				$attachment['mimeType'] = $part->getType();
-				if (!isset($attachment['filename'])||empty($attachment['filename'])) $attachment['filename'] = $part->getName();
+				if (!isset($attachment['filename']) || empty($attachment['filename'])) $attachment['filename'] = $part->getName();
 				if (($cid = $part->getContentId())) $attachment['cid'] = $cid;
 				if (empty($attachment['filename']))
 				{
-					$attachment['filename'] = (isset($attachment['cid'])&&!empty($attachment['cid'])?
-						$attachment['cid']:lang("unknown").'_Uid'.$_uid.'_Part'.$mime_id).'.'.mime_magic::mime2ext($attachment['mimeType']);
+					$attachment['filename'] = (isset($attachment['cid']) && !empty($attachment['cid']) ?
+						$attachment['cid'] : lang("unknown").'_Uid'.$_uid.'_Part'.$mime_id).'.'.mime_magic::mime2ext($attachment['mimeType']);
 				}
 
 				$attachment['attachment'] = $part->getContents(array('stream'=>$_stream));
@@ -5486,10 +5486,10 @@ 
 	 *
 	 * @return array
 	 */
-	function getAttachment($_uid, $_partID, $_winmail_nr=0, $_returnPart=true, $_stream=false, $_folder=null)
+	function getAttachment($_uid, $_partID, $_winmail_nr = 0, $_returnPart = true, $_stream = false, $_folder = null)
 	{
 		//error_log(__METHOD__.__LINE__."Uid:$_uid, PartId:$_partID, WinMailNr:$_winmail_nr, ReturnPart:$_returnPart, Stream:$_stream, Folder:$_folder".function_backtrace());
-		if (!isset($_folder)) $_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
+		if (!isset($_folder)) $_folder = ($this->sessionData['mailbox'] ? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
 
 		$uidsToFetch = new Horde_Imap_Client_Ids();
 		if (!(is_object($_uid) || is_array($_uid))) $_uid = (array)$_uid;
@@ -5502,36 +5502,36 @@ 
 			'ids' => $uidsToFetch,
 		));
 		if (is_object($headersNew)) {
-			foreach($headersNew as $id=>$_headerObject) {
+			foreach ($headersNew as $id=>$_headerObject) {
 				$body = $_headerObject->getFullMsg();
 				if ($_partID != '')
 				{
 					$mailStructureObject = $_headerObject->getStructure();
 					$mailStructureObject->contentTypeMap();
 					$part = $mailStructureObject->getPart($_partID);
-					$partDisposition = ($part?$part->getDisposition():'failed');
-					if ($partDisposition=='failed')
+					$partDisposition = ($part ? $part->getDisposition() : 'failed');
+					if ($partDisposition == 'failed')
 					{
 						error_log(__METHOD__.'('.__LINE__.'):'.array2string($_uid).','.$_partID.' ID:'.$id.' HObject:'.array2string($_headerObject).' StructureObject:'.array2string($mailStructureObject->contentTypeMap()).'->'.function_backtrace());
 					}
 					// if $partDisposition is empty, we assume attachment, and hope that the function
 					// itself is only triggered to fetch attachments
-					if (empty($partDisposition)) $partDisposition='attachment';
-					if ($part && ($partDisposition=='attachment' || $partDisposition=='inline' || ($part->getPrimaryType() == 'text' && $part->getSubType() == 'calendar')))
+					if (empty($partDisposition)) $partDisposition = 'attachment';
+					if ($part && ($partDisposition == 'attachment' || $partDisposition == 'inline' || ($part->getPrimaryType() == 'text' && $part->getSubType() == 'calendar')))
 					{
 						//$headerObject=$part->getAllDispositionParameters();//not used anywhere around here
 						$structure_mime = $part->getType();
 						$filename = $part->getName();
 						$charset = $part->getContentTypeParameter('charset');
 						//$structure_bytes = $part->getBytes(); $structure_partID=$part->getMimeId(); error_log(__METHOD__.__LINE__." fetchPartContents(".array2string($_uid).", $structure_partID, $_stream, $_preserveSeen,$structure_mime)" );
-						$this->fetchPartContents($_uid, $part, $_stream, $_preserveSeen=true,$structure_mime);
+						$this->fetchPartContents($_uid, $part, $_stream, $_preserveSeen = true, $structure_mime);
 						if ($_returnPart) return $part;
 					}
 				}
 			}
 		}
 		$ext = mime_magic::mime2ext($structure_mime);
-		if ($ext && stripos($filename,'.')===false && stripos($filename,$ext)===false) $filename = trim($filename).'.'.$ext;
+		if ($ext && stripos($filename, '.') === false && stripos($filename, $ext) === false) $filename = trim($filename).'.'.$ext;
 		if (!$part)
 		{
 			throw new egw_exception_wrong_parameter("Error: Could not fetch attachment for Uid=".array2string($_uid).", PartId=$_partID, WinMailNr=$_winmail_nr, folder=$_folder");
@@ -5549,20 +5549,20 @@ 
 		// try guessing the mimetype, if we get the application/octet-stream
 		if (strtolower($attachmentData['type']) == 'application/octet-stream') $attachmentData['type'] = mime_magic::filename2mime($attachmentData['filename']);
 		# if the attachment holds a winmail number and is a winmail.dat then we have to handle that.
-		if ( $filename == 'winmail.dat' && $_winmail_nr)
+		if ($filename == 'winmail.dat' && $_winmail_nr)
 		{
 			//by now _uid is of type array
-			$tnefResolved=false;
-			$wantedPart=$_uid[0].'@'.$_partID;
+			$tnefResolved = false;
+			$wantedPart = $_uid[0].'@'.$_partID;
 			$myTnef = $this->tnef_decoder($attachmentData['attachment']);
 			//error_log(__METHOD__.__LINE__.array2string($myTnef->getParts()));
 			// Note: MimeId starts with 0, almost always, we cannot use that as winmail_id
 			// we need to build Something that meets the needs
 			if ($myTnef)
 			{
-				foreach($myTnef->getParts() as $mime_id => $part)
+				foreach ($myTnef->getParts() as $mime_id => $part)
 				{
-					$tnefResolved=true;
+					$tnefResolved = true;
 					$attachment = $part->getAllDispositionParameters();
 					$attachment['mimeType'] = $part->getType();
 					//error_log(__METHOD__.__LINE__.'#'.$mime_id.'#'.$filename.'#'.array2string($attachment));
@@ -5570,9 +5570,9 @@ 
 					if ($_winmail_nr == $wantedPart.'@'.$mime_id)
 					{
 						//error_log(__METHOD__.__LINE__.'#'.$structure_mime.'#'.$filename.'#'.array2string($attachment));
-						if (!isset($attachment['filename'])||empty($attachment['filename'])) $attachment['filename'] = $part->getName();
+						if (!isset($attachment['filename']) || empty($attachment['filename'])) $attachment['filename'] = $part->getName();
 						if (($cid = $part->getContentId())) $attachment['cid'] = $cid;
-						if (empty($attachment['filename'])) $attachment['filename'] = (isset($attachment['cid'])&&!empty($attachment['cid'])?$attachment['cid']:lang("unknown").'_Uid'.$_uid.'_Part'.$mime_id).'.'.mime_magic::mime2ext($attachment['mimeType']);
+						if (empty($attachment['filename'])) $attachment['filename'] = (isset($attachment['cid']) && !empty($attachment['cid']) ? $attachment['cid'] : lang("unknown").'_Uid'.$_uid.'_Part'.$mime_id).'.'.mime_magic::mime2ext($attachment['mimeType']);
 						$wmattach = $attachment;
 						$wmattach['attachment'] = $part->getContents(array('stream'=>$_stream));
 
@@ -5582,7 +5582,7 @@ 
 			if ($tnefResolved)
 			{
 				$ext = mime_magic::mime2ext($wmattach['mimeType']);
-				if ($ext && stripos($wmattach['filename'],'.')===false && stripos($wmattach['filename'],$ext)===false) $wmattach['filename'] = trim($wmattach['filename']).'.'.$ext;
+				if ($ext && stripos($wmattach['filename'], '.') === false && stripos($wmattach['filename'], $ext) === false) $wmattach['filename'] = trim($wmattach['filename']).'.'.$ext;
 				$attachmentData = array(
 					'type'       => $wmattach['mimeType'],
 					'filename'   => $wmattach['filename'],
@@ -5606,21 +5606,21 @@ 
 	 *	true:
 	 * @return Horde_Mime_Part
 	 */
-	function getAttachmentByCID($_uid, $_cid, $_part, $_stream=null)
+	function getAttachmentByCID($_uid, $_cid, $_part, $_stream = null)
 	{
 		// some static variables to avoid fetching the same mail multiple times
-		static $uid=null, $part=null, $structure=null;
+		static $uid = null, $part = null, $structure = null;
 		//error_log(__METHOD__.' ('.__LINE__.') '.":$_uid, $_cid, $_part");
 
-		if(empty($_cid)) return false;
+		if (empty($_cid)) return false;
 
 		if ($_uid != $uid || $_part != $part)
 		{
-			$structure = $this->getStructure($uid=$_uid, $part=$_part);
+			$structure = $this->getStructure($uid = $_uid, $part = $_part);
 		}
 		/** @var Horde_Mime_Part */
 		$attachment = null;
-		foreach($structure->contentTypeMap() as $mime_id => $mime_type)
+		foreach ($structure->contentTypeMap() as $mime_id => $mime_type)
 		{
 			$part = $structure->getPart($mime_id);
 
@@ -5672,16 +5672,16 @@ 
 	 * @param string  $_mimetype to decide wether to try to fetch part as binary or not
 	 * @return Horde_Mime_Part
 	 */
-	public function fetchPartContents($_uid, Horde_Mime_Part $part=null, $_stream=false, $_preserveSeen=false, $_mimetype=null)
+	public function fetchPartContents($_uid, Horde_Mime_Part $part = null, $_stream = false, $_preserveSeen = false, $_mimetype = null)
 	{
-		if (is_null($part)) return null;//new Horde_Mime_Part;
+		if (is_null($part)) return null; //new Horde_Mime_Part;
 		$encoding = null;
 		$fetchAsBinary = true;
-		if ($_mimetype && strtolower($_mimetype)=='message/rfc822') $fetchAsBinary = false;
+		if ($_mimetype && strtolower($_mimetype) == 'message/rfc822') $fetchAsBinary = false;
 		// we need to set content on structure to decode transfer encoding
 		$part->setContents(
 			$this->getBodyPart($_uid, $part->getMimeId(), null, $_preserveSeen, $_stream, $encoding, $fetchAsBinary),
-			array('encoding' => (!$fetchAsBinary&&!$encoding?'8bit':$encoding)));
+			array('encoding' => (!$fetchAsBinary && !$encoding ? '8bit' : $encoding)));
 
 		return $part;
 	}
@@ -5699,17 +5699,17 @@ 
 	 * @return the id of the message appended or exception
 	 * @throws egw_exception_wrong_userinput
 	 */
-	function appendMessage($_folderName, $_header, $_body, $_flags='\\Recent')
+	function appendMessage($_folderName, $_header, $_body, $_flags = '\\Recent')
 	{
 		if (!is_resource($_header))
 		{
-			if (stripos($_header,'message-id:')===false)
+			if (stripos($_header, 'message-id:') === false)
 			{
 				$_header = 'Message-ID: <'.self::getRandomString().'@localhost>'."\n".$_header;
 			}
 			//error_log(__METHOD__.' ('.__LINE__.') '."$_folderName, $_header, $_body, $_flags");
-			$_header = ltrim(str_replace("\n","\r\n",$_header));
-			$_header .= str_replace("\n","\r\n",$_body);
+			$_header = ltrim(str_replace("\n", "\r\n", $_header));
+			$_header .= str_replace("\n", "\r\n", $_body);
 		}
 		// the recent flag is the default enforced here ; as we assume the _flags is always set,
 		// we default it to hordes default (Recent) (, other wise we should not pass the parameter
@@ -5727,7 +5727,7 @@ 
 			// searched for the message-id then returning the uid found
 			//$dataNflags[] = array('data'=>array(array('t'=>'text','v'=>"$header"."$body")), 'flags'=>array($_flags));
 			$dataNflags[] = array('data' => $_header, 'flags'=>array($_flags));
-			$messageid = $this->icServer->append($_folderName,$dataNflags);
+			$messageid = $this->icServer->append($_folderName, $dataNflags);
 		}
 		catch (Exception $e)
 		{
@@ -5739,7 +5739,7 @@ 
 		//$messageid = true; // for debug reasons only
 		if ($messageid === true || empty($messageid)) // try to figure out the message uid
 		{
-			$list = $this->getHeaders($_folderName, $_startMessage=1, 1, 'INTERNALDATE', true, array(),null, false);
+			$list = $this->getHeaders($_folderName, $_startMessage = 1, 1, 'INTERNALDATE', true, array(), null, false);
 			if ($list)
 			{
 				if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.' MessageUid:'.$messageid.' but found:'.array2string($list));
@@ -5779,27 +5779,27 @@ 
 	 *				'attachments'=>$attachments,
 	 *				'headers'=>$headers,; boolean false on failure
 	 */
-	static function get_mailcontent(&$mailClass,$uid,$partid='',$mailbox='', $preserveHTML = false, $addHeaderSection=true, $includeAttachments=true)
+	static function get_mailcontent(&$mailClass, $uid, $partid = '', $mailbox = '', $preserveHTML = false, $addHeaderSection = true, $includeAttachments = true)
 	{
 			//echo __METHOD__." called for $uid,$partid <br>";
-			$headers = $mailClass->getMessageHeader($uid,$partid,true,false,$mailbox);
+			$headers = $mailClass->getMessageHeader($uid, $partid, true, false, $mailbox);
 			if (empty($headers)) return false;
 			// dont force retrieval of the textpart, let mailClass preferences decide
-			$bodyParts = $mailClass->getMessageBody($uid,($preserveHTML?'always_display':'only_if_no_text'),$partid,null,false,$mailbox);
+			$bodyParts = $mailClass->getMessageBody($uid, ($preserveHTML ? 'always_display' : 'only_if_no_text'), $partid, null, false, $mailbox);
 			// if we do not want HTML but there is no TextRepresentation with the message itself, try converting
-			if ( !$preserveHTML && $bodyParts[0]['mimeType']=='text/html')
+			if (!$preserveHTML && $bodyParts[0]['mimeType'] == 'text/html')
 			{
-				foreach($bodyParts as $i => $part)
+				foreach ($bodyParts as $i => $part)
 				{
-					if ($bodyParts[$i]['mimeType']=='text/html')
+					if ($bodyParts[$i]['mimeType'] == 'text/html')
 					{
-						$bodyParts[$i]['body'] = translation::convertHTMLToText($bodyParts[$i]['body'],$bodyParts[$i]['charSet'],true,$stripalltags=true);
-						$bodyParts[$i]['mimeType']='text/plain';
+						$bodyParts[$i]['body'] = translation::convertHTMLToText($bodyParts[$i]['body'], $bodyParts[$i]['charSet'], true, $stripalltags = true);
+						$bodyParts[$i]['mimeType'] = 'text/plain';
 					}
 				}
 			}
 			//error_log(array2string($bodyParts));
-			$attachments = $includeAttachments?$mailClass->getMessageAttachments($uid,$partid,null,true,false,true,$mailbox):array();
+			$attachments = $includeAttachments ? $mailClass->getMessageAttachments($uid, $partid, null, true, false, true, $mailbox) : array();
 
 			if ($mailClass->isSentFolder($mailbox)) $mailaddress = $headers['TO'];
 			elseif (isset($headers['FROM'])) $mailaddress = $headers['FROM'];
@@ -5810,7 +5810,7 @@ 
 
 			$message = self::getdisplayableBody($mailClass, $bodyParts, $preserveHTML);
 			if ($preserveHTML && $mailClass->activeMimeType == 'text/plain') $message = '<pre>'.$message.'</pre>';
-			$headdata = ($addHeaderSection ? self::createHeaderInfoSection($headers, '',$preserveHTML) : '');
+			$headdata = ($addHeaderSection ? self::createHeaderInfoSection($headers, '', $preserveHTML) : '');
 			$message = $headdata.$message;
 			//echo __METHOD__.'<br>';
 			//_debug_array($attachments);
@@ -5826,25 +5826,25 @@ 
 						//_debug_array($mailClass->getMessageHeader($uid, $attachment['partID']));
 						//_debug_array($mailClass->getMessageBody($uid,'', $attachment['partID']));
 						//_debug_array($mailClass->getMessageAttachments($uid, $attachment['partID']));
-						$mailcontent = self::get_mailcontent($mailClass,$uid,$attachment['partID'],$mailbox);
-						$headdata ='';
+						$mailcontent = self::get_mailcontent($mailClass, $uid, $attachment['partID'], $mailbox);
+						$headdata = '';
 						if ($mailcontent['headers'])
 						{
-							$headdata = self::createHeaderInfoSection($mailcontent['headers'],'',$preserveHTML);
+							$headdata = self::createHeaderInfoSection($mailcontent['headers'], '', $preserveHTML);
 						}
 						if ($mailcontent['message'])
 						{
-							$tempname =tempnam($GLOBALS['egw_info']['server']['temp_dir'],$GLOBALS['egw_info']['flags']['currentapp']."_");
+							$tempname = tempnam($GLOBALS['egw_info']['server']['temp_dir'], $GLOBALS['egw_info']['flags']['currentapp']."_");
 							$attachedMessages[] = array(
 								'type' => 'TEXT/PLAIN',
 								'name' => $mailcontent['subject'].'.txt',
 								'tmp_name' => $tempname,
 							);
-							$tmpfile = fopen($tempname,'w');
-							fwrite($tmpfile,$headdata.$mailcontent['message']);
+							$tmpfile = fopen($tempname, 'w');
+							fwrite($tmpfile, $headdata.$mailcontent['message']);
 							fclose($tmpfile);
 						}
-						foreach($mailcontent['attachments'] as &$tmpval)
+						foreach ($mailcontent['attachments'] as &$tmpval)
 						{
 							$attachedMessages[] = $tmpval;
 						}
@@ -5852,36 +5852,36 @@ 
 					}
 					else
 					{
-						$attachments[$num] = array_merge($attachments[$num],$mailClass->getAttachment($uid, $attachment['partID'],0,false,false));
+						$attachments[$num] = array_merge($attachments[$num], $mailClass->getAttachment($uid, $attachment['partID'], 0, false, false));
 
-						if (empty($attachments[$num]['attachment'])&&$attachments[$num]['cid'])
+						if (empty($attachments[$num]['attachment']) && $attachments[$num]['cid'])
 						{
-							$c = $mailClass->getAttachmentByCID($uid, $attachment['cid'], $attachment['partID'],true);
+							$c = $mailClass->getAttachmentByCID($uid, $attachment['cid'], $attachment['partID'], true);
 							$attachments[$num]['attachment'] = $c->getContents();
 						}
 						// no attempt to convert, if we dont know about the charset
-						if (isset($attachments[$num]['charset'])&&!empty($attachments[$num]['charset'])) {
+						if (isset($attachments[$num]['charset']) && !empty($attachments[$num]['charset'])) {
 							// we do not try guessing the charset, if it is not set
 							//if ($attachments[$num]['charset']===false) $attachments[$num]['charset'] = translation::detect_encoding($attachments[$num]['attachment']);
-							translation::convert($attachments[$num]['attachment'],$attachments[$num]['charset']);
+							translation::convert($attachments[$num]['attachment'], $attachments[$num]['charset']);
 						}
-						if(in_array($attachments[$num]['name'], $file_list))
+						if (in_array($attachments[$num]['name'], $file_list))
 						{
 							$dupe_count[$attachments[$num]['name']]++;
-							$attachments[$num]['name'] = pathinfo($attachments[$num]['name'], PATHINFO_FILENAME) .
-								' ('.($dupe_count[$attachments[$num]['name']] + 1).')' . '.' .
+							$attachments[$num]['name'] = pathinfo($attachments[$num]['name'], PATHINFO_FILENAME).
+								' ('.($dupe_count[$attachments[$num]['name']] + 1).')'.'.'.
 								pathinfo($attachments[$num]['name'], PATHINFO_EXTENSION);
 						}
 						$attachments[$num]['type'] = $attachments[$num]['mimeType'];
-						$attachments[$num]['tmp_name'] = tempnam($GLOBALS['egw_info']['server']['temp_dir'],$GLOBALS['egw_info']['flags']['currentapp']."_");
-						$tmpfile = fopen($attachments[$num]['tmp_name'],'w');
-						fwrite($tmpfile,$attachments[$num]['attachment']);
+						$attachments[$num]['tmp_name'] = tempnam($GLOBALS['egw_info']['server']['temp_dir'], $GLOBALS['egw_info']['flags']['currentapp']."_");
+						$tmpfile = fopen($attachments[$num]['tmp_name'], 'w');
+						fwrite($tmpfile, $attachments[$num]['attachment']);
 						fclose($tmpfile);
 						$file_list[] = $attachments[$num]['name'];
 						unset($attachments[$num]['attachment']);
 					}
 				}
-				if (is_array($attachedMessages)) $attachments = array_merge($attachments,$attachedMessages);
+				if (is_array($attachedMessages)) $attachments = array_merge($attachments, $attachedMessages);
 			}
 			return array(
 					'mailaddress'=>$mailaddress,
@@ -5903,10 +5903,10 @@ 
 	{
 		$c = 0;
 		// use the standardIdentity
-		foreach($_identities as $key => $acc) {
-			if ($c==0) $identity = $acc;
+		foreach ($_identities as $key => $acc) {
+			if ($c == 0) $identity = $acc;
 			//error_log(__METHOD__.__LINE__." $key == $_profile_id ");
-			if ($key==$_profile_id) $identity = $acc;
+			if ($key == $_profile_id) $identity = $acc;
 			$c++;
 		}
 		return $identity;
@@ -5918,29 +5918,29 @@ 
 	 * @param bool createHTML do it with HTML breaks
 	 * @return string a preformatted string with the information of the header worked into it
 	 */
-	static function createHeaderInfoSection($header,$headline='', $createHTML = false)
+	static function createHeaderInfoSection($header, $headline = '', $createHTML = false)
 	{
 		$headdata = null;
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($header).function_backtrace());
-		if ($header['SUBJECT']) $headdata = lang('subject').': '.$header['SUBJECT'].($createHTML?"<br />":"\n");
-		if ($header['FROM']) $headdata .= lang('from').': '.self::convertAddressArrayToString($header['FROM'], $createHTML).($createHTML?"<br />":"\n");
-		if ($header['SENDER']) $headdata .= lang('sender').': '.self::convertAddressArrayToString($header['SENDER'], $createHTML).($createHTML?"<br />":"\n");
-		if ($header['TO']) $headdata .= lang('to').': '.self::convertAddressArrayToString($header['TO'], $createHTML).($createHTML?"<br />":"\n");
-		if ($header['CC']) $headdata .= lang('cc').': '.self::convertAddressArrayToString($header['CC'], $createHTML).($createHTML?"<br />":"\n");
-		if ($header['BCC']) $headdata .= lang('bcc').': '.self::convertAddressArrayToString($header['BCC'], $createHTML).($createHTML?"<br />":"\n");
-		if ($header['DATE']) $headdata .= lang('date').': '.$header['DATE'].($createHTML?"<br />":"\n");
-		if ($header['PRIORITY'] && $header['PRIORITY'] != 'normal') $headdata .= lang('priority').': '.$header['PRIORITY'].($createHTML?"<br />":"\n");
-		if ($header['IMPORTANCE'] && $header['IMPORTANCE'] !='normal') $headdata .= lang('importance').': '.$header['IMPORTANCE'].($createHTML?"<br />":"\n");
+		if ($header['SUBJECT']) $headdata = lang('subject').': '.$header['SUBJECT'].($createHTML ? "<br />" : "\n");
+		if ($header['FROM']) $headdata .= lang('from').': '.self::convertAddressArrayToString($header['FROM'], $createHTML).($createHTML ? "<br />" : "\n");
+		if ($header['SENDER']) $headdata .= lang('sender').': '.self::convertAddressArrayToString($header['SENDER'], $createHTML).($createHTML ? "<br />" : "\n");
+		if ($header['TO']) $headdata .= lang('to').': '.self::convertAddressArrayToString($header['TO'], $createHTML).($createHTML ? "<br />" : "\n");
+		if ($header['CC']) $headdata .= lang('cc').': '.self::convertAddressArrayToString($header['CC'], $createHTML).($createHTML ? "<br />" : "\n");
+		if ($header['BCC']) $headdata .= lang('bcc').': '.self::convertAddressArrayToString($header['BCC'], $createHTML).($createHTML ? "<br />" : "\n");
+		if ($header['DATE']) $headdata .= lang('date').': '.$header['DATE'].($createHTML ? "<br />" : "\n");
+		if ($header['PRIORITY'] && $header['PRIORITY'] != 'normal') $headdata .= lang('priority').': '.$header['PRIORITY'].($createHTML ? "<br />" : "\n");
+		if ($header['IMPORTANCE'] && $header['IMPORTANCE'] != 'normal') $headdata .= lang('importance').': '.$header['IMPORTANCE'].($createHTML ? "<br />" : "\n");
 		//if ($mailcontent['headers']['ORGANIZATION']) $headdata .= lang('organization').': '.$mailcontent['headers']['ORGANIZATION']."\
 		if (!empty($headdata))
 		{
-			if (!empty($headline) && $headline != 'SUPPRESS') $headdata = "---------------------------- $headline ----------------------------".($createHTML?"<br />":"\n").$headdata;
-			if (empty($headline)) $headdata = ($headline != 'SUPPRESS'?"--------------------------------------------------------".($createHTML?"<br />":"\n"):'').$headdata;
-			$headdata .= ($headline != 'SUPPRESS'?"--------------------------------------------------------".($createHTML?"<br />":"\n"):'');
+			if (!empty($headline) && $headline != 'SUPPRESS') $headdata = "---------------------------- $headline ----------------------------".($createHTML ? "<br />" : "\n").$headdata;
+			if (empty($headline)) $headdata = ($headline != 'SUPPRESS' ? "--------------------------------------------------------".($createHTML ? "<br />" : "\n") : '').$headdata;
+			$headdata .= ($headline != 'SUPPRESS' ? "--------------------------------------------------------".($createHTML ? "<br />" : "\n") : '');
 		}
 		else
 		{
-			$headdata = ($headline != 'SUPPRESS'?"--------------------------------------------------------".($createHTML?"<br />":"\n"):'');
+			$headdata = ($headline != 'SUPPRESS' ? "--------------------------------------------------------".($createHTML ? "<br />" : "\n") : '');
 		}
 		return $headdata;
 	}
@@ -5953,8 +5953,8 @@ 
 	 */
 	static function adaptSubjectForImport($subject)
 	{
-		$subject = str_replace('$$','__',($subject?$subject:lang('(no subject)')));
-		$subject = str_ireplace(array('[FWD]','[',']','{','}','<','>'),array('Fwd:',' ',' ',' ',' ',' ',' '),trim($subject));
+		$subject = str_replace('$$', '__', ($subject ? $subject : lang('(no subject)')));
+		$subject = str_ireplace(array('[FWD]', '[', ']', '{', '}', '<', '>'), array('Fwd:', ' ', ' ', ' ', ' ', ' ', ' '), trim($subject));
 		return $subject;
 	}
 
@@ -5966,15 +5966,15 @@ 
 	static function convertAddressArrayToString($rfcAddressArray)
 	{
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($rfcAddressArray));
-		$returnAddr ='';
+		$returnAddr = '';
 		if (is_array($rfcAddressArray))
 		{
-			foreach((array)$rfcAddressArray as $addressData) {
+			foreach ((array)$rfcAddressArray as $addressData) {
 				//error_log(__METHOD__.' ('.__LINE__.') '.array2string($addressData));
-				if($addressData['MAILBOX_NAME'] == 'NIL') {
+				if ($addressData['MAILBOX_NAME'] == 'NIL') {
 					continue;
 				}
-				if(strtolower($addressData['MAILBOX_NAME']) == 'undisclosed-recipients') {
+				if (strtolower($addressData['MAILBOX_NAME']) == 'undisclosed-recipients') {
 					continue;
 				}
 				if ($addressData['RFC822_EMAIL'])
@@ -5983,7 +5983,7 @@ 
 				}
 				else
 				{
-					$emailaddress = ($addressData['PERSONAL_NAME']?$addressData['PERSONAL_NAME'].' <'.$addressData['EMAIL'].'>':$addressData['EMAIL']);
+					$emailaddress = ($addressData['PERSONAL_NAME'] ? $addressData['PERSONAL_NAME'].' <'.$addressData['EMAIL'].'>' : $addressData['EMAIL']);
 					$addressObjectA = self::parseAddressList($emailaddress);
 				}
 				$addressObject = $addressObjectA[0];
@@ -5992,10 +5992,10 @@ 
 				//$mb =(string)$addressObject->mailbox;
 				//$h = (string)$addressObject->host;
 				//$p = (string)$addressObject->personal;
-				$returnAddr .= (strlen($returnAddr)>0?',':'');
+				$returnAddr .= (strlen($returnAddr) > 0 ? ',' : '');
 				//error_log(__METHOD__.' ('.__LINE__.') '.$p.' <'.$mb.'@'.$h.'>');
 				$buff = imap_rfc822_write_address($addressObject->mailbox, self::$idna2->decode($addressObject->host), $addressObject->personal);
-				$buff = str_replace(array('<','>','"\'','\'"'),array('[',']','"','"'),$buff);
+				$buff = str_replace(array('<', '>', '"\'', '\'"'), array('[', ']', '"', '"'), $buff);
 				//error_log(__METHOD__.' ('.__LINE__.') '.' Address: '.$returnAddr);
 				$returnAddr .= $buff;
 			}
@@ -6003,8 +6003,8 @@ 
 		else
 		{
 			// do not mess with strings, return them untouched /* ToDo: validate string as Address */
-			$rfcAddressArray = self::decode_header($rfcAddressArray,true);
-			$rfcAddressArray = str_replace(array('<','>','"\'','\'"'),array('[',']','"','"'),$rfcAddressArray);
+			$rfcAddressArray = self::decode_header($rfcAddressArray, true);
+			$rfcAddressArray = str_replace(array('<', '>', '"\'', '\'"'), array('[', ']', '"', '"'), $rfcAddressArray);
 			if (is_string($rfcAddressArray)) return $rfcAddressArray;
 		}
 		return $returnAddr;
@@ -6018,12 +6018,12 @@ 
 	 * @param string &$err error-message on error
 	 * @return string/boolean merged content or false on error
 	 */
-	static function merge($content,$ids,$mimetype='')
+	static function merge($content, $ids, $mimetype = '')
 	{
 		$mergeobj = new addressbook_merge();
 
-		if (empty($mimetype)) $mimetype = (strlen(strip_tags($content)) == strlen($content) ?'text/plain':'text/html');
-		$rv = $mergeobj->merge_string($content,$ids,$err='',$mimetype, array(), self::$displayCharset);
+		if (empty($mimetype)) $mimetype = (strlen(strip_tags($content)) == strlen($content) ? 'text/plain' : 'text/html');
+		$rv = $mergeobj->merge_string($content, $ids, $err = '', $mimetype, array(), self::$displayCharset);
 		if (empty($rv) && !empty($content) && !empty($err)) $rv = $content;
 		if (!empty($err) && !empty($content) && !empty($ids)) error_log(__METHOD__.' ('.__LINE__.') '.' Merge failed for Ids:'.array2string($ids).' ContentType:'.$mimetype.' Content:'.$content.' Reason:'.array2string($err));
 		return $rv;
@@ -6065,12 +6065,12 @@ 
 		else
 			settype($bytes, 'integer');
 
-		return $bytes . ' ' . $type ;
+		return $bytes.' '.$type;
 	}
 
 	static function detect_qp(&$sting) {
 		$needle = '/(=[0-9][A-F])|(=[A-F][0-9])|(=[A-F][A-F])|(=[0-9][0-9])/';
-		return preg_match("$needle",$string);
+		return preg_match("$needle", $string);
 	}
 
 	/**
@@ -6083,11 +6083,11 @@ 
 	 * @param string $_methodNline - Information where the log was taken
 	 * @return void
 	 */
-	static function logRunTimes($_starttime,$_endtime=null,$_message='',$_methodNline='')
+	static function logRunTimes($_starttime, $_endtime = null, $_message = '', $_methodNline = '')
 	{
 		if (is_null($_endtime)) $_endtime = microtime(true);
 		$usagetime = microtime(true) - $_starttime;
-		if (self::$debugTimes) error_log($_methodNline.' took:'.number_format($usagetime,5).'(s) '.($_message?'Details:'.$_message:''));
+		if (self::$debugTimes) error_log($_methodNline.' took:'.number_format($usagetime, 5).'(s) '.($_message ? 'Details:'.$_message : ''));
 	}
 
 	/**
@@ -6100,9 +6100,9 @@ 
 	 *
 	 * @throws egw_exception_wrong_userinput
 	 */
-	static function checkFileBasics(&$_formData, $IDtoAddToFileName='', $reqMimeType='message/rfc822')
+	static function checkFileBasics(&$_formData, $IDtoAddToFileName = '', $reqMimeType = 'message/rfc822')
 	{
-		if (parse_url($_formData['file'],PHP_URL_SCHEME) == 'egw-data') return $_formData['file'];
+		if (parse_url($_formData['file'], PHP_URL_SCHEME) == 'egw-data') return $_formData['file'];
 
 		//error_log(__METHOD__.__FILE__.array2string($_formData).' Id:'.$IDtoAddToFileName.' ReqMimeType:'.$reqMimeType);
 		$importfailed = $tmpFileName = false;
@@ -6112,7 +6112,7 @@ 
 			$importfailed = true;
 			$alert_msg .= lang("Empty file %1 ignored.", $_formData['name']);
 		}
-		elseif (parse_url($_formData['file'],PHP_URL_SCHEME) == 'vfs' || is_uploaded_file($_formData['file']) ||
+		elseif (parse_url($_formData['file'], PHP_URL_SCHEME) == 'vfs' || is_uploaded_file($_formData['file']) ||
 			realpath(dirname($_formData['file'])) == realpath($GLOBALS['egw_info']['server']['temp_dir']))
 		{
 			// ensure existance of eGW temp dir
@@ -6120,7 +6120,7 @@ 
 			// and different from any other temp file location set in php.ini
 			if (!file_exists($GLOBALS['egw_info']['server']['temp_dir']))
 			{
-				@mkdir($GLOBALS['egw_info']['server']['temp_dir'],0700);
+				@mkdir($GLOBALS['egw_info']['server']['temp_dir'], 0700);
 			}
 
 			// if we were NOT able to create this temp directory, then make an ERROR report
@@ -6147,14 +6147,14 @@ 
 			// maybe its application/octet-stream -> this may mean that we could not determine the type
 			// so we check for the suffix too
 			// trust vfs mime-types, trust the mimetype if it contains a method
-			if ((substr($_formData['file'],0,6) !== 'vfs://' || $_formData['type'] == 'application/octet-stream') && stripos($_formData['type'],'method=')===false)
+			if ((substr($_formData['file'], 0, 6) !== 'vfs://' || $_formData['type'] == 'application/octet-stream') && stripos($_formData['type'], 'method=') === false)
 			{
-				$buff = explode('.',$_formData['name']);
+				$buff = explode('.', $_formData['name']);
 				$suffix = '';
 				if (is_array($buff)) $suffix = array_pop($buff); // take the last extension to check with ext2mime
 				if (!empty($suffix)) $sfxMimeType = mime_magic::ext2mime($suffix);
 				if (!empty($suffix) && !empty($sfxMimeType) &&
-					(strlen(trim($_formData['type']))==0 || (strtolower(trim($_formData['type'])) != $sfxMimeType)))
+					(strlen(trim($_formData['type'])) == 0 || (strtolower(trim($_formData['type'])) != $sfxMimeType)))
 				{
 					error_log(__METHOD__.' ('.__LINE__.') '.' Data:'.array2string($_formData));
 					error_log(__METHOD__.' ('.__LINE__.') '.' Form reported Mimetype:'.$_formData['type'].' but seems to be:'.$sfxMimeType);
@@ -6169,13 +6169,13 @@ 
 			if ($reqMimeType)
 			{
 				// so if PHP did not pass any file_type info, then substitute the rfc default value
-				if (substr(strtolower(trim($_formData['type'])),0,strlen($mime_type_default)) != $mime_type_default)
+				if (substr(strtolower(trim($_formData['type'])), 0, strlen($mime_type_default)) != $mime_type_default)
 				{
 					if (!(strtolower(trim($_formData['type'])) == "application/octet-stream" && $sfxMimeType == $reqMimeType))
 					{
 						//error_log("Message rejected, no message/rfc. Is:".$_formData['type']);
 						$importfailed = true;
-						$alert_msg .= lang("File rejected, no %2. Is:%1",$_formData['type'],$reqMimeType);
+						$alert_msg .= lang("File rejected, no %2. Is:%1", $_formData['type'], $reqMimeType);
 					}
 					if ((strtolower(trim($_formData['type'])) != $reqMimeType && $sfxMimeType == $reqMimeType))
 					{
@@ -6184,17 +6184,17 @@ 
 				}
 			}
 			// as FreeBSD seems to have problems with the generated temp names we append some more random stuff
-			$randomString = chr(rand(65,90)).chr(rand(48,57)).chr(rand(65,90)).chr(rand(48,57)).chr(rand(65,90));
+			$randomString = chr(rand(65, 90)).chr(rand(48, 57)).chr(rand(65, 90)).chr(rand(48, 57)).chr(rand(65, 90));
 			$tmpFileName = $GLOBALS['egw_info']['user']['account_id'].
 				trim($IDtoAddToFileName).basename($_formData['file']).'_'.$randomString;
 
-			if (parse_url($_formData['file'],PHP_URL_SCHEME) == 'vfs')
+			if (parse_url($_formData['file'], PHP_URL_SCHEME) == 'vfs')
 			{
-				$tmpFileName = $_formData['file'];	// no need to store it somewhere
+				$tmpFileName = $_formData['file']; // no need to store it somewhere
 			}
 			elseif (is_uploaded_file($_formData['file']))
 			{
-				move_uploaded_file($_formData['file'], $GLOBALS['egw_info']['server']['temp_dir'].SEP.$tmpFileName);	// requirement for safe_mode!
+				move_uploaded_file($_formData['file'], $GLOBALS['egw_info']['server']['temp_dir'].SEP.$tmpFileName); // requirement for safe_mode!
 			}
 			else
 			{
@@ -6203,7 +6203,7 @@ 
 		} else {
 			//error_log("Import of message ".$_formData['file']." failes to meet basic restrictions");
 			$importfailed = true;
-			$alert_msg .= lang("Processing of file %1 failed. Failed to meet basic restrictions.",$_formData['name']);
+			$alert_msg .= lang("Processing of file %1 failed. Failed to meet basic restrictions.", $_formData['name']);
 		}
 		if ($importfailed == true)
 		{
@@ -6211,7 +6211,7 @@ 
 		}
 		else
 		{
-			if (parse_url($tmpFileName,PHP_URL_SCHEME) == 'vfs')
+			if (parse_url($tmpFileName, PHP_URL_SCHEME) == 'vfs')
 			{
 				egw_vfs::load_wrapper('vfs');
 			}
@@ -6236,7 +6236,7 @@ 
 		$images = null;
 		if (preg_match_all("/(src|background)=\"(.*)\"/Ui", $_html2parse, $images) && isset($images[2]))
 		{
-			foreach($images[2] as $i => $url)
+			foreach ($images[2] as $i => $url)
 			{
 				//$isData = false;
 				$basedir = $data = '';
@@ -6248,20 +6248,20 @@ 
 					$filename = basename($url);
 					if (($directory = dirname($url)) == '.') $directory = '';
 					$ext = pathinfo($filename, PATHINFO_EXTENSION);
-					$mimeType  = mime_magic::ext2mime($ext);
-					if ( strlen($directory) > 1 && substr($directory,-1) != '/') { $directory .= '/'; }
+					$mimeType = mime_magic::ext2mime($ext);
+					if (strlen($directory) > 1 && substr($directory, -1) != '/') { $directory .= '/'; }
 					$myUrl = $directory.$filename;
-					if ($myUrl[0]=='/') // local path -> we only allow path's that are available via http/https (or vfs)
+					if ($myUrl[0] == '/') // local path -> we only allow path's that are available via http/https (or vfs)
 					{
-						$basedir = ($_SERVER['HTTPS']?'https://':'http://'.$_SERVER['HTTP_HOST']);
+						$basedir = ($_SERVER['HTTPS'] ? 'https://' : 'http://'.$_SERVER['HTTP_HOST']);
 					}
 					// use vfs instead of url containing webdav.php
 					// ToDo: we should test if the webdav url is of our own scope, as we cannot handle foreign
 					// webdav.php urls as vfs
-					if (strpos($myUrl,'/webdav.php') !== false) // we have a webdav link, so we build a vfs/sqlfs link of it.
+					if (strpos($myUrl, '/webdav.php') !== false) // we have a webdav link, so we build a vfs/sqlfs link of it.
 					{
 						egw_vfs::load_wrapper('vfs');
-						list(,$myUrl) = explode('/webdav.php',$myUrl,2);
+						list(,$myUrl) = explode('/webdav.php', $myUrl, 2);
 						$basedir = 'vfs://default';
 						$needTempFile = false;
 					}
@@ -6274,11 +6274,11 @@ 
 						// Strips the url and store it into a temp for further procss
 						$tmp_url = html_entity_decode($myUrl);
 
-						parse_str(parse_url($tmp_url, PHP_URL_QUERY),$URI_params);
+						parse_str(parse_url($tmp_url, PHP_URL_QUERY), $URI_params);
 						if ($URI_params['mailbox'] && $URI_params['uid'] && $URI_params['cid'])
 						{
 							$mail_bo->reopen(base64_decode($URI_params['mailbox']));
-							$attachment = $mail_bo->getAttachmentByCID($URI_params['uid'], base64_decode($URI_params['cid']),base64_decode($URI_params['partID']),true);
+							$attachment = $mail_bo->getAttachmentByCID($URI_params['uid'], base64_decode($URI_params['cid']), base64_decode($URI_params['partID']), true);
 							$mail_bo->closeConnection();
 							if ($attachment)
 							{
@@ -6289,32 +6289,32 @@ 
 						}
 					}
 
-					if ( strlen($basedir) > 1 && substr($basedir,-1) != '/' && $myUrl[0]!='/') { $basedir .= '/'; }
-					if ($needTempFile && !$attachment && substr($myUrl,0,4) !== "http") $data = file_get_contents($basedir.urldecode($myUrl));
+					if (strlen($basedir) > 1 && substr($basedir, -1) != '/' && $myUrl[0] != '/') { $basedir .= '/'; }
+					if ($needTempFile && !$attachment && substr($myUrl, 0, 4) !== "http") $data = file_get_contents($basedir.urldecode($myUrl));
 				}
-				if (substr($url,0,strlen('data:'))=='data:')
+				if (substr($url, 0, strlen('data:')) == 'data:')
 				{
 					//error_log(__METHOD__.' ('.__LINE__.') '.' -> '.$i.': '.array2string($images[$i]));
 					// we only support base64 encoded data
-					$tmp = substr($url,strlen('data:'));
-					list($mimeType,$data_base64) = explode(';base64,',$tmp);
+					$tmp = substr($url, strlen('data:'));
+					list($mimeType, $data_base64) = explode(';base64,', $tmp);
 					$data = base64_decode($data_base64);
 					// FF currently does NOT add any mime-type
 					if (strtolower(substr($mimeType, 0, 6)) != 'image/')
 					{
 						$mimeType = mime_magic::analyze_data($data);
 					}
-					list($what,$exactly) = explode('/',$mimeType);
+					list($what, $exactly) = explode('/', $mimeType);
 					$needTempFile = true;
-					$filename = ($what?$what:'data').$imageC++.'.'.$exactly;
+					$filename = ($what ? $what : 'data').$imageC++.'.'.$exactly;
 				}
 				if ($data || $needTempFile === false)
 				{
 					if ($needTempFile)
 					{
-						$attachment_file =tempnam($GLOBALS['egw_info']['server']['temp_dir'],$GLOBALS['egw_info']['flags']['currentapp']."_");
-						$tmpfile = fopen($attachment_file,'w');
-						fwrite($tmpfile,$data);
+						$attachment_file = tempnam($GLOBALS['egw_info']['server']['temp_dir'], $GLOBALS['egw_info']['flags']['currentapp']."_");
+						$tmpfile = fopen($attachment_file, 'w');
+						fwrite($tmpfile, $data);
 						fclose($tmpfile);
 					}
 					else
@@ -6325,7 +6325,7 @@ 
 					// (or similar) in all cases (when cut&paste). This may lead to more attached files, in case
 					// we use the same image multiple times, but, if we do this, we should try to detect that
 					// on upload. filename itself is not sufficient to determine the sameness of images
-					$cid = 'cid:' . md5($attachment_file);
+					$cid = 'cid:'.md5($attachment_file);
 					if ($_mailObject->AddEmbeddedImage($attachment_file, substr($cid, 4), $filename, $mimeType) !== null)
 					{
 						//$_html2parse = preg_replace("/".$images[1][$i]."=\"".preg_quote($url, '/')."\"/Ui", $images[1][$i]."=\"".$cid."\"", $_html2parse);
@@ -6347,14 +6347,14 @@ 
 	 * @param string $importID ID for the imported message, used by attachments to identify them unambiguously
 	 * @return mixed array of messages with success and failed messages or exception
 	 */
-	function importMessageToMergeAndSend(bo_merge $bo_merge, $document, $SendAndMergeTocontacts, &$_folder, &$importID='')
+	function importMessageToMergeAndSend(bo_merge $bo_merge, $document, $SendAndMergeTocontacts, &$_folder, &$importID = '')
 	{
 		$importfailed = false;
-		$processStats = array('success'=>array(),'failed'=>array());
+		$processStats = array('success'=>array(), 'failed'=>array());
 		if (empty($SendAndMergeTocontacts))
 		{
 			$importfailed = true;
-			$alert_msg .= lang("Import of message %1 failed. No Contacts to merge and send to specified.",$_formData['name']);
+			$alert_msg .= lang("Import of message %1 failed. No Contacts to merge and send to specified.", $_formData['name']);
 		}
 
 		// check if formdata meets basic restrictions (in tmp dir, or vfs, mimetype, etc.)
@@ -6391,7 +6391,7 @@ 
 				$_folder = $this->getSentFolder();
 			}
 			$delimiter = $this->getHierarchyDelimiter();
-			if($_folder=='INBOX'.$delimiter) $_folder='INBOX';
+			if ($_folder == 'INBOX'.$delimiter) $_folder = 'INBOX';
 			if ($importfailed === false)
 			{
 				$Subject = $mailObject->getHeader('Subject');
@@ -6409,9 +6409,9 @@ 
 				{
 					$mailObject->clearReplyTos();
 					$activeMailProfiles = $this->mail->getAccountIdentities($this->profileID);
-					$activeMailProfile = self::getStandardIdentityForProfile($activeMailProfiles,$this->profileID);
+					$activeMailProfile = self::getStandardIdentityForProfile($activeMailProfiles, $this->profileID);
 
-					$mailObject->addReplyTo(self::$idna2->encode($activeMailProfile['ident_email']),emailadmin_imapbase::generateIdentityString($activeMailProfile,false));
+					$mailObject->addReplyTo(self::$idna2->encode($activeMailProfile['ident_email']), emailadmin_imapbase::generateIdentityString($activeMailProfile, false));
 				}
 				foreach ($SendAndMergeTocontacts as $k => $val)
 				{
@@ -6425,12 +6425,12 @@ 
 						//error_log(__METHOD__.' ('.__LINE__.') '.array2string($mailObject));
 
 						// Parse destinations for placeholders
-						foreach(egw_mailer::$type2header as $type => $h)
+						foreach (egw_mailer::$type2header as $type => $h)
 						{
 							//error_log('ID ' . $val . ' ' .$type . ': ' . $mailObject->getHeader(egw_mailer::$type2header[$type]) . ' -> ' .$bo_merge->merge_string($mailObject->getHeader(egw_mailer::$type2header[$type]),$val,$e,'text/plain',array(),self::$displayCharset));
-							$merged = $bo_merge->merge_string($mailObject->getHeader(egw_mailer::$type2header[$type]),$val,$e,'text/plain',array(),self::$displayCharset);
-							$mailObject->addAddress($merged,'',$type);
-							if($type == 'to')
+							$merged = $bo_merge->merge_string($mailObject->getHeader(egw_mailer::$type2header[$type]), $val, $e, 'text/plain', array(), self::$displayCharset);
+							$mailObject->addAddress($merged, '', $type);
+							if ($type == 'to')
 							{
 								$email = $merged;
 							}
@@ -6443,26 +6443,26 @@ 
 							//error_log(__METHOD__.' ('.__LINE__.') '.' ID:'.$val.' Data:'.array2string($contact));
 							$email = ($contact['email'] ? $contact['email'] : $contact['email_home']);
 							$nfn = ($contact['n_fn'] ? $contact['n_fn'] : $contact['n_given'].' '.$contact['n_family']);
-							if($email)
+							if ($email)
 							{
-								$mailObject->addAddress(self::$idna2->encode($email),$mailObject->EncodeHeader($nfn));
+								$mailObject->addAddress(self::$idna2->encode($email), $mailObject->EncodeHeader($nfn));
 							}
 						}
 
 						$activeMailProfiles = $this->getAccountIdentities($this->profileID);
-						$activeMailProfile = self::getStandardIdentityForProfile($activeMailProfiles,$this->profileID);
+						$activeMailProfile = self::getStandardIdentityForProfile($activeMailProfiles, $this->profileID);
 						//error_log(__METHOD__.' ('.__LINE__.') '.array2string($activeMailProfile));
 						$mailObject->setFrom($activeMailProfile['ident_email'],
-							self::generateIdentityString($activeMailProfile,false));
+							self::generateIdentityString($activeMailProfile, false));
 
 						$mailObject->removeHeader('Message-ID');
 						$mailObject->removeHeader('Date');
 						$mailObject->clearCustomHeaders();
 						$mailObject->addHeader('Subject', $bo_merge->merge_string($Subject, $val, $e, 'text/plain', array(), self::$displayCharset));
 						//error_log(__METHOD__.' ('.__LINE__.') '.' ContentType:'.$mailObject->BodyContentType);
-						if($text_body) $text_body->setContents($bo_merge->merge_string($Body, $val, $e, 'text/plain', array(), self::$displayCharset),array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
+						if ($text_body) $text_body->setContents($bo_merge->merge_string($Body, $val, $e, 'text/plain', array(), self::$displayCharset), array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
 						//error_log(__METHOD__.' ('.__LINE__.') '.' Result:'.$mailObject->Body.' error:'.array2string($e));
-						if($html_body) $html_body->setContents($bo_merge->merge_string($AltBody, $val, $e, 'text/html', array(), self::$displayCharset),array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
+						if ($html_body) $html_body->setContents($bo_merge->merge_string($AltBody, $val, $e, 'text/html', array(), self::$displayCharset), array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
 
 						//error_log(__METHOD__.' ('.__LINE__.') '.array2string($mailObject));
 						// set a higher timeout for big messages
@@ -6471,7 +6471,7 @@ 
 						try {
 							$mailObject->send();
 						}
-						catch(Exception $e) {
+						catch (Exception $e) {
 							$sendOK = false;
 							$errorInfo = $e->getMessage();
 							//error_log(__METHOD__.' ('.__LINE__.') '.array2string($errorInfo));
@@ -6485,42 +6485,42 @@ 
 						$mailObject->clearCustomHeaders();
 
 						// Parse destinations for placeholders
-						foreach(egw_mailer::$type2header as $type => $h)
+						foreach (egw_mailer::$type2header as $type => $h)
 						{
 							// Parse destinations for placeholders
-							$merged = $bo_merge->merge_string($mailObject->getHeader(egw_mailer::$type2header[$type]),$val,$e,'text/plain',array(),self::$displayCharset);
+							$merged = $bo_merge->merge_string($mailObject->getHeader(egw_mailer::$type2header[$type]), $val, $e, 'text/plain', array(), self::$displayCharset);
 							//error_log($type . ': ' . $mailObject->getHeader(Mailer::$type2header[$type]) . ' -> ' .$merged);
-							$mailObject->addAddress(trim($merged,'"'),'',$type);
+							$mailObject->addAddress(trim($merged, '"'), '', $type);
 						}
 
 						// No addresses from placeholders?  Treat it as just a contact ID
-						if (count($mailObject->getAddresses('to',true)) == 0 &&
+						if (count($mailObject->getAddresses('to', true)) == 0 &&
 							is_numeric($val) || $GLOBALS['egw']->accounts->name2id($val)) // do the merge
 						{
 							$contact = $bo_merge->contacts->read($val);
 							//error_log(__METHOD__.' ('.__LINE__.') '.array2string($contact));
 							$email = ($contact['email'] ? $contact['email'] : $contact['email_home']);
 							$nfn = ($contact['n_fn'] ? $contact['n_fn'] : $contact['n_given'].' '.$contact['n_family']);
-							if($email)
+							if ($email)
 							{
-								$mailObject->addAddress(self::$idna2->encode($email),$mailObject->EncodeHeader($nfn));
+								$mailObject->addAddress(self::$idna2->encode($email), $mailObject->EncodeHeader($nfn));
 							}
 						}
 						$mailObject->addHeader('Subject', $bo_merge->merge_string($Subject, $val, $e, 'text/plain', array(), self::$displayCharset));
 						//error_log(__METHOD__.' ('.__LINE__.') '.' ContentType:'.$mailObject->BodyContentType);
-						if (!empty($Body)) $text_body->setContents($bo_merge->merge_string($Body, $val, $e, 'text/plain', array(), self::$displayCharset),array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
+						if (!empty($Body)) $text_body->setContents($bo_merge->merge_string($Body, $val, $e, 'text/plain', array(), self::$displayCharset), array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
 						//error_log(__METHOD__.' ('.__LINE__.') '.' Result:'.$mailObject->Body.' error:'.array2string($e));
-						if (!empty($AltBody)) $html_body->setContents($bo_merge->merge_string($AltBody, $val, $e, 'text/html', array(), self::$displayCharset),array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
+						if (!empty($AltBody)) $html_body->setContents($bo_merge->merge_string($AltBody, $val, $e, 'text/html', array(), self::$displayCharset), array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
 						$_folder = $this->getDraftFolder();
 					}
 					if ($sendOK || $openAsDraft)
 					{
-						if ($this->folderExists($_folder,true))
+						if ($this->folderExists($_folder, true))
 						{
-						    if($this->isSentFolder($_folder))
+						    if ($this->isSentFolder($_folder))
 							{
 						        $flags = '\\Seen';
-						    } elseif($this->isDraftFolder($_folder)) {
+						    } elseif ($this->isDraftFolder($_folder)) {
 						        $flags = '\\Draft';
 						    } else {
 						        $flags = '';
@@ -6528,7 +6528,7 @@ 
 							$savefailed = false;
 							try
 							{
-								$messageUid =$this->appendMessage($_folder,
+								$messageUid = $this->appendMessage($_folder,
 									$mailObject->getRaw(),
 									null,
 									$flags);
@@ -6536,10 +6536,10 @@ 
 							catch (egw_exception_wrong_userinput $e)
 							{
 								$savefailed = true;
-								$alert_msg .= lang("Save of message %1 failed. Could not save message to folder %2 due to: %3",$Subject,$_folder,$e->getMessage());
+								$alert_msg .= lang("Save of message %1 failed. Could not save message to folder %2 due to: %3", $Subject, $_folder, $e->getMessage());
 							}
 							// no send, save successful, and message_uid present
-							if ($savefailed===false && $messageUid && is_null($sendOK))
+							if ($savefailed === false && $messageUid && is_null($sendOK))
 							{
 								$importID = $messageUid;
 								$openComposeWindow = true;
@@ -6548,20 +6548,20 @@ 
 						else
 						{
 							$savefailed = true;
-							$alert_msg .= lang("Saving of message %1 failed. Destination Folder %2 does not exist.",$Subject,$_folder);
+							$alert_msg .= lang("Saving of message %1 failed. Destination Folder %2 does not exist.", $Subject, $_folder);
 						}
 						if ($sendOK)
 						{
-							$processStats['success'][$val] = 'Send succeeded to '.$nfn.'<'.$email.'>'.($savefailed?' but failed to store to Folder:'.$_folder:'');
+							$processStats['success'][$val] = 'Send succeeded to '.$nfn.'<'.$email.'>'.($savefailed ? ' but failed to store to Folder:'.$_folder : '');
 						}
 						else
 						{
-							if (!$openComposeWindow) $processStats['failed'][$val] = $errorInfo?$errorInfo:'Send failed to '.$nfn.'<'.$email.'> See error_log for details';
+							if (!$openComposeWindow) $processStats['failed'][$val] = $errorInfo ? $errorInfo : 'Send failed to '.$nfn.'<'.$email.'> See error_log for details';
 						}
 					}
-					if (!is_null($sendOK) && $sendOK===false && is_null($openComposeWindow))
+					if (!is_null($sendOK) && $sendOK === false && is_null($openComposeWindow))
 					{
-						$processStats['failed'][$val] = $errorInfo?$errorInfo:'Send failed to '.$nfn.'<'.$email.'> See error_log for details';
+						$processStats['failed'][$val] = $errorInfo ? $errorInfo : 'Send failed to '.$nfn.'<'.$email.'> See error_log for details';
 					}
 				}
 			}
@@ -6631,19 +6631,18 @@ 
 			//error_log(__METHOD__.__LINE__.':'.array2string($structure));
 
 			// unfortunately parseMessage does NOT return parsed headers (we assume header is shorter then 8k)
-			$start = is_string($message) ? substr($message, 0, 8192) :
-				(fseek($message, 0, SEEK_SET) == -1 ? '' : fread($message, 8192));
+			$start = is_string($message) ? substr($message, 0, 8192) : (fseek($message, 0, SEEK_SET) == -1 ? '' : fread($message, 8192));
 
 			$length = strpos($start, Horde_Mime_Part::RFC_EOL.Horde_Mime_Part::RFC_EOL);
-			if ($length===false) $length = strlen($start);
-			$headers = Horde_Mime_Headers::parseHeaders(substr($start, 0,$length));
+			if ($length === false) $length = strlen($start);
+			$headers = Horde_Mime_Headers::parseHeaders(substr($start, 0, $length));
 
-			foreach($headers->toArray(array('nowrap' => true)) as $header => $value)
+			foreach ($headers->toArray(array('nowrap' => true)) as $header => $value)
 			{
-				foreach((array)$value as $n => $val)
+				foreach ((array)$value as $n => $val)
 				{
 					$overwrite = !$n;
-					switch($header)
+					switch ($header)
 					{
 						case 'Content-Transfer-Encoding':
 							//as we parse the message and this sets the part with a Content-Transfer-Encoding, we
@@ -6664,7 +6663,7 @@ 
 		}
 		else
 		{
-			if (($type = gettype($message)) == 'object') $type = get_class ($message);
+			if (($type = gettype($message)) == 'object') $type = get_class($message);
 			throw new egw_exception_wrong_parameter('Wrong parameter type for message: '.$type);
 		}
 	}
@@ -6678,50 +6677,50 @@ 
 	 * @param string $default_domain
 	 * @return Horde_Mail_Rfc822_List iteratable Horde_Mail_Rfc822_Address objects with attributes mailbox, host, personal and valid
 	 */
-	public static function parseAddressList($addresses, $default_domain=null)
+	public static function parseAddressList($addresses, $default_domain = null)
 	{
 		$rfc822 = new Horde_Mail_Rfc822();
 		$ret = $rfc822->parseAddressList($addresses, $default_domain ? array('default_domain' => $default_domain) : array());
 		//error_log(__METHOD__.__LINE__.'#'.array2string($addresses).'#'.array2string($ret).'#'.$ret->count().'#'.$ret->count.function_backtrace());
-		if ((empty($ret) || $ret->count()==0)&& is_string($addresses) && strlen($addresses)>0)
+		if ((empty($ret) || $ret->count() == 0) && is_string($addresses) && strlen($addresses) > 0)
 		{
 			$matches = array();
-			preg_match_all("/[\w\.,-.,_.,0-9.]+@[\w\.,-.,_.,0-9.]+/",$addresses,$matches);
+			preg_match_all("/[\w\.,-.,_.,0-9.]+@[\w\.,-.,_.,0-9.]+/", $addresses, $matches);
 			//error_log(__METHOD__.__LINE__.array2string($matches));
-			foreach ($matches[0] as &$match) {$match = trim($match,', ');}
-			$addresses = implode(',',$matches[0]);
+			foreach ($matches[0] as &$match) {$match = trim($match, ', '); }
+			$addresses = implode(',', $matches[0]);
 			//error_log(__METHOD__.__LINE__.array2string($addresses));
 			$ret = $rfc822->parseAddressList($addresses, $default_domain ? array('default_domain' => $default_domain) : array());
 			//error_log(__METHOD__.__LINE__.'#'.array2string($addresses).'#'.array2string($ret).'#'.$ret->count().'#'.$ret->count);
 		}
-		$previousFailed=false;
+		$previousFailed = false;
 		$ret2 = new Horde_Mail_Rfc822_List();
 		// handle known problems on emailaddresses
-		foreach($ret as $i => $adr)
+		foreach ($ret as $i => $adr)
 		{
 			//mailaddresses enclosed in single quotes like 'me@you.com' show up as 'me as mailbox and you.com' as host
-			if ($adr->mailbox && stripos($adr->mailbox,"'")== 0 &&
-					$adr->host && stripos($adr->host,"'")== (strlen($adr->host) -1))
+			if ($adr->mailbox && stripos($adr->mailbox, "'") == 0 &&
+					$adr->host && stripos($adr->host, "'") == (strlen($adr->host) - 1))
 			{
-				$adr->mailbox = str_replace("'","",$adr->mailbox);
-				$adr->host = str_replace("'","",$adr->host);
+				$adr->mailbox = str_replace("'", "", $adr->mailbox);
+				$adr->host = str_replace("'", "", $adr->host);
 			}
 			// no mailbox or host part as 'Xr\xc3\xa4hlyz, User <mailboxpart1.mailboxpart2@yourhost.com>' is parsed as 2 addresses separated by ','
 			//#'Xr\xc3\xa4hlyz, User <mailboxpart1.mailboxpart2@yourhost.com>'
 			//#Horde_Mail_Rfc822_List Object([_data:protected] => Array(
 			//[0] => Horde_Mail_Rfc822_Address Object([comment] => Array()[mailbox] => Xr\xc3\xa4hlyz[_host:protected] => [_personal:protected] => )
 			//[1] => Horde_Mail_Rfc822_Address Object([comment] => Array()[mailbox] => mailboxpart1.mailboxpart2[_host:protected] => youthost.com[_personal:protected] => User))[_filter:protected] => Array()[_ptr:protected] => )#2#,
-			if (strlen($adr->mailbox)==0||strlen($adr->host)==0)
+			if (strlen($adr->mailbox) == 0 || strlen($adr->host) == 0)
 			{
-				$remember = ($adr->mailbox?$adr->mailbox:($adr->host?$adr->host:''));
-				$previousFailed=true;
+				$remember = ($adr->mailbox ? $adr->mailbox : ($adr->host ? $adr->host : ''));
+				$previousFailed = true;
 				//error_log(__METHOD__.__LINE__."('$addresses', $default_domain) parsed $i: mailbox=$adr->mailbox, host=$adr->host, personal=$adr->personal");
 			}
 			else
 			{
-				if ($previousFailed && $remember) $adr->personal = $remember. ' ' . $adr->personal;
+				if ($previousFailed && $remember) $adr->personal = $remember.' '.$adr->personal;
 				$remember = '';
-				$previousFailed=false;
+				$previousFailed = false;
 				//error_log(__METHOD__.__LINE__."('$addresses', $default_domain) parsed $i: mailbox=$adr->mailbox, host=$adr->host, personal=$adr->personal");
 				$ret2->add($adr);
 			}
@@ -6737,7 +6736,7 @@ 
 	 * @param string $_folder
 	 * @return boolean
 	 */
-	function sendMDN($uid,$_folder)
+	function sendMDN($uid, $_folder)
 	{
 		$acc = emailadmin_account::read($this->profileID);
 		$identity = emailadmin_account::read_identity($acc['ident_id'], true, null, $acc);
@@ -6767,7 +6766,7 @@ 
 	 */
 	function addAccount($_hookValues)
 	{
-		error_log(__METHOD__.' ('.__LINE__.') '.' NOT DONE YET!' . ' hookValue = '. $_hookValues);
+		error_log(__METHOD__.' ('.__LINE__.') '.' NOT DONE YET!'.' hookValue = '.$_hookValues);
 
 	}
 
@@ -6781,7 +6780,7 @@ 
 	 */
 	function deleteAccount($_hookValues)
 	{
-		error_log(__METHOD__.' ('.__LINE__.') '.' NOT DONE YET!' . ' hookValue = '. $_hookValues);
+		error_log(__METHOD__.' ('.__LINE__.') '.' NOT DONE YET!'.' hookValue = '.$_hookValues);
 
 	}
 
@@ -6795,7 +6794,7 @@ 
 	 */
 	function updateAccount($_hookValues)
 	{
-		error_log(__METHOD__.' ('.__LINE__.') '.' NOT DONE YET!' . ' hookValue = '. $_hookValues);
+		error_log(__METHOD__.' ('.__LINE__.') '.' NOT DONE YET!'.' hookValue = '.$_hookValues);
 
 	}
 }

emailadmin/inc/class.emailadmin_script.inc.php

Doc Comments +5 added lines, -1 removed lines

@@ -52,6 +52,10 @@ 
 	var $debug=false;
 
 	// class constructor
+
+	/**
+	 * @param string $scriptname
+	 */
 	function __construct ($scriptname) {
 		$this->name = $scriptname;
 		$this->script = '';
@@ -69,7 +73,7 @@ 
 	/**
 	 * Retrieve the rules
 	 *
-	 * @param bosieve $connection
+	 * @param emailadmin_sieve $connection
 	 * @return boolean true, if script written successfull
 	 */
 	function retrieveRules ($connection) {

Spacing +132 added lines, -132 removed lines

@@ -18,17 +18,17 @@ 
  */
 class emailadmin_script {
 
-	var $name;         /* filename of script. */
-	var $script;       /* full ascii text of script from server. */
-	var $size;         /* size of script in bytes. */
-	var $so;           /* boolean: is it safe to overwrite script?
+	var $name; /* filename of script. */
+	var $script; /* full ascii text of script from server. */
+	var $size; /* size of script in bytes. */
+	var $so; /* boolean: is it safe to overwrite script?
 											* only safe if we recognise encoding. */
-	var $mode;         /* basic or advanced. Smartsieve can only read/write basic. */
-	var $rules;        /* array of sieve rules. */
-	var $vacation;     /* vacation settings. */
+	var $mode; /* basic or advanced. Smartsieve can only read/write basic. */
+	var $rules; /* array of sieve rules. */
+	var $vacation; /* vacation settings. */
 	var $emailNotification; /* email notification settings. */
-	var $pcount;       /* highest priority value in ruleset. */
-	var $errstr;       /* error text. */
+	var $pcount; /* highest priority value in ruleset. */
+	var $errstr; /* error text. */
 	/**
 	 * Body transform content types
 	 *
@@ -49,10 +49,10 @@ 
 	 *
 	 * @var boolean
 	 */
-	var $debug=false;
+	var $debug = false;
 
 	// class constructor
-	function __construct ($scriptname) {
+	function __construct($scriptname) {
 		$this->name = $scriptname;
 		$this->script = '';
 		$this->size = 0;
@@ -72,7 +72,7 @@ 
 	 * @param bosieve $connection
 	 * @return boolean true, if script written successfull
 	 */
-	function retrieveRules ($connection) {
+	function retrieveRules($connection) {
 		#global $_SESSION;
 		$continuebit = 1;
 		$sizebit = 2;
@@ -80,7 +80,7 @@ 
 		$keepbit = 8;
 		$regexbit = 128;
 
-		if (!isset($this->name)){
+		if (!isset($this->name)) {
 			$this->errstr = 'retrieveRules: no script name specified';
 			if ($this->debug) error_log(__CLASS__.'::'.__METHOD__.": no script name specified");
 			return false;
@@ -99,13 +99,13 @@ 
 			$this->updateScript($connection);
 		}
 
-		if(self::isError($script = $connection->getScript($this->name))) {
+		if (self::isError($script = $connection->getScript($this->name))) {
 			if ($this->debug) error_log(__CLASS__.'::'.__METHOD__.": error retrieving script: ".$script->getMessage());
 			return $script;
 		}
 		#print "<br>AAA: Script is ". htmlentities($script) ."<br>";
 
-		$lines = preg_split("/\n/",$script); //,PREG_SPLIT_NO_EMPTY);
+		$lines = preg_split("/\n/", $script); //,PREG_SPLIT_NO_EMPTY);
 
 		$rules = array();
 		$vacation = array();
@@ -123,7 +123,7 @@ 
 		/* next line should be the recognised encoded head. if not, the script
 		 * is of an unrecognised format, and we should not overwrite it. */
 		$line1 = array_shift($lines);
-		if (!preg_match("/^# ?Mail(.*)rules for/", $line1)){
+		if (!preg_match("/^# ?Mail(.*)rules for/", $line1)) {
 				$this->errstr = 'retrieveRules: encoding not recognised';
 				$this->so = false;
 				if ($this->debug) error_log(__CLASS__.'::'.__METHOD__.": encoding not recognised");
@@ -136,62 +136,62 @@ 
 		while (isset($line))
 		{
 			$matches = null;
-			if (preg_match("/^ *#(#PSEUDO|rule|vacation|mode|notify)/i",$line,$matches)){
+			if (preg_match("/^ *#(#PSEUDO|rule|vacation|mode|notify)/i", $line, $matches)) {
 				$line = rtrim($line);
-				switch ($matches[1]){
+				switch ($matches[1]) {
 					case "rule":
-						$bits = explode("&&",  $line);
+						$bits = explode("&&", $line);
 						$rule = array();
-						$rule['priority']	= $bits[1];
+						$rule['priority'] = $bits[1];
 						$rule['status']		= $bits[2];
-						$rule['from']		= stripslashes($bits[3]);
-						$rule['to']		= stripslashes($bits[4]);
+						$rule['from'] = stripslashes($bits[3]);
+						$rule['to'] = stripslashes($bits[4]);
 						$rule['subject']	= stripslashes($bits[5]);
 						$rule['action']		= $bits[6];
 						$rule['action_arg']	= $bits[7];
 						// <crnl>s will be encoded as \\n. undo this.
-						$rule['action_arg']	= preg_replace("/\\\\n/","\r\n",$rule['action_arg']);
+						$rule['action_arg']	= preg_replace("/\\\\n/", "\r\n", $rule['action_arg']);
 						$rule['action_arg']	= stripslashes($rule['action_arg']);
-						$rule['flg']		= $bits[8];   // bitwise flag
-						$rule['field']		= stripslashes($bits[9]);
-						$rule['field_val']	= stripslashes($bits[10]);
-						$rule['size']		= $bits[11];
-						$rule['continue']	= ($bits[8] & $continuebit);
-						$rule['gthan']		= ($bits[8] & $sizebit); // use 'greater than'
-						$rule['anyof']		= ($bits[8] & $anyofbit);
-						$rule['keep']		= ($bits[8] & $keepbit);
-						$rule['regexp']		= ($bits[8] & $regexbit);
+						$rule['flg'] = $bits[8]; // bitwise flag
+						$rule['field'] = stripslashes($bits[9]);
+						$rule['field_val'] = stripslashes($bits[10]);
+						$rule['size'] = $bits[11];
+						$rule['continue'] = ($bits[8]&$continuebit);
+						$rule['gthan']		= ($bits[8]&$sizebit); // use 'greater than'
+						$rule['anyof']		= ($bits[8]&$anyofbit);
+						$rule['keep'] = ($bits[8]&$keepbit);
+						$rule['regexp'] = ($bits[8]&$regexbit);
 						$rule['bodytransform'] = ($bits[12]);
 						$rule['field_bodytransform'] = ($bits[13]);
 						$rule['ctype'] = ($bits[14]);
 						$rule['field_ctype_val'] = ($bits[15]);
-						$rule['unconditional']	= 0;
+						$rule['unconditional'] = 0;
 						if (!$rule['from'] && !$rule['to'] && !$rule['subject'] &&
 							!$rule['field'] && !$rule['size'] && $rule['action']) {
 							$rule['unconditional'] = 1;
 						}
 
-						array_push($rules,$rule);
+						array_push($rules, $rule);
 
 						if ($rule['priority'] > $this->pcount) {
 							$this->pcount = $rule['priority'];
 						}
 						break;
 					case "vacation" :
-						if (preg_match("/^ *#vacation&&(.*)&&(.*)&&(.*)&&(.*)&&(.*)/i",$line,$bits) ||
-							preg_match("/^ *#vacation&&(.*)&&(.*)&&(.*)&&(.*)/i",$line,$bits)) {
+						if (preg_match("/^ *#vacation&&(.*)&&(.*)&&(.*)&&(.*)&&(.*)/i", $line, $bits) ||
+							preg_match("/^ *#vacation&&(.*)&&(.*)&&(.*)&&(.*)/i", $line, $bits)) {
 							$vacation['days'] = $bits[1];
-							$vaddresslist = preg_replace("/\"|\s/","",$bits[2]);
-							$vaddresses = preg_split("/,/",$vaddresslist);
+							$vaddresslist = preg_replace("/\"|\s/", "", $bits[2]);
+							$vaddresses = preg_split("/,/", $vaddresslist);
 							$vacation['text'] = $bits[3];
 
 						// <crnl>s will be encoded as \\n. undo this.
-							$vacation['text'] = preg_replace("/\\\\n/","\r\n",$vacation['text']);
+							$vacation['text'] = preg_replace("/\\\\n/", "\r\n", $vacation['text']);
 
-							if (strpos($bits[4],'-')!== false)
+							if (strpos($bits[4], '-') !== false)
 							{
 								$vacation['status'] = 'by_date';
-								list($vacation['start_date'],$vacation['end_date']) = explode('-',$bits[4]);
+								list($vacation['start_date'], $vacation['end_date']) = explode('-', $bits[4]);
 							}
 							else
 							{
@@ -203,14 +203,14 @@ 
 						}
 						break;
 					case "notify":
-						if (preg_match("/^ *#notify&&(.*)&&(.*)&&(.*)/i",$line,$bits)) {
+						if (preg_match("/^ *#notify&&(.*)&&(.*)&&(.*)/i", $line, $bits)) {
 							$emailNotification['status'] = $bits[1];
 							$emailNotification['externalEmail'] = $bits[2];
 							$emailNotification['displaySubject'] = $bits[3];
 						}
 						break;
 					case "mode" :
-						if (preg_match("/^ *#mode&&(.*)/i",$line,$bits)){
+						if (preg_match("/^ *#mode&&(.*)/i", $line, $bits)) {
 							if ($bits[1] == 'basic')
 								$this->mode = 'basic';
 							elseif ($bits[1] == 'advanced')
@@ -226,9 +226,9 @@ 
 		$this->script = $script;
 		$this->rules = $rules;
 		$this->vacation = $vacation;
-		if (!(in_array('vacation',$connection->_capability['extensions'])|| in_array('VACATION', $connection->_capability['extensions']))) $this->vacation = false;
+		if (!(in_array('vacation', $connection->_capability['extensions']) || in_array('VACATION', $connection->_capability['extensions']))) $this->vacation = false;
 		$this->emailNotification = $emailNotification; // Added email notifications
-		if ($this->debug) error_log(__CLASS__.'::'.__METHOD__.": Script succesful retrieved: ".print_r($vacation,true));
+		if ($this->debug) error_log(__CLASS__.'::'.__METHOD__.": Script succesful retrieved: ".print_r($vacation, true));
 
 		return true;
 	}
@@ -240,10 +240,10 @@ 
 	 * @param emailadmin_imap $connection
 	 * @param boolean $utf7imap_fileinto =false true: encode foldernames with utf7imap, default utf8
 	 */
-	function updateScript ($connection, $utf7imap_fileinto=false)
+	function updateScript($connection, $utf7imap_fileinto = false)
 	{
 		#global $_SESSION,$default,$sieve;
-		global $default,$sieve;
+		global $default, $sieve;
 
 		$activerules = 0;
 		$regexused = 0;
@@ -251,8 +251,8 @@ 
 		$rejectused = 0;
 		$vacation_active = false;
 
-		$username	= $GLOBALS['egw_info']['user']['account_lid'];
-		$version	= $GLOBALS['egw_info']['apps']['mail']['version'];
+		$username = $GLOBALS['egw_info']['user']['account_lid'];
+		$version = $GLOBALS['egw_info']['apps']['mail']['version'];
 
 		//include "$default->lib_dir/version.php";
 
@@ -271,12 +271,12 @@ 
 
 		// lets generate the main body of the script from our rules
 		//error_log(__METHOD__.__LINE__.array2string($connection->_capability));
-		$enotify = $variables= $supportsbody = false;
-		if (in_array('enotify',$connection->_capability['extensions'])|| in_array('ENOTIFY', $connection->_capability['extensions'])) $enotify = true;
-		if (in_array('variables',$connection->_capability['extensions'])|| in_array('VARIABLES', $connection->_capability['extensions'])) $variables = true;
+		$enotify = $variables = $supportsbody = false;
+		if (in_array('enotify', $connection->_capability['extensions']) || in_array('ENOTIFY', $connection->_capability['extensions'])) $enotify = true;
+		if (in_array('variables', $connection->_capability['extensions']) || in_array('VARIABLES', $connection->_capability['extensions'])) $variables = true;
 		if (in_array('body', $connection->_capability['extensions']) || in_array('BODY', $connection->_capability['extensions'])) $supportsbody = true;
-		if (!(in_array('vacation',$connection->_capability['extensions'])|| in_array('VACATION', $connection->_capability['extensions']))) $this->vacation = false;
-		if (!(in_array('regex',$connection->_capability['extensions'])|| in_array('REGEX', $connection->_capability['extensions']))) $regexsupported = false;
+		if (!(in_array('vacation', $connection->_capability['extensions']) || in_array('VACATION', $connection->_capability['extensions']))) $this->vacation = false;
+		if (!(in_array('regex', $connection->_capability['extensions']) || in_array('REGEX', $connection->_capability['extensions']))) $regexsupported = false;
 
 		$newscriptbody = "";
 		$continue = 1;
@@ -300,83 +300,83 @@ 
 
 				if (!$rule['unconditional']) {
 						if (!$continue) $newruletext .= "els";
-						$newruletext .= "if " . $anyall . " (";
+						$newruletext .= "if ".$anyall." (";
 						if ($rule['from']) {
-								if (preg_match("/^\s*!/", $rule['from'])){
+								if (preg_match("/^\s*!/", $rule['from'])) {
 										$newruletext .= 'not ';
-										$rule['from'] = preg_replace("/^\s*!/","",$rule['from']);
+										$rule['from'] = preg_replace("/^\s*!/", "", $rule['from']);
 								}
 								$match = ':contains';
 								if (preg_match("/\*|\?/", $rule['from'])) $match = ':matches';
 								if ($rule['regexp']) $match = ':regex';
-								$newruletext .= "address " . $match . " [\"From\"]";
-								$newruletext .= " \"" . addslashes($rule['from']) . "\"";
+								$newruletext .= "address ".$match." [\"From\"]";
+								$newruletext .= " \"".addslashes($rule['from'])."\"";
 								$started = 1;
 						}
 						if ($rule['to']) {
 								if ($started) $newruletext .= ", ";
-								if (preg_match("/^\s*!/", $rule['to'])){
+								if (preg_match("/^\s*!/", $rule['to'])) {
 										$newruletext .= 'not ';
-										$rule['to'] = preg_replace("/^\s*!/","",$rule['to']);
+										$rule['to'] = preg_replace("/^\s*!/", "", $rule['to']);
 								}
 								$match = ':contains';
 								if (preg_match("/\*|\?/", $rule['to'])) $match = ':matches';
 								if ($rule['regexp']) $match = ':regex';
-								$newruletext .= "address " . $match . " [\"To\",\"TO\",\"Cc\",\"CC\"]";
-								$newruletext .= " \"" . addslashes($rule['to']) . "\"";
+								$newruletext .= "address ".$match." [\"To\",\"TO\",\"Cc\",\"CC\"]";
+								$newruletext .= " \"".addslashes($rule['to'])."\"";
 								$started = 1;
 						}
 						if ($rule['subject']) {
 								if ($started) $newruletext .= ", ";
-								if (preg_match("/^\s*!/", $rule['subject'])){
+								if (preg_match("/^\s*!/", $rule['subject'])) {
 										$newruletext .= 'not ';
-										$rule['subject'] = preg_replace("/^\s*!/","",$rule['subject']);
+										$rule['subject'] = preg_replace("/^\s*!/", "", $rule['subject']);
 								}
 								$match = ':contains';
 								if (preg_match("/\*|\?/", $rule['subject'])) $match = ':matches';
 								if ($rule['regexp']) $match = ':regex';
-								$newruletext .= "header " . $match . " \"subject\"";
-								$newruletext .= " \"" . addslashes($rule['subject']) . "\"";
+								$newruletext .= "header ".$match." \"subject\"";
+								$newruletext .= " \"".addslashes($rule['subject'])."\"";
 								$started = 1;
 						}
 						if ($rule['field'] && $rule['field_val']) {
 								if ($started) $newruletext .= ", ";
-								if (preg_match("/^\s*!/", $rule['field_val'])){
+								if (preg_match("/^\s*!/", $rule['field_val'])) {
 										$newruletext .= 'not ';
-										$rule['field_val'] = preg_replace("/^\s*!/","",$rule['field_val']);
+										$rule['field_val'] = preg_replace("/^\s*!/", "", $rule['field_val']);
 								}
 								$match = ':contains';
 								if (preg_match("/\*|\?/", $rule['field_val'])) $match = ':matches';
 								if ($rule['regexp']) $match = ':regex';
-								$newruletext .= "header " . $match . " \"" . addslashes($rule['field']) . "\"";
-								$newruletext .= " \"" . addslashes($rule['field_val']) . "\"";
+								$newruletext .= "header ".$match." \"".addslashes($rule['field'])."\"";
+								$newruletext .= " \"".addslashes($rule['field_val'])."\"";
 								$started = 1;
 						}
 						if ($rule['size']) {
 								$xthan = " :under ";
 								if ($rule['gthan']) $xthan = " :over ";
 								if ($started) $newruletext .= ", ";
-								$newruletext .= "size " . $xthan . $rule['size'] . "K";
+								$newruletext .= "size ".$xthan.$rule['size']."K";
 								$started = 1;
 						}
-						if ($supportsbody){
-							if (!empty($rule['field_bodytransform'])){
+						if ($supportsbody) {
+							if (!empty($rule['field_bodytransform'])) {
 								if ($started) $newruletext .= ", ";
-								$btransform	= " :raw ";
+								$btransform = " :raw ";
 								$match = ' :contains';
 								if ($rule['bodytransform'])	$btransform = " :text ";
 								if (preg_match("/\*|\?/", $rule['field_bodytransform'])) $match = ':matches';
 								if ($rule['regexp']) $match = ':regex';
-								$newruletext .= "body " . $btransform . $match . " \"" . $rule['field_bodytransform'] . "\"";
+								$newruletext .= "body ".$btransform.$match." \"".$rule['field_bodytransform']."\"";
 								$started = 1;
 
 							}
-							if ($rule['ctype']!= '0' && !empty($rule['ctype'])){
+							if ($rule['ctype'] != '0' && !empty($rule['ctype'])) {
 								if ($started) $newruletext .= ", ";
 								$btransform_ctype = emailadmin_script::$btransform_ctype_array[$rule['ctype']];
 								$ctype_subtype = "";
 								if ($rule['field_ctype_val']) $ctype_subtype = "/";
-								$newruletext .= "body :content " . " \"" . $btransform_ctype . $ctype_subtype . $rule['field_ctype_val'] . "\"" . " :contains \"\"";
+								$newruletext .= "body :content "." \"".$btransform_ctype.$ctype_subtype.$rule['field_ctype_val']."\""." :contains \"\"";
 								$started = 1;
 								//error_log(__CLASS__."::".__METHOD__.array2string(emailadmin_script::$btransform_ctype_array));
 							}
@@ -387,21 +387,21 @@ 
 
 				if (!$rule['unconditional']) $newruletext .= ") {\n\t";
 
-				if (preg_match("/folder/i",$rule['action'])) {
-						$newruletext .= "fileinto \"" . ($utf7imap_fileinto ?
-							translation::convert($rule['action_arg'],'utf-8', 'utf7-imap') : $rule['action_arg']) . "\";";
+				if (preg_match("/folder/i", $rule['action'])) {
+						$newruletext .= "fileinto \"".($utf7imap_fileinto ?
+							translation::convert($rule['action_arg'], 'utf-8', 'utf7-imap') : $rule['action_arg'])."\";";
 				}
-				if (preg_match("/reject/i",$rule['action'])) {
-						$newruletext .= "reject text: \n" . $rule['action_arg'] . "\n.\n;";
+				if (preg_match("/reject/i", $rule['action'])) {
+						$newruletext .= "reject text: \n".$rule['action_arg']."\n.\n;";
 						$rejectused = 1;
 				}
-				if (preg_match("/address/i",$rule['action'])) {
-						foreach(preg_split('/, ?/',$rule['action_arg']) as $addr)
+				if (preg_match("/address/i", $rule['action'])) {
+						foreach (preg_split('/, ?/', $rule['action_arg']) as $addr)
 						{
 							$newruletext .= "\tredirect \"".trim($addr)."\";\n";
 						}
 				}
-				if (preg_match("/discard/i",$rule['action'])) {
+				if (preg_match("/discard/i", $rule['action'])) {
 						$newruletext .= "discard;";
 				}
 				if ($rule['keep']) $newruletext .= "\n\tkeep;";
@@ -411,7 +411,7 @@ 
 				if ($rule['continue']) $continue = 1;
 				if ($rule['unconditional']) $continue = 1;
 
-				$newscriptbody .= $newruletext . "\n\n";
+				$newscriptbody .= $newruletext."\n\n";
 
 			} // end 'if ! ENABLED'
 		}
@@ -420,32 +420,32 @@ 
 
 		if ($this->vacation) {
 			$vacation = $this->vacation;
-			if (!$vacation['days']) $vacation['days'] = ($default->vacation_days ? $default->vacation_days:'');
-			if (!$vacation['text']) $vacation['text'] = ($default->vacation_text ? $default->vacation_text:'');
+			if (!$vacation['days']) $vacation['days'] = ($default->vacation_days ? $default->vacation_days : '');
+			if (!$vacation['text']) $vacation['text'] = ($default->vacation_text ? $default->vacation_text : '');
 			if (!$vacation['status']) $vacation['status'] = 'on';
 
 			// filter out invalid addresses.
 			$ok_vaddrs = array();
-			foreach($vacation['addresses'] as $addr){
-				if ($addr != '' && preg_match("/\@/",$addr))
-				array_push($ok_vaddrs,$addr);
+			foreach ($vacation['addresses'] as $addr) {
+				if ($addr != '' && preg_match("/\@/", $addr))
+				array_push($ok_vaddrs, $addr);
 			}
 			$vacation['addresses'] = $ok_vaddrs;
 
-			if (!$vacation['addresses'][0]){
-				$defaultaddr = $sieve->user . '@' . $sieve->maildomain;
-				array_push($vacation['addresses'],$defaultaddr);
+			if (!$vacation['addresses'][0]) {
+				$defaultaddr = $sieve->user.'@'.$sieve->maildomain;
+				array_push($vacation['addresses'], $defaultaddr);
 			}
-			if (($vacation['status'] == 'on' && strlen(trim($vacation['text']))>0)|| $vacation['status'] == 'by_date' &&
-				$vacation['start_date'] <= time() && time() < $vacation['end_date']+24*3600)	// +24*3600 to include the end_date day
+			if (($vacation['status'] == 'on' && strlen(trim($vacation['text'])) > 0) || $vacation['status'] == 'by_date' &&
+				$vacation['start_date'] <= time() && time() < $vacation['end_date'] + 24 * 3600)	// +24*3600 to include the end_date day
 			{
 				if (trim($vacation['forwards'])) {
 					$if = array();
-					foreach($vacation['addresses'] as $addr) {
+					foreach ($vacation['addresses'] as $addr) {
 						$if[] = 'address :contains ["To","TO","Cc","CC"] "'.trim($addr).'"';
 					}
-					$newscriptbody .= 'if anyof ('.implode(', ',$if).") {\n";
-					foreach(preg_split('/, ?/',$vacation['forwards']) as $addr) {
+					$newscriptbody .= 'if anyof ('.implode(', ', $if).") {\n";
+					foreach (preg_split('/, ?/', $vacation['forwards']) as $addr) {
 						$newscriptbody .= "\tredirect \"".trim($addr)."\";\n";
 					}
 					$newscriptbody .= "\tkeep;\n}\n";
@@ -466,11 +466,11 @@ 
 						$newscriptbody .= "if header :contains ".'"X-Spam-Status" '.'"YES"'."{\n\tstop;\n}\n"; //stop vacation reply if it is spam
 					}
 				}
-				$newscriptbody .= "vacation :days " . $vacation['days'] . " :addresses [";
+				$newscriptbody .= "vacation :days ".$vacation['days']." :addresses [";
 				$first = 1;
 				foreach ($vacation['addresses'] as $vaddress) {
 						if (!$first) $newscriptbody .= ", ";
-						$newscriptbody .= "\"" . trim($vaddress) . "\"";
+						$newscriptbody .= "\"".trim($vaddress)."\"";
 						$first = 0;
 				}
 				$message = $vacation['text'];
@@ -478,12 +478,12 @@ 
 				{
 					$format_date = 'd M Y'; // see to it, that there is always a format, because if it is missing - no date will be output
 					if (!empty($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'])) $format_date = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'];
-					$message = str_replace(array('$$start$$','$$end$$'),array(
-							date($format_date,$vacation['start_date']),
-							date($format_date,$vacation['end_date']),
-						),$message);
+					$message = str_replace(array('$$start$$', '$$end$$'), array(
+							date($format_date, $vacation['start_date']),
+							date($format_date, $vacation['end_date']),
+						), $message);
 				}
-				$newscriptbody .= "] text:\n" . $message . "\n.\n;\n\n";
+				$newscriptbody .= "] text:\n".$message."\n.\n;\n\n";
 			}
 
 			// update with any changes.
@@ -496,7 +496,7 @@ 
 
 			// format notification body
 			$egw_site_title = $GLOBALS['egw_info']['server']['site_title'];
-			if ($enotify==true)
+			if ($enotify == true)
 			{
 				$notification_body = lang("You have received a new message on the")." {$egw_site_title}";
 				if ($variables)
@@ -512,7 +512,7 @@ 
 				}
 				else
 				{
-					$notification_body ="[SIEVE] ".$notification_body;
+					$notification_body = "[SIEVE] ".$notification_body;
 				}
 				$newscriptbody .= 'notify :message "'.$notification_body.'"'."\n\t".'"mailto:'.$notification_email.'";'."\n";
 				//$newscriptbody .= 'notify :message "'.$notification_body.'" :method "mailto" :options "'.$notification_email.'?subject='.$notification_subject.'";'."\n";
@@ -536,8 +536,8 @@ 
 		// generate the script head
 
 		$newscripthead = "";
-		$newscripthead .= "#Mail filter rules for " . $username . "\n";
-		$newscripthead .= '#Generated by ' . $username . ' using Mail ' . $version . ' ' . date($default->script_date_format);
+		$newscripthead .= "#Mail filter rules for ".$username."\n";
+		$newscripthead .= '#Generated by '.$username.' using Mail '.$version.' '.date($default->script_date_format);
 		$newscripthead .= "\n";
 
 		if ($activerules) {
@@ -548,7 +548,7 @@ 
 				$newscripthead .= ",\"vacation\"";
 			}
 			if ($supportsbody) $newscripthead .= ",\"body\"";
-			if ($this->emailNotification && $this->emailNotification['status'] == 'on') $newscripthead .= ',"'.($enotify?'e':'').'notify"'.($variables?',"variables"':''); // Added email notifications
+			if ($this->emailNotification && $this->emailNotification['status'] == 'on') $newscripthead .= ',"'.($enotify ? 'e' : '').'notify"'.($variables ? ',"variables"' : ''); // Added email notifications
 			$newscripthead .= "];\n\n";
 		} else {
 			// no active rules, but might still have an active vacation rule
@@ -557,17 +557,17 @@ 
 			{
 				$newscripthead .= "require [\"vacation\"";
 				if ($regexsupported && $regexused) $newscripthead .= ",\"regex\"";
-				$closeRequired=true;
+				$closeRequired = true;
 			}
 			if ($this->emailNotification && $this->emailNotification['status'] == 'on')
 			{
 				if ($this->vacation && $vacation_active)
 				{
-					$newscripthead .= ",\"".($enotify?'e':'')."notify\"".($variables?',"variables"':'')."];\n\n"; // Added email notifications
+					$newscripthead .= ",\"".($enotify ? 'e' : '')."notify\"".($variables ? ',"variables"' : '')."];\n\n"; // Added email notifications
 				}
 				else
 				{
-					$newscripthead .= "require [\"".($enotify?'e':'')."notify\"".($variables?',"variables"':'')."];\n\n"; // Added email notifications
+					$newscripthead .= "require [\"".($enotify ? 'e' : '')."notify\"".($variables ? ',"variables"' : '')."];\n\n"; // Added email notifications
 				}
 			}
 			if ($closeRequired) $newscripthead .= "];\n\n";
@@ -583,16 +583,16 @@ 
 			if ($rule['status'] != 'DELETED') {
 				$rule['action_arg'] = addslashes($rule['action_arg']);
 				// we need to handle \r\n here.
-				$rule['action_arg'] = preg_replace("/\r?\n/","\\n",$rule['action_arg']);
+				$rule['action_arg'] = preg_replace("/\r?\n/", "\\n", $rule['action_arg']);
 				/* reset priority value. note: we only do this
 				* for compatibility with Websieve. */
 				$rule['priority'] = $pcount;
-				$newscriptfoot .= "#rule&&" . $rule['priority'] . "&&" . $rule['status'] . "&&" .
-				addslashes($rule['from']) . "&&" . addslashes($rule['to']) . "&&" . addslashes($rule['subject']) . "&&" . $rule['action'] . "&&" .
-				$rule['action_arg'] . "&&" . $rule['flg'] . "&&" . addslashes($rule['field']) . "&&" . addslashes($rule['field_val']) . "&&" . $rule['size'];
-				if ($supportsbody && (!empty($rule['field_bodytransform']) || ($rule['ctype']!= '0' && !empty($rule['ctype'])))) $newscriptfoot .= "&&" . $rule['bodytransform'] . "&&" . $rule['field_bodytransform']. "&&" . $rule['ctype'] . "&&" . $rule['field_ctype_val'];
+				$newscriptfoot .= "#rule&&".$rule['priority']."&&".$rule['status']."&&".
+				addslashes($rule['from'])."&&".addslashes($rule['to'])."&&".addslashes($rule['subject'])."&&".$rule['action']."&&".
+				$rule['action_arg']."&&".$rule['flg']."&&".addslashes($rule['field'])."&&".addslashes($rule['field_val'])."&&".$rule['size'];
+				if ($supportsbody && (!empty($rule['field_bodytransform']) || ($rule['ctype'] != '0' && !empty($rule['ctype'])))) $newscriptfoot .= "&&".$rule['bodytransform']."&&".$rule['field_bodytransform']."&&".$rule['ctype']."&&".$rule['field_ctype_val'];
 				$newscriptfoot .= "\n";
-				$pcount = $pcount+2;
+				$pcount = $pcount + 2;
 				//error_log(__CLASS__."::".__METHOD__.__LINE__.array2string($newscriptfoot));
 			}
 		}
@@ -600,36 +600,36 @@ 
 		if ($this->vacation)
 		{
 			$vacation = $this->vacation;
-			$newscriptfoot .= "#vacation&&" . $vacation['days'] . "&&";
+			$newscriptfoot .= "#vacation&&".$vacation['days']."&&";
 			$first = 1;
 			foreach ($vacation['addresses'] as $address) {
 				if (!$first) $newscriptfoot .= ", ";
-				$newscriptfoot .= "\"" . trim($address) . "\"";
+				$newscriptfoot .= "\"".trim($address)."\"";
 				$first = 0;
 			}
 
-			$vacation['text'] = preg_replace("/\r?\n/","\\n",$vacation['text']);
-			$newscriptfoot .= "&&" . $vacation['text'] . "&&" .
-				($vacation['status']=='by_date' ? $vacation['start_date'].'-'.$vacation['end_date'] : $vacation['status']);
-			if ($vacation['forwards']) $newscriptfoot .= '&&' . $vacation['forwards'];
+			$vacation['text'] = preg_replace("/\r?\n/", "\\n", $vacation['text']);
+			$newscriptfoot .= "&&".$vacation['text']."&&".
+				($vacation['status'] == 'by_date' ? $vacation['start_date'].'-'.$vacation['end_date'] : $vacation['status']);
+			if ($vacation['forwards']) $newscriptfoot .= '&&'.$vacation['forwards'];
 			$newscriptfoot .= "\n";
 		}
 		if ($this->emailNotification) {
 			$emailNotification = $this->emailNotification;
-			$newscriptfoot .= "#notify&&" . $emailNotification['status'] . "&&" . $emailNotification['externalEmail'] . "&&" . $emailNotification['displaySubject'] . "\n";
+			$newscriptfoot .= "#notify&&".$emailNotification['status']."&&".$emailNotification['externalEmail']."&&".$emailNotification['displaySubject']."\n";
 		}
 
 		$newscriptfoot .= "#mode&&basic\n";
 
-		$newscript = $newscripthead . $newscriptbody . $newscriptfoot;
+		$newscript = $newscripthead.$newscriptbody.$newscriptfoot;
 		$this->script = $newscript;
 		//error_log(__METHOD__.__LINE__.array2string($newscript));
 		//print "<pre>$newscript</pre>"; exit;
 		//print "<hr><pre>".htmlentities($newscript)."</pre><hr>";
 		$ret = $connection->installScript($this->name, $newscript, true);
 		if (!$ret || self::isError($ret)) {
-			$this->errstr = 'updateScript: putscript failed: ' . (self::isError($ret)?$ret->message:$connection->errstr);
-			if ($regexused&&!$regexsupported) $this->errstr .= " REGEX is not an supported CAPABILITY";
+			$this->errstr = 'updateScript: putscript failed: '.(self::isError($ret) ? $ret->message : $connection->errstr);
+			if ($regexused && !$regexsupported) $this->errstr .= " REGEX is not an supported CAPABILITY";
 			error_log(__METHOD__.__LINE__.' # Error: ->'.$this->errstr);
 			error_log(__METHOD__.__LINE__.' # ScriptName:'.$this->name.' Script:'.$newscript);
 			error_log(__METHOD__.__LINE__.' # Instance='.$GLOBALS['egw_info']['user']['domain'].', User='.$GLOBALS['egw_info']['user']['account_lid']);
@@ -654,7 +654,7 @@ 
 	 */
 	protected static function isError($data, $code = null)
 	{
-		static $pear=null;
+		static $pear = null;
 		if (!isset($pear)) $pear = new PEAR();
 
 		return $pear->isError($data, $code);

Braces +335 added lines, -111 removed lines

@@ -16,7 +16,8 @@ 
 /**
  * Support for Sieve scripts
  */
-class emailadmin_script {
+class emailadmin_script
+{
 
 	var $name;         /* filename of script. */
 	var $script;       /* full ascii text of script from server. */
@@ -52,7 +53,8 @@ 
 	var $debug=false;
 
 	// class constructor
-	function __construct ($scriptname) {
+	function __construct ($scriptname)
+	{
 		$this->name = $scriptname;
 		$this->script = '';
 		$this->size = 0;
@@ -72,7 +74,8 @@ 
 	 * @param bosieve $connection
 	 * @return boolean true, if script written successfull
 	 */
-	function retrieveRules ($connection) {
+	function retrieveRules ($connection)
+	{
 		#global $_SESSION;
 		$continuebit = 1;
 		$sizebit = 2;
@@ -80,15 +83,23 @@ 
 		$keepbit = 8;
 		$regexbit = 128;
 
-		if (!isset($this->name)){
+		if (!isset($this->name))
+		{
 			$this->errstr = 'retrieveRules: no script name specified';
-			if ($this->debug) error_log(__CLASS__.'::'.__METHOD__.": no script name specified");
+			if ($this->debug)
+			{
+				error_log(__CLASS__.'::'.__METHOD__.": no script name specified");
+			}
 			return false;
 		}
 
-		if (!is_object($connection)) {
+		if (!is_object($connection))
+		{
 			$this->errstr = "retrieveRules: no sieve session open";
-			if ($this->debug) error_log(__CLASS__.'::'.__METHOD__.": no sieve session open");
+			if ($this->debug)
+			{
+				error_log(__CLASS__.'::'.__METHOD__.": no sieve session open");
+			}
 			return false;
 		}
 
@@ -99,8 +110,12 @@ 
 			$this->updateScript($connection);
 		}
 
-		if(self::isError($script = $connection->getScript($this->name))) {
-			if ($this->debug) error_log(__CLASS__.'::'.__METHOD__.": error retrieving script: ".$script->getMessage());
+		if(self::isError($script = $connection->getScript($this->name)))
+		{
+			if ($this->debug)
+			{
+				error_log(__CLASS__.'::'.__METHOD__.": error retrieving script: ".$script->getMessage());
+			}
 			return $script;
 		}
 		#print "<br>AAA: Script is ". htmlentities($script) ."<br>";
@@ -123,10 +138,14 @@ 
 		/* next line should be the recognised encoded head. if not, the script
 		 * is of an unrecognised format, and we should not overwrite it. */
 		$line1 = array_shift($lines);
-		if (!preg_match("/^# ?Mail(.*)rules for/", $line1)){
+		if (!preg_match("/^# ?Mail(.*)rules for/", $line1))
+		{
 				$this->errstr = 'retrieveRules: encoding not recognised';
 				$this->so = false;
-				if ($this->debug) error_log(__CLASS__.'::'.__METHOD__.": encoding not recognised");
+				if ($this->debug)
+				{
+					error_log(__CLASS__.'::'.__METHOD__.": encoding not recognised");
+				}
 				return false;
 		}
 		$this->so = true;
@@ -136,9 +155,11 @@ 
 		while (isset($line))
 		{
 			$matches = null;
-			if (preg_match("/^ *#(#PSEUDO|rule|vacation|mode|notify)/i",$line,$matches)){
+			if (preg_match("/^ *#(#PSEUDO|rule|vacation|mode|notify)/i",$line,$matches))
+			{
 				$line = rtrim($line);
-				switch ($matches[1]){
+				switch ($matches[1])
+				{
 					case "rule":
 						$bits = explode("&&",  $line);
 						$rule = array();
@@ -167,19 +188,22 @@ 
 						$rule['field_ctype_val'] = ($bits[15]);
 						$rule['unconditional']	= 0;
 						if (!$rule['from'] && !$rule['to'] && !$rule['subject'] &&
-							!$rule['field'] && !$rule['size'] && $rule['action']) {
+							!$rule['field'] && !$rule['size'] && $rule['action'])
+						{
 							$rule['unconditional'] = 1;
 						}
 
 						array_push($rules,$rule);
 
-						if ($rule['priority'] > $this->pcount) {
+						if ($rule['priority'] > $this->pcount)
+						{
 							$this->pcount = $rule['priority'];
 						}
 						break;
 					case "vacation" :
 						if (preg_match("/^ *#vacation&&(.*)&&(.*)&&(.*)&&(.*)&&(.*)/i",$line,$bits) ||
-							preg_match("/^ *#vacation&&(.*)&&(.*)&&(.*)&&(.*)/i",$line,$bits)) {
+							preg_match("/^ *#vacation&&(.*)&&(.*)&&(.*)&&(.*)/i",$line,$bits))
+						{
 							$vacation['days'] = $bits[1];
 							$vaddresslist = preg_replace("/\"|\s/","",$bits[2]);
 							$vaddresses = preg_split("/,/",$vaddresslist);
@@ -203,20 +227,27 @@ 
 						}
 						break;
 					case "notify":
-						if (preg_match("/^ *#notify&&(.*)&&(.*)&&(.*)/i",$line,$bits)) {
+						if (preg_match("/^ *#notify&&(.*)&&(.*)&&(.*)/i",$line,$bits))
+						{
 							$emailNotification['status'] = $bits[1];
 							$emailNotification['externalEmail'] = $bits[2];
 							$emailNotification['displaySubject'] = $bits[3];
 						}
 						break;
 					case "mode" :
-						if (preg_match("/^ *#mode&&(.*)/i",$line,$bits)){
+						if (preg_match("/^ *#mode&&(.*)/i",$line,$bits))
+						{
 							if ($bits[1] == 'basic')
-								$this->mode = 'basic';
+							{
+															$this->mode = 'basic';
+							}
 							elseif ($bits[1] == 'advanced')
-								$this->mode = 'advanced';
-							else
-								$this->mode = 'unknown';
+							{
+															$this->mode = 'advanced';
+							}
+							else {
+															$this->mode = 'unknown';
+							}
 						}
 				}
 			}
@@ -226,9 +257,15 @@ 
 		$this->script = $script;
 		$this->rules = $rules;
 		$this->vacation = $vacation;
-		if (!(in_array('vacation',$connection->_capability['extensions'])|| in_array('VACATION', $connection->_capability['extensions']))) $this->vacation = false;
+		if (!(in_array('vacation',$connection->_capability['extensions'])|| in_array('VACATION', $connection->_capability['extensions'])))
+		{
+			$this->vacation = false;
+		}
 		$this->emailNotification = $emailNotification; // Added email notifications
-		if ($this->debug) error_log(__CLASS__.'::'.__METHOD__.": Script succesful retrieved: ".print_r($vacation,true));
+		if ($this->debug)
+		{
+			error_log(__CLASS__.'::'.__METHOD__.": Script succesful retrieved: ".print_r($vacation,true));
+		}
 
 		return true;
 	}
@@ -272,110 +309,206 @@ 
 		// lets generate the main body of the script from our rules
 		//error_log(__METHOD__.__LINE__.array2string($connection->_capability));
 		$enotify = $variables= $supportsbody = false;
-		if (in_array('enotify',$connection->_capability['extensions'])|| in_array('ENOTIFY', $connection->_capability['extensions'])) $enotify = true;
-		if (in_array('variables',$connection->_capability['extensions'])|| in_array('VARIABLES', $connection->_capability['extensions'])) $variables = true;
-		if (in_array('body', $connection->_capability['extensions']) || in_array('BODY', $connection->_capability['extensions'])) $supportsbody = true;
-		if (!(in_array('vacation',$connection->_capability['extensions'])|| in_array('VACATION', $connection->_capability['extensions']))) $this->vacation = false;
-		if (!(in_array('regex',$connection->_capability['extensions'])|| in_array('REGEX', $connection->_capability['extensions']))) $regexsupported = false;
+		if (in_array('enotify',$connection->_capability['extensions'])|| in_array('ENOTIFY', $connection->_capability['extensions']))
+		{
+			$enotify = true;
+		}
+		if (in_array('variables',$connection->_capability['extensions'])|| in_array('VARIABLES', $connection->_capability['extensions']))
+		{
+			$variables = true;
+		}
+		if (in_array('body', $connection->_capability['extensions']) || in_array('BODY', $connection->_capability['extensions']))
+		{
+			$supportsbody = true;
+		}
+		if (!(in_array('vacation',$connection->_capability['extensions'])|| in_array('VACATION', $connection->_capability['extensions'])))
+		{
+			$this->vacation = false;
+		}
+		if (!(in_array('regex',$connection->_capability['extensions'])|| in_array('REGEX', $connection->_capability['extensions'])))
+		{
+			$regexsupported = false;
+		}
 
 		$newscriptbody = "";
 		$continue = 1;
 
-		foreach ($this->rules as $rule) {
+		foreach ($this->rules as $rule)
+		{
 			$newruletext = "";
 
 			// don't print this rule if disabled.
-			if ($rule['status'] != 'ENABLED') {
-			} else {
+			if ($rule['status'] != 'ENABLED')
+			{
+			}
+			else
+			{
 				$activerules = 1;
 
 				// conditions
 
 				$anyall = "allof";
-				if ($rule['anyof']) $anyall = "anyof";
-				if ($rule['regexp']) {
+				if ($rule['anyof'])
+				{
+					$anyall = "anyof";
+				}
+				if ($rule['regexp'])
+				{
 						$regexused = 1;
 				}
 				$started = 0;
 
-				if (!$rule['unconditional']) {
-						if (!$continue) $newruletext .= "els";
+				if (!$rule['unconditional'])
+				{
+						if (!$continue)
+						{
+							$newruletext .= "els";
+						}
 						$newruletext .= "if " . $anyall . " (";
-						if ($rule['from']) {
-								if (preg_match("/^\s*!/", $rule['from'])){
+						if ($rule['from'])
+						{
+								if (preg_match("/^\s*!/", $rule['from']))
+								{
 										$newruletext .= 'not ';
 										$rule['from'] = preg_replace("/^\s*!/","",$rule['from']);
 								}
 								$match = ':contains';
-								if (preg_match("/\*|\?/", $rule['from'])) $match = ':matches';
-								if ($rule['regexp']) $match = ':regex';
+								if (preg_match("/\*|\?/", $rule['from']))
+								{
+									$match = ':matches';
+								}
+								if ($rule['regexp'])
+								{
+									$match = ':regex';
+								}
 								$newruletext .= "address " . $match . " [\"From\"]";
 								$newruletext .= " \"" . addslashes($rule['from']) . "\"";
 								$started = 1;
 						}
-						if ($rule['to']) {
-								if ($started) $newruletext .= ", ";
-								if (preg_match("/^\s*!/", $rule['to'])){
+						if ($rule['to'])
+						{
+								if ($started)
+								{
+									$newruletext .= ", ";
+								}
+								if (preg_match("/^\s*!/", $rule['to']))
+								{
 										$newruletext .= 'not ';
 										$rule['to'] = preg_replace("/^\s*!/","",$rule['to']);
 								}
 								$match = ':contains';
-								if (preg_match("/\*|\?/", $rule['to'])) $match = ':matches';
-								if ($rule['regexp']) $match = ':regex';
+								if (preg_match("/\*|\?/", $rule['to']))
+								{
+									$match = ':matches';
+								}
+								if ($rule['regexp'])
+								{
+									$match = ':regex';
+								}
 								$newruletext .= "address " . $match . " [\"To\",\"TO\",\"Cc\",\"CC\"]";
 								$newruletext .= " \"" . addslashes($rule['to']) . "\"";
 								$started = 1;
 						}
-						if ($rule['subject']) {
-								if ($started) $newruletext .= ", ";
-								if (preg_match("/^\s*!/", $rule['subject'])){
+						if ($rule['subject'])
+						{
+								if ($started)
+								{
+									$newruletext .= ", ";
+								}
+								if (preg_match("/^\s*!/", $rule['subject']))
+								{
 										$newruletext .= 'not ';
 										$rule['subject'] = preg_replace("/^\s*!/","",$rule['subject']);
 								}
 								$match = ':contains';
-								if (preg_match("/\*|\?/", $rule['subject'])) $match = ':matches';
-								if ($rule['regexp']) $match = ':regex';
+								if (preg_match("/\*|\?/", $rule['subject']))
+								{
+									$match = ':matches';
+								}
+								if ($rule['regexp'])
+								{
+									$match = ':regex';
+								}
 								$newruletext .= "header " . $match . " \"subject\"";
 								$newruletext .= " \"" . addslashes($rule['subject']) . "\"";
 								$started = 1;
 						}
-						if ($rule['field'] && $rule['field_val']) {
-								if ($started) $newruletext .= ", ";
-								if (preg_match("/^\s*!/", $rule['field_val'])){
+						if ($rule['field'] && $rule['field_val'])
+						{
+								if ($started)
+								{
+									$newruletext .= ", ";
+								}
+								if (preg_match("/^\s*!/", $rule['field_val']))
+								{
 										$newruletext .= 'not ';
 										$rule['field_val'] = preg_replace("/^\s*!/","",$rule['field_val']);
 								}
 								$match = ':contains';
-								if (preg_match("/\*|\?/", $rule['field_val'])) $match = ':matches';
-								if ($rule['regexp']) $match = ':regex';
+								if (preg_match("/\*|\?/", $rule['field_val']))
+								{
+									$match = ':matches';
+								}
+								if ($rule['regexp'])
+								{
+									$match = ':regex';
+								}
 								$newruletext .= "header " . $match . " \"" . addslashes($rule['field']) . "\"";
 								$newruletext .= " \"" . addslashes($rule['field_val']) . "\"";
 								$started = 1;
 						}
-						if ($rule['size']) {
+						if ($rule['size'])
+						{
 								$xthan = " :under ";
-								if ($rule['gthan']) $xthan = " :over ";
-								if ($started) $newruletext .= ", ";
+								if ($rule['gthan'])
+								{
+									$xthan = " :over ";
+								}
+								if ($started)
+								{
+									$newruletext .= ", ";
+								}
 								$newruletext .= "size " . $xthan . $rule['size'] . "K";
 								$started = 1;
 						}
-						if ($supportsbody){
-							if (!empty($rule['field_bodytransform'])){
-								if ($started) $newruletext .= ", ";
+						if ($supportsbody)
+						{
+							if (!empty($rule['field_bodytransform']))
+							{
+								if ($started)
+								{
+									$newruletext .= ", ";
+								}
 								$btransform	= " :raw ";
 								$match = ' :contains';
-								if ($rule['bodytransform'])	$btransform = " :text ";
-								if (preg_match("/\*|\?/", $rule['field_bodytransform'])) $match = ':matches';
-								if ($rule['regexp']) $match = ':regex';
+								if ($rule['bodytransform'])
+								{
+									$btransform = " :text ";
+								}
+								if (preg_match("/\*|\?/", $rule['field_bodytransform']))
+								{
+									$match = ':matches';
+								}
+								if ($rule['regexp'])
+								{
+									$match = ':regex';
+								}
 								$newruletext .= "body " . $btransform . $match . " \"" . $rule['field_bodytransform'] . "\"";
 								$started = 1;
 
 							}
-							if ($rule['ctype']!= '0' && !empty($rule['ctype'])){
-								if ($started) $newruletext .= ", ";
+							if ($rule['ctype']!= '0' && !empty($rule['ctype']))
+							{
+								if ($started)
+								{
+									$newruletext .= ", ";
+								}
 								$btransform_ctype = emailadmin_script::$btransform_ctype_array[$rule['ctype']];
 								$ctype_subtype = "";
-								if ($rule['field_ctype_val']) $ctype_subtype = "/";
+								if ($rule['field_ctype_val'])
+								{
+									$ctype_subtype = "/";
+								}
 								$newruletext .= "body :content " . " \"" . $btransform_ctype . $ctype_subtype . $rule['field_ctype_val'] . "\"" . " :contains \"\"";
 								$started = 1;
 								//error_log(__CLASS__."::".__METHOD__.array2string(emailadmin_script::$btransform_ctype_array));
@@ -385,31 +518,50 @@ 
 
 				// actions
 
-				if (!$rule['unconditional']) $newruletext .= ") {\n\t";
+				if (!$rule['unconditional'])
+				{
+					$newruletext .= ") {\n\t";
+				}
 
-				if (preg_match("/folder/i",$rule['action'])) {
+				if (preg_match("/folder/i",$rule['action']))
+				{
 						$newruletext .= "fileinto \"" . ($utf7imap_fileinto ?
 							translation::convert($rule['action_arg'],'utf-8', 'utf7-imap') : $rule['action_arg']) . "\";";
 				}
-				if (preg_match("/reject/i",$rule['action'])) {
+				if (preg_match("/reject/i",$rule['action']))
+				{
 						$newruletext .= "reject text: \n" . $rule['action_arg'] . "\n.\n;";
 						$rejectused = 1;
 				}
-				if (preg_match("/address/i",$rule['action'])) {
+				if (preg_match("/address/i",$rule['action']))
+				{
 						foreach(preg_split('/, ?/',$rule['action_arg']) as $addr)
 						{
 							$newruletext .= "\tredirect \"".trim($addr)."\";\n";
 						}
 				}
-				if (preg_match("/discard/i",$rule['action'])) {
+				if (preg_match("/discard/i",$rule['action']))
+				{
 						$newruletext .= "discard;";
 				}
-				if ($rule['keep']) $newruletext .= "\n\tkeep;";
-				if (!$rule['unconditional']) $newruletext .= "\n}";
+				if ($rule['keep'])
+				{
+					$newruletext .= "\n\tkeep;";
+				}
+				if (!$rule['unconditional'])
+				{
+					$newruletext .= "\n}";
+				}
 
 				$continue = 0;
-				if ($rule['continue']) $continue = 1;
-				if ($rule['unconditional']) $continue = 1;
+				if ($rule['continue'])
+				{
+					$continue = 1;
+				}
+				if ($rule['unconditional'])
+				{
+					$continue = 1;
+				}
 
 				$newscriptbody .= $newruletext . "\n\n";
 
@@ -418,34 +570,53 @@ 
 
 		// vacation rule
 
-		if ($this->vacation) {
+		if ($this->vacation)
+		{
 			$vacation = $this->vacation;
-			if (!$vacation['days']) $vacation['days'] = ($default->vacation_days ? $default->vacation_days:'');
-			if (!$vacation['text']) $vacation['text'] = ($default->vacation_text ? $default->vacation_text:'');
-			if (!$vacation['status']) $vacation['status'] = 'on';
+			if (!$vacation['days'])
+			{
+				$vacation['days'] = ($default->vacation_days ? $default->vacation_days:'');
+			}
+			if (!$vacation['text'])
+			{
+				$vacation['text'] = ($default->vacation_text ? $default->vacation_text:'');
+			}
+			if (!$vacation['status'])
+			{
+				$vacation['status'] = 'on';
+			}
 
 			// filter out invalid addresses.
 			$ok_vaddrs = array();
-			foreach($vacation['addresses'] as $addr){
+			foreach($vacation['addresses'] as $addr)
+			{
 				if ($addr != '' && preg_match("/\@/",$addr))
-				array_push($ok_vaddrs,$addr);
+				{
+								array_push($ok_vaddrs,$addr);
+				}
 			}
 			$vacation['addresses'] = $ok_vaddrs;
 
-			if (!$vacation['addresses'][0]){
+			if (!$vacation['addresses'][0])
+			{
 				$defaultaddr = $sieve->user . '@' . $sieve->maildomain;
 				array_push($vacation['addresses'],$defaultaddr);
 			}
 			if (($vacation['status'] == 'on' && strlen(trim($vacation['text']))>0)|| $vacation['status'] == 'by_date' &&
-				$vacation['start_date'] <= time() && time() < $vacation['end_date']+24*3600)	// +24*3600 to include the end_date day
+				$vacation['start_date'] <= time() && time() < $vacation['end_date']+24*3600)
+			{
+				// +24*3600 to include the end_date day
 			{
 				if (trim($vacation['forwards'])) {
 					$if = array();
-					foreach($vacation['addresses'] as $addr) {
+			}
+					foreach($vacation['addresses'] as $addr)
+					{
 						$if[] = 'address :contains ["To","TO","Cc","CC"] "'.trim($addr).'"';
 					}
 					$newscriptbody .= 'if anyof ('.implode(', ',$if).") {\n";
-					foreach(preg_split('/, ?/',$vacation['forwards']) as $addr) {
+					foreach(preg_split('/, ?/',$vacation['forwards']) as $addr)
+					{
 						$newscriptbody .= "\tredirect \"".trim($addr)."\";\n";
 					}
 					$newscriptbody .= "\tkeep;\n}\n";
@@ -468,8 +639,12 @@ 
 				}
 				$newscriptbody .= "vacation :days " . $vacation['days'] . " :addresses [";
 				$first = 1;
-				foreach ($vacation['addresses'] as $vaddress) {
-						if (!$first) $newscriptbody .= ", ";
+				foreach ($vacation['addresses'] as $vaddress)
+				{
+						if (!$first)
+						{
+							$newscriptbody .= ", ";
+						}
 						$newscriptbody .= "\"" . trim($vaddress) . "\"";
 						$first = 0;
 				}
@@ -477,7 +652,10 @@ 
 				if ($vacation['start_date'] || $vacation['end_date'])
 				{
 					$format_date = 'd M Y'; // see to it, that there is always a format, because if it is missing - no date will be output
-					if (!empty($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'])) $format_date = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'];
+					if (!empty($GLOBALS['egw_info']['user']['preferences']['common']['dateformat']))
+					{
+						$format_date = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'];
+					}
 					$message = str_replace(array('$$start$$','$$end$$'),array(
 							date($format_date,$vacation['start_date']),
 							date($format_date,$vacation['end_date']),
@@ -490,7 +668,8 @@ 
 			$this->vacation = $vacation;
 		}
 
-		if ($this->emailNotification && $this->emailNotification['status'] == 'on') {
+		if ($this->emailNotification && $this->emailNotification['status'] == 'on')
+		{
 			// format notification email header components
 			$notification_email = $this->emailNotification['externalEmail'];
 
@@ -503,7 +682,8 @@ 
 				{
 					$notification_body .= ", ";
 					$notification_body .= 'From: ${from}';
-					if ($this->emailNotification['displaySubject']) {
+					if ($this->emailNotification['displaySubject'])
+					{
 						$notification_body .= ', Subject: ${subject}';
 					}
 					//$notification_body .= 'Size: $size$'."\n";
@@ -522,7 +702,8 @@ 
 				$notification_body = lang("You have received a new message on the")." {$egw_site_title}"."\n";
 				$notification_body .= "\n";
 				$notification_body .= 'From: $from$'."\n";
-				if ($this->emailNotification['displaySubject']) {
+				if ($this->emailNotification['displaySubject'])
+				{
 					$notification_body .= 'Subject: $subject$'."\n";
 				}
 				//$notification_body .= 'Size: $size$'."\n";
@@ -540,23 +721,43 @@ 
 		$newscripthead .= '#Generated by ' . $username . ' using Mail ' . $version . ' ' . date($default->script_date_format);
 		$newscripthead .= "\n";
 
-		if ($activerules) {
+		if ($activerules)
+		{
 			$newscripthead .= "require [\"fileinto\"";
-			if ($regexsupported && $regexused) $newscripthead .= ",\"regex\"";
-			if ($rejectused) $newscripthead .= ",\"reject\"";
-			if ($this->vacation && $vacation_active) {
+			if ($regexsupported && $regexused)
+			{
+				$newscripthead .= ",\"regex\"";
+			}
+			if ($rejectused)
+			{
+				$newscripthead .= ",\"reject\"";
+			}
+			if ($this->vacation && $vacation_active)
+			{
 				$newscripthead .= ",\"vacation\"";
 			}
-			if ($supportsbody) $newscripthead .= ",\"body\"";
-			if ($this->emailNotification && $this->emailNotification['status'] == 'on') $newscripthead .= ',"'.($enotify?'e':'').'notify"'.($variables?',"variables"':''); // Added email notifications
+			if ($supportsbody)
+			{
+				$newscripthead .= ",\"body\"";
+			}
+			if ($this->emailNotification && $this->emailNotification['status'] == 'on')
+			{
+				$newscripthead .= ',"'.($enotify?'e':'').'notify"'.($variables?',"variables"':'');
+			}
+			// Added email notifications
 			$newscripthead .= "];\n\n";
-		} else {
+		}
+		else
+		{
 			// no active rules, but might still have an active vacation rule
 			$closeRequired = false;
 			if ($this->vacation && $vacation_active)
 			{
 				$newscripthead .= "require [\"vacation\"";
-				if ($regexsupported && $regexused) $newscripthead .= ",\"regex\"";
+				if ($regexsupported && $regexused)
+				{
+					$newscripthead .= ",\"regex\"";
+				}
 				$closeRequired=true;
 			}
 			if ($this->emailNotification && $this->emailNotification['status'] == 'on')
@@ -570,7 +771,10 @@ 
 					$newscripthead .= "require [\"".($enotify?'e':'')."notify\"".($variables?',"variables"':'')."];\n\n"; // Added email notifications
 				}
 			}
-			if ($closeRequired) $newscripthead .= "];\n\n";
+			if ($closeRequired)
+			{
+				$newscripthead .= "];\n\n";
+			}
 		}
 
 		// generate the encoded script foot
@@ -578,9 +782,11 @@ 
 		$newscriptfoot = "";
 		$pcount = 1;
 		$newscriptfoot .= "##PSEUDO script start\n";
-		foreach ($this->rules as $rule) {
+		foreach ($this->rules as $rule)
+		{
 			// only add rule to foot if status != deleted. this is how we delete a rule.
-			if ($rule['status'] != 'DELETED') {
+			if ($rule['status'] != 'DELETED')
+			{
 				$rule['action_arg'] = addslashes($rule['action_arg']);
 				// we need to handle \r\n here.
 				$rule['action_arg'] = preg_replace("/\r?\n/","\\n",$rule['action_arg']);
@@ -590,7 +796,10 @@ 
 				$newscriptfoot .= "#rule&&" . $rule['priority'] . "&&" . $rule['status'] . "&&" .
 				addslashes($rule['from']) . "&&" . addslashes($rule['to']) . "&&" . addslashes($rule['subject']) . "&&" . $rule['action'] . "&&" .
 				$rule['action_arg'] . "&&" . $rule['flg'] . "&&" . addslashes($rule['field']) . "&&" . addslashes($rule['field_val']) . "&&" . $rule['size'];
-				if ($supportsbody && (!empty($rule['field_bodytransform']) || ($rule['ctype']!= '0' && !empty($rule['ctype'])))) $newscriptfoot .= "&&" . $rule['bodytransform'] . "&&" . $rule['field_bodytransform']. "&&" . $rule['ctype'] . "&&" . $rule['field_ctype_val'];
+				if ($supportsbody && (!empty($rule['field_bodytransform']) || ($rule['ctype']!= '0' && !empty($rule['ctype']))))
+				{
+					$newscriptfoot .= "&&" . $rule['bodytransform'] . "&&" . $rule['field_bodytransform']. "&&" . $rule['ctype'] . "&&" . $rule['field_ctype_val'];
+				}
 				$newscriptfoot .= "\n";
 				$pcount = $pcount+2;
 				//error_log(__CLASS__."::".__METHOD__.__LINE__.array2string($newscriptfoot));
@@ -602,8 +811,12 @@ 
 			$vacation = $this->vacation;
 			$newscriptfoot .= "#vacation&&" . $vacation['days'] . "&&";
 			$first = 1;
-			foreach ($vacation['addresses'] as $address) {
-				if (!$first) $newscriptfoot .= ", ";
+			foreach ($vacation['addresses'] as $address)
+			{
+				if (!$first)
+				{
+					$newscriptfoot .= ", ";
+				}
 				$newscriptfoot .= "\"" . trim($address) . "\"";
 				$first = 0;
 			}
@@ -611,10 +824,14 @@ 
 			$vacation['text'] = preg_replace("/\r?\n/","\\n",$vacation['text']);
 			$newscriptfoot .= "&&" . $vacation['text'] . "&&" .
 				($vacation['status']=='by_date' ? $vacation['start_date'].'-'.$vacation['end_date'] : $vacation['status']);
-			if ($vacation['forwards']) $newscriptfoot .= '&&' . $vacation['forwards'];
+			if ($vacation['forwards'])
+			{
+				$newscriptfoot .= '&&' . $vacation['forwards'];
+			}
 			$newscriptfoot .= "\n";
 		}
-		if ($this->emailNotification) {
+		if ($this->emailNotification)
+		{
 			$emailNotification = $this->emailNotification;
 			$newscriptfoot .= "#notify&&" . $emailNotification['status'] . "&&" . $emailNotification['externalEmail'] . "&&" . $emailNotification['displaySubject'] . "\n";
 		}
@@ -627,9 +844,13 @@ 
 		//print "<pre>$newscript</pre>"; exit;
 		//print "<hr><pre>".htmlentities($newscript)."</pre><hr>";
 		$ret = $connection->installScript($this->name, $newscript, true);
-		if (!$ret || self::isError($ret)) {
+		if (!$ret || self::isError($ret))
+		{
 			$this->errstr = 'updateScript: putscript failed: ' . (self::isError($ret)?$ret->message:$connection->errstr);
-			if ($regexused&&!$regexsupported) $this->errstr .= " REGEX is not an supported CAPABILITY";
+			if ($regexused&&!$regexsupported)
+			{
+				$this->errstr .= " REGEX is not an supported CAPABILITY";
+			}
 			error_log(__METHOD__.__LINE__.' # Error: ->'.$this->errstr);
 			error_log(__METHOD__.__LINE__.' # ScriptName:'.$this->name.' Script:'.$newscript);
 			error_log(__METHOD__.__LINE__.' # Instance='.$GLOBALS['egw_info']['user']['domain'].', User='.$GLOBALS['egw_info']['user']['account_lid']);
@@ -655,7 +876,10 @@ 
 	protected static function isError($data, $code = null)
 	{
 		static $pear=null;
-		if (!isset($pear)) $pear = new PEAR();
+		if (!isset($pear))
+		{
+			$pear = new PEAR();
+		}
 
 		return $pear->isError($data, $code);
 	}

emailadmin/inc/class.emailadmin_sieve.inc.php

Doc Comments +3 added lines, -2 removed lines

@@ -116,7 +116,7 @@ 
 	 *
 	 * @param emailadmin_imap $_icServer
 	 * @param string $euser effictive user, if given the Cyrus admin account is used to login on behalf of $euser
-	 * @return mixed 'die' = sieve not enabled, false=connect or login failure, true=success
+	 * @return string|boolean 'die' = sieve not enabled, false=connect or login failure, true=success
 	 */
 	function _connect(emailadmin_imap $_icServer, $euser='')
 	{
@@ -314,6 +314,7 @@ 
 	*
 	* @param string if !=null,check this one first if reported as serverMethod.
 	*                  if so, return as bestauthmethod
+	* @param string $userMethod
 	* @return mixed    Returns a string containing the name of the best
 	*                  supported authentication method or a PEAR_Error object
 	*                  if a failure condition is encountered.
@@ -606,7 +607,7 @@ 
 	 *
 	 * @param array $_emailNotification
 	 * @param string $_scriptName
-	 * @return emailadmin_script
+	 * @return boolean
 	 */
 	function setEmailNotification(array $_emailNotification, $_scriptName=null)
 	{

Indentation +252 added lines, -252 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;
 
 	/**
@@ -245,79 +245,79 @@ 
 		return true;
 	}
 
-    /**
-     * Handles connecting to the server and checks the response validity.
-     * overwritten function from Net_Sieve to respect timeout
-     *
-     * @param string  $host    Hostname of server.
-     * @param string  $port    Port of server.
-     * @param array   $options List of options to pass to
-     *                         stream_context_create().
-     * @param boolean $useTLS  Use TLS if available.
-     *
-     * @return boolean  True on success, PEAR_Error otherwise.
-     */
-    function connect($host, $port, $options = null, $useTLS = true)
-    {
-        if ($this->debug)
+	/**
+	 * Handles connecting to the server and checks the response validity.
+	 * overwritten function from Net_Sieve to respect timeout
+	 *
+	 * @param string  $host    Hostname of server.
+	 * @param string  $port    Port of server.
+	 * @param array   $options List of options to pass to
+	 *                         stream_context_create().
+	 * @param boolean $useTLS  Use TLS if available.
+	 *
+	 * @return boolean  True on success, PEAR_Error otherwise.
+	 */
+	function connect($host, $port, $options = null, $useTLS = true)
+	{
+		if ($this->debug)
 		{
 			error_log(__METHOD__ . __LINE__ . "$host, $port, " . array2string($options) . ", $useTLS");
 		}
 		$this->_data['host'] = $host;
-        $this->_data['port'] = $port;
-        $this->_useTLS       = $useTLS;
-        if (is_array($options)) {
-            $this->_options = array_merge((array)$this->_options, $options);
-        }
+		$this->_data['port'] = $port;
+		$this->_useTLS       = $useTLS;
+		if (is_array($options)) {
+			$this->_options = array_merge((array)$this->_options, $options);
+		}
 
-        if (NET_SIEVE_STATE_DISCONNECTED != $this->_state) {
-            return PEAR::raiseError('Not currently in DISCONNECTED state', 1);
-        }
+		if (NET_SIEVE_STATE_DISCONNECTED != $this->_state) {
+			return PEAR::raiseError('Not currently in DISCONNECTED state', 1);
+		}
 
 		if (self::isError($res = $this->_sock->connect($host, $port, false, ($this->_timeout?$this->_timeout:10), $options))) {
-            return $res;
-        }
-
-        if ($this->_bypassAuth) {
-            $this->_state = NET_SIEVE_STATE_TRANSACTION;
-        } else {
-            $this->_state = NET_SIEVE_STATE_AUTHORISATION;
-            if (self::isError($res = $this->_doCmd())) {
-                return $res;
-            }
-        }
-
-        // Explicitly ask for the capabilities in case the connection is
-        // picked up from an existing connection.
-        if (self::isError($res = $this->_cmdCapability())) {
-            return PEAR::raiseError(
-                'Failed to connect, server said: ' . $res->getMessage(), 2
-            );
-        }
-
-        // Check if we can enable TLS via STARTTLS.
-        if ($useTLS && !empty($this->_capability['starttls'])
-            && function_exists('stream_socket_enable_crypto')
-        ) {
-            if (self::isError($res = $this->_startTLS())) {
-                return $res;
-            }
-        }
-
-        return true;
-    }
+			return $res;
+		}
+
+		if ($this->_bypassAuth) {
+			$this->_state = NET_SIEVE_STATE_TRANSACTION;
+		} else {
+			$this->_state = NET_SIEVE_STATE_AUTHORISATION;
+			if (self::isError($res = $this->_doCmd())) {
+				return $res;
+			}
+		}
+
+		// Explicitly ask for the capabilities in case the connection is
+		// picked up from an existing connection.
+		if (self::isError($res = $this->_cmdCapability())) {
+			return PEAR::raiseError(
+				'Failed to connect, server said: ' . $res->getMessage(), 2
+			);
+		}
+
+		// Check if we can enable TLS via STARTTLS.
+		if ($useTLS && !empty($this->_capability['starttls'])
+			&& function_exists('stream_socket_enable_crypto')
+		) {
+			if (self::isError($res = $this->_startTLS())) {
+				return $res;
+			}
+		}
+
+		return true;
+	}
 
 	/**
-	* Own _getBestAuthMethod as Net/Sieve.php assumes SASLMethods to be working
-	* Returns the name of the best authentication method that the server
-	* has advertised.
-	*
-	* @param string if !=null,check this one first if reported as serverMethod.
-	*                  if so, return as bestauthmethod
-	* @return mixed    Returns a string containing the name of the best
-	*                  supported authentication method or a PEAR_Error object
-	*                  if a failure condition is encountered.
-	*/
+	 * Own _getBestAuthMethod as Net/Sieve.php assumes SASLMethods to be working
+	 * Returns the name of the best authentication method that the server
+	 * has advertised.
+	 *
+	 * @param string if !=null,check this one first if reported as serverMethod.
+	 *                  if so, return as bestauthmethod
+	 * @return mixed    Returns a string containing the name of the best
+	 *                  supported authentication method or a PEAR_Error object
+	 *                  if a failure condition is encountered.
+	 */
 	function _getBestAuthMethod($userMethod = null)
 	{
 		//error_log(__METHOD__.__LINE__.'->'.$userMethod.'<->'.array2string($this->_capability['sasl']));
@@ -352,196 +352,196 @@ 
 		}
 	}
 
-    /**
-     * Handles the authentication using any known method
-     * overwritten function from Net_Sieve to support fallback
-     *
-     * @param string $uid The userid to authenticate as.
-     * @param string $pwd The password to authenticate with.
-     * @param string $userMethod The method to use ( if $userMethod == '' then the class chooses the best method (the stronger is the best ) )
-     * @param string $euser The effective uid to authenticate as.
-     *
-     * @return mixed  string or PEAR_Error
-     *
-     * @access private
-     * @since  1.0
-     */
-    function _cmdAuthenticate($uid , $pwd , $userMethod = null , $euser = '' )
-    {
-        if ( self::isError( $method = $this->_getBestAuthMethod($userMethod) ) ) {
-            return $method;
-        }
-        //error_log(__METHOD__.__LINE__.' using AuthMethod: '.$method);
-        switch ($method) {
-            case 'DIGEST-MD5':
-                $result = $this->_authDigestMD5( $uid , $pwd , $euser );
-                if (!self::isError($result))
+	/**
+	 * Handles the authentication using any known method
+	 * overwritten function from Net_Sieve to support fallback
+	 *
+	 * @param string $uid The userid to authenticate as.
+	 * @param string $pwd The password to authenticate with.
+	 * @param string $userMethod The method to use ( if $userMethod == '' then the class chooses the best method (the stronger is the best ) )
+	 * @param string $euser The effective uid to authenticate as.
+	 *
+	 * @return mixed  string or PEAR_Error
+	 *
+	 * @access private
+	 * @since  1.0
+	 */
+	function _cmdAuthenticate($uid , $pwd , $userMethod = null , $euser = '' )
+	{
+		if ( self::isError( $method = $this->_getBestAuthMethod($userMethod) ) ) {
+			return $method;
+		}
+		//error_log(__METHOD__.__LINE__.' using AuthMethod: '.$method);
+		switch ($method) {
+			case 'DIGEST-MD5':
+				$result = $this->_authDigestMD5( $uid , $pwd , $euser );
+				if (!self::isError($result))
 				{
 					break;
 				}
 				$res = $this->_doCmd();
-                unset($this->_error);
-                $this->supportedAuthMethods = array_diff($this->supportedAuthMethods,array($method,'CRAM-MD5'));
-                return $this->_cmdAuthenticate($uid , $pwd, null, $euser);
-            case 'CRAM-MD5':
-                $result = $this->_authCRAMMD5( $uid , $pwd, $euser);
-                if (!self::isError($result))
+				unset($this->_error);
+				$this->supportedAuthMethods = array_diff($this->supportedAuthMethods,array($method,'CRAM-MD5'));
+				return $this->_cmdAuthenticate($uid , $pwd, null, $euser);
+			case 'CRAM-MD5':
+				$result = $this->_authCRAMMD5( $uid , $pwd, $euser);
+				if (!self::isError($result))
 				{
 					break;
 				}
 				$res = $this->_doCmd();
-                unset($this->_error);
-                $this->supportedAuthMethods = array_diff($this->supportedAuthMethods,array($method,'DIGEST-MD5'));
-                return $this->_cmdAuthenticate($uid , $pwd, null, $euser);
-            case 'LOGIN':
-                $result = $this->_authLOGIN( $uid , $pwd , $euser );
-                if (!self::isError($result))
+				unset($this->_error);
+				$this->supportedAuthMethods = array_diff($this->supportedAuthMethods,array($method,'DIGEST-MD5'));
+				return $this->_cmdAuthenticate($uid , $pwd, null, $euser);
+			case 'LOGIN':
+				$result = $this->_authLOGIN( $uid , $pwd , $euser );
+				if (!self::isError($result))
 				{
 					break;
 				}
 				$res = $this->_doCmd();
-                unset($this->_error);
-                $this->supportedAuthMethods = array_diff($this->supportedAuthMethods,array($method));
-                return $this->_cmdAuthenticate($uid , $pwd, null, $euser);
-            case 'PLAIN':
-                $result = $this->_authPLAIN( $uid , $pwd , $euser );
-                break;
-            default :
-                $result = new PEAR_Error( "$method is not a supported authentication method" );
-                break;
-        }
-        if (self::isError($result))
+				unset($this->_error);
+				$this->supportedAuthMethods = array_diff($this->supportedAuthMethods,array($method));
+				return $this->_cmdAuthenticate($uid , $pwd, null, $euser);
+			case 'PLAIN':
+				$result = $this->_authPLAIN( $uid , $pwd , $euser );
+				break;
+			default :
+				$result = new PEAR_Error( "$method is not a supported authentication method" );
+				break;
+		}
+		if (self::isError($result))
 		{
 			return $result;
 		}
 		if (self::isError($res = $this->_doCmd())) {
-            return $res;
-        }
-
-        // Query the server capabilities again now that we are authenticated.
-        if (self::isError($res = $this->_cmdCapability())) {
-            return PEAR::raiseError(
-                'Failed to connect, server said: ' . $res->getMessage(), 2
-            );
-        }
-
-        return $result;
-    }
-
-    /**
-     * Send a command and retrieves a response from the server.
-     *
-     * @param string $cmd   The command to send.
-     * @param boolean $auth Whether this is an authentication command.
-     *
-     * @return string|PEAR_Error  Reponse string if an OK response, PEAR_Error
-     *                            if a NO response.
-     */
-    function _doCmd($cmd = '', $auth = false)
-    {
-        $referralCount = 0;
-        while ($referralCount < $this->_maxReferralCount) {
-            if (strlen($cmd)) {
-                $error = $this->_sendCmd($cmd);
-                if (is_a($error, 'PEAR_Error')) {
-                    return $error;
-                }
-            }
-
-            $response = '';
-            while (true) {
-                $line = $this->_recvLn();
-
-                if (is_a($line, 'PEAR_Error')) {
-                    return $line;
-                }
-
-                if (preg_match('/^(OK|NO)/i', $line, $tag)) {
-                    // Check for string literal message.
-                    // ServerResponse may send {nm} (nm representing a number)
-                    // dbmail (in some versions) sends: {nm+} thus breaking RFC5804 rules (Section 4 Formal Syntax)
-                    // {nm+} may only be used in communicating from client TO server; (not Server to Client)
-                    // we work around this bug (allowing +) using a patch introduced with roundcube 2 years ago.
-                    //if (preg_match('/{([0-9]+)}$/', $line, $matches)) { //original
-                    if (preg_match('/{([0-9]+)\+?}$/', $line, $matches)) { //patched to cope with dbmail
-                        $line = substr($line, 0, -(strlen($matches[1]) + 2))
-                            . str_replace(
-                                "\r\n", ' ', $this->_recvBytes($matches[1] + 2)
-                            );
-                    }
-
-                    if ('OK' == $this->_toUpper($tag[1])) {
-                        $response .= $line;
-                        return rtrim($response);
-                    }
-
-                    return $this->_pear->raiseError(trim($response . substr($line, 2)), 3);
-                }
-
-                if (preg_match('/^BYE/i', $line)) {
-                    $error = $this->disconnect(false);
-                    if (is_a($error, 'PEAR_Error')) {
-                        return $this->_pear->raiseError(
-                            'Cannot handle BYE, the error was: '
-                            . $error->getMessage(),
-                            4
-                        );
-                    }
-                    // Check for referral, then follow it.  Otherwise, carp an
-                    // error.
-                    if (preg_match('/^bye \(referral "(sieve:\/\/)?([^"]+)/i', $line, $matches)) {
-                        // Replace the old host with the referral host
-                        // preserving any protocol prefix.
-                        $this->_data['host'] = preg_replace(
-                            '/\w+(?!(\w|\:\/\/)).*/', $matches[2],
-                            $this->_data['host']
-                        );
-                        $error = $this->_handleConnectAndLogin();
-                        if (is_a($error, 'PEAR_Error')) {
-                            return $this->_pear->raiseError(
-                                'Cannot follow referral to '
-                                . $this->_data['host'] . ', the error was: '
-                                . $error->getMessage(),
-                                5
-                            );
-                        }
-                        break;
-                    }
-                    return $this->_pear->raiseError(trim($response . $line), 6);
-                }
-
-                // ServerResponse may send {nm} (nm representing a number)
-                // dbmail (in some versions) sends: {nm+} thus breaking RFC5804 rules (Section 4 Formal Syntax)
-                // {nm+} may only be used in communicating from client TO server; (not Server to Client)
-                // we work around this bug (allowing +) using a patch introduced with roundcube 2 years ago.
-                // although roundcube suggested only the change in line
-                //if (preg_match('/^{([0-9]+)}/', $line, $matches)) { //original
-                if (preg_match('/^{([0-9]+)\+?}/', $line, $matches)) { //patched to cope with dbmail
-                    // Matches literal string responses.
-                    $line = $this->_recvBytes($matches[1] + 2);
-                    if (!$auth) {
-                        // Receive the pending OK only if we aren't
-                        // authenticating since string responses during
-                        // authentication don't need an OK.
-                        $this->_recvLn();
-                    }
-                    return $line;
-                }
-
-                if ($auth) {
-                    // String responses during authentication don't need an
-                    // OK.
-                    $response .= $line;
-                    return rtrim($response);
-                }
-
-                $response .= $line . "\r\n";
-                $referralCount++;
-            }
-        }
-
-        return $this->_pear->raiseError('Max referral count (' . $referralCount . ') reached. Cyrus murder loop error?', 7);
-    }
+			return $res;
+		}
+
+		// Query the server capabilities again now that we are authenticated.
+		if (self::isError($res = $this->_cmdCapability())) {
+			return PEAR::raiseError(
+				'Failed to connect, server said: ' . $res->getMessage(), 2
+			);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Send a command and retrieves a response from the server.
+	 *
+	 * @param string $cmd   The command to send.
+	 * @param boolean $auth Whether this is an authentication command.
+	 *
+	 * @return string|PEAR_Error  Reponse string if an OK response, PEAR_Error
+	 *                            if a NO response.
+	 */
+	function _doCmd($cmd = '', $auth = false)
+	{
+		$referralCount = 0;
+		while ($referralCount < $this->_maxReferralCount) {
+			if (strlen($cmd)) {
+				$error = $this->_sendCmd($cmd);
+				if (is_a($error, 'PEAR_Error')) {
+					return $error;
+				}
+			}
+
+			$response = '';
+			while (true) {
+				$line = $this->_recvLn();
+
+				if (is_a($line, 'PEAR_Error')) {
+					return $line;
+				}
+
+				if (preg_match('/^(OK|NO)/i', $line, $tag)) {
+					// Check for string literal message.
+					// ServerResponse may send {nm} (nm representing a number)
+					// dbmail (in some versions) sends: {nm+} thus breaking RFC5804 rules (Section 4 Formal Syntax)
+					// {nm+} may only be used in communicating from client TO server; (not Server to Client)
+					// we work around this bug (allowing +) using a patch introduced with roundcube 2 years ago.
+					//if (preg_match('/{([0-9]+)}$/', $line, $matches)) { //original
+					if (preg_match('/{([0-9]+)\+?}$/', $line, $matches)) { //patched to cope with dbmail
+						$line = substr($line, 0, -(strlen($matches[1]) + 2))
+							. str_replace(
+								"\r\n", ' ', $this->_recvBytes($matches[1] + 2)
+							);
+					}
+
+					if ('OK' == $this->_toUpper($tag[1])) {
+						$response .= $line;
+						return rtrim($response);
+					}
+
+					return $this->_pear->raiseError(trim($response . substr($line, 2)), 3);
+				}
+
+				if (preg_match('/^BYE/i', $line)) {
+					$error = $this->disconnect(false);
+					if (is_a($error, 'PEAR_Error')) {
+						return $this->_pear->raiseError(
+							'Cannot handle BYE, the error was: '
+							. $error->getMessage(),
+							4
+						);
+					}
+					// Check for referral, then follow it.  Otherwise, carp an
+					// error.
+					if (preg_match('/^bye \(referral "(sieve:\/\/)?([^"]+)/i', $line, $matches)) {
+						// Replace the old host with the referral host
+						// preserving any protocol prefix.
+						$this->_data['host'] = preg_replace(
+							'/\w+(?!(\w|\:\/\/)).*/', $matches[2],
+							$this->_data['host']
+						);
+						$error = $this->_handleConnectAndLogin();
+						if (is_a($error, 'PEAR_Error')) {
+							return $this->_pear->raiseError(
+								'Cannot follow referral to '
+								. $this->_data['host'] . ', the error was: '
+								. $error->getMessage(),
+								5
+							);
+						}
+						break;
+					}
+					return $this->_pear->raiseError(trim($response . $line), 6);
+				}
+
+				// ServerResponse may send {nm} (nm representing a number)
+				// dbmail (in some versions) sends: {nm+} thus breaking RFC5804 rules (Section 4 Formal Syntax)
+				// {nm+} may only be used in communicating from client TO server; (not Server to Client)
+				// we work around this bug (allowing +) using a patch introduced with roundcube 2 years ago.
+				// although roundcube suggested only the change in line
+				//if (preg_match('/^{([0-9]+)}/', $line, $matches)) { //original
+				if (preg_match('/^{([0-9]+)\+?}/', $line, $matches)) { //patched to cope with dbmail
+					// Matches literal string responses.
+					$line = $this->_recvBytes($matches[1] + 2);
+					if (!$auth) {
+						// Receive the pending OK only if we aren't
+						// authenticating since string responses during
+						// authentication don't need an OK.
+						$this->_recvLn();
+					}
+					return $line;
+				}
+
+				if ($auth) {
+					// String responses during authentication don't need an
+					// OK.
+					$response .= $line;
+					return rtrim($response);
+				}
+
+				$response .= $line . "\r\n";
+				$referralCount++;
+			}
+		}
+
+		return $this->_pear->raiseError('Max referral count (' . $referralCount . ') reached. Cyrus murder loop error?', 7);
+	}
 
 	function getRules()
 	{
@@ -611,11 +611,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 +70 added lines, -70 removed lines

@@ -86,7 +86,7 @@ 
 	 * @param string $_euser effictive user, if given the Cyrus admin account is used to login on behalf of $euser
 	 * @param string $_scriptName
 	 */
-	function __construct(emailadmin_imap $_icServer=null, $_euser='', $_scriptName=null)
+	function __construct(emailadmin_imap $_icServer = null, $_euser = '', $_scriptName = null)
 	{
 		parent::Net_Sieve();
 
@@ -95,16 +95,16 @@ 
 		// TODO: since we seem to have major problems authenticating via DIGEST-MD5 and CRAM-MD5 in SIEVE, we skip MD5-METHODS for now
 		if (!is_null($_icServer))
 		{
-			$_icServer->supportedAuthMethods = array('PLAIN' , 'LOGIN');
-			$_icServer->supportedSASLAuthMethods=array();
+			$_icServer->supportedAuthMethods = array('PLAIN', 'LOGIN');
+			$_icServer->supportedSASLAuthMethods = array();
 		}
 		else
 		{
-			$this->supportedAuthMethods = array('PLAIN' , 'LOGIN');
-			$this->supportedSASLAuthMethods=array();
+			$this->supportedAuthMethods = array('PLAIN', 'LOGIN');
+			$this->supportedSASLAuthMethods = array();
 		}
 
-		$this->displayCharset	= translation::charset();
+		$this->displayCharset = translation::charset();
 
 		if (!is_null($_icServer) && $this->_connect($_icServer, $_euser) === 'die') {
 			die('Sieve not activated');
@@ -118,16 +118,16 @@ 
 	 * @param string $euser effictive user, if given the Cyrus admin account is used to login on behalf of $euser
 	 * @return mixed 'die' = sieve not enabled, false=connect or login failure, true=success
 	 */
-	function _connect(emailadmin_imap $_icServer, $euser='')
+	function _connect(emailadmin_imap $_icServer, $euser = '')
 	{
 		static $isConError = null;
 		static $sieveAuthMethods = null;
 		$_icServerID = $_icServer->acc_id;
 		if (is_null($isConError))
 		{
-			$isConError =  egw_cache::getCache(egw_cache::INSTANCE, 'email', 'icServerSIEVE_connectionError' . trim($GLOBALS['egw_info']['user']['account_id']));
+			$isConError = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'icServerSIEVE_connectionError'.trim($GLOBALS['egw_info']['user']['account_id']));
 		}
-		if ( isset($isConError[$_icServerID]) )
+		if (isset($isConError[$_icServerID]))
 		{
 			$this->error = new PEAR_Error($isConError[$_icServerID]);
 			return false;
@@ -135,9 +135,9 @@ 
 
 		if ($this->debug)
 		{
-			error_log(__METHOD__ . array2string($euser));
+			error_log(__METHOD__.array2string($euser));
 		}
-		if($_icServer->acc_sieve_enabled)
+		if ($_icServer->acc_sieve_enabled)
 		{
 			if ($_icServer->acc_sieve_host)
 			{
@@ -152,7 +152,7 @@ 
 
 			$useTLS = false;
 
-			switch($_icServer->acc_sieve_ssl & ~emailadmin_account::SSL_VERIFY)
+			switch ($_icServer->acc_sieve_ssl&~emailadmin_account::SSL_VERIFY)
 			{
 				case emailadmin_account::SSL_SSL:
 					$sieveHost = 'ssl://'.$sieveHost;
@@ -166,8 +166,8 @@ 
 			// disable certificate validation, if not explicitly enabled (not possible in current UI, as not supported by Horde_Imap_Client)
 			$options = array(
 				'ssl' => array(
-					'verify_peer' => (bool)($_icServer->acc_sieve_ssl & emailadmin_account::SSL_VERIFY),
-					'verify_peer_name' => (bool)($_icServer->acc_sieve_ssl & emailadmin_account::SSL_VERIFY),
+					'verify_peer' => (bool)($_icServer->acc_sieve_ssl&emailadmin_account::SSL_VERIFY),
+					'verify_peer_name' => (bool)($_icServer->acc_sieve_ssl&emailadmin_account::SSL_VERIFY),
 				),
 			);
 
@@ -185,7 +185,7 @@ 
 		}
 		else
 		{
-			egw_cache::setCache(egw_cache::INSTANCE,'email','icServerSIEVE_connectionError'.trim($GLOBALS['egw_info']['user']['account_id']),$isConError,$expiration=60*15);
+			egw_cache::setCache(egw_cache::INSTANCE, 'email', 'icServerSIEVE_connectionError'.trim($GLOBALS['egw_info']['user']['account_id']), $isConError, $expiration = 60 * 15);
 			return 'die';
 		}
 		$this->_timeout = 10; // socket::connect sets the/this timeout on connection
@@ -195,14 +195,14 @@ 
 			$this->_timeout = $timeout;
 		}
 
-		if(self::isError($this->error = $this->connect($sieveHost , $sievePort, $options, $useTLS) ) )
+		if (self::isError($this->error = $this->connect($sieveHost, $sievePort, $options, $useTLS)))
 		{
 			if ($this->debug)
 			{
-				error_log(__METHOD__ . ": error in connect($sieveHost,$sievePort, " . array2string($options) . ", $useTLS): " . $this->error->getMessage());
+				error_log(__METHOD__.": error in connect($sieveHost,$sievePort, ".array2string($options).", $useTLS): ".$this->error->getMessage());
 			}
 			$isConError[$_icServerID] = $this->error->getMessage();
-			egw_cache::setCache(egw_cache::INSTANCE,'email','icServerSIEVE_connectionError'.trim($GLOBALS['egw_info']['user']['account_id']),$isConError,$expiration=60*15);
+			egw_cache::setCache(egw_cache::INSTANCE, 'email', 'icServerSIEVE_connectionError'.trim($GLOBALS['egw_info']['user']['account_id']), $isConError, $expiration = 60 * 15);
 			return false;
 		}
 		// we cache the supported AuthMethods during session, to be able to speed up login.
@@ -215,14 +215,14 @@ 
 			$this->supportedAuthMethods = $sieveAuthMethods[$_icServerID];
 		}
 		// pear net_sieve _authLOGIN does not support euser. so use plain, when trying to act on behalf of another user (effective user = euser)
-		if(self::isError($this->error = $this->login($username, $password, ($euser?'PLAIN':'LOGIN'), $euser) ) )
+		if (self::isError($this->error = $this->login($username, $password, ($euser ? 'PLAIN' : 'LOGIN'), $euser)))
 		{
 			if ($this->debug)
 			{
-				error_log(__METHOD__ . ": error in login($username,$password,null,$euser): " . $this->error->getMessage());
+				error_log(__METHOD__.": error in login($username,$password,null,$euser): ".$this->error->getMessage());
 			}
 			$isConError[$_icServerID] = $this->error->getMessage();
-			egw_cache::setCache(egw_cache::INSTANCE,'email','icServerSIEVE_connectionError'.trim($GLOBALS['egw_info']['user']['account_id']),$isConError,$expiration=60*15);
+			egw_cache::setCache(egw_cache::INSTANCE, 'email', 'icServerSIEVE_connectionError'.trim($GLOBALS['egw_info']['user']['account_id']), $isConError, $expiration = 60 * 15);
 			return false;
 		}
 
@@ -232,8 +232,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))
 			{
@@ -261,7 +261,7 @@ 
     {
         if ($this->debug)
 		{
-			error_log(__METHOD__ . __LINE__ . "$host, $port, " . array2string($options) . ", $useTLS");
+			error_log(__METHOD__.__LINE__."$host, $port, ".array2string($options).", $useTLS");
 		}
 		$this->_data['host'] = $host;
         $this->_data['port'] = $port;
@@ -274,7 +274,7 @@ 
             return PEAR::raiseError('Not currently in DISCONNECTED state', 1);
         }
 
-		if (self::isError($res = $this->_sock->connect($host, $port, false, ($this->_timeout?$this->_timeout:10), $options))) {
+		if (self::isError($res = $this->_sock->connect($host, $port, false, ($this->_timeout ? $this->_timeout : 10), $options))) {
             return $res;
         }
 
@@ -291,7 +291,7 @@ 
         // picked up from an existing connection.
         if (self::isError($res = $this->_cmdCapability())) {
             return PEAR::raiseError(
-                'Failed to connect, server said: ' . $res->getMessage(), 2
+                'Failed to connect, server said: '.$res->getMessage(), 2
             );
         }
 
@@ -321,33 +321,33 @@ 
 	function _getBestAuthMethod($userMethod = null)
 	{
 		//error_log(__METHOD__.__LINE__.'->'.$userMethod.'<->'.array2string($this->_capability['sasl']));
-		if( isset($this->_capability['sasl']) ){
-			$serverMethods=$this->_capability['sasl'];
-		}else{
+		if (isset($this->_capability['sasl'])) {
+			$serverMethods = $this->_capability['sasl'];
+		} else {
 			// if the server don't send an sasl capability fallback to login auth
 			//return 'LOGIN';
 			return PEAR::raiseError("This server don't support any Auth methods SASL problem?");
 		}
 		$methods = array();
-		if($userMethod != null ){
+		if ($userMethod != null) {
 			$methods[] = $userMethod;
-			foreach ( $this->supportedAuthMethods as $method ) {
-				$methods[]=$method;
+			foreach ($this->supportedAuthMethods as $method) {
+				$methods[] = $method;
 			}
-		}else{
+		} else {
 			$methods = $this->supportedAuthMethods;
 		}
-		if( ($methods != null) && ($serverMethods != null)){
-			foreach ( $methods as $method ) {
-				if ( in_array( $method , $serverMethods ) ) {
+		if (($methods != null) && ($serverMethods != null)) {
+			foreach ($methods as $method) {
+				if (in_array($method, $serverMethods)) {
 					return $method;
 				}
 			}
-			$serverMethods=implode(',' , $serverMethods );
-			$myMethods=implode(',' ,$this->supportedAuthMethods);
-			return PEAR::raiseError("$method NOT supported authentication method!. This server " .
+			$serverMethods = implode(',', $serverMethods);
+			$myMethods = implode(',', $this->supportedAuthMethods);
+			return PEAR::raiseError("$method NOT supported authentication method!. This server ".
 				"supports these methods= $serverMethods, but I support $myMethods");
-		}else{
+		} else {
 			return PEAR::raiseError("This server don't support any Auth methods");
 		}
 	}
@@ -366,48 +366,48 @@ 
      * @access private
      * @since  1.0
      */
-    function _cmdAuthenticate($uid , $pwd , $userMethod = null , $euser = '' )
+    function _cmdAuthenticate($uid, $pwd, $userMethod = null, $euser = '')
     {
-        if ( self::isError( $method = $this->_getBestAuthMethod($userMethod) ) ) {
+        if (self::isError($method = $this->_getBestAuthMethod($userMethod))) {
             return $method;
         }
         //error_log(__METHOD__.__LINE__.' using AuthMethod: '.$method);
         switch ($method) {
             case 'DIGEST-MD5':
-                $result = $this->_authDigestMD5( $uid , $pwd , $euser );
+                $result = $this->_authDigestMD5($uid, $pwd, $euser);
                 if (!self::isError($result))
 				{
 					break;
 				}
 				$res = $this->_doCmd();
                 unset($this->_error);
-                $this->supportedAuthMethods = array_diff($this->supportedAuthMethods,array($method,'CRAM-MD5'));
-                return $this->_cmdAuthenticate($uid , $pwd, null, $euser);
+                $this->supportedAuthMethods = array_diff($this->supportedAuthMethods, array($method, 'CRAM-MD5'));
+                return $this->_cmdAuthenticate($uid, $pwd, null, $euser);
             case 'CRAM-MD5':
-                $result = $this->_authCRAMMD5( $uid , $pwd, $euser);
+                $result = $this->_authCRAMMD5($uid, $pwd, $euser);
                 if (!self::isError($result))
 				{
 					break;
 				}
 				$res = $this->_doCmd();
                 unset($this->_error);
-                $this->supportedAuthMethods = array_diff($this->supportedAuthMethods,array($method,'DIGEST-MD5'));
-                return $this->_cmdAuthenticate($uid , $pwd, null, $euser);
+                $this->supportedAuthMethods = array_diff($this->supportedAuthMethods, array($method, 'DIGEST-MD5'));
+                return $this->_cmdAuthenticate($uid, $pwd, null, $euser);
             case 'LOGIN':
-                $result = $this->_authLOGIN( $uid , $pwd , $euser );
+                $result = $this->_authLOGIN($uid, $pwd, $euser);
                 if (!self::isError($result))
 				{
 					break;
 				}
 				$res = $this->_doCmd();
                 unset($this->_error);
-                $this->supportedAuthMethods = array_diff($this->supportedAuthMethods,array($method));
-                return $this->_cmdAuthenticate($uid , $pwd, null, $euser);
+                $this->supportedAuthMethods = array_diff($this->supportedAuthMethods, array($method));
+                return $this->_cmdAuthenticate($uid, $pwd, null, $euser);
             case 'PLAIN':
-                $result = $this->_authPLAIN( $uid , $pwd , $euser );
+                $result = $this->_authPLAIN($uid, $pwd, $euser);
                 break;
             default :
-                $result = new PEAR_Error( "$method is not a supported authentication method" );
+                $result = new PEAR_Error("$method is not a supported authentication method");
                 break;
         }
         if (self::isError($result))
@@ -421,7 +421,7 @@ 
         // Query the server capabilities again now that we are authenticated.
         if (self::isError($res = $this->_cmdCapability())) {
             return PEAR::raiseError(
-                'Failed to connect, server said: ' . $res->getMessage(), 2
+                'Failed to connect, server said: '.$res->getMessage(), 2
             );
         }
 
@@ -475,7 +475,7 @@ 
                         return rtrim($response);
                     }
 
-                    return $this->_pear->raiseError(trim($response . substr($line, 2)), 3);
+                    return $this->_pear->raiseError(trim($response.substr($line, 2)), 3);
                 }
 
                 if (preg_match('/^BYE/i', $line)) {
@@ -500,14 +500,14 @@ 
                         if (is_a($error, 'PEAR_Error')) {
                             return $this->_pear->raiseError(
                                 'Cannot follow referral to '
-                                . $this->_data['host'] . ', the error was: '
+                                . $this->_data['host'].', the error was: '
                                 . $error->getMessage(),
                                 5
                             );
                         }
                         break;
                     }
-                    return $this->_pear->raiseError(trim($response . $line), 6);
+                    return $this->_pear->raiseError(trim($response.$line), 6);
                 }
 
                 // ServerResponse may send {nm} (nm representing a number)
@@ -535,12 +535,12 @@ 
                     return rtrim($response);
                 }
 
-                $response .= $line . "\r\n";
+                $response .= $line."\r\n";
                 $referralCount++;
             }
         }
 
-        return $this->_pear->raiseError('Max referral count (' . $referralCount . ') reached. Cyrus murder loop error?', 7);
+        return $this->_pear->raiseError('Max referral count ('.$referralCount.') reached. Cyrus murder loop error?', 7);
     }
 
 	function getRules()
@@ -571,7 +571,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;
@@ -587,11 +587,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;
@@ -608,9 +608,9 @@ 
 	 * @param string $_scriptName
 	 * @return emailadmin_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'] = '';
     	}
@@ -628,7 +628,7 @@ 
 	 * @param string $_scriptName
 	 * @return emailadmin_script
 	 */
-	function retrieveRules($_scriptName=null)
+	function retrieveRules($_scriptName = null)
 	{
 		if (!$_scriptName)
 		{
@@ -640,11 +640,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;
 	}
@@ -664,7 +664,7 @@ 
 	 */
 	protected static function isError($data, $code = null)
 	{
-		static $pear=null;
+		static $pear = null;
 		if (!isset($pear)) $pear = new PEAR();
 
 		return $pear->isError($data, $code);

Braces +107 added lines, -48 removed lines

@@ -90,7 +90,10 @@ 
 	{
 		parent::Net_Sieve();
 
-		if ($_scriptName) $this->scriptName = $_scriptName;
+		if ($_scriptName)
+		{
+			$this->scriptName = $_scriptName;
+		}
 
 		// TODO: since we seem to have major problems authenticating via DIGEST-MD5 and CRAM-MD5 in SIEVE, we skip MD5-METHODS for now
 		if (!is_null($_icServer))
@@ -106,7 +109,8 @@ 
 
 		$this->displayCharset	= translation::charset();
 
-		if (!is_null($_icServer) && $this->_connect($_icServer, $_euser) === 'die') {
+		if (!is_null($_icServer) && $this->_connect($_icServer, $_euser) === 'die')
+		{
 			die('Sieve not activated');
 		}
 	}
@@ -260,36 +264,44 @@ 
     function connect($host, $port, $options = null, $useTLS = true)
     {
         if ($this->debug)
-		{
+        {
 			error_log(__METHOD__ . __LINE__ . "$host, $port, " . array2string($options) . ", $useTLS");
 		}
 		$this->_data['host'] = $host;
         $this->_data['port'] = $port;
         $this->_useTLS       = $useTLS;
-        if (is_array($options)) {
+        if (is_array($options))
+        {
             $this->_options = array_merge((array)$this->_options, $options);
         }
 
-        if (NET_SIEVE_STATE_DISCONNECTED != $this->_state) {
+        if (NET_SIEVE_STATE_DISCONNECTED != $this->_state)
+        {
             return PEAR::raiseError('Not currently in DISCONNECTED state', 1);
         }
 
-		if (self::isError($res = $this->_sock->connect($host, $port, false, ($this->_timeout?$this->_timeout:10), $options))) {
+		if (self::isError($res = $this->_sock->connect($host, $port, false, ($this->_timeout?$this->_timeout:10), $options)))
+		{
             return $res;
         }
 
-        if ($this->_bypassAuth) {
+        if ($this->_bypassAuth)
+        {
             $this->_state = NET_SIEVE_STATE_TRANSACTION;
-        } else {
+        }
+        else
+        {
             $this->_state = NET_SIEVE_STATE_AUTHORISATION;
-            if (self::isError($res = $this->_doCmd())) {
+            if (self::isError($res = $this->_doCmd()))
+            {
                 return $res;
             }
         }
 
         // Explicitly ask for the capabilities in case the connection is
         // picked up from an existing connection.
-        if (self::isError($res = $this->_cmdCapability())) {
+        if (self::isError($res = $this->_cmdCapability()))
+        {
             return PEAR::raiseError(
                 'Failed to connect, server said: ' . $res->getMessage(), 2
             );
@@ -299,7 +311,8 @@ 
         if ($useTLS && !empty($this->_capability['starttls'])
             && function_exists('stream_socket_enable_crypto')
         ) {
-            if (self::isError($res = $this->_startTLS())) {
+            if (self::isError($res = $this->_startTLS()))
+            {
                 return $res;
             }
         }
@@ -321,25 +334,35 @@ 
 	function _getBestAuthMethod($userMethod = null)
 	{
 		//error_log(__METHOD__.__LINE__.'->'.$userMethod.'<->'.array2string($this->_capability['sasl']));
-		if( isset($this->_capability['sasl']) ){
+		if( isset($this->_capability['sasl']) )
+		{
 			$serverMethods=$this->_capability['sasl'];
-		}else{
+		}
+		else
+		{
 			// if the server don't send an sasl capability fallback to login auth
 			//return 'LOGIN';
 			return PEAR::raiseError("This server don't support any Auth methods SASL problem?");
 		}
 		$methods = array();
-		if($userMethod != null ){
+		if($userMethod != null )
+		{
 			$methods[] = $userMethod;
-			foreach ( $this->supportedAuthMethods as $method ) {
+			foreach ( $this->supportedAuthMethods as $method )
+			{
 				$methods[]=$method;
 			}
-		}else{
+		}
+		else
+		{
 			$methods = $this->supportedAuthMethods;
 		}
-		if( ($methods != null) && ($serverMethods != null)){
-			foreach ( $methods as $method ) {
-				if ( in_array( $method , $serverMethods ) ) {
+		if( ($methods != null) && ($serverMethods != null))
+		{
+			foreach ( $methods as $method )
+			{
+				if ( in_array( $method , $serverMethods ) )
+				{
 					return $method;
 				}
 			}
@@ -347,7 +370,9 @@ 
 			$myMethods=implode(',' ,$this->supportedAuthMethods);
 			return PEAR::raiseError("$method NOT supported authentication method!. This server " .
 				"supports these methods= $serverMethods, but I support $myMethods");
-		}else{
+		}
+		else
+		{
 			return PEAR::raiseError("This server don't support any Auth methods");
 		}
 	}
@@ -368,15 +393,17 @@ 
      */
     function _cmdAuthenticate($uid , $pwd , $userMethod = null , $euser = '' )
     {
-        if ( self::isError( $method = $this->_getBestAuthMethod($userMethod) ) ) {
+        if ( self::isError( $method = $this->_getBestAuthMethod($userMethod) ) )
+        {
             return $method;
         }
         //error_log(__METHOD__.__LINE__.' using AuthMethod: '.$method);
-        switch ($method) {
+        switch ($method)
+        {
             case 'DIGEST-MD5':
                 $result = $this->_authDigestMD5( $uid , $pwd , $euser );
                 if (!self::isError($result))
-				{
+                {
 					break;
 				}
 				$res = $this->_doCmd();
@@ -386,7 +413,7 @@ 
             case 'CRAM-MD5':
                 $result = $this->_authCRAMMD5( $uid , $pwd, $euser);
                 if (!self::isError($result))
-				{
+                {
 					break;
 				}
 				$res = $this->_doCmd();
@@ -396,7 +423,7 @@ 
             case 'LOGIN':
                 $result = $this->_authLOGIN( $uid , $pwd , $euser );
                 if (!self::isError($result))
-				{
+                {
 					break;
 				}
 				$res = $this->_doCmd();
@@ -411,15 +438,17 @@ 
                 break;
         }
         if (self::isError($result))
-		{
+        {
 			return $result;
 		}
-		if (self::isError($res = $this->_doCmd())) {
+		if (self::isError($res = $this->_doCmd()))
+		{
             return $res;
         }
 
         // Query the server capabilities again now that we are authenticated.
-        if (self::isError($res = $this->_cmdCapability())) {
+        if (self::isError($res = $this->_cmdCapability()))
+        {
             return PEAR::raiseError(
                 'Failed to connect, server said: ' . $res->getMessage(), 2
             );
@@ -440,37 +469,46 @@ 
     function _doCmd($cmd = '', $auth = false)
     {
         $referralCount = 0;
-        while ($referralCount < $this->_maxReferralCount) {
-            if (strlen($cmd)) {
+        while ($referralCount < $this->_maxReferralCount)
+        {
+            if (strlen($cmd))
+            {
                 $error = $this->_sendCmd($cmd);
-                if (is_a($error, 'PEAR_Error')) {
+                if (is_a($error, 'PEAR_Error'))
+                {
                     return $error;
                 }
             }
 
             $response = '';
-            while (true) {
+            while (true)
+            {
                 $line = $this->_recvLn();
 
-                if (is_a($line, 'PEAR_Error')) {
+                if (is_a($line, 'PEAR_Error'))
+                {
                     return $line;
                 }
 
-                if (preg_match('/^(OK|NO)/i', $line, $tag)) {
+                if (preg_match('/^(OK|NO)/i', $line, $tag))
+                {
                     // Check for string literal message.
                     // ServerResponse may send {nm} (nm representing a number)
                     // dbmail (in some versions) sends: {nm+} thus breaking RFC5804 rules (Section 4 Formal Syntax)
                     // {nm+} may only be used in communicating from client TO server; (not Server to Client)
                     // we work around this bug (allowing +) using a patch introduced with roundcube 2 years ago.
                     //if (preg_match('/{([0-9]+)}$/', $line, $matches)) { //original
-                    if (preg_match('/{([0-9]+)\+?}$/', $line, $matches)) { //patched to cope with dbmail
+                    if (preg_match('/{([0-9]+)\+?}$/', $line, $matches))
+                    {
+//patched to cope with dbmail
                         $line = substr($line, 0, -(strlen($matches[1]) + 2))
                             . str_replace(
                                 "\r\n", ' ', $this->_recvBytes($matches[1] + 2)
                             );
                     }
 
-                    if ('OK' == $this->_toUpper($tag[1])) {
+                    if ('OK' == $this->_toUpper($tag[1]))
+                    {
                         $response .= $line;
                         return rtrim($response);
                     }
@@ -478,9 +516,11 @@ 
                     return $this->_pear->raiseError(trim($response . substr($line, 2)), 3);
                 }
 
-                if (preg_match('/^BYE/i', $line)) {
+                if (preg_match('/^BYE/i', $line))
+                {
                     $error = $this->disconnect(false);
-                    if (is_a($error, 'PEAR_Error')) {
+                    if (is_a($error, 'PEAR_Error'))
+                    {
                         return $this->_pear->raiseError(
                             'Cannot handle BYE, the error was: '
                             . $error->getMessage(),
@@ -489,7 +529,8 @@ 
                     }
                     // Check for referral, then follow it.  Otherwise, carp an
                     // error.
-                    if (preg_match('/^bye \(referral "(sieve:\/\/)?([^"]+)/i', $line, $matches)) {
+                    if (preg_match('/^bye \(referral "(sieve:\/\/)?([^"]+)/i', $line, $matches))
+                    {
                         // Replace the old host with the referral host
                         // preserving any protocol prefix.
                         $this->_data['host'] = preg_replace(
@@ -497,7 +538,8 @@ 
                             $this->_data['host']
                         );
                         $error = $this->_handleConnectAndLogin();
-                        if (is_a($error, 'PEAR_Error')) {
+                        if (is_a($error, 'PEAR_Error'))
+                        {
                             return $this->_pear->raiseError(
                                 'Cannot follow referral to '
                                 . $this->_data['host'] . ', the error was: '
@@ -516,10 +558,13 @@ 
                 // we work around this bug (allowing +) using a patch introduced with roundcube 2 years ago.
                 // although roundcube suggested only the change in line
                 //if (preg_match('/^{([0-9]+)}/', $line, $matches)) { //original
-                if (preg_match('/^{([0-9]+)\+?}/', $line, $matches)) { //patched to cope with dbmail
+                if (preg_match('/^{([0-9]+)\+?}/', $line, $matches))
+                {
+//patched to cope with dbmail
                     // Matches literal string responses.
                     $line = $this->_recvBytes($matches[1] + 2);
-                    if (!$auth) {
+                    if (!$auth)
+                    {
                         // Receive the pending OK only if we aren't
                         // authenticating since string responses during
                         // authentication don't need an OK.
@@ -528,7 +573,8 @@ 
                     return $line;
                 }
 
-                if ($auth) {
+                if ($auth)
+                {
                     // String responses during authentication don't need an
                     // OK.
                     $response .= $line;
@@ -545,21 +591,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;
 	}
@@ -610,7 +665,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'] = '';
     	}
@@ -665,7 +721,10 @@ 
 	protected static function isError($data, $code = null)
 	{
 		static $pear=null;
-		if (!isset($pear)) $pear = new PEAR();
+		if (!isset($pear))
+		{
+			$pear = new PEAR();
+		}
 
 		return $pear->isError($data, $code);
 	}

emailadmin/inc/class.emailadmin_smtp.inc.php

Doc Comments +5 added lines, -5 removed lines

@@ -72,7 +72,7 @@ 
 	/**
 	 * Constructor
 	 *
-	 * @param string $defaultDomain=null
+	 * @param string $defaultDomain
 	 */
 	function __construct($defaultDomain=null)
 	{
@@ -149,8 +149,8 @@ 
 	/**
 	 * Get the data of a given user
 	 *
-	 * @param int|string $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
+	 * @param integer $user numerical account-id, account-name or email address
+	 * @param boolean $match_uid_at_domain 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")
 	 */
@@ -187,8 +187,8 @@ 
 	 * @param string $_accountStatus
 	 * @param string $_mailLocalAddress
 	 * @param int $_quota in MB
-	 * @param boolean $_forwarding_only=false true: store only forwarding info, used internally by saveSMTPForwarding
-	 * @param string $_setMailbox=null used only for account migration
+	 * @param boolean $_forwarding_only true: store only forwarding info, used internally by saveSMTPForwarding
+	 * @param string $_setMailbox used only for account migration
 	 * @return boolean true on success, false on error writing to ldap
 	 */
 	function setUserData($_uidnumber, array $_mailAlternateAddress, array $_mailForwardingAddress, $_deliveryMode,

Spacing +12 added lines, -14 removed lines

@@ -74,7 +74,7 @@ 
 	 *
 	 * @param string $defaultDomain=null
 	 */
-	function __construct($defaultDomain=null)
+	function __construct($defaultDomain = null)
 	{
 		$this->defaultDomain = $defaultDomain ? $defaultDomain : $GLOBALS['egw_info']['server']['mail_suffix'];
 
@@ -99,12 +99,10 @@ 
 	 */
 	function addAccount($_hookValues)
 	{
-		$mailLocalAddress = $_hookValues['account_email'] ? $_hookValues['account_email'] :
-			common::email_address($_hookValues['account_firstname'],
-				$_hookValues['account_lastname'],$_hookValues['account_lid'],$this->defaultDomain);
+		$mailLocalAddress = $_hookValues['account_email'] ? $_hookValues['account_email'] : common::email_address($_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)
 		{
@@ -132,12 +130,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',
@@ -154,7 +152,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();
 
@@ -192,7 +190,7 @@ 
 	 * @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)
 	{
 		return true;
 	}
@@ -219,15 +217,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;
 

emailadmin/inc/class.emailadmin_smtp_ads.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -146,7 +146,7 @@
 	/**
 	 * Constructor
 	 *
-	 * @param string $defaultDomain=null
+	 * @param string $defaultDomain
 	 */
 	function __construct($defaultDomain=null)
 	{

Spacing +1 added lines, -1 removed lines

@@ -148,7 +148,7 @@
 	 *
 	 * @param string $defaultDomain=null
 	 */
-	function __construct($defaultDomain=null)
+	function __construct($defaultDomain = null)
 	{
 		parent::__construct($defaultDomain);
 

emailadmin/inc/class.emailadmin_smtp_ldap.inc.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 +44 added lines, -45 removed lines

@@ -151,7 +151,7 @@ 
 	 *
 	 * @param string $defaultDomain =null
 	 */
-	function __construct($defaultDomain=null)
+	function __construct($defaultDomain = null)
 	{
 		parent::__construct($defaultDomain);
 
@@ -199,9 +199,8 @@ 
 	 */
 	function addAccount($_hookValues)
 	{
-		$mailLocalAddress = $_hookValues['account_email'] ? $_hookValues['account_email'] :
-			common::email_address($_hookValues['account_firstname'],
-				$_hookValues['account_lastname'],$_hookValues['account_lid'],$this->defaultDomain);
+		$mailLocalAddress = $_hookValues['account_email'] ? $_hookValues['account_email'] : common::email_address($_hookValues['account_firstname'],
+				$_hookValues['account_lastname'], $_hookValues['account_lid'], $this->defaultDomain);
 
 		$ds = $this->getLdapConnection();
 
@@ -213,13 +212,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(
@@ -250,7 +249,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;
 	}
@@ -264,7 +263,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
 	}
 
 	/**
@@ -275,24 +274,24 @@ 
 	 */
 	function getAccountEmailAddress($_accountName)
 	{
-		$emailAddresses	= array();
+		$emailAddresses = array();
 		$ds = $this->getLdapConnection();
 		$filter = '(&'.static::USER_FILTER.'('.static::USER_ATTR.'='.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',
@@ -301,7 +300,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,
@@ -328,7 +327,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(),
@@ -388,7 +387,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;
 
@@ -471,16 +470,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]);
 				}
@@ -513,9 +512,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)
 		{
@@ -535,15 +534,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);
@@ -556,7 +555,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);
 			}
@@ -589,12 +588,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
@@ -636,7 +635,7 @@ 
 			$uid = $GLOBALS['egw']->accounts->id2name($_accountID);
 			$filter = '(&'.static::USER_FILTER.'('.static::USER_ATTR.'='.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;
@@ -647,12 +646,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;
 			}
@@ -662,9 +661,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))
 						{
@@ -696,7 +695,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);
 		}
 	}
 
@@ -738,9 +737,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;
 		}
@@ -754,13 +753,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;
 		}
@@ -775,7 +774,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();
@@ -784,7 +783,7 @@ 
 		{
 			unset($attribute['count']);
 
-			foreach($attribute as $key => $value)
+			foreach ($attribute as $key => $value)
 			{
 				if (!$prefix || stripos($value, $prefix) === 0)
 				{
@@ -804,7 +803,7 @@ 
 	 */
 	protected function getLdapConnection()
 	{
-		static $ldap=null;
+		static $ldap = null;
 
 		if (is_null($ldap)) $ldap = $GLOBALS['egw']->ldap->ldapConnect();
 

Braces +73 added lines, -18 removed lines

@@ -290,7 +290,10 @@ 
 			{
 				foreach($allValues[0][static::MAIL_ATTR] as $key => $value)
 				{
-					if ($key === 'count') continue;
+					if ($key === 'count')
+					{
+						continue;
+					}
 
 					$emailAddresses[] = array (
 						'name'		=> $realName,
@@ -311,7 +314,10 @@ 
 				}
 			}
 		}
-		if ($this->debug) error_log(__METHOD__."('$_accountName') returning ".array2string($emailAddresses));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."('$_accountName') returning ".array2string($emailAddresses));
+		}
 
 		return $emailAddresses;
 	}
@@ -344,7 +350,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.'='.ldap::quote($user).'))';
 		}
 		else	// email address --> build filter by attributes defined in config
@@ -361,7 +370,10 @@ 
 			else
 			{
 				$to_or = array('('.static::MAIL_ATTR.'='.ldap::quote($user).')');
-				if ($match_uid_at_domain) $to_or[] = '('.static::USER_ATTR.'='.ldap::quote($namepart).')';
+				if ($match_uid_at_domain)
+				{
+					$to_or[] = '('.static::USER_ATTR.'='.ldap::quote($namepart).')';
+				}
 				if (static::ALIAS_ATTR)
 				{
 					$to_or[] = '('.static::ALIAS_ATTR.'='.static::ALIAS_PREFIX.ldap::quote($user).')';
@@ -386,11 +398,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']))
@@ -415,11 +433,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) ?
 								emailadmin_smtp::FORWARD_ONLY : '';
 						}
+						}
 						else	// check for existence of any value
 						{
 							$deliveryMode = $values[static::FORWARD_ONLY_ATTR]['count'] > 0 ?
@@ -452,7 +473,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;
@@ -474,7 +498,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;
 
@@ -493,7 +520,10 @@ 
 				}
 			}
 		}
-		if ($this->debug) error_log(__METHOD__."('$user') returning ".array2string($userData));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."('$user') returning ".array2string($userData));
+		}
 
 		return $userData;
 	}
@@ -611,7 +641,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);
 	}
@@ -694,7 +727,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);
 		}
@@ -740,7 +776,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;
 		}
@@ -757,8 +797,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)
 		{
@@ -788,12 +834,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;
@@ -806,7 +858,10 @@ 
 	{
 		static $ldap=null;
 
-		if (is_null($ldap)) $ldap = $GLOBALS['egw']->ldap->ldapConnect();
+		if (is_null($ldap))
+		{
+			$ldap = $GLOBALS['egw']->ldap->ldapConnect();
+		}
 
 		return $ldap;
 	}

emailadmin/inc/class.emailadmin_smtp_sql.inc.php

Doc Comments +4 added lines, -4 removed lines

@@ -55,7 +55,7 @@ 
 	/**
 	 * Constructor
 	 *
-	 * @param string $defaultDomain=null
+	 * @param string $defaultDomain
 	 */
 	function __construct($defaultDomain=null)
 	{
@@ -101,7 +101,7 @@ 
 	 * from all accounts!
 	 *
 	 * @param int|string $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
+	 * @param boolean $match_uid_at_domain 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")
 	 */
@@ -227,8 +227,8 @@ 
 	 * @param string $_accountStatus
 	 * @param string $_mailLocalAddress
 	 * @param int $_quota in MB
-	 * @param boolean $_forwarding_only=false true: store only forwarding info, used internally by saveSMTPForwarding
-	 * @param string $_setMailbox=null used only for account migration
+	 * @param boolean $_forwarding_only true: store only forwarding info, used internally by saveSMTPForwarding
+	 * @param string $_setMailbox used only for account migration
 	 * @return boolean true on success, false on error writing to ldap
 	 */
 	function setUserData($_uidnumber, array $_mailAlternateAddress, array $_mailForwardingAddress, $_deliveryMode,

Spacing +20 added lines, -20 removed lines

@@ -63,7 +63,7 @@ 
 	 *
 	 * @param string $defaultDomain =null
 	 */
-	function __construct($defaultDomain=null)
+	function __construct($defaultDomain = null)
 	{
 		parent::__construct($defaultDomain);
 
@@ -78,16 +78,16 @@ 
 	 */
 	function getAccountEmailAddress($_accountName)
 	{
-		$emailAddresses	= parent::getAccountEmailAddress($_accountName);
+		$emailAddresses = parent::getAccountEmailAddress($_accountName);
 
 		if (($account_id = $this->accounts->name2id($_accountName, 'account_lid', 'u')))
 		{
-			foreach($this->db->select(self::TABLE, 'mail_value', array(
+			foreach ($this->db->select(self::TABLE, 'mail_value', array(
 				'account_id' => $account_id,
 				'mail_type' => self::TYPE_ALIAS,
 			), __LINE__, __FILE__, false, 'ORDER BY mail_value', self::APP) as $row)
 			{
-				$emailAddresses[] = array (
+				$emailAddresses[] = array(
 					'name'		=> $emailAddresses[0]['name'],
 					'address'	=> $row['mail_value'],
 					'type'		=> 'alternate',
@@ -111,7 +111,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();
 
@@ -140,7 +140,7 @@ 
 			{
 				$account_id[] = $id;
 			}
-			foreach($this->db->select(self::TABLE, 'account_id', array(
+			foreach ($this->db->select(self::TABLE, 'account_id', array(
 				'mail_type' => self::TYPE_ALIAS,
 				'mail_value' => $user,
 			), __LINE__, __FILE__, false, '', self::APP) as $row)
@@ -156,11 +156,11 @@ 
 				$userData['mailLocalAddress'] = $this->accounts->id2name($account_id, 'account_email');
 			}
 			$enabled = $forwardOnly = array();
-			foreach($this->db->select(self::TABLE, '*', array(
+			foreach ($this->db->select(self::TABLE, '*', array(
 				'account_id' => $account_id,
 			), __LINE__, __FILE__, false, 'ORDER BY mail_type,mail_value', self::APP) as $row)
 			{
-				switch($row['mail_type'])
+				switch ($row['mail_type'])
 				{
 					case self::TYPE_ENABLED:
 						$userData['accountStatus'] = $row['mail_value'];
@@ -203,11 +203,11 @@ 
 			if (is_array($account_id))
 			{
 				// add group-members for groups as forward (that way we dont need to store&update them)
-				foreach($account_id as $id)
+				foreach ($account_id as $id)
 				{
 					if ($id < 0 && ($members = $this->accounts->members($id, true)))
 					{
-						foreach($members as $member)
+						foreach ($members as $member)
 						{
 							if (($email = $this->accounts->id2name($member, 'account_email')) && !in_array($email, (array)$userData['forward']))
 							{
@@ -238,7 +238,7 @@ 
 	 * @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)
 	{
 		if ($this->debug) error_log(__METHOD__."($_uidnumber, ".array2string($_mailAlternateAddress).', '.array2string($_mailForwardingAddress).", '$_deliveryMode', '$_accountStatus', '$_mailLocalAddress', $_quota, forwarding_only=".array2string($_forwarding_only).') '.function_backtrace());
 
@@ -257,22 +257,22 @@ 
 		if ($_forwarding_only) $where['mail_type'] = array(self::TYPE_FORWARD, self::TYPE_DELIVERY);
 		// find all invalid values: either delete or update them
 		$delete_ids = array();
-		foreach($this->db->select(self::TABLE, '*', $where, __LINE__, __FILE__, false, '', self::APP) as $row)
+		foreach ($this->db->select(self::TABLE, '*', $where, __LINE__, __FILE__, false, '', self::APP) as $row)
 		{
-			switch($row['mail_type'])
+			switch ($row['mail_type'])
 			{
 				case self::TYPE_ALIAS:
-					$new_addresses =& $_mailAlternateAddress;
+					$new_addresses = & $_mailAlternateAddress;
 					// fall-throught
 				case self::TYPE_FORWARD:
-					if ($row['mail_type'] == self::TYPE_FORWARD) $new_addresses =& $_mailForwardingAddress;
+					if ($row['mail_type'] == self::TYPE_FORWARD) $new_addresses = & $_mailForwardingAddress;
 					if (($key = array_search($row['mail_value'], $new_addresses)) === false)
 					{
 						$delete_ids[] = $row['mail_id'];
 					}
 					else
 					{
-						unset($new_addresses[$key]);	// no need to store
+						unset($new_addresses[$key]); // no need to store
 					}
 					break;
 
@@ -322,14 +322,14 @@ 
 			));
 		}
 		// store all new values
-		foreach($flags+array(
+		foreach ($flags + array(
 			self::TYPE_ALIAS => $_mailAlternateAddress,
 			self::TYPE_FORWARD => $_mailForwardingAddress,
 		) as $type => $values)
 		{
 			if ($values && (!$_forwarding_only || in_array($type, array(self::TYPE_FORWARD, self::TYPE_DELIVERY))))
 			{
-				foreach((array)$values as $value)
+				foreach ((array)$values as $value)
 				{
 					$this->db->insert(self::TABLE, array(
 						'account_id' => $_uidnumber,
@@ -363,11 +363,11 @@ 
 			$join .= ' JOIN '.self::TABLE.' active ON active.account_id='.self::TABLE.'.account_id AND active.mail_type='.self::TYPE_ENABLED;
 		}
 		$mailboxes = array();
-		foreach($this->db->select(self::TABLE, 'account_lid AS uid,'.self::TABLE.'.mail_value AS mailbox',
+		foreach ($this->db->select(self::TABLE, 'account_lid AS uid,'.self::TABLE.'.mail_value AS mailbox',
 			self::TABLE.'.mail_type='.self::TYPE_MAILBOX,
 			__LINE__, __FILE__, false, 'ORDER BY account_lid', self::APP, 0, $join) as $row)
 		{
-			if ($row['uid'] == 'anonymous') continue;	// anonymous is never a mail-user!
+			if ($row['uid'] == 'anonymous') continue; // anonymous is never a mail-user!
 			list($mailbox) = explode('@', $row['mailbox']);
 			$mailboxes[$row['uid']] = $mailbox;
 		}

Braces +29 added lines, -7 removed lines

@@ -94,7 +94,10 @@ 
 				);
 			}
 		}
-		if ($this->debug) error_log(__METHOD__."('$_accountName') returning ".array2string($emailAddresses));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."('$_accountName') returning ".array2string($emailAddresses));
+		}
 
 		return $emailAddresses;
 	}
@@ -145,7 +148,10 @@ 
 				'mail_value' => $user,
 			), __LINE__, __FILE__, false, '', self::APP) as $row)
 			{
-				if (!in_array($row['account_id'], $account_id)) $account_id[] = $row['account_id'];
+				if (!in_array($row['account_id'], $account_id))
+				{
+					$account_id[] = $row['account_id'];
+				}
 			}
 			//error_log(__METHOD__."('$user') account_id=".array2string($account_id));
 		}
@@ -218,7 +224,10 @@ 
 				}
 			}
 		}
-		if ($this->debug) error_log(__METHOD__."('$user') returning ".array2string($userData));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."('$user') returning ".array2string($userData));
+		}
 
 		return $userData;
 	}
@@ -240,7 +249,10 @@ 
 	function setUserData($_uidnumber, array $_mailAlternateAddress, array $_mailForwardingAddress, $_deliveryMode,
 		$_accountStatus, $_mailLocalAddress, $_quota, $_forwarding_only=false, $_setMailbox=null)
 	{
-		if ($this->debug) error_log(__METHOD__."($_uidnumber, ".array2string($_mailAlternateAddress).', '.array2string($_mailForwardingAddress).", '$_deliveryMode', '$_accountStatus', '$_mailLocalAddress', $_quota, forwarding_only=".array2string($_forwarding_only).') '.function_backtrace());
+		if ($this->debug)
+		{
+			error_log(__METHOD__."($_uidnumber, ".array2string($_mailAlternateAddress).', '.array2string($_mailForwardingAddress).", '$_deliveryMode', '$_accountStatus', '$_mailLocalAddress', $_quota, forwarding_only=".array2string($_forwarding_only).') '.function_backtrace());
+		}
 
 		if (!$_forwarding_only && $this->accounts->id2name($_uidnumber, 'account_email') !== $_mailLocalAddress)
 		{
@@ -254,7 +266,10 @@ 
 			self::TYPE_QUOTA => $_quota,
 		);
 		$where = array('account_id' => $_uidnumber);
-		if ($_forwarding_only) $where['mail_type'] = array(self::TYPE_FORWARD, self::TYPE_DELIVERY);
+		if ($_forwarding_only)
+		{
+			$where['mail_type'] = array(self::TYPE_FORWARD, self::TYPE_DELIVERY);
+		}
 		// find all invalid values: either delete or update them
 		$delete_ids = array();
 		foreach($this->db->select(self::TABLE, '*', $where, __LINE__, __FILE__, false, '', self::APP) as $row)
@@ -265,7 +280,10 @@ 
 					$new_addresses =& $_mailAlternateAddress;
 					// fall-throught
 				case self::TYPE_FORWARD:
-					if ($row['mail_type'] == self::TYPE_FORWARD) $new_addresses =& $_mailForwardingAddress;
+					if ($row['mail_type'] == self::TYPE_FORWARD)
+					{
+						$new_addresses =& $_mailForwardingAddress;
+					}
 					if (($key = array_search($row['mail_value'], $new_addresses)) === false)
 					{
 						$delete_ids[] = $row['mail_id'];
@@ -367,7 +385,11 @@ 
 			self::TABLE.'.mail_type='.self::TYPE_MAILBOX,
 			__LINE__, __FILE__, false, 'ORDER BY account_lid', self::APP, 0, $join) as $row)
 		{
-			if ($row['uid'] == 'anonymous') continue;	// anonymous is never a mail-user!
+			if ($row['uid'] == 'anonymous')
+			{
+				continue;
+			}
+			// anonymous is never a mail-user!
 			list($mailbox) = explode('@', $row['mailbox']);
 			$mailboxes[$row['uid']] = $mailbox;
 		}

etemplate/doc/et_media/inc/class.ui_et_media.inc.php

Doc Comments +1 added lines, -2 removed lines

@@ -127,8 +127,7 @@
 	/**
 	 * Show files shared
 	 *
-	 * @param array $content=null
-	 * @param string $msg=''
+	 * @param array $content
 	 */
 	public function index(array $content=null)
 	{

Spacing +10 added lines, -10 removed lines

@@ -10,7 +10,7 @@ 
  * @version $Id$ 
  */
 
-include_once(EGW_INCLUDE_ROOT . '/et_media/inc/class.bo_et_media.inc.php');
+include_once(EGW_INCLUDE_ROOT.'/et_media/inc/class.bo_et_media.inc.php');
 
 class ui_et_media extends bo_et_media
 {
@@ -31,9 +31,9 @@ 
 	 */
 	function ui_et_media()
 	{
-		$this->bo_et_media();	// calling the constructor of the extended bo object
+		$this->bo_et_media(); // calling the constructor of the extended bo object
 
-		$this->tmpl =& CreateObject('etemplate.etemplate','et_media.edit');
+		$this->tmpl = & CreateObject('etemplate.etemplate', 'et_media.edit');
 	}
 
 	/**
@@ -42,7 +42,7 @@ 
 	 * @param array $content=null
 	 * @param string $msg=''
 	 */
-	function edit($content=null,$msg = '')
+	function edit($content = null, $msg = '')
 	{
 		if (is_array($content))	// not first call from index
 		{
@@ -62,7 +62,7 @@ 
 			{
 				unset($content['id']);
 				unset($content['read']);
-				$found = $this->search($content,False,'name,author');
+				$found = $this->search($content, False, 'name,author');
 
 				if (!$found)
 				{
@@ -108,7 +108,7 @@ 
 		$no_button = array(
 			'delete' => !$this->data[$this->db_key_cols[$this->autoinc_id]]
 		);
-		$this->tmpl->exec('et_media.ui_et_media.edit',$content,$sel_options,$no_button,array(
+		$this->tmpl->exec('et_media.ui_et_media.edit', $content, $sel_options, $no_button, array(
 			'id' => $this->data['id']
 		));
 	}
@@ -118,20 +118,20 @@ 
 	 *
 	 * @param array $found
 	 */
-	function show($found=null)
+	function show($found = null)
 	{
 		if (!is_array($found) || !count($found))
 		{
 			$this->edit();
 			return;
 		}
-		array_unshift($found,false);	// change the array to start with index 1
+		array_unshift($found, false); // change the array to start with index 1
 		$content = array(
-			'msg' => lang('%1 matches on search criteria',count($found)),
+			'msg' => lang('%1 matches on search criteria', count($found)),
 			'entry' => $found,
 		);
 		$this->tmpl->read('et_media.show');
 
-		$this->tmpl->exec('et_media.ui_et_media.edit',$content);
+		$this->tmpl->exec('et_media.ui_et_media.edit', $content);
 	}
 }

Braces +4 added lines, -1 removed lines

@@ -44,11 +44,14 @@
 	 */
 	function edit($content=null,$msg = '')
 	{
-		if (is_array($content))	// not first call from index
+		if (is_array($content))
+		{
+			// not first call from index
 		{
 			if ($content['id'] > 0)
 			{
 				$this->read($content);
+		}
 			}
 			//echo "<p>edit: content ="; _debug_array($content);
 			$this->data_merge($content);