EGroupware / egroupware

mail/inc/class.mail_activesync.inc.php

Spacing +335 added lines, -336 removed lines

@@ -97,23 +97,23 @@ 
 		$this->backend = $backend;
 		if (!isset($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-ActiveSyncProfileID']))
 		{
-			if ($this->debugLevel>1) error_log(__METHOD__.__LINE__.' Noprefs set: using 0 as default');
+			if ($this->debugLevel > 1) error_log(__METHOD__.__LINE__.' Noprefs set: using 0 as default');
 			// globals preferences add appname varname value
-			$GLOBALS['egw']->preferences->add('activesync','mail-ActiveSyncProfileID',0,'user');
+			$GLOBALS['egw']->preferences->add('activesync', 'mail-ActiveSyncProfileID', 0, 'user');
 			// save prefs
 			$GLOBALS['egw']->preferences->save_repository(true);
 		}
-		if ($this->debugLevel>1) error_log(__METHOD__.__LINE__.' ActiveProfileID:'.array2string(self::$profileID));
+		if ($this->debugLevel > 1) error_log(__METHOD__.__LINE__.' ActiveProfileID:'.array2string(self::$profileID));
 
 		if (is_null(self::$profileID))
 		{
-			if ($this->debugLevel>1) error_log(__METHOD__.__LINE__.' self::ProfileID isNUll:'.array2string(self::$profileID));
-			self::$profileID =& egw_cache::getSession('mail','activeSyncProfileID');
-			if ($this->debugLevel>1) error_log(__METHOD__.__LINE__.' ActiveProfileID (after reading Cache):'.array2string(self::$profileID));
+			if ($this->debugLevel > 1) error_log(__METHOD__.__LINE__.' self::ProfileID isNUll:'.array2string(self::$profileID));
+			self::$profileID = & egw_cache::getSession('mail', 'activeSyncProfileID');
+			if ($this->debugLevel > 1) error_log(__METHOD__.__LINE__.' ActiveProfileID (after reading Cache):'.array2string(self::$profileID));
 		}
 		if (isset($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-ActiveSyncProfileID']))
 		{
-			if ($this->debugLevel>1) error_log(__METHOD__.__LINE__.' Pref for ProfileID:'.array2string($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-ActiveSyncProfileID']));
+			if ($this->debugLevel > 1) error_log(__METHOD__.__LINE__.' Pref for ProfileID:'.array2string($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-ActiveSyncProfileID']));
 			if ($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-ActiveSyncProfileID'] == 'G')
 			{
 				self::$profileID = 'G'; // this should trigger the fetch of the first negative profile (or if no negative profile is available the firstb there is)
@@ -123,7 +123,7 @@ 
 				self::$profileID = (int)$GLOBALS['egw_info']['user']['preferences']['activesync']['mail-ActiveSyncProfileID'];
 			}
 		}
-		if ($this->debugLevel>1) error_log(__METHOD__.__LINE__.' Profile Selected (after reading Prefs):'.array2string(self::$profileID));
+		if ($this->debugLevel > 1) error_log(__METHOD__.__LINE__.' Profile Selected (after reading Prefs):'.array2string(self::$profileID));
 
 		// verify we are on an existing profile, if not running in setup (settings can not be static according to interface!)
 		if (!isset($GLOBALS['egw_setup']))
@@ -131,12 +131,12 @@ 
 			try {
 				emailadmin_account::read(self::$profileID);
 			}
-			catch(Exception $e) {
+			catch (Exception $e) {
 				unset($e);
 				self::$profileID = emailadmin_account::get_default_acc_id();
 			}
 		}
-		if ($this->debugLevel>0) error_log(__METHOD__.'::'.__LINE__.' ProfileSelected:'.self::$profileID);
+		if ($this->debugLevel > 0) error_log(__METHOD__.'::'.__LINE__.' ProfileSelected:'.self::$profileID);
 		//$this->debugLevel=0;
 	}
 
@@ -208,13 +208,13 @@ 
 			$this->__construct($this->backend);
 
 			try {
-				$this->_connect(0,true);
+				$this->_connect(0, true);
 				$this->_disconnect();
 
 				if (!$this->_wasteID) $errors[] = lang('No valid %1 folder configured!', '<b>'.lang('trash').'</b>');
 				if (!$this->_sentID) $errors[] = lang('No valid %1 folder configured!', '<b>'.lang('send').'</b>');
 			}
-			catch(Exception $e) {
+			catch (Exception $e) {
 				$errors[] = lang('Can not open IMAP connection').': '.$e->getMessage();
 			}
 			if ($errors)
@@ -232,7 +232,7 @@ 
 	 * @param int $account integer id of account to use
 	 * @todo support different accounts
 	 */
-	private function _connect($account=0)
+	private function _connect($account = 0)
 	{
 		if (is_null($account)) $account = 0;
 		if ($this->mail && $this->account != $account) $this->_disconnect();
@@ -245,10 +245,10 @@ 
 			$this->account = $account;
 			// todo: tell mail which account to use
 			//error_log(__METHOD__.__LINE__.' create object with ProfileID:'.array2string(self::$profileID));
-			$this->mail = mail_bo::getInstance(false,self::$profileID,true,false,true);
+			$this->mail = mail_bo::getInstance(false, self::$profileID, true, false, true);
 		}
 		if (self::$profileID == 0 && isset($this->mail->icServer->ImapServerId) && !empty($this->mail->icServer->ImapServerId)) self::$profileID = $this->mail->icServer->ImapServerId;
-		$this->mail->openConnection(self::$profileID,false);
+		$this->mail->openConnection(self::$profileID, false);
 
 		$this->_wasteID = $this->mail->getTrashFolder(false);
 		//error_log(__METHOD__.__LINE__.' TrashFolder:'.$this->_wasteID);
@@ -283,16 +283,16 @@ 
 		/*foreach($available_accounts as $account)*/ $account = 0;
 		{
 			$this->_connect($account);
-			if (!isset($this->folders)) $this->folders = $this->mail->getFolderObjects(true,false,$_alwaysGetDefaultFolders=true);
+			if (!isset($this->folders)) $this->folders = $this->mail->getFolderObjects(true, false, $_alwaysGetDefaultFolders = true);
 			//debugLog(__METHOD__.__LINE__.array2string($this->folders));
 
 			foreach ($this->folders as $folder => $folderObj) {
 				$folderlist[] = $f = array(
-					'id'     => $this->createID($account,$folder),
+					'id'     => $this->createID($account, $folder),
 					'mod'    => $folderObj->shortDisplayName,
-					'parent' => $this->getParentID($account,$folder),
+					'parent' => $this->getParentID($account, $folder),
 				);
-				if ($this->debugLevel>0) debugLog(__METHOD__."() returning ".array2string($f));
+				if ($this->debugLevel > 0) debugLog(__METHOD__."() returning ".array2string($f));
 			}
 		}
 		//debugLog(__METHOD__."() returning ".array2string($folderlist));
@@ -322,64 +322,64 @@ 
      * @todo implement either here or in mail backend
      * 	(maybe sending here and storing to sent folder in plugin, as sending is supposed to always work in EGroupware)
      */
-	public function SendMail($rfc822, $smartdata=array(), $protocolversion = false)
+	public function SendMail($rfc822, $smartdata = array(), $protocolversion = false)
 	{
 		//$this->debugLevel=3;
 		$ClientSideMeetingRequest = false;
 		$allowSendingInvitations = 'sendifnocalnotif';
 		if (isset($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-allowSendingInvitations']) &&
-			$GLOBALS['egw_info']['user']['preferences']['activesync']['mail-allowSendingInvitations']=='nosend')
+			$GLOBALS['egw_info']['user']['preferences']['activesync']['mail-allowSendingInvitations'] == 'nosend')
 		{
 			$allowSendingInvitations = false;
 		}
 		elseif (isset($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-allowSendingInvitations']) &&
-			$GLOBALS['egw_info']['user']['preferences']['activesync']['mail-allowSendingInvitations']!='nosend')
+			$GLOBALS['egw_info']['user']['preferences']['activesync']['mail-allowSendingInvitations'] != 'nosend')
 		{
 			$allowSendingInvitations = $GLOBALS['egw_info']['user']['preferences']['activesync']['mail-allowSendingInvitations'];
 		}
 
 		if ($protocolversion < 14.0)
-    		debugLog("IMAP-SendMail: " . (isset($rfc822) ? $rfc822 : ""). "task: ".(isset($smartdata['task']) ? $smartdata['task'] : "")." itemid: ".(isset($smartdata['itemid']) ? $smartdata['itemid'] : "")." folder: ".(isset($smartdata['folderid']) ? $smartdata['folderid'] : ""));
-		if ($this->debugLevel>0) debugLog("IMAP-Sendmail: Smartdata = ".array2string($smartdata));
+    		debugLog("IMAP-SendMail: ".(isset($rfc822) ? $rfc822 : "")."task: ".(isset($smartdata['task']) ? $smartdata['task'] : "")." itemid: ".(isset($smartdata['itemid']) ? $smartdata['itemid'] : "")." folder: ".(isset($smartdata['folderid']) ? $smartdata['folderid'] : ""));
+		if ($this->debugLevel > 0) debugLog("IMAP-Sendmail: Smartdata = ".array2string($smartdata));
 		//error_log("IMAP-Sendmail: Smartdata = ".array2string($smartdata));
 
 		// initialize our mail_bo
-		if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false,self::$profileID,true,false,true);
+		if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false, self::$profileID, true, false, true);
 		$activeMailProfiles = $this->mail->getAccountIdentities(self::$profileID);
 		// use the standardIdentity
-		$activeMailProfile = mail_bo::getStandardIdentityForProfile($activeMailProfiles,self::$profileID);
+		$activeMailProfile = mail_bo::getStandardIdentityForProfile($activeMailProfiles, self::$profileID);
 
-		if ($this->debugLevel>2) debugLog(__METHOD__.__LINE__.' ProfileID:'.self::$profileID.' ActiveMailProfile:'.array2string($activeMailProfile));
+		if ($this->debugLevel > 2) debugLog(__METHOD__.__LINE__.' ProfileID:'.self::$profileID.' ActiveMailProfile:'.array2string($activeMailProfile));
 
 		// initialize the new egw_mailer object for sending
 		$mailObject = new egw_mailer();
-		$this->mail->parseRawMessageIntoMailObject($mailObject,$rfc822);
+		$this->mail->parseRawMessageIntoMailObject($mailObject, $rfc822);
 		// Horde SMTP Class uses utf-8 by default. as we set charset always to utf-8
-		$mailObject->Sender  = $activeMailProfile['ident_email'];
-		$mailObject->setFrom($activeMailProfile['ident_email'],$mailObject->EncodeHeader(mail_bo::generateIdentityString($activeMailProfile,false)));
+		$mailObject->Sender = $activeMailProfile['ident_email'];
+		$mailObject->setFrom($activeMailProfile['ident_email'], $mailObject->EncodeHeader(mail_bo::generateIdentityString($activeMailProfile, false)));
 		$mailObject->AddCustomHeader('X-Mailer: mail-Activesync');
 
 
 		// prepare addressee list; moved the adding of addresses to the mailobject down
 		// to
 
-		foreach(emailadmin_imapbase::parseAddressList($mailObject->getHeader("To")) as $addressObject) {
+		foreach (emailadmin_imapbase::parseAddressList($mailObject->getHeader("To")) as $addressObject) {
 			if (!$addressObject->valid) continue;
-			if ($this->debugLevel>0) debugLog("Header Sentmail To: ".array2string($addressObject) );
+			if ($this->debugLevel > 0) debugLog("Header Sentmail To: ".array2string($addressObject));
 			//$mailObject->AddAddress($addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''),$addressObject->personal);
 			$toMailAddr[] = imap_rfc822_write_address($addressObject->mailbox, $addressObject->host, $addressObject->personal);
 		}
 		// CC
-		foreach(emailadmin_imapbase::parseAddressList($mailObject->getHeader("Cc")) as $addressObject) {
+		foreach (emailadmin_imapbase::parseAddressList($mailObject->getHeader("Cc")) as $addressObject) {
 			if (!$addressObject->valid) continue;
-			if ($this->debugLevel>0) debugLog("Header Sentmail CC: ".array2string($addressObject) );
+			if ($this->debugLevel > 0) debugLog("Header Sentmail CC: ".array2string($addressObject));
 			//$mailObject->AddCC($addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''),$addressObject->personal);
 			$ccMailAddr[] = imap_rfc822_write_address($addressObject->mailbox, $addressObject->host, $addressObject->personal);
 		}
 		// BCC
-		foreach(emailadmin_imapbase::parseAddressList($mailObject->getHeader("Bcc")) as $addressObject) {
+		foreach (emailadmin_imapbase::parseAddressList($mailObject->getHeader("Bcc")) as $addressObject) {
 			if (!$addressObject->valid) continue;
-			if ($this->debugLevel>0) debugLog("Header Sentmail BCC: ".array2string($addressObject) );
+			if ($this->debugLevel > 0) debugLog("Header Sentmail BCC: ".array2string($addressObject));
 			//$mailObject->AddBCC($addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''),$addressObject->personal);
 			$bccMailAddr[] = imap_rfc822_write_address($addressObject->mailbox, $addressObject->host, $addressObject->personal);
 		}
@@ -388,7 +388,7 @@ 
 		$use_orgbody = false;
 
 		$k = 'Content-Type';
-		$ContentType =$mailObject->getHeader('Content-Type');
+		$ContentType = $mailObject->getHeader('Content-Type');
 		//error_log(__METHOD__.__LINE__." Header Sentmail original Header (filtered): " . $k.  " = ".trim($ContentType));
 		// if the message is a multipart message, then we should use the sent body
 		if (preg_match("/multipart/i", $ContentType)) {
@@ -408,26 +408,26 @@ 
 			$k == "Content-Type" && preg_match("/multipart/i", $ContentType))) {
 			$use_orgbody = true;
 		}
-		$Body =  $AltBody = "";
+		$Body = $AltBody = "";
 		// get body of the transmitted message
 		// if this is a simple message, no structure at all
 		if (preg_match("/text/i", $ContentType))
 		{
-			$simpleBodyType = (preg_match("/html/i", $ContentType)?'text/html':'text/plain');
+			$simpleBodyType = (preg_match("/html/i", $ContentType) ? 'text/html' : 'text/plain');
 			$bodyObj = $mailObject->findBody(preg_match("/html/i", $ContentType) ? 'html' : 'plain');
-			$body = $bodyObj ?$bodyObj->getContents() : null;
-			$body = preg_replace("/(<|&lt;)*(([\w\.,-.,_.,0-9.]+)@([\w\.,-.,_.,0-9.]+))(>|&gt;)*/i","[$2]", $body);
-			if  ($simpleBodyType == "text/plain")
+			$body = $bodyObj ? $bodyObj->getContents() : null;
+			$body = preg_replace("/(<|&lt;)*(([\w\.,-.,_.,0-9.]+)@([\w\.,-.,_.,0-9.]+))(>|&gt;)*/i", "[$2]", $body);
+			if ($simpleBodyType == "text/plain")
 			{
 				$Body = $body;
 				$AltBody = "<pre>".nl2br($body)."</pre>";
-				if ($this->debugLevel>1) debugLog("IMAP-Sendmail: fetched Body as :". $simpleBodyType.'=> Created AltBody');
+				if ($this->debugLevel > 1) debugLog("IMAP-Sendmail: fetched Body as :".$simpleBodyType.'=> Created AltBody');
 			}
 			else
 			{
 				$AltBody = $body;
-				$Body =  trim(translation::convertHTMLToText($body));
-				if ($this->debugLevel>1) debugLog("IMAP-Sendmail: fetched Body as :". $simpleBodyType.'=> Created Body');
+				$Body = trim(translation::convertHTMLToText($body));
+				if ($this->debugLevel > 1) debugLog("IMAP-Sendmail: fetched Body as :".$simpleBodyType.'=> Created Body');
 			}
 		}
 		else
@@ -436,60 +436,60 @@ 
 			$Body = ($text_body = $mailObject->findBody('plain')) ? $text_body->getContents() : null;
 			$AltBody = ($html_body = $mailObject->findBody('html')) ? $html_body->getContents() : null;
 			// prefer plain over html
-			$Body = preg_replace("/(<|&lt;)*(([\w\.,-.,_.,0-9.]+)@([\w\.,-.,_.,0-9.]+))(>|&gt;)*/i","[$2]", $Body);
-			$AltBody = preg_replace("/(<|&lt;)*(([\w\.,-.,_.,0-9.]+)@([\w\.,-.,_.,0-9.]+))(>|&gt;)*/i","[$2]", $AltBody);
+			$Body = preg_replace("/(<|&lt;)*(([\w\.,-.,_.,0-9.]+)@([\w\.,-.,_.,0-9.]+))(>|&gt;)*/i", "[$2]", $Body);
+			$AltBody = preg_replace("/(<|&lt;)*(([\w\.,-.,_.,0-9.]+)@([\w\.,-.,_.,0-9.]+))(>|&gt;)*/i", "[$2]", $AltBody);
 		}
-		if ($this->debugLevel>1 && $Body) debugLog("IMAP-Sendmail: fetched Body as with MessageContentType:". $ContentType.'=>'.$Body);
-		if ($this->debugLevel>1 && $AltBody) debugLog("IMAP-Sendmail: fetched AltBody as with MessageContentType:". $ContentType.'=>'.$AltBody);
+		if ($this->debugLevel > 1 && $Body) debugLog("IMAP-Sendmail: fetched Body as with MessageContentType:".$ContentType.'=>'.$Body);
+		if ($this->debugLevel > 1 && $AltBody) debugLog("IMAP-Sendmail: fetched AltBody as with MessageContentType:".$ContentType.'=>'.$AltBody);
 		//error_log(__METHOD__.__LINE__.array2string($mailObject));
 		// if this is a multipart message with a boundary, we must use the original body
 		//if ($this->debugLevel>2) debugLog(__METHOD__.__LINE__.' mailObject after Inital Parse:'.array2string($mailObject));
         if ($use_orgbody) {
-    	    if ($this->debugLevel>0) debugLog("IMAP-Sendmail: use_orgbody = true ContentType:".$ContentType);
+    	    if ($this->debugLevel > 0) debugLog("IMAP-Sendmail: use_orgbody = true ContentType:".$ContentType);
  			// if it is a ClientSideMeetingRequest, we report it as send at all times
-			if (stripos($ContentType,'text/calendar') !== false )
+			if (stripos($ContentType, 'text/calendar') !== false)
 			{
 				$body = ($text_body = $mailObject->findBody('calendar')) ? $text_body->getContents() : null;
 				$Body = $body;
 				$AltBody = "<pre>".nl2br($body)."</pre>";
-				if ($this->debugLevel>0) debugLog("IMAP-Sendmail: we have a Client Side Meeting Request");
+				if ($this->debugLevel > 0) debugLog("IMAP-Sendmail: we have a Client Side Meeting Request");
 				// try figuring out the METHOD -> [ContentType] => text/calendar; name=meeting.ics; method=REQUEST
-				$tA = explode(' ',$ContentType);
-				foreach ((array)$tA as $k => $p) if (stripos($p,"method=")!==false) $cSMRMethod= trim(str_replace('METHOD=','',strtoupper($p)));
+				$tA = explode(' ', $ContentType);
+				foreach ((array)$tA as $k => $p) if (stripos($p, "method=") !== false) $cSMRMethod = trim(str_replace('METHOD=', '', strtoupper($p)));
 				$ClientSideMeetingRequest = true;
 			}
         }
 		// now handle the addressee list
 		$toCount = 0;
 		//error_log(__METHOD__.__LINE__.array2string($toMailAddr));
-		foreach((array)$toMailAddr as $address) {
-			foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($address):$address)) as $addressObject) {
-				$emailAddress = $addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : '');
-				if ($ClientSideMeetingRequest === true && $allowSendingInvitations == 'sendifnocalnotif' && calendar_boupdate::email_update_requested($emailAddress,(isset($cSMRMethod)?$cSMRMethod:'REQUEST'))) continue;
+		foreach ((array)$toMailAddr as $address) {
+			foreach (emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc() ? stripslashes($address) : $address)) as $addressObject) {
+				$emailAddress = $addressObject->mailbox.($addressObject->host ? '@'.$addressObject->host : '');
+				if ($ClientSideMeetingRequest === true && $allowSendingInvitations == 'sendifnocalnotif' && calendar_boupdate::email_update_requested($emailAddress, (isset($cSMRMethod) ? $cSMRMethod : 'REQUEST'))) continue;
 				$mailObject->AddAddress($emailAddress, $addressObject->personal);
 				$toCount++;
 			}
 		}
 		$ccCount = 0;
-		foreach((array)$ccMailAddr as $address) {
-			foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($address):$address)) as $addressObject) {
-				$emailAddress = $addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : '');
+		foreach ((array)$ccMailAddr as $address) {
+			foreach (emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc() ? stripslashes($address) : $address)) as $addressObject) {
+				$emailAddress = $addressObject->mailbox.($addressObject->host ? '@'.$addressObject->host : '');
 				if ($ClientSideMeetingRequest === true && $allowSendingInvitations == 'sendifnocalnotif' && calendar_boupdate::email_update_requested($emailAddress)) continue;
 				$mailObject->AddCC($emailAddress, $addressObject->personal);
 				$ccCount++;
 			}
 		}
 		$bccCount = 0;
-		foreach((array)$bccMailAddr as $address) {
-			foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($address):$address)) as $addressObject) {
-				$emailAddress = $addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : '');
+		foreach ((array)$bccMailAddr as $address) {
+			foreach (emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc() ? stripslashes($address) : $address)) as $addressObject) {
+				$emailAddress = $addressObject->mailbox.($addressObject->host ? '@'.$addressObject->host : '');
 				if ($ClientSideMeetingRequest === true && $allowSendingInvitations == 'sendifnocalnotif' && calendar_boupdate::email_update_requested($emailAddress)) continue;
 				$mailObject->AddBCC($emailAddress, $addressObject->personal);
 				$bccCount++;
 			}
 		}
-		if ($toCount+$ccCount+$bccCount == 0) return 0; // noone to send mail to
-		if ($ClientSideMeetingRequest === true && $allowSendingInvitations===false) return true;
+		if ($toCount + $ccCount + $bccCount == 0) return 0; // noone to send mail to
+		if ($ClientSideMeetingRequest === true && $allowSendingInvitations === false) return true;
 		// as we use our mailer (horde mailer) it is detecting / setting the mimetype by itself while creating the mail
 /*
 		if ($this->debugLevel>2) debugLog(__METHOD__.__LINE__.' retrieved Body:'.$body);
@@ -497,29 +497,29 @@ 
 		if ($this->debugLevel>2) debugLog(__METHOD__.__LINE__.' retrieved Body (modified):'.$body);
 */
 		// add signature!! -----------------------------------------------------------------
-		if ($this->debugLevel>2) debugLog(__METHOD__.__LINE__.' ActiveMailProfile:'.array2string($activeMailProfile));
+		if ($this->debugLevel > 2) debugLog(__METHOD__.__LINE__.' ActiveMailProfile:'.array2string($activeMailProfile));
 		try
 		{
 			$acc = emailadmin_account::read($this->mail->icServer->ImapServerId);
 			//error_log(__METHOD__.__LINE__.array2string($acc));
-			$_signature = emailadmin_account::read_identity($acc['ident_id'],true);
+			$_signature = emailadmin_account::read_identity($acc['ident_id'], true);
 		}
 		catch (Exception $e)
 		{
-			$_signature=array();
+			$_signature = array();
 		}
 		$signature = $_signature['ident_signature'];
 		if ((isset($preferencesArray['disableRulerForSignatureSeparation']) &&
 			$preferencesArray['disableRulerForSignatureSeparation']) ||
-			empty($signature) || trim(translation::convertHTMLToText($signature)) =='')
+			empty($signature) || trim(translation::convertHTMLToText($signature)) == '')
 		{
 			$disableRuler = true;
 		}
 		$beforePlain = $beforeHtml = "";
-		$beforeHtml = ($disableRuler ?'&nbsp;<br>':'&nbsp;<br><hr style="border:dotted 1px silver; width:90%; border:dotted 1px silver;">');
-		$beforePlain = ($disableRuler ?"\r\n\r\n":"\r\n\r\n-- \r\n");
-		$sigText = emailadmin_imapbase::merge($signature,array($GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'],'person_id')));
-		if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__.' Signature to use:'.$sigText);
+		$beforeHtml = ($disableRuler ? '&nbsp;<br>' : '&nbsp;<br><hr style="border:dotted 1px silver; width:90%; border:dotted 1px silver;">');
+		$beforePlain = ($disableRuler ? "\r\n\r\n" : "\r\n\r\n-- \r\n");
+		$sigText = emailadmin_imapbase::merge($signature, array($GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'], 'person_id')));
+		if ($this->debugLevel > 0) debugLog(__METHOD__.__LINE__.' Signature to use:'.$sigText);
 		$sigTextHtml = $beforeHtml.$sigText;
 		$sigTextPlain = $beforePlain.translation::convertHTMLToText($sigText);
 		$isreply = $isforward = false;
@@ -531,26 +531,26 @@ 
 		{
 			// now get on, and fetch the original mail
 			$uid = $smartdata['itemid'];
-			if ($this->debugLevel>0) debugLog("IMAP Smartreply is called with FolderID:".$smartdata['folderid'].' and ItemID:'.$smartdata['itemid']);
+			if ($this->debugLevel > 0) debugLog("IMAP Smartreply is called with FolderID:".$smartdata['folderid'].' and ItemID:'.$smartdata['itemid']);
 			$this->splitID($smartdata['folderid'], $account, $folder);
 
 			$this->mail->reopen($folder);
 			$bodyStruct = $this->mail->getMessageBody($uid, 'html_only');
-			$bodyBUFFHtml = $this->mail->getdisplayableBody($this->mail,$bodyStruct,true,false);
-			if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.' html_only:'.$bodyBUFFHtml);
-		    if ($bodyBUFFHtml != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/html')) {
+			$bodyBUFFHtml = $this->mail->getdisplayableBody($this->mail, $bodyStruct, true, false);
+			if ($this->debugLevel > 3) debugLog(__METHOD__.__LINE__.' html_only:'.$bodyBUFFHtml);
+		    if ($bodyBUFFHtml != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType'] == 'text/html')) {
 				// may be html
-				if ($this->debugLevel>0) debugLog("MIME Body".' Type:html (fetched with html_only):'.$bodyBUFFHtml);
+				if ($this->debugLevel > 0) debugLog("MIME Body".' Type:html (fetched with html_only):'.$bodyBUFFHtml);
 				$AltBody = $AltBody."</br>".$bodyBUFFHtml.$sigTextHtml;
 				$isreply = true;
 			}
 			// plain text Message part
-			if ($this->debugLevel>0) debugLog("MIME Body".' Type:plain, fetch text:');
+			if ($this->debugLevel > 0) debugLog("MIME Body".' Type:plain, fetch text:');
 			// if the new part of the message is html, we must preserve it, and handle that the original mail is text/plain
-			$bodyStruct = $this->mail->getMessageBody($uid,'never_display');//'never_display');
-			$bodyBUFF = $this->mail->getdisplayableBody($this->mail,$bodyStruct,false,false);
-			if ($bodyBUFF != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/plain')) {
-				if ($this->debugLevel>0) debugLog("MIME Body".' Type:plain (fetched with never_display):'.$bodyBUFF);
+			$bodyStruct = $this->mail->getMessageBody($uid, 'never_display'); //'never_display');
+			$bodyBUFF = $this->mail->getdisplayableBody($this->mail, $bodyStruct, false, false);
+			if ($bodyBUFF != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType'] == 'text/plain')) {
+				if ($this->debugLevel > 0) debugLog("MIME Body".' Type:plain (fetched with never_display):'.$bodyBUFF);
 				$Body = $Body."\r\n".$bodyBUFF.$sigTextPlain;
 				$isreply = true;
 			}
@@ -558,12 +558,12 @@ 
 			{
 				$isreply = true;
 				$AltBody = $AltBody."</br><pre>".nl2br($bodyBUFF).'</pre>'.$sigTextHtml;
-				if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__." no html Body found use modified plaintext body for txt/html: ".$AltBody);
+				if ($this->debugLevel > 0) debugLog(__METHOD__.__LINE__." no html Body found use modified plaintext body for txt/html: ".$AltBody);
 			}
 		}
 
 		// how to forward and other prefs
-		$preferencesArray =& $GLOBALS['egw_info']['user']['preferences']['mail'];
+		$preferencesArray = & $GLOBALS['egw_info']['user']['preferences']['mail'];
 
 		// forward -------------------------------------------------------------------------
 		if ($smartdata['task'] == 'forward' && isset($smartdata['itemid']) &&
@@ -573,7 +573,7 @@ 
 		{
 			//force the default for the forwarding -> asmail
 			if (is_array($preferencesArray)) {
-				if (!array_key_exists('message_forwarding',$preferencesArray)
+				if (!array_key_exists('message_forwarding', $preferencesArray)
 					|| !isset($preferencesArray['message_forwarding'])
 					|| empty($preferencesArray['message_forwarding'])) $preferencesArray['message_forwarding'] = 'asmail';
 			} else {
@@ -581,19 +581,19 @@ 
 			}
 			// construct the uid of the message out of the itemid - seems to be the uid, no construction needed
 			$uid = $smartdata['itemid'];
-			if ($this->debugLevel>0) debugLog("IMAP Smartfordward is called with FolderID:".$smartdata['folderid'].' and ItemID:'.$smartdata['itemid']);
+			if ($this->debugLevel > 0) debugLog("IMAP Smartfordward is called with FolderID:".$smartdata['folderid'].' and ItemID:'.$smartdata['itemid']);
 			$this->splitID($smartdata['folderid'], $account, $folder);
 
 			$this->mail->reopen($folder);
             // receive entire mail (header + body)
 			// get message headers for specified message
-			$headers	= $this->mail->getMessageEnvelope($uid, $_partID, true, $folder);
+			$headers = $this->mail->getMessageEnvelope($uid, $_partID, true, $folder);
 			// build a new mime message, forward entire old mail as file
 			if ($preferencesArray['message_forwarding'] == 'asmail')
 			{
-				$rawHeader='';
-				$rawHeader      = $this->mail->getMessageRawHeader($smartdata['itemid'], $_partID,$folder);
-				$rawBody        = $this->mail->getMessageRawBody($smartdata['itemid'], $_partID,$folder);
+				$rawHeader = '';
+				$rawHeader      = $this->mail->getMessageRawHeader($smartdata['itemid'], $_partID, $folder);
+				$rawBody        = $this->mail->getMessageRawBody($smartdata['itemid'], $_partID, $folder);
 				$mailObject->AddStringAttachment($rawHeader.$rawBody, $headers['SUBJECT'].'.eml', 'message/rfc822');
 				$AltBody = $AltBody."</br>".lang("See Attachments for Content of the Orignial Mail").$sigTextHtml;
 				$Body = $Body."\r\n".lang("See Attachments for Content of the Orignial Mail").$sigTextPlain;
@@ -603,49 +603,49 @@ 
 			{
 				// now get on, and fetch the original mail
 				$uid = $smartdata['itemid'];
-				if ($this->debugLevel>0) debugLog("IMAP Smartreply is called with FolderID:".$smartdata['folderid'].' and ItemID:'.$smartdata['itemid']);
+				if ($this->debugLevel > 0) debugLog("IMAP Smartreply is called with FolderID:".$smartdata['folderid'].' and ItemID:'.$smartdata['itemid']);
 				$this->splitID($smartdata['folderid'], $account, $folder);
 
 				$this->mail->reopen($folder);
 				$bodyStruct = $this->mail->getMessageBody($uid, 'html_only');
-				$bodyBUFFHtml = $this->mail->getdisplayableBody($this->mail,$bodyStruct,true,false);
-				if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.' html_only:'.$bodyBUFFHtml);
-				if ($bodyBUFFHtml != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/html')) {
+				$bodyBUFFHtml = $this->mail->getdisplayableBody($this->mail, $bodyStruct, true, false);
+				if ($this->debugLevel > 3) debugLog(__METHOD__.__LINE__.' html_only:'.$bodyBUFFHtml);
+				if ($bodyBUFFHtml != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType'] == 'text/html')) {
 					// may be html
-					if ($this->debugLevel>0) debugLog("MIME Body".' Type:html (fetched with html_only):'.$bodyBUFFHtml);
+					if ($this->debugLevel > 0) debugLog("MIME Body".' Type:html (fetched with html_only):'.$bodyBUFFHtml);
 					$AltBody = $AltBody."</br>".$bodyBUFFHtml.$sigTextHtml;
 					$isforward = true;
 				}
 				// plain text Message part
-				if ($this->debugLevel>0) debugLog("MIME Body".' Type:plain, fetch text:');
+				if ($this->debugLevel > 0) debugLog("MIME Body".' Type:plain, fetch text:');
 				// if the new part of the message is html, we must preserve it, and handle that the original mail is text/plain
-				$bodyStruct = $this->mail->getMessageBody($uid,'never_display');//'never_display');
-				$bodyBUFF = $this->mail->getdisplayableBody($this->mail,$bodyStruct,false,false);
-				if ($bodyBUFF != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/plain')) {
-					if ($this->debugLevel>0) debugLog("MIME Body".' Type:plain (fetched with never_display):'.$bodyBUFF);
+				$bodyStruct = $this->mail->getMessageBody($uid, 'never_display'); //'never_display');
+				$bodyBUFF = $this->mail->getdisplayableBody($this->mail, $bodyStruct, false, false);
+				if ($bodyBUFF != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType'] == 'text/plain')) {
+					if ($this->debugLevel > 0) debugLog("MIME Body".' Type:plain (fetched with never_display):'.$bodyBUFF);
 					$Body = $Body."\r\n".$bodyBUFF.$sigTextPlain;
 					$isforward = true;
 				}
 				if (!empty($bodyBUFF) && empty($bodyBUFFHtml) && !empty($AltBody))
 				{
 					$AltBody = $AltBody."</br><pre>".nl2br($bodyBUFF).'</pre>'.$sigTextHtml;
-					if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__." no html Body found use modified plaintext body for txt/html: ".$AltBody);
+					if ($this->debugLevel > 0) debugLog(__METHOD__.__LINE__." no html Body found use modified plaintext body for txt/html: ".$AltBody);
 					$isforward = true;
 				}
 				// get all the attachments and add them too.
 				// start handle Attachments
 				//												$_uid, $_partID=null, Horde_Mime_Part $_structure=null, $fetchEmbeddedImages=true, $fetchTextCalendar=false, $resolveTNEF=true, $_folderName=''
-				$attachments = $this->mail->getMessageAttachments($uid, null,          null,								true,						false,				 true			, $folder);
+				$attachments = $this->mail->getMessageAttachments($uid, null, null, true, false, true, $folder);
 				$attachmentNames = false;
-				if (is_array($attachments) && count($attachments)>0)
+				if (is_array($attachments) && count($attachments) > 0)
 				{
-					if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__.' gather Attachments for BodyCreation of/for MessageID:'.$uid.' found:'.count($attachments));
-					foreach((array)$attachments as $key => $attachment)
+					if ($this->debugLevel > 0) debugLog(__METHOD__.__LINE__.' gather Attachments for BodyCreation of/for MessageID:'.$uid.' found:'.count($attachments));
+					foreach ((array)$attachments as $key => $attachment)
 					{
-						if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__.' Key:'.$key.'->'.array2string($attachment));
+						if ($this->debugLevel > 0) debugLog(__METHOD__.__LINE__.' Key:'.$key.'->'.array2string($attachment));
 						$attachmentNames .= $attachment['name']."\n";
 						$attachmentData = '';
-						$attachmentData	= $this->mail->getAttachment($uid, $attachment['partID'],0,false,false,$folder);
+						$attachmentData	= $this->mail->getAttachment($uid, $attachment['partID'], 0, false, false, $folder);
 						/*$x =*/ $mailObject->AddStringAttachment($attachmentData['attachment'], $mailObject->EncodeHeader($attachment['name']), $attachment['mimeType']);
 						//debugLog(__METHOD__.__LINE__.' added part with number:'.$x);
 					}
@@ -661,18 +661,18 @@ 
 		// now set the body
 		if ($AltBody && ($html_body = $mailObject->findBody('html')))
 		{
-			if ($this->debugLevel>1) debugLog(__METHOD__.__LINE__.' -> '.$AltBody);
-			$html_body->setContents($AltBody,array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
+			if ($this->debugLevel > 1) debugLog(__METHOD__.__LINE__.' -> '.$AltBody);
+			$html_body->setContents($AltBody, array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
 		}
 		if ($Body && ($text_body = $mailObject->findBody('plain')))
 		{
-			if ($this->debugLevel>1) debugLog(__METHOD__.__LINE__.' -> '.$Body);
-			$text_body->setContents($Body,array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
+			if ($this->debugLevel > 1) debugLog(__METHOD__.__LINE__.' -> '.$Body);
+			$text_body->setContents($Body, array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
 		}
 		//advanced debugging
 		// Horde SMTP Class uses utf-8 by default.
         //debugLog("IMAP-SendMail: parsed message: ". print_r($message,1));
-		if ($this->debugLevel>2) debugLog("IMAP-SendMail: MailObject:".array2string($mailObject));
+		if ($this->debugLevel > 2) debugLog("IMAP-SendMail: MailObject:".array2string($mailObject));
 
 		// set a higher timeout for big messages
 		@set_time_limit(120);
@@ -682,15 +682,15 @@ 
 		try {
 			$mailObject->Send();
 		}
-		catch(phpmailerException $e) {
-			debugLog("The email could not be sent. Last-SMTP-error: ". $e->getMessage());
+		catch (phpmailerException $e) {
+			debugLog("The email could not be sent. Last-SMTP-error: ".$e->getMessage());
 			$send = false;
 		}
 
-		if (( $smartdata['task'] == 'reply' || $smartdata['task'] == 'forward') && $send == true)
+		if (($smartdata['task'] == 'reply' || $smartdata['task'] == 'forward') && $send == true)
 		{
 			$uid = $smartdata['itemid'];
-			if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__.' tASK:'.$smartdata['task']." FolderID:".$smartdata['folderid'].' and ItemID:'.$smartdata['itemid']);
+			if ($this->debugLevel > 0) debugLog(__METHOD__.__LINE__.' tASK:'.$smartdata['task']." FolderID:".$smartdata['folderid'].' and ItemID:'.$smartdata['itemid']);
 			$this->splitID($smartdata['folderid'], $account, $folder);
 			//error_log(__METHOD__.__LINE__.' Folder:'.$folder.' Uid:'.$uid);
 			$this->mail->reopen($folder);
@@ -698,25 +698,25 @@ 
 			// unless your templatefolder is a subfolder of your draftfolder, and the message is in there
 			if ($this->mail->isDraftFolder($folder) && !$this->mail->isTemplateFolder($folder))
 			{
-				$this->mail->deleteMessages(array($uid),$folder);
+				$this->mail->deleteMessages(array($uid), $folder);
 			} else {
-				$this->mail->flagMessages("answered", array($uid),$folder);
-				if ($smartdata['task']== "forward")
+				$this->mail->flagMessages("answered", array($uid), $folder);
+				if ($smartdata['task'] == "forward")
 				{
-					$this->mail->flagMessages("forwarded", array($uid),$folder);
+					$this->mail->flagMessages("forwarded", array($uid), $folder);
 				}
 			}
 		}
 
-		$asf = ($send ? true:false); // initalize accordingly
-		if (($smartdata['saveinsentitems']==1 || !isset($smartdata['saveinsentitems'])) && $send==true && $this->mail->mailPreferences['sendOptions'] != 'send_only')
+		$asf = ($send ? true : false); // initalize accordingly
+		if (($smartdata['saveinsentitems'] == 1 || !isset($smartdata['saveinsentitems'])) && $send == true && $this->mail->mailPreferences['sendOptions'] != 'send_only')
 		{
 			$asf = false;
 			$sentFolder = $this->mail->getSentFolder();
 			if ($this->_sentID) {
 				$folderArray[] = $this->_sentID;
 			}
-			else if(isset($sentFolder) && $sentFolder != 'none')
+			else if (isset($sentFolder) && $sentFolder != 'none')
 			{
 				$folderArray[] = $sentFolder;
 			}
@@ -728,43 +728,43 @@ 
 				$asf = true;
 			}
 			if (count($folderArray) > 0) {
-				foreach((array)$bccMailAddr as $address) {
-					foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($address):$address)) as $addressObject) {
-						$emailAddress = $addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : '');
+				foreach ((array)$bccMailAddr as $address) {
+					foreach (emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc() ? stripslashes($address) : $address)) as $addressObject) {
+						$emailAddress = $addressObject->mailbox.($addressObject->host ? '@'.$addressObject->host : '');
 						$mailAddr[] = array($emailAddress, $addressObject->personal);
 					}
 				}
-				$BCCmail='';
-				if (count($mailAddr)>0) $BCCmail = $mailObject->AddrAppend("Bcc",$mailAddr);
-				foreach($folderArray as $folderName) {
-					if($this->mail->isSentFolder($folderName)) {
+				$BCCmail = '';
+				if (count($mailAddr) > 0) $BCCmail = $mailObject->AddrAppend("Bcc", $mailAddr);
+				foreach ($folderArray as $folderName) {
+					if ($this->mail->isSentFolder($folderName)) {
 						$flags = '\\Seen';
-					} elseif($this->mail->isDraftFolder($folderName)) {
+					} elseif ($this->mail->isDraftFolder($folderName)) {
 						$flags = '\\Draft';
 					} else {
 						$flags = '';
 					}
 					$asf = true;
 					//debugLog(__METHOD__.__LINE__.'->'.array2string($this->mail->icServer));
-					$this->mail->openConnection(self::$profileID,false);
+					$this->mail->openConnection(self::$profileID, false);
 					if ($this->mail->folderExists($folderName)) {
 						try
 						{
-							$this->mail->appendMessage($folderName,$mailObject->getRaw(), null,
+							$this->mail->appendMessage($folderName, $mailObject->getRaw(), null,
 									$flags);
 						}
 						catch (egw_exception_wrong_userinput $e)
 						{
 							//$asf = false;
-							debugLog(__METHOD__.__LINE__.'->'.lang("Import of message %1 failed. Could not save message to folder %2 due to: %3",$mailObject->getHeader('Subject'),$folderName,$e->getMessage()));
+							debugLog(__METHOD__.__LINE__.'->'.lang("Import of message %1 failed. Could not save message to folder %2 due to: %3", $mailObject->getHeader('Subject'), $folderName, $e->getMessage()));
 						}
 					}
 					else
 					{
 						//$asf = false;
-						debugLog(__METHOD__.__LINE__.'->'.lang("Import of message %1 failed. Destination Folder %2 does not exist.",$mailObject->getHeader('Subject'),$folderName));
+						debugLog(__METHOD__.__LINE__.'->'.lang("Import of message %1 failed. Destination Folder %2 does not exist.", $mailObject->getHeader('Subject'), $folderName));
 					}
-			        debugLog("IMAP-SendMail: Outgoing mail saved in configured 'Sent' folder '".$folderName."': ". (($asf)?"success":"failed"));
+			        debugLog("IMAP-SendMail: Outgoing mail saved in configured 'Sent' folder '".$folderName."': ".(($asf) ? "success" : "failed"));
 				}
 				//$this->mail->closeConnection();
 			}
@@ -778,8 +778,8 @@ 
 		}
 		else
 		{
-			debugLog(__METHOD__." returning ".($ClientSideMeetingRequest ? true : 120)." (MailSubmissionFailed)".($ClientSideMeetingRequest ?" is ClientSideMeetingRequest (we ignore the failure)":""));
-			return ($ClientSideMeetingRequest ? true : 120);   //MAIL Submission failed, see MS-ASCMD
+			debugLog(__METHOD__." returning ".($ClientSideMeetingRequest ? true : 120)." (MailSubmissionFailed)".($ClientSideMeetingRequest ? " is ClientSideMeetingRequest (we ignore the failure)" : ""));
+			return ($ClientSideMeetingRequest ? true : 120); //MAIL Submission failed, see MS-ASCMD
 		}
 
 	}
@@ -791,39 +791,39 @@ 
 	 *
 	 * @see activesync_plugin_read::GetMessage()
 	 */
-	public function GetMessage($folderid, $id, $truncsize, $bodypreference=false, $optionbodypreference=false, $mimesupport = 0)
+	public function GetMessage($folderid, $id, $truncsize, $bodypreference = false, $optionbodypreference = false, $mimesupport = 0)
 	{
 		//$this->debugLevel=4;
-		if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false,self::$profileID,true,false,true);
+		if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false, self::$profileID, true, false, true);
 		debugLog(__METHOD__.__LINE__.' FolderID:'.$folderid.' ID:'.$id.' TruncSize:'.$truncsize.' Bodypreference: '.array2string($bodypreference));
-		$rv = $this->splitID($folderid,$account,$_folderName,$xid);
+		$rv = $this->splitID($folderid, $account, $_folderName, $xid);
 		$this->mail->reopen($_folderName);
 		$stat = $this->StatMessage($folderid, $id);
-		if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.array2string($stat));
+		if ($this->debugLevel > 3) debugLog(__METHOD__.__LINE__.array2string($stat));
 		// StatMessage should reopen the folder in question, so we dont need folderids in the following statements.
 		if ($stat)
 		{
 			debugLog(__METHOD__.__LINE__." Message $id with stat ".array2string($stat));
 			// initialize the object
 			$output = new SyncMail();
-			$headers = $this->mail->getMessageHeader($id,'',true,true,$_folderName);
+			$headers = $this->mail->getMessageHeader($id, '', true, true, $_folderName);
 			if (empty($headers))
 			{
 				error_log(__METHOD__.__LINE__.' Retrieval of Headers Failed! for .'.$this->account.'/'.$GLOBALS['egw_info']['user']['account_lid'].' ServerID:'.self::$profileID.'FolderID:'.$folderid.'/'.$_folderName.' ID:'.$id.' TruncSize:'.$truncsize.' Bodypreference: '.array2string($bodypreference).' Stat was:'.array2string($stat));
-				return $output;//empty object
+				return $output; //empty object
 			}
 			//$rawHeaders = $this->mail->getMessageRawHeader($id);
 			// simple style
 			// start AS12 Stuff (bodypreference === false) case = old behaviour
-			if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__. ' for message with ID:'.$id.' with headers:'.array2string($headers));
+			if ($this->debugLevel > 0) debugLog(__METHOD__.__LINE__.' for message with ID:'.$id.' with headers:'.array2string($headers));
 			if ($bodypreference === false) {
-				$bodyStruct = $this->mail->getMessageBody($id, 'only_if_no_text', '', null, true,$_folderName);
-				$body = $this->mail->getdisplayableBody($this->mail,$bodyStruct,false,false);
+				$bodyStruct = $this->mail->getMessageBody($id, 'only_if_no_text', '', null, true, $_folderName);
+				$body = $this->mail->getdisplayableBody($this->mail, $bodyStruct, false, false);
 				//$body = html_entity_decode($body,ENT_QUOTES,$this->mail->detect_encoding($body));
-				if (stripos($body,'<style')!==false) $body = preg_replace("/<style.*?<\/style>/is", "", $body); // in case there is only a html part
+				if (stripos($body, '<style') !== false) $body = preg_replace("/<style.*?<\/style>/is", "", $body); // in case there is only a html part
 				// remove all other html
 				$body = strip_tags($body);
-				if(strlen($body) > $truncsize) {
+				if (strlen($body) > $truncsize) {
 					$body = utf8_truncate($body, $truncsize);
 					$output->bodytruncated = 1;
 				}
@@ -837,60 +837,60 @@ 
 			else // style with bodypreferences
 			{
 				if (isset($bodypreference[1]) && !isset($bodypreference[1]["TruncationSize"]))
-					$bodypreference[1]["TruncationSize"] = 1024*1024;
+					$bodypreference[1]["TruncationSize"] = 1024 * 1024;
 				if (isset($bodypreference[2]) && !isset($bodypreference[2]["TruncationSize"]))
-					$bodypreference[2]["TruncationSize"] = 1024*1024;
+					$bodypreference[2]["TruncationSize"] = 1024 * 1024;
 				if (isset($bodypreference[3]) && !isset($bodypreference[3]["TruncationSize"]))
-					$bodypreference[3]["TruncationSize"] = 1024*1024;
+					$bodypreference[3]["TruncationSize"] = 1024 * 1024;
 				if (isset($bodypreference[4]) && !isset($bodypreference[4]["TruncationSize"]))
-					$bodypreference[4]["TruncationSize"] = 1024*1024;
+					$bodypreference[4]["TruncationSize"] = 1024 * 1024;
 				// set the protocoll class
 				$output->airsyncbasebody = new SyncAirSyncBaseBody();
-				if ($this->debugLevel>0) debugLog("airsyncbasebody!");
+				if ($this->debugLevel > 0) debugLog("airsyncbasebody!");
 				// fetch the body (try to gather data only once)
-				$css ='';
-				$bodyStruct = $this->mail->getMessageBody($id, 'html_only', '', null, true,$_folderName);
-				if ($this->debugLevel>2) debugLog(__METHOD__.__LINE__.' html_only Struct:'.array2string($bodyStruct));
-				$body = $this->mail->getdisplayableBody($this->mail,$bodyStruct,true,false);
-				if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.' html_only:'.$body);
-			    if ($body != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/html')) {
+				$css = '';
+				$bodyStruct = $this->mail->getMessageBody($id, 'html_only', '', null, true, $_folderName);
+				if ($this->debugLevel > 2) debugLog(__METHOD__.__LINE__.' html_only Struct:'.array2string($bodyStruct));
+				$body = $this->mail->getdisplayableBody($this->mail, $bodyStruct, true, false);
+				if ($this->debugLevel > 3) debugLog(__METHOD__.__LINE__.' html_only:'.$body);
+			    if ($body != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType'] == 'text/html')) {
 					// may be html
-					if ($this->debugLevel>0) debugLog("MIME Body".' Type:html (fetched with html_only)');
+					if ($this->debugLevel > 0) debugLog("MIME Body".' Type:html (fetched with html_only)');
 					$css = $this->mail->getStyles($bodyStruct);
-					$output->airsyncbasenativebodytype=2;
+					$output->airsyncbasenativebodytype = 2;
 				} else {
 					// plain text Message
-					if ($this->debugLevel>0) debugLog("MIME Body".' Type:plain, fetch text (HTML, if no text available)');
-					$output->airsyncbasenativebodytype=1;
-					$bodyStruct = $this->mail->getMessageBody($id,'never_display', '', null, true,$_folderName); //'only_if_no_text');
-					if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.' plain text Struct:'.array2string($bodyStruct));
-					$body = $this->mail->getdisplayableBody($this->mail,$bodyStruct,false,false);
-					if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.' never display html(plain text only):'.$body);
+					if ($this->debugLevel > 0) debugLog("MIME Body".' Type:plain, fetch text (HTML, if no text available)');
+					$output->airsyncbasenativebodytype = 1;
+					$bodyStruct = $this->mail->getMessageBody($id, 'never_display', '', null, true, $_folderName); //'only_if_no_text');
+					if ($this->debugLevel > 3) debugLog(__METHOD__.__LINE__.' plain text Struct:'.array2string($bodyStruct));
+					$body = $this->mail->getdisplayableBody($this->mail, $bodyStruct, false, false);
+					if ($this->debugLevel > 3) debugLog(__METHOD__.__LINE__.' never display html(plain text only):'.$body);
 				}
 				// whatever format decode (using the correct encoding)
-				if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__."MIME Body".' Type:'.($output->airsyncbasenativebodytype==2?' html ':' plain ').$body);
+				if ($this->debugLevel > 3) debugLog(__METHOD__.__LINE__."MIME Body".' Type:'.($output->airsyncbasenativebodytype == 2 ? ' html ' : ' plain ').$body);
 				//$body = html_entity_decode($body,ENT_QUOTES,$this->mail->detect_encoding($body));
 				// prepare plaintextbody
 				if ($output->airsyncbasenativebodytype == 2)
 				{
-					$bodyStructplain = $this->mail->getMessageBody($id,'never_display', '', null, true,$_folderName); //'only_if_no_text');
-					if($bodyStructplain[0]['error']==1)
+					$bodyStructplain = $this->mail->getMessageBody($id, 'never_display', '', null, true, $_folderName); //'only_if_no_text');
+					if ($bodyStructplain[0]['error'] == 1)
 					{
 						$plainBody = translation::convertHTMLToText($body); // always display with preserved HTML
 					}
 					else
 					{
-						$plainBody = $this->mail->getdisplayableBody($this->mail,$bodyStructplain,false,false);
+						$plainBody = $this->mail->getdisplayableBody($this->mail, $bodyStructplain, false, false);
 					}
 				}
 				//if ($this->debugLevel>0) debugLog("MIME Body".$body);
-				$plainBody = preg_replace("/<style.*?<\/style>/is", "", (strlen($plainBody)?$plainBody:$body));
+				$plainBody = preg_replace("/<style.*?<\/style>/is", "", (strlen($plainBody) ? $plainBody : $body));
 				// remove all other html
-				$plainBody = preg_replace("/<br.*>/is","\r\n",$plainBody);
+				$plainBody = preg_replace("/<br.*>/is", "\r\n", $plainBody);
 				$plainBody = strip_tags($plainBody);
-				if ($this->debugLevel>3 && $output->airsyncbasenativebodytype==1) debugLog(__METHOD__.__LINE__.' Plain Text:'.$plainBody);
+				if ($this->debugLevel > 3 && $output->airsyncbasenativebodytype == 1) debugLog(__METHOD__.__LINE__.' Plain Text:'.$plainBody);
 				//$body = str_replace("\n","\r\n", str_replace("\r","",$body)); // do we need that?
-				if (isset($bodypreference[4]) && ($mimesupport==2 || ($mimesupport ==1 && stristr($headers['CONTENT-TYPE'],'signed') !== false)))
+				if (isset($bodypreference[4]) && ($mimesupport == 2 || ($mimesupport == 1 && stristr($headers['CONTENT-TYPE'], 'signed') !== false)))
 				{
 					debugLog(__METHOD__.__LINE__." bodypreference 4 requested");
 					$output->airsyncbasebody->type = 4;
@@ -902,7 +902,7 @@ 
 						// we create a complete new rfc822 message here to pass a clean one to the client.
 						// this strips a lot of information, but ...
 						$Header = $Body = '';
-						if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__." Creation of Mailobject.");
+						if ($this->debugLevel > 0) debugLog(__METHOD__.__LINE__." Creation of Mailobject.");
 						//if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__." Using data from ".$rawHeaders.$rawBody);
 						//$this->mail->parseRawMessageIntoMailObject($mailObject,$rawHeaders.$rawBody,$Header,$Body);
 						//debugLog(__METHOD__.__LINE__.array2string($headers));
@@ -915,33 +915,33 @@ 
 						$mailObject->Subject = $headers['SUBJECT'];
 						$mailObject->MessageID = $headers['MESSAGE-ID'];
 						// from
-						foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($headers['FROM']):$headers['FROM'])) as $addressObject) {
+						foreach (emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc() ? stripslashes($headers['FROM']) : $headers['FROM'])) as $addressObject) {
 							//debugLog(__METHOD__.__LINE__.'Address to add (FROM):'.array2string($addressObject));
 							if (!$addressObject->valid) continue;
-							$mailObject->From = $addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : '');
+							$mailObject->From = $addressObject->mailbox.($addressObject->host ? '@'.$addressObject->host : '');
 							$mailObject->FromName = $addressObject->personal;
 //error_log(__METHOD__.__LINE__.'Address to add (FROM):'.array2string($addressObject));
 						}
 						// to
-						foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($headers['TO']):$headers['TO'])) as $addressObject) {
+						foreach (emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc() ? stripslashes($headers['TO']) : $headers['TO'])) as $addressObject) {
 							//debugLog(__METHOD__.__LINE__.'Address to add (TO):'.array2string($addressObject));
 							if (!$addressObject->valid) continue;
-							$mailObject->AddAddress($addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''),$addressObject->personal);
+							$mailObject->AddAddress($addressObject->mailbox.($addressObject->host ? '@'.$addressObject->host : ''), $addressObject->personal);
 						}
 						// CC
-						foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($headers['CC']):$headers['CC'])) as $addressObject) {
+						foreach (emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc() ? stripslashes($headers['CC']) : $headers['CC'])) as $addressObject) {
 							//debugLog(__METHOD__.__LINE__.'Address to add (CC):'.array2string($addressObject));
 							if (!$addressObject->valid) continue;
-							$mailObject->AddCC($addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''),$addressObject->personal);
+							$mailObject->AddCC($addressObject->mailbox.($addressObject->host ? '@'.$addressObject->host : ''), $addressObject->personal);
 						}
 						//	AddReplyTo
-						foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($headers['REPLY-TO']):$headers['REPLY-TO'])) as $addressObject) {
+						foreach (emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc() ? stripslashes($headers['REPLY-TO']) : $headers['REPLY-TO'])) as $addressObject) {
 							//debugLog(__METHOD__.__LINE__.'Address to add (ReplyTO):'.array2string($addressObject));
 							if (!$addressObject->valid) continue;
-							$mailObject->AddReplyTo($addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''),$addressObject->personal);
+							$mailObject->AddReplyTo($addressObject->mailbox.($addressObject->host ? '@'.$addressObject->host : ''), $addressObject->personal);
 						}
 						$Header = $Body = ''; // we do not use Header and Body we use the MailObject
-						if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__." Creation of Mailobject succeeded.");
+						if ($this->debugLevel > 0) debugLog(__METHOD__.__LINE__." Creation of Mailobject succeeded.");
 					}
 					catch (egw_exception_assertion_failed $e)
 					{
@@ -949,11 +949,11 @@ 
 						$Header = $Body = '';
 					}
 
-					if ($this->debugLevel>0) debugLog("MIME Body -> ".$body); // body is retrieved up
-					if ($output->airsyncbasenativebodytype==2) { //html
-						if ($this->debugLevel>0) debugLog("HTML Body with requested pref 4");
+					if ($this->debugLevel > 0) debugLog("MIME Body -> ".$body); // body is retrieved up
+					if ($output->airsyncbasenativebodytype == 2) { //html
+						if ($this->debugLevel > 0) debugLog("HTML Body with requested pref 4");
 						// if we happen to extract css from body. then remove it
-						if ($css) translation::replaceTagsCompletley($body,'style');
+						if ($css) translation::replaceTagsCompletley($body, 'style');
 						$html = '<html>'.
 	    					    '<head>'.
 						        '<meta name="Generator" content="Z-Push">'.
@@ -961,30 +961,30 @@ 
 								$css.
 							    '</head>'.
 							    '<body>'.
-						        str_replace("\n","<BR>",str_replace("\r","", str_replace("\r\n","<BR>",$body))).
+						        str_replace("\n", "<BR>", str_replace("\r", "", str_replace("\r\n", "<BR>", $body))).
 							    '</body>'.
 								'</html>';
-						$mailObject->setHtmlBody(str_replace("\n","\r\n", str_replace("\r","",$html)),null,false);
-						if ($this->debugLevel>2) debugLog(__METHOD__.__LINE__." MIME Body (constructed)-> ".$mailObject->findBody('html')->getContents());
-						$mailObject->setBody(empty($plainBody)?strip_tags($body):$plainBody);
+						$mailObject->setHtmlBody(str_replace("\n", "\r\n", str_replace("\r", "", $html)), null, false);
+						if ($this->debugLevel > 2) debugLog(__METHOD__.__LINE__." MIME Body (constructed)-> ".$mailObject->findBody('html')->getContents());
+						$mailObject->setBody(empty($plainBody) ? strip_tags($body) : $plainBody);
 					}
-					if ($output->airsyncbasenativebodytype==1) { //plain
-						if ($this->debugLevel>0) debugLog("Plain Body with requested pref 4");
+					if ($output->airsyncbasenativebodytype == 1) { //plain
+						if ($this->debugLevel > 0) debugLog("Plain Body with requested pref 4");
 						$mailObject->setBody($plainBody);
 					}
 					// we still need the attachments to be added ( if there are any )
 					// start handle Attachments
 					//												$_uid, $_partID=null, Horde_Mime_Part $_structure=null, $fetchEmbeddedImages=true, $fetchTextCalendar=false, $resolveTNEF=true, $_folderName=''
-					$attachments = $this->mail->getMessageAttachments($id, null,          null,								true,						false,					 true				, $_folderName);
-					if (is_array($attachments) && count($attachments)>0)
+					$attachments = $this->mail->getMessageAttachments($id, null, null, true, false, true, $_folderName);
+					if (is_array($attachments) && count($attachments) > 0)
 					{
 						debugLog(__METHOD__.__LINE__.' gather Attachments for BodyCreation of/for MessageID:'.$id.' found:'.count($attachments));
 						//error_log(__METHOD__.__LINE__.array2string($attachments));
-						foreach((array)$attachments as $key => $attachment)
+						foreach ((array)$attachments as $key => $attachment)
 						{
-							if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__.' Key:'.$key.'->'.array2string($attachment));
+							if ($this->debugLevel > 0) debugLog(__METHOD__.__LINE__.' Key:'.$key.'->'.array2string($attachment));
 							$attachmentData = '';
-							$attachmentData	= $this->mail->getAttachment($id, $attachment['partID'],0,false,false,$_folderName);
+							$attachmentData	= $this->mail->getAttachment($id, $attachment['partID'], 0, false, false, $_folderName);
 							$mailObject->AddStringAttachment($attachmentData['attachment'], $mailObject->EncodeHeader($attachment['name']), $attachment['mimeType']);
 						}
 					}
@@ -992,13 +992,13 @@ 
 					$Header = $mailObject->getMessageHeader();
 					//debugLog(__METHOD__.__LINE__.' MailObject-Header:'.array2string($Header));
 					$Body = trim($mailObject->getMessageBody()); // philip thinks this is needed, so lets try if it does any good/harm
-					if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.' MailObject:'.array2string($mailObject));
-					if ($this->debugLevel>2) debugLog(__METHOD__.__LINE__." Setting Mailobjectcontent to output:".$Header.self::$LE.self::$LE.$Body);
+					if ($this->debugLevel > 3) debugLog(__METHOD__.__LINE__.' MailObject:'.array2string($mailObject));
+					if ($this->debugLevel > 2) debugLog(__METHOD__.__LINE__." Setting Mailobjectcontent to output:".$Header.self::$LE.self::$LE.$Body);
 					$output->airsyncbasebody->data = $Header.self::$LE.self::$LE.$Body;
 				}
 				else if (isset($bodypreference[2]))
 				{
-					if ($this->debugLevel>0) debugLog("HTML Body with requested pref 2");
+					if ($this->debugLevel > 0) debugLog("HTML Body with requested pref 2");
 					// Send HTML if requested and native type was html
 					$output->airsyncbasebody->type = 2;
 					$htmlbody = '<html>'.
@@ -1008,7 +1008,7 @@ 
 						$css.
 						'</head>'.
 						'<body>';
-					if ($output->airsyncbasenativebodytype==2)
+					if ($output->airsyncbasenativebodytype == 2)
 					{
 						// as we fetch html, and body is HTML, we may not need to handle this
 						$htmlbody .= $body;
@@ -1016,14 +1016,14 @@ 
 					else
 					{
 						// html requested but got only plaintext, so fake html
-						$htmlbody .= str_replace("\n","<BR>",str_replace("\r","<BR>", str_replace("\r\n","<BR>",$plainBody)));
+						$htmlbody .= str_replace("\n", "<BR>", str_replace("\r", "<BR>", str_replace("\r\n", "<BR>", $plainBody)));
 					}
 					$htmlbody .= '</body>'.
 							'</html>';
 
-					if(isset($bodypreference[2]["TruncationSize"]) && strlen($html) > $bodypreference[2]["TruncationSize"])
+					if (isset($bodypreference[2]["TruncationSize"]) && strlen($html) > $bodypreference[2]["TruncationSize"])
 					{
-						$htmlbody = utf8_truncate($htmlbody,$bodypreference[2]["TruncationSize"]);
+						$htmlbody = utf8_truncate($htmlbody, $bodypreference[2]["TruncationSize"]);
 						$output->airsyncbasebody->truncated = 1;
 					}
 					$output->airsyncbasebody->data = $htmlbody;
@@ -1031,7 +1031,7 @@ 
 				else
 				{
 					// Send Plaintext as Fallback or if original body is plainttext
-					if ($this->debugLevel>0) debugLog("Plaintext Body:".$plainBody);
+					if ($this->debugLevel > 0) debugLog("Plaintext Body:".$plainBody);
 					/* we use plainBody (set above) instead
 					$bodyStruct = $this->mail->getMessageBody($id,'only_if_no_text'); //'never_display');
 					$plain = $this->mail->getdisplayableBody($this->mail,$bodyStruct);
@@ -1040,7 +1040,7 @@ 
 					//$plain = str_replace("\n","\r\n",str_replace("\r","",$plain));
 					*/
 					$output->airsyncbasebody->type = 1;
-					if(isset($bodypreference[1]["TruncationSize"]) &&
+					if (isset($bodypreference[1]["TruncationSize"]) &&
 			    		strlen($plainBody) > $bodypreference[1]["TruncationSize"])
 					{
 						$plainBody = utf8_truncate($plainBody, $bodypreference[1]["TruncationSize"]);
@@ -1061,21 +1061,20 @@ 
 			debugLog(__METHOD__.__LINE__.' gather Header info:'.$headers['SUBJECT'].' from:'.$headers['DATE']);
 			$output->read = $stat["flags"];
 			$output->subject = $this->messages[$id]['subject'];
-			$output->importance = $this->messages[$id]['priority'] > 3 ? 0 :
-				($this->messages[$id]['priority'] < 3 ? 2 : 1) ;
-			$output->datereceived = $this->mail->_strtotime($headers['DATE'],'ts',true);
-			$output->displayto = ($headers['TO'] ? $headers['TO']:null); //$stat['FETCHED_HEADER']['to_name']
+			$output->importance = $this->messages[$id]['priority'] > 3 ? 0 : ($this->messages[$id]['priority'] < 3 ? 2 : 1);
+			$output->datereceived = $this->mail->_strtotime($headers['DATE'], 'ts', true);
+			$output->displayto = ($headers['TO'] ? $headers['TO'] : null); //$stat['FETCHED_HEADER']['to_name']
 			// $output->to = $this->messages[$id]['to_address']; //$stat['FETCHED_HEADER']['to_name']
 			// $output->from = $this->messages[$id]['sender_address']; //$stat['FETCHED_HEADER']['sender_name']
 //error_log(__METHOD__.__LINE__.' To:'.$headers['TO']);
 			$output->to = $headers['TO'];
 //error_log(__METHOD__.__LINE__.' From:'.$headers['FROM']);
 			$output->from = $headers['FROM'];
-			$output->cc = ($headers['CC'] ? $headers['CC']:null);
-			$output->reply_to = ($headers['REPLY_TO']?$headers['REPLY_TO']:null);
+			$output->cc = ($headers['CC'] ? $headers['CC'] : null);
+			$output->reply_to = ($headers['REPLY_TO'] ? $headers['REPLY_TO'] : null);
 			$output->messageclass = "IPM.Note";
-			if (stripos($this->messages[$id]['mimetype'],'multipart')!== false &&
-				stripos($this->messages[$id]['mimetype'],'signed')!== false)
+			if (stripos($this->messages[$id]['mimetype'], 'multipart') !== false &&
+				stripos($this->messages[$id]['mimetype'], 'signed') !== false)
 			{
 				$output->messageclass = "IPM.Note.SMIME.MultipartSigned";
 			}
@@ -1090,61 +1089,61 @@ 
 			}
 
 			$output->internetcpid = 65001;
-			$output->contentclass="urn:content-classes:message";
+			$output->contentclass = "urn:content-classes:message";
 			// end AS12 Stuff
 
 			// start handle Attachments (include text/calendar multipart alternative)
-			$attachments = $this->mail->getMessageAttachments($id, $_partID='', $_structure=null, $fetchEmbeddedImages=true, $fetchTextCalendar=true, true, $_folderName);
-			if (is_array($attachments) && count($attachments)>0)
+			$attachments = $this->mail->getMessageAttachments($id, $_partID = '', $_structure = null, $fetchEmbeddedImages = true, $fetchTextCalendar = true, true, $_folderName);
+			if (is_array($attachments) && count($attachments) > 0)
 			{
 				debugLog(__METHOD__.__LINE__.' gather Attachments for MessageID:'.$id.' found:'.count($attachments));
 				//error_log(__METHOD__.__LINE__.array2string($attachments));
 				foreach ($attachments as $key => $attach)
 				{
-					if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__.' Key:'.$key.'->'.array2string($attach));
+					if ($this->debugLevel > 0) debugLog(__METHOD__.__LINE__.' Key:'.$key.'->'.array2string($attach));
 
 					// pass meeting requests to calendar plugin
 					if (strtolower($attach['mimeType']) == 'text/calendar' && strtolower($attach['method']) == 'request' &&
 						isset($GLOBALS['egw_info']['user']['apps']['calendar']) &&
-						($attachment = $this->mail->getAttachment($id, $attach['partID'],0,false,false,$_folderName)) &&
+						($attachment = $this->mail->getAttachment($id, $attach['partID'], 0, false, false, $_folderName)) &&
 						($output->meetingrequest = calendar_activesync::meetingRequest($attachment['attachment'])))
 					{
 						$output->messageclass = "IPM.Schedule.Meeting.Request";
-						continue;	// do NOT add attachment as attachment
+						continue; // do NOT add attachment as attachment
 					}
-					if(isset($output->_mapping['POOMMAIL:Attachments'])) {
+					if (isset($output->_mapping['POOMMAIL:Attachments'])) {
 						$attachment = new SyncAttachment();
-					} else if(isset($output->_mapping['AirSyncBase:Attachments'])) {
+					} else if (isset($output->_mapping['AirSyncBase:Attachments'])) {
 						$attachment = new SyncAirSyncBaseAttachment();
 					}
 					$attachment->attsize = $attach['size'];
 					$attachment->displayname = $attach['name'];
-					$attachment->attname = $folderid . ":" . $id . ":" . $attach['partID'];//$key;
+					$attachment->attname = $folderid.":".$id.":".$attach['partID']; //$key;
 					//error_log(__METHOD__.__LINE__.'->'.$folderid . ":" . $id . ":" . $attach['partID']);
 					$attachment->attmethod = 1;
-					$attachment->attoid = "";//isset($part->headers['content-id']) ? trim($part->headers['content-id']) : "";
-					if (!empty($attach['cid']) && $attach['cid'] <> 'NIL' )
+					$attachment->attoid = ""; //isset($part->headers['content-id']) ? trim($part->headers['content-id']) : "";
+					if (!empty($attach['cid']) && $attach['cid'] <> 'NIL')
 					{
-						$attachment->isinline=true;
-						$attachment->attmethod=6;
-						$attachment->contentid= $attach['cid'];
+						$attachment->isinline = true;
+						$attachment->attmethod = 6;
+						$attachment->contentid = $attach['cid'];
 						//	debugLog("'".$part->headers['content-id']."'  ".$attachment->contentid);
 						$attachment->contenttype = trim($attach['mimeType']);
 						//	debugLog("'".$part->headers['content-type']."'  ".$attachment->contentid);
 					} else {
-						$attachment->attmethod=1;
+						$attachment->attmethod = 1;
 					}
 
 					if (isset($output->_mapping['POOMMAIL:Attachments'])) {
 						array_push($output->attachments, $attachment);
-					} else if(isset($output->_mapping['AirSyncBase:Attachments'])) {
+					} else if (isset($output->_mapping['AirSyncBase:Attachments'])) {
 						array_push($output->airsyncbaseattachments, $attachment);
 					}
 				}
 			}
 			//$this->debugLevel=0;
 			// end handle Attachments
-			if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.array2string($output));
+			if ($this->debugLevel > 3) debugLog(__METHOD__.__LINE__.array2string($output));
 			return $output;
 		}
 		return false;
@@ -1174,16 +1173,16 @@ 
 			return false;
 		}
 		$ret = false;
-		foreach($this->mail->getMessageAttachments($requestid, $_partID='', $_structure=null, $fetchEmbeddedImages=true, $fetchTextCalendar=true) as $key => $attach)
+		foreach ($this->mail->getMessageAttachments($requestid, $_partID = '', $_structure = null, $fetchEmbeddedImages = true, $fetchTextCalendar = true) as $key => $attach)
 		{
 			if (strtolower($attach['mimeType']) == 'text/calendar' && strtolower($attach['method']) == 'request' &&
-				($attachment = $this->mail->getAttachment($requestid, $attach['partID'],0,false)))
+				($attachment = $this->mail->getAttachment($requestid, $attach['partID'], 0, false)))
 			{
 				debugLog(__METHOD__."($requestid, '$folderid', $response) iCal found, calling now backend->MeetingResponse('$attachment[attachment]')");
 
 				// calling backend again with iCal attachment, to let calendar add the event
 				if (($ret = $this->backend->MeetingResponse($attachment['attachment'],
-					$this->backend->createID('calendar',$GLOBALS['egw_info']['user']['account_id']),
+					$this->backend->createID('calendar', $GLOBALS['egw_info']['user']['account_id']),
 					$response, $calendarid)))
 				{
 					$ret = $calendarid;
@@ -1205,17 +1204,17 @@ 
      * @param string $attname - should contain (folder)id
 	 * @return true, prints the content of the attachment
 	 */
-	function GetAttachmentData($fid,$attname) {
+	function GetAttachmentData($fid, $attname) {
 		debugLog("getAttachmentData: $fid (attname: '$attname')");
 		error_log(__METHOD__.__LINE__." Fid: $fid (attname: '$attname')");
 		list($folderid, $id, $part) = explode(":", $attname);
 
 		$this->splitID($folderid, $account, $folder);
 
-		if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false,self::$profileID,true,false,true);
+		if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false, self::$profileID, true, false, true);
 
 		$this->mail->reopen($folder);
-		$attachment = $this->mail->getAttachment($id,$part,0,false,false,$folder);
+		$attachment = $this->mail->getAttachment($id, $part, 0, false, false, $folder);
 		print $attachment['attachment'];
 		unset($attachment);
 		return true;
@@ -1231,17 +1230,17 @@ 
      * @param string $attname - should contain (folder)id
 	 * @return SyncAirSyncBaseFileAttachment-object
 	 */
-	function ItemOperationsGetAttachmentData($fid,$attname) {
+	function ItemOperationsGetAttachmentData($fid, $attname) {
 		debugLog("ItemOperationsGetAttachmentData: (attname: '$attname')");
 
 		list($folderid, $id, $part) = explode(":", $attname);
 
 		$this->splitID($folderid, $account, $folder);
 
-		if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false, self::$profileID,true,false,true);
+		if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false, self::$profileID, true, false, true);
 
 		$this->mail->reopen($folder);
-		$att = $this->mail->getAttachment($id,$part,0,false,false,$folder);
+		$att = $this->mail->getAttachment($id, $part, 0, false, false, $folder);
 		$attachment = new SyncAirSyncBaseFileAttachment();
 		/*
 		debugLog(__METHOD__.__LINE__.array2string($att));
@@ -1303,17 +1302,17 @@ 
 		$this->splitID($folderid, $account, $srcFolder);
 		$this->splitID($newfolderid, $account, $destFolder);
 		debugLog("IMAP-MoveMessage: (SourceFolder: '$srcFolder'  id: '$id'  DestFolder: '$destFolder' )");
-		if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false,self::$profileID,true,false,true);
+		if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false, self::$profileID, true, false, true);
 		$this->mail->reopen($destFolder);
 		$status = $this->mail->getFolderStatus($destFolder);
 		$uidNext = $status['uidnext'];
 		$this->mail->reopen($srcFolder);
 
 		// move message
-		$rv = $this->mail->moveMessages($destFolder,(array)$id,true,$srcFolder,true);
+		$rv = $this->mail->moveMessages($destFolder, (array)$id, true, $srcFolder, true);
 		debugLog(__METHOD__.__LINE__.array2string($rv)); // this may be true, so try using the nextUID value by examine
 		// return the new id "as string""
-		return ($rv===true ? $uidNext : $rv[$id]) . "";
+		return ($rv === true ? $uidNext : $rv[$id])."";
 	}
 
 	/**
@@ -1321,86 +1320,86 @@ 
 	 *
 	 *  @ToDo loop over available email accounts
 	 */
-	public function GetMessageList($folderid, $cutoffdate=NULL)
+	public function GetMessageList($folderid, $cutoffdate = NULL)
 	{
 		static $cutdate;
-		if (!empty($cutoffdate) && $cutoffdate >0 && (empty($cutdate) || $cutoffdate != $cutdate))  $cutdate = $cutoffdate;
-		debugLog (__METHOD__.' for Folder:'.$folderid.' SINCE:'.$cutdate.'/'.date("d-M-Y", $cutdate));
+		if (!empty($cutoffdate) && $cutoffdate > 0 && (empty($cutdate) || $cutoffdate != $cutdate))  $cutdate = $cutoffdate;
+		debugLog(__METHOD__.' for Folder:'.$folderid.' SINCE:'.$cutdate.'/'.date("d-M-Y", $cutdate));
 		if (empty($cutdate))
 		{
-			$cutdate = egw_time::to('now','ts')-(3600*24*28*3);
+			$cutdate = egw_time::to('now', 'ts') - (3600 * 24 * 28 * 3);
 			debugLog(__METHOD__.' Client set no truncationdate. Using 12 weeks.'.date("d-M-Y", $cutdate));
 		}
 		return $this->fetchMessages($folderid, $cutdate);
 	}
 
-	private function fetchMessages($folderid, $cutoffdate=NULL, $_id=NULL)
+	private function fetchMessages($folderid, $cutoffdate = NULL, $_id = NULL)
 	{
-		if ($this->debugLevel>1) $gstarttime = microtime (true);
+		if ($this->debugLevel > 1) $gstarttime = microtime(true);
 		//debugLog(__METHOD__.__LINE__);
 		$rv_messages = array();
 		// if the message is still available within the class, we use it instead of fetching it again
-		if (is_array($_id) && count($_id)==1 && is_array($this->messages) && isset($this->messages[$_id[0]]) && is_array($this->messages[$_id[0]]))
+		if (is_array($_id) && count($_id) == 1 && is_array($this->messages) && isset($this->messages[$_id[0]]) && is_array($this->messages[$_id[0]]))
 		{
 			//debugLog(__METHOD__.__LINE__." the message ".$_id[0]." is still available within the class, we use it instead of fetching it again");
 			$rv_messages = array('header'=>array($this->messages[$_id[0]]));
 		}
 		if (empty($rv_messages))
 		{
-			if ($this->debugLevel>1) $starttime = microtime (true);
+			if ($this->debugLevel > 1) $starttime = microtime(true);
 			$this->_connect($this->account);
-			if ($this->debugLevel>1)
+			if ($this->debugLevel > 1)
 			{
 				$endtime = microtime(true) - $starttime;
-				debugLog(__METHOD__. " connect took : ".$endtime.' for account:'.$this->account);
+				debugLog(__METHOD__." connect took : ".$endtime.' for account:'.$this->account);
 			}
 			$messagelist = array();
 			// if not connected, any further action must fail
-			if (!empty($cutoffdate)) $_filter = array('status'=>array('UNDELETED'),'type'=>"SINCE",'string'=> date("d-M-Y", $cutoffdate));
-			if ($this->debugLevel>1) $starttime = microtime (true);
-			$rv = $this->splitID($folderid,$account,$_folderName,$id);
-			if ($this->debugLevel>1)
+			if (!empty($cutoffdate)) $_filter = array('status'=>array('UNDELETED'), 'type'=>"SINCE", 'string'=> date("d-M-Y", $cutoffdate));
+			if ($this->debugLevel > 1) $starttime = microtime(true);
+			$rv = $this->splitID($folderid, $account, $_folderName, $id);
+			if ($this->debugLevel > 1)
 			{
 				$endtime = microtime(true) - $starttime;
-				debugLog(__METHOD__. " splitID took : ".$endtime.' for FolderID:'.$folderid);
+				debugLog(__METHOD__." splitID took : ".$endtime.' for FolderID:'.$folderid);
 			}
-			if ($this->debugLevel>1) debugLog(__METHOD__.' for Folder:'.$_folderName.' Filter:'.array2string($_filter).' Ids:'.array2string($_id).'/'.$id);
-			if ($this->debugLevel>1) $starttime = microtime (true);
-			$_numberOfMessages = (empty($cutoffdate)?250:99999);
-			$rv_messages = $this->mail->getHeaders($_folderName, $_startMessage=1, $_numberOfMessages, $_sort=0, $_reverse=false, $_filter, $_id);
-			if ($this->debugLevel>1)
+			if ($this->debugLevel > 1) debugLog(__METHOD__.' for Folder:'.$_folderName.' Filter:'.array2string($_filter).' Ids:'.array2string($_id).'/'.$id);
+			if ($this->debugLevel > 1) $starttime = microtime(true);
+			$_numberOfMessages = (empty($cutoffdate) ? 250 : 99999);
+			$rv_messages = $this->mail->getHeaders($_folderName, $_startMessage = 1, $_numberOfMessages, $_sort = 0, $_reverse = false, $_filter, $_id);
+			if ($this->debugLevel > 1)
 			{
 				$endtime = microtime(true) - $starttime;
-				debugLog(__METHOD__. " getHeaders call took : ".$endtime.' for FolderID:'.$_folderName);
+				debugLog(__METHOD__." getHeaders call took : ".$endtime.' for FolderID:'.$_folderName);
 			}
 		}
-		if ($_id == NULL && $this->debugLevel>1)  debugLog(__METHOD__." found :". count($rv_messages['header']));
+		if ($_id == NULL && $this->debugLevel > 1)  debugLog(__METHOD__." found :".count($rv_messages['header']));
 		//debugLog(__METHOD__.__LINE__.' Result:'.array2string($rv_messages));
 		foreach ((array)$rv_messages['header'] as $k => $vars)
 		{
-			if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.' ID to process:'.$vars['uid'].' Subject:'.$vars['subject']);
+			if ($this->debugLevel > 3) debugLog(__METHOD__.__LINE__.' ID to process:'.$vars['uid'].' Subject:'.$vars['subject']);
 			$this->messages[$vars['uid']] = $vars;
-			if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.' MailID:'.$k.'->'.array2string($vars));
+			if ($this->debugLevel > 3) debugLog(__METHOD__.__LINE__.' MailID:'.$k.'->'.array2string($vars));
 			if (!empty($vars['deleted'])) continue; // cut of deleted messages
 			if ($cutoffdate && $vars['date'] < $cutoffdate) continue; // message is out of range for cutoffdate, ignore it
-			if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__.' ID to report:'.$vars['uid'].' Subject:'.$vars['subject']);
+			if ($this->debugLevel > 0) debugLog(__METHOD__.__LINE__.' ID to report:'.$vars['uid'].' Subject:'.$vars['subject']);
 			$mess["mod"] = $vars['date'];
 			$mess["id"] = $vars['uid'];
 			// 'seen' aka 'read' is the only flag we want to know about
 			$mess["flags"] = 0;
 			// outlook supports additional flags, set them to 0
 			$mess["olflags"] = 0;
-			if($vars["seen"]) $mess["flags"] = 1;
-			if($vars["flagged"]) $mess["olflags"] = 2;
-			if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.array2string($mess));
+			if ($vars["seen"]) $mess["flags"] = 1;
+			if ($vars["flagged"]) $mess["olflags"] = 2;
+			if ($this->debugLevel > 3) debugLog(__METHOD__.__LINE__.array2string($mess));
 			$messagelist[$vars['uid']] = $mess;
 			unset($mess);
 		}
 
-		if ($this->debugLevel>1)
+		if ($this->debugLevel > 1)
 		{
 			$endtime = microtime(true) - $gstarttime;
-			debugLog(__METHOD__. " total time used : ".$endtime.' for Folder:'.$_folderName.' Filter:'.array2string($_filter).' Ids:'.array2string($_id).'/'.$id);
+			debugLog(__METHOD__." total time used : ".$endtime.' for Folder:'.$_folderName.' Filter:'.array2string($_filter).' Ids:'.array2string($_id).'/'.$id);
 		}
 		return $messagelist;
 	}
@@ -1414,7 +1413,7 @@ 
 	public function getSearchResultsMailbox($searchquery)
 	{
 		if (!is_array($searchquery)) return array();
-		if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__.array2string($searchquery));
+		if ($this->debugLevel > 0) debugLog(__METHOD__.__LINE__.array2string($searchquery));
 		// 19.10.2011 16:28:59 [24502] mail_activesync::getSearchResultsMailbox1408
 		//Array(
 		//	[query] => Array(
@@ -1438,22 +1437,22 @@ 
 		} else {
 			$rebuildresults = false;
 		}
-		if ($this->debugLevel>0) debugLog( 'RebuildResults ['.$rebuildresults.']' );
+		if ($this->debugLevel > 0) debugLog('RebuildResults ['.$rebuildresults.']');
 
 		if (isset($searchquery['deeptraversal'])) {
 			$deeptraversal = $searchquery['deeptraversal'];
 		} else {
 			$deeptraversal = false;
 		}
-		if ($this->debugLevel>0) debugLog( 'DeepTraversal ['.$deeptraversal.']' );
+		if ($this->debugLevel > 0) debugLog('DeepTraversal ['.$deeptraversal.']');
 
 		if (isset($searchquery['range'])) {
-			$range = explode("-",$searchquery['range']);
+			$range = explode("-", $searchquery['range']);
 			$limit = $range[1] - $range[0] + 1;
 		} else {
 			$range = false;
 		}
-		if ($this->debugLevel>0) debugLog( 'Range ['.print_r($range, true).']' );
+		if ($this->debugLevel > 0) debugLog('Range ['.print_r($range, true).']');
 
 		//foreach($searchquery['query'] as $k => $value) {
 		//	$query = $value;
@@ -1465,38 +1464,38 @@ 
 		// other types may be possible - we support quicksearch first (freeText in subject and from (or TO in Sent Folder))
 		if (is_null(emailadmin_imapbase::$supportsORinQuery) || !isset(emailadmin_imapbase::$supportsORinQuery[$this->mail->profileID]))
 		{
-			emailadmin_imapbase::$supportsORinQuery = egw_cache::getCache(egw_cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']),$callback=null,$callback_params=array(),$expiration=60*60*10);
-			if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail->profileID])) emailadmin_imapbase::$supportsORinQuery[$this->mail->profileID]=true;
+			emailadmin_imapbase::$supportsORinQuery = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), $callback = null, $callback_params = array(), $expiration = 60 * 60 * 10);
+			if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail->profileID])) emailadmin_imapbase::$supportsORinQuery[$this->mail->profileID] = true;
 		}
 
 		if (isset($searchquery['query'][0]['value']['Search:FreeText']))
 		{
-			$type = (emailadmin_imapbase::$supportsORinQuery[$this->mail->profileID]?'quick':'subject');
+			$type = (emailadmin_imapbase::$supportsORinQuery[$this->mail->profileID] ? 'quick' : 'subject');
 			$searchText = $searchquery['query'][0]['value']['Search:FreeText'];
 		}
 		if (!$folderid)
 		{
-			$_folderName = ($this->mail->sessionData['mailbox']?$this->mail->sessionData['mailbox']:'INBOX');
-			$folderid = $this->createID($account=0,$_folderName);
+			$_folderName = ($this->mail->sessionData['mailbox'] ? $this->mail->sessionData['mailbox'] : 'INBOX');
+			$folderid = $this->createID($account = 0, $_folderName);
 		}
 //if ($searchquery['query'][0]['value'][subquery][0][op]=='Search:GreaterThan');
 //if (isset($searchquery['query'][0]['value'][subquery][0][value][POOMMAIL:DateReceived]));
 //if ($searchquery['query'][0]['value'][subquery][1][op]=='Search:LessThan');
 //if (isset($searchquery['query'][0]['value'][subquery][1][value][POOMMAIL:DateReceived]));
 //$_filter = array('status'=>array('UNDELETED'),'type'=>"SINCE",'string'=> date("d-M-Y", $cutoffdate));
-		$rv = $this->splitID($folderid,$account,$_folderName,$id);
+		$rv = $this->splitID($folderid, $account, $_folderName, $id);
 		$this->_connect($account);
-		$_filter = array('type'=> (emailadmin_imapbase::$supportsORinQuery[$this->mail->profileID]?'quick':'subject'),
+		$_filter = array('type'=> (emailadmin_imapbase::$supportsORinQuery[$this->mail->profileID] ? 'quick' : 'subject'),
 						 'string'=> $searchText,
 						 'status'=>'any',
 						);
 
 		//$_filter[] = array('type'=>"SINCE",'string'=> date("d-M-Y", $cutoffdate));
-		if ($this->debugLevel>1) debugLog (__METHOD__.' for Folder:'.$_folderName.' Filter:'.array2string($_filter));
-		$rv_messages = $this->mail->getHeaders($_folderName, $_startMessage=1, $_numberOfMessages=($limit?$limit:9999999), $_sort=0, $_reverse=false, $_filter, $_id=NULL);
+		if ($this->debugLevel > 1) debugLog(__METHOD__.' for Folder:'.$_folderName.' Filter:'.array2string($_filter));
+		$rv_messages = $this->mail->getHeaders($_folderName, $_startMessage = 1, $_numberOfMessages = ($limit ? $limit : 9999999), $_sort = 0, $_reverse = false, $_filter, $_id = NULL);
 		//debugLog(__METHOD__.__LINE__.array2string($rv_messages));
-		$list=array();
-		foreach((array)$rv_messages['header'] as $i => $vars)
+		$list = array();
+		foreach ((array)$rv_messages['header'] as $i => $vars)
 		{
 			$list[] = array(
 				"uniqueid" => $folderid.':'.$vars['uid'],
@@ -1507,7 +1506,7 @@ 
 		}
 		//error_log(__METHOD__.__LINE__.array2string($list));
 		//debugLog(__METHOD__.__LINE__.array2string($list));
-		return $list;//array('rows'=>$list,'status'=>1,'global_search_status'=>1);//array();
+		return $list; //array('rows'=>$list,'status'=>1,'global_search_status'=>1);//array();
 	}
 
 	/**
@@ -1517,20 +1516,20 @@ 
 	 * @param string $folder
 	 * @return string
 	 */
-	private function getParentID($account,$folder)
+	private function getParentID($account, $folder)
 	{
 		$this->_connect($account);
-		if (!isset($this->folders)) $this->folders = $this->mail->getFolderObjects(true,false);
+		if (!isset($this->folders)) $this->folders = $this->mail->getFolderObjects(true, false);
 
 		$mailFolder = $this->folders[$folder];
 		if (!isset($mailFolder)) return false;
-		$delimiter = (isset($mailFolder->delimiter)?$mailFolder->delimiter:$this->mail->getHierarchyDelimiter());
-		$parent = explode($delimiter,$folder);
+		$delimiter = (isset($mailFolder->delimiter) ? $mailFolder->delimiter : $this->mail->getHierarchyDelimiter());
+		$parent = explode($delimiter, $folder);
 		array_pop($parent);
-		$parent = implode($delimiter,$parent);
+		$parent = implode($delimiter, $parent);
 
 		$id = $parent ? $this->createID($account, $parent) : '0';
-		if ($this->debugLevel>1) debugLog(__METHOD__."('$folder') --> parent=$parent --> $id");
+		if ($this->debugLevel > 1) debugLog(__METHOD__."('$folder') --> parent=$parent --> $id");
 		return $id;
 	}
 
@@ -1549,48 +1548,48 @@ 
 		try {
 			$this->splitID($id, $account, $folder);
 		}
-		catch(Exception $e) {
+		catch (Exception $e) {
 			debugLog(__METHOD__.__LINE__.' failed for '.$e->getMessage());
-			return $folderObj=false;
+			return $folderObj = false;
 		}
 		$this->_connect($account);
-		if (!isset($this->folders)) $this->folders = $this->mail->getFolderObjects(true,false);
+		if (!isset($this->folders)) $this->folders = $this->mail->getFolderObjects(true, false);
 
 		$mailFolder = $this->folders[$folder];
-		if (!isset($mailFolder)) return $folderObj=false;
+		if (!isset($mailFolder)) return $folderObj = false;
 
 		$folderObj = new SyncFolder();
 		$folderObj->serverid = $id;
-		$folderObj->parentid = $this->getParentID($account,$folder);
+		$folderObj->parentid = $this->getParentID($account, $folder);
 		$folderObj->displayname = $mailFolder->shortDisplayName;
-		if ($this->debugLevel>1) debugLog(__METHOD__.__LINE__." ID: $id, Account:$account, Folder:$folder");
+		if ($this->debugLevel > 1) debugLog(__METHOD__.__LINE__." ID: $id, Account:$account, Folder:$folder");
 		// get folder-type
-		foreach($this->folders as $inbox => $mailFolder) break;
+		foreach ($this->folders as $inbox => $mailFolder) break;
 		if ($folder == $inbox)
 		{
 			$folderObj->type = SYNC_FOLDER_TYPE_INBOX;
 		}
-		elseif($this->mail->isDraftFolder($folder, false))
+		elseif ($this->mail->isDraftFolder($folder, false))
 		{
 			//debugLog(__METHOD__.' isDraft');
 			$folderObj->type = SYNC_FOLDER_TYPE_DRAFTS;
 			$folderObj->parentid = 0; // required by devices
 		}
-		elseif($this->mail->isTrashFolder($folder, false))
+		elseif ($this->mail->isTrashFolder($folder, false))
 		{
 			$folderObj->type = SYNC_FOLDER_TYPE_WASTEBASKET;
 			$this->_wasteID = $folder;
 			//error_log(__METHOD__.__LINE__.' TrashFolder:'.$this->_wasteID);
 			$folderObj->parentid = 0; // required by devices
 		}
-		elseif($this->mail->isSentFolder($folder, false))
+		elseif ($this->mail->isSentFolder($folder, false))
 		{
 			$folderObj->type = SYNC_FOLDER_TYPE_SENTMAIL;
 			$folderObj->parentid = 0; // required by devices
 			$this->_sentID = $folder;
 			//error_log(__METHOD__.__LINE__.' SentFolder:'.$this->_sentID);
 		}
-		elseif($this->mail->isOutbox($folder, false))
+		elseif ($this->mail->isOutbox($folder, false))
 		{
 			//debugLog(__METHOD__.' isOutbox');
 			$folderObj->type = SYNC_FOLDER_TYPE_OUTBOX;
@@ -1602,7 +1601,7 @@ 
 			$folderObj->type = SYNC_FOLDER_TYPE_USER_MAIL;
 		}
 
-		if ($this->debugLevel>1) debugLog(__METHOD__."($id) --> $folder --> type=$folderObj->type, parentID=$folderObj->parentid, displayname=$folderObj->displayname");
+		if ($this->debugLevel > 1) debugLog(__METHOD__."($id) --> $folder --> type=$folderObj->type, parentID=$folderObj->parentid, displayname=$folderObj->displayname");
 		return $folderObj;
 	}
 
@@ -1649,18 +1648,18 @@ 
 		if (is_numeric($account)) $type = 'mail';
 		if ($type != 'mail') return false;
 
-		if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false,self::$profileID,true,false,true);
+		if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false, self::$profileID, true, false, true);
 
 		$changes = array();
-        debugLog("AlterPingChanges on $folderid ($folder) stat: ". $syncstate);
+        debugLog("AlterPingChanges on $folderid ($folder) stat: ".$syncstate);
         $this->mail->reopen($folder);
 
-        $status = $this->mail->getFolderStatus($folder,$ignoreStatusCache=true);
+        $status = $this->mail->getFolderStatus($folder, $ignoreStatusCache = true);
         if (!$status) {
             debugLog("AlterPingChanges: could not stat folder $folder ");
             return false;
         } else {
-            $newstate = "M:". $status['messages'] ."-R:". $status['recent'] ."-U:". $status['unseen']."-NUID:".$status['uidnext']."-UIDV:".$status['uidvalidity'];
+            $newstate = "M:".$status['messages']."-R:".$status['recent']."-U:".$status['unseen']."-NUID:".$status['uidnext']."-UIDV:".$status['uidvalidity'];
 
             // message number is different - change occured
             if ($syncstate != $newstate) {
@@ -1719,7 +1718,7 @@ 
 			$error = $e->getMessage();
 			debugLog(__METHOD__.__LINE__." $_messageUID, $folder ->".$error);
 			// if the server thinks the message does not exist report deletion as success
-			if (stripos($error,'[NONEXISTENT]')!==false) return true;
+			if (stripos($error, '[NONEXISTENT]') !== false) return true;
 			return false;
 		}
 
@@ -1749,8 +1748,8 @@ 
 
 		$_messageUID = (array)$id;
 		$this->_connect($this->account);
-		$rv = $this->mail->flagMessages((($flags) ? "read" : "unread"), $_messageUID,$folder);
-		debugLog("IMAP-SetReadFlag -> set ".array2string($_messageUID).' in Folder '.$folder." as " . (($flags) ? "read" : "unread") . "-->". $rv);
+		$rv = $this->mail->flagMessages((($flags) ? "read" : "unread"), $_messageUID, $folder);
+		debugLog("IMAP-SetReadFlag -> set ".array2string($_messageUID).' in Folder '.$folder." as ".(($flags) ? "read" : "unread")."-->".$rv);
 
 		return $rv;
 	}
@@ -1801,8 +1800,8 @@ 
 		$_messageUID = (array)$id;
 		$this->_connect($this->account);
 		$this->splitID($folderid, $account, $folder);
-		$rv = $this->mail->flagMessages((($flags->flagstatus == 2) ? "flagged" : "unflagged"), $_messageUID,$folder);
-		debugLog("IMAP-SetFlaggedFlag -> set ".array2string($_messageUID).' in Folder '.$folder." as " . (($flags->flagstatus == 2) ? "flagged" : "unflagged") . "-->". $rv);
+		$rv = $this->mail->flagMessages((($flags->flagstatus == 2) ? "flagged" : "unflagged"), $_messageUID, $folder);
+		debugLog("IMAP-SetFlaggedFlag -> set ".array2string($_messageUID).' in Folder '.$folder." as ".(($flags->flagstatus == 2) ? "flagged" : "unflagged")."-->".$rv);
 
 		return $rv;
 	}
@@ -1816,17 +1815,17 @@ 
 	 * @return string
 	 * @throws egw_exception_wrong_parameter
 	 */
-	private function createID($account,$folder,$id=0)
+	private function createID($account, $folder, $id = 0)
 	{
 		if (!is_numeric($folder))
 		{
 			// convert string $folder in numeric id
-			$folder = $this->folder2hash($account,$f=$folder);
+			$folder = $this->folder2hash($account, $f = $folder);
 		}
 
 		$str = $this->backend->createID($account, $folder, $id);
 
-		if ($this->debugLevel>1) debugLog(__METHOD__."($account,'$f',$id) type=$account, folder=$folder --> '$str'");
+		if ($this->debugLevel > 1) debugLog(__METHOD__."($account,'$f',$id) type=$account, folder=$folder --> '$str'");
 
 		return $str;
 	}
@@ -1840,14 +1839,14 @@ 
 	 * @param int &$id=null
 	 * @throws egw_exception_wrong_parameter
 	 */
-	private function splitID($str,&$account,&$folder,&$id=null)
+	private function splitID($str, &$account, &$folder, &$id = null)
 	{
 		$this->backend->splitID($str, $account, $folder, $id);
 
 		// convert numeric folder-id back to folder name
-		$folder = $this->hash2folder($account,$f=$folder);
+		$folder = $this->hash2folder($account, $f = $folder);
 
-		if ($this->debugLevel>1) debugLog(__METHOD__."('$str','$account','$folder',$id)");
+		if ($this->debugLevel > 1) debugLog(__METHOD__."('$str','$account','$folder',$id)");
 	}
 
 	/**
@@ -1864,9 +1863,9 @@ 
 	 * @param string $folder
 	 * @return int
 	 */
-	private function folder2hash($account,$folder)
+	private function folder2hash($account, $folder)
 	{
-		if(!isset($this->folderHashes)) $this->readFolderHashes();
+		if (!isset($this->folderHashes)) $this->readFolderHashes();
 
 		if (($index = array_search($folder, (array)$this->folderHashes[$account])) === false)
 		{
@@ -1887,9 +1886,9 @@ 
 	 * @param int $index
 	 * @return string NULL if not used so far
 	 */
-	private function hash2folder($account,$index)
+	private function hash2folder($account, $index)
 	{
-		if(!isset($this->folderHashes)) $this->readFolderHashes();
+		if (!isset($this->folderHashes)) $this->readFolderHashes();
 
 		return $this->folderHashes[$account][$index];
 	}
@@ -1904,9 +1903,9 @@ 
 		if (file_exists($file = $this->hashFile()) &&
 			($hashes = file_get_contents($file)))
 		{
-			$this->folderHashes = json_decode($hashes,true);
+			$this->folderHashes = json_decode($hashes, true);
 			// fallback in case hashes have been serialized instead of being json-encoded
-			if (json_last_error()!=JSON_ERROR_NONE)
+			if (json_last_error() != JSON_ERROR_NONE)
 			{
 				//error_log(__METHOD__.__LINE__." error decoding with json");
 				$this->folderHashes = unserialize($hashes);
@@ -1926,7 +1925,7 @@ 
 	private function storeFolderHashes()
 	{
 		// make sure $this->folderHashes is an array otherwise json_encode may fail on decode for string,integer,float or boolean
-		return file_put_contents($this->hashFile(), json_encode((is_array($this->folderHashes)?$this->folderHashes:array($this->folderHashes))));
+		return file_put_contents($this->hashFile(), json_encode((is_array($this->folderHashes) ? $this->folderHashes : array($this->folderHashes))));
 	}
 
 	/**