EGroupware / egroupware

mail/inc/class.mail_zpush.inc.php

Braces +593 added lines, -174 removed lines

@@ -84,29 +84,47 @@ 
 	 */
 	public function __construct(activesync_backend $backend)
 	{
-		if ($GLOBALS['egw_setup']) return;
+		if ($GLOBALS['egw_setup'])
+		{
+			return;
+		}
 
 		//$this->debugLevel=2;
 		$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');
 			// 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));
+			if ($this->debugLevel>1)
+			{
+				error_log(__METHOD__.__LINE__.' self::ProfileID isNUll:'.array2string(self::$profileID));
+			}
 			self::$profileID =& Api\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__.' 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)
@@ -116,7 +134,10 @@ 
 				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']))
@@ -129,7 +150,10 @@ 
 				self::$profileID = Mail\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;
 	}
 
@@ -229,8 +253,14 @@ 
 				$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>');
+				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) {
 				$errors[] = lang('Can not open IMAP connection').': '.$e->getMessage();
@@ -252,8 +282,14 @@ 
 	 */
 	private function _connect($account=0)
 	{
-		if (!$account) $account = self::$profileID ? self::$profileID : 0;
-		if ($this->mail && $this->account != $account) $this->_disconnect();
+		if (!$account)
+		{
+			$account = self::$profileID ? self::$profileID : 0;
+		}
+		if ($this->mail && $this->account != $account)
+		{
+			$this->_disconnect();
+		}
 
 		$this->_wasteID = false;
 		$this->_sentID = false;
@@ -264,12 +300,18 @@ 
 			// todo: tell mail which account to use
 			//error_log(__METHOD__.__LINE__.' create object with ProfileID:'.array2string(self::$profileID));
 			$this->mail = Mail::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;
+			if (self::$profileID == 0 && isset($this->mail->icServer->ImapServerId) && !empty($this->mail->icServer->ImapServerId))
+			{
+				self::$profileID = $this->mail->icServer->ImapServerId;
+			}
 		}
 		else
 		{
 			//error_log(__METHOD__.__LINE__." connect with profileID: ".self::$profileID);
-			if (self::$profileID == 0 && isset($this->mail->icServer->ImapServerId) && !empty($this->mail->icServer->ImapServerId)) self::$profileID = $this->mail->icServer->ImapServerId;
+			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);
 
@@ -286,8 +328,14 @@ 
 	 */
 	private function _disconnect()
 	{
-		if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__);
-		if ($this->mail) $this->mail->closeConnection();
+		if ($this->debugLevel>0)
+		{
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__);
+		}
+		if ($this->mail)
+		{
+			$this->mail->closeConnection();
+		}
 
 		unset($this->mail);
 		unset($this->account);
@@ -302,24 +350,43 @@ 
 	public function GetFolderList()
 	{
 		$folderlist = array();
-		if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__);
+		if ($this->debugLevel>0)
+		{
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__);
+		}
 		/*foreach($available_accounts as $account)*/ $account = 0;
 		{
 			$this->_connect($account);
-			if (!isset($this->folders)) $this->folders = $this->mail->getFolderObjects(true,false,$_alwaysGetDefaultFolders=true);
-			if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($this->folders));
+			if (!isset($this->folders))
+			{
+				$this->folders = $this->mail->getFolderObjects(true,false,$_alwaysGetDefaultFolders=true);
+			}
+			if ($this->debugLevel>1)
+			{
+				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($this->folders));
+			}
 
-			foreach ($this->folders as $folder => $folderObj) {
-				if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' folder='.$folder);
+			foreach ($this->folders as $folder => $folderObj)
+			{
+				if ($this->debugLevel>1)
+				{
+					ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' folder='.$folder);
+				}
 				$folderlist[] = $f = array(
 					'id'     => $this->createID($account,$folder),
 					'mod'    => $folderObj->shortDisplayName,
 					'parent' => $this->getParentID($account,$folder),
 				);
-				if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."() returning ".array2string($f));
+				if ($this->debugLevel>1)
+				{
+					ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."() returning ".array2string($f));
+				}
 			}
 		}
-		if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."() returning ".array2string($folderlist));
+		if ($this->debugLevel>0)
+		{
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."() returning ".array2string($folderlist));
+		}
 
 		return $folderlist;
 	}
@@ -380,11 +447,17 @@ 
 		$smartdata_task = ($smartdata->replyflag?'reply':($smartdata->forwardflag?'forward':'new'));
 
    		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__ . (isset($smartdata->mime) ? $smartdata->mime : ""). "task: ".(isset($smartdata_task) ? $smartdata_task : "")." itemid: ".(isset($smartdata->source->itemid) ? $smartdata->source->itemid : "")." folder: ".(isset($smartdata->source->folderid) ? $smartdata->source->folderid : ""));
-		if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__."): Smartdata = ".array2string($smartdata));
+		if ($this->debugLevel>0)
+		{
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__."): Smartdata = ".array2string($smartdata));
+		}
 		//error_log("IMAP-Sendmail: Smartdata = ".array2string($smartdata));
 
 		// initialize our Mail
-		if (!isset($this->mail)) $this->mail = Mail::getInstance(false,self::$profileID,true,false,true);
+		if (!isset($this->mail))
+		{
+			$this->mail = Mail::getInstance(false,self::$profileID,true,false,true);
+		}
 		$activeMailProfiles = $this->mail->getAccountIdentities(self::$profileID);
 		// use the standardIdentity
 		$activeMailProfile = Mail::getStandardIdentityForProfile($activeMailProfiles,self::$profileID);
@@ -412,12 +485,18 @@ 
 		$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 = Mail::merge($signature,array($GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'],'person_id')));
-		if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' Signature to use:'.$sigText);
+		if ($this->debugLevel>0)
+		{
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' Signature to use:'.$sigText);
+		}
 		$sigTextHtml = $beforeHtml.$sigText;
 		$sigTextPlain = $beforePlain.Api\Mail\Html::convertHTMLToText($sigText);
 
 		$force8bit=false;
-		if (Api\Translation::detect_encoding($sigTextPlain)!='ascii') $force8bit=true;
+		if (Api\Translation::detect_encoding($sigTextPlain)!='ascii')
+		{
+			$force8bit=true;
+		}
 		// initialize the new Api\Mailer object for sending
 		$mailObject = new Api\Mailer(self::$profileID);
 		$this->mail->parseRawMessageIntoMailObject($mailObject,$smartdata->mime,$force8bit);
@@ -428,22 +507,34 @@ 
 
 		// prepare addressee list; moved the adding of addresses to the mailobject down
 		// to
-		foreach(Mail::parseAddressList($mailObject->getHeader("To")) as $addressObject) {
-			if (!$addressObject->valid) continue;
+		foreach(Mail::parseAddressList($mailObject->getHeader("To")) as $addressObject)
+		{
+			if (!$addressObject->valid)
+			{
+				continue;
+			}
 			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") 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(Mail::parseAddressList($mailObject->getHeader("Cc")) as $addressObject) {
-			if (!$addressObject->valid) continue;
+		foreach(Mail::parseAddressList($mailObject->getHeader("Cc")) as $addressObject)
+		{
+			if (!$addressObject->valid)
+			{
+				continue;
+			}
 			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") 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($mailObject->getAddresses('bcc') as $addressObject) {
-			if (!$addressObject->valid) continue;
+		foreach($mailObject->getAddresses('bcc') as $addressObject)
+		{
+			if (!$addressObject->valid)
+			{
+				continue;
+			}
 			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") 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);
@@ -456,12 +547,14 @@ 
 		$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)) {
+		if (preg_match("/multipart/i", $ContentType))
+		{
 			$use_orgbody = true;
 		}
 
 		// save the original content-type header for the body part when forwarding
-		if ($smartdata_task == 'forward' && $smartdata->source->itemid && !$use_orgbody) {
+		if ($smartdata_task == 'forward' && $smartdata->source->itemid && !$use_orgbody)
+		{
 			//continue; // ignore
 		}
 		// horde/egw_ mailer does everything as utf-8, the following should not be needed
@@ -470,7 +563,8 @@ 
 		// if the message is a multipart message, then we should use the sent body
 		if (($smartdata_task == 'new' || $smartdata_task == 'reply' || $smartdata_task == 'forward') &&
 			((isset($smartdata->replacemime) && $smartdata->replacemime == true) ||
-			$k == "Content-Type" && preg_match("/multipart/i", $ContentType))) {
+			$k == "Content-Type" && preg_match("/multipart/i", $ContentType)))
+		{
 			$use_orgbody = true;
 		}
 		$Body =  $AltBody = "";
@@ -503,12 +597,19 @@ 
 			$AltBody = preg_replace("/(<|&lt;)*(([\w\.,-.,_.,0-9.]+)@([\w\.,-.,_.,0-9.]+))(>|&gt;)*/i","[$2]",
 				($html_body = $mailObject->findBody('html')) ? $html_body->getContents() : null);
 		}
-		if ($this->debugLevel>1 && $Body) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") fetched Body as with MessageContentType:". $ContentType.'=>'.$Body);
-		if ($this->debugLevel>1 && $AltBody) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") fetched AltBody as with MessageContentType:". $ContentType.'=>'.$AltBody);
+		if ($this->debugLevel>1 && $Body)
+		{
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") fetched Body as with MessageContentType:". $ContentType.'=>'.$Body);
+		}
+		if ($this->debugLevel>1 && $AltBody)
+		{
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") 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) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' mailObject after Inital Parse:'.array2string($mailObject));
-        if ($use_orgbody) {
+        if ($use_orgbody)
+        {
     	    ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") use_orgbody = true ContentType:".$ContentType);
  			// if it is a ClientSideMeetingRequest, we report it as send at all times
 			if (($cal_body = $mailObject->findBody('calendar')) &&
@@ -518,15 +619,20 @@ 
 				{
 					$organizer = calendar_ical::getIcalOrganizer($cal_body->getContents());
 				}
-				if ($this->debugLevel) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") we have a Client Side Meeting Request from organizer=$organizer");
+				if ($this->debugLevel)
+				{
+					ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") we have a Client Side Meeting Request from organizer=$organizer");
+				}
 				$ClientSideMeetingRequest = true;
 			}
         }
 		// now handle the addressee list
 		$toCount = 0;
 		//error_log(__METHOD__.__LINE__.array2string($toMailAddr));
-		foreach((array)$toMailAddr as $address) {
-			foreach(Mail::parseAddressList((get_magic_quotes_gpc()?stripslashes($address):$address)) as $addressObject) {
+		foreach((array)$toMailAddr as $address)
+		{
+			foreach(Mail::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',
@@ -540,19 +646,29 @@ 
 			}
 		}
 		$ccCount = 0;
-		foreach((array)$ccMailAddr as $address) {
-			foreach(Mail::parseAddressList((get_magic_quotes_gpc()?stripslashes($address):$address)) as $addressObject) {
+		foreach((array)$ccMailAddr as $address)
+		{
+			foreach(Mail::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;
+				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(Mail::parseAddressList((get_magic_quotes_gpc()?stripslashes($address):$address)) as $addressObject) {
+		foreach((array)$bccMailAddr as $address)
+		{
+			foreach(Mail::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;
+				if ($ClientSideMeetingRequest === true && $allowSendingInvitations == 'sendifnocalnotif' && calendar_boupdate::email_update_requested($emailAddress))
+				{
+					continue;
+				}
 				$mailObject->AddBCC($emailAddress, $addressObject->personal);
 				$bccCount++;
 			}
@@ -562,7 +678,10 @@ 
 		{
 			return $ClientSideMeetingRequest && $allowSendingInvitations === 'sendifnocalnotif' && $organizer ? true : 0; // noone to send mail to
 		}
-		if ($ClientSideMeetingRequest === true && $allowSendingInvitations===false) return true;
+		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) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' retrieved Body:'.$body);
@@ -585,10 +704,17 @@ 
 			$this->mail->reopen($folder);
 			$bodyStruct = $this->mail->getMessageBody($uid, 'html_only');
 			$bodyBUFFHtml = $this->mail->getdisplayableBody($this->mail,$bodyStruct,true,false);
-			if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' html_only:'.$bodyBUFFHtml);
-		    if ($bodyBUFFHtml != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/html')) {
+			if ($this->debugLevel>3)
+			{
+				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' html_only:'.$bodyBUFFHtml);
+			}
+		    if ($bodyBUFFHtml != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/html'))
+		    {
 				// may be html
-				if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") MIME Body".' Type:html (fetched with html_only):'.$bodyBUFFHtml);
+				if ($this->debugLevel>0)
+				{
+					ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") MIME Body".' Type:html (fetched with html_only):'.$bodyBUFFHtml);
+				}
 				$AltBody = $AltBody."</br>".$bodyBUFFHtml.$sigTextHtml;
 				$isreply = true;
 			}
@@ -597,8 +723,12 @@ 
 			// 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) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") MIME Body".' Type:plain (fetched with never_display):'.$bodyBUFF);
+			if ($bodyBUFF != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/plain'))
+			{
+				if ($this->debugLevel>0)
+				{
+					ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") MIME Body".' Type:plain (fetched with never_display):'.$bodyBUFF);
+				}
 				$Body = $Body."\r\n".$bodyBUFF.$sigTextPlain;
 				$isreply = true;
 			}
@@ -606,7 +736,10 @@ 
 			{
 				$isreply = true;
 				$AltBody = $AltBody."</br><pre>".nl2br($bodyBUFF).'</pre>'.$sigTextHtml;
-				if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__." no Api\Html Body found use modified plaintext body for txt/html: ".$AltBody);
+				if ($this->debugLevel>0)
+				{
+					ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__." no Api\Html Body found use modified plaintext body for txt/html: ".$AltBody);
+				}
 			}
 		}
 
@@ -620,11 +753,17 @@ 
 			(isset($smartdata->replacemime) && $smartdata->replacemime == false)))
 		{
 			//force the default for the forwarding -> asmail
-			if (is_array($preferencesArray)) {
+			if (is_array($preferencesArray))
+			{
 				if (!array_key_exists('message_forwarding',$preferencesArray)
 					|| !isset($preferencesArray['message_forwarding'])
-					|| empty($preferencesArray['message_forwarding'])) $preferencesArray['message_forwarding'] = 'asmail';
-			} else {
+					|| empty($preferencesArray['message_forwarding']))
+				{
+					$preferencesArray['message_forwarding'] = 'asmail';
+				}
+			}
+			else
+			{
 				$preferencesArray['message_forwarding'] = 'asmail';
 			}
 			// construct the uid of the message out of the itemid - seems to be the uid, no construction needed
@@ -656,27 +795,44 @@ 
 				$this->mail->reopen($folder);
 				$bodyStruct = $this->mail->getMessageBody($uid, 'html_only');
 				$bodyBUFFHtml = $this->mail->getdisplayableBody($this->mail,$bodyStruct,true,false);
-				if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' html_only:'.$bodyBUFFHtml);
-				if ($bodyBUFFHtml != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/html')) {
+				if ($this->debugLevel>0)
+				{
+					ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' html_only:'.$bodyBUFFHtml);
+				}
+				if ($bodyBUFFHtml != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/html'))
+				{
 					// may be html
-					if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") MIME Body".' Type:html (fetched with html_only):'.$bodyBUFFHtml);
+					if ($this->debugLevel>0)
+					{
+						ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") MIME Body".' Type:html (fetched with html_only):'.$bodyBUFFHtml);
+					}
 					$AltBody = $AltBody."</br>".$bodyBUFFHtml.$sigTextHtml;
 					$isforward = true;
 				}
 				// plain text Message part
-				if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") MIME Body".' Type:plain, fetch text:');
+				if ($this->debugLevel>0)
+				{
+					ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") 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) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") MIME Body".' Type:plain (fetched with never_display):'.$bodyBUFF);
+				if ($bodyBUFF != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/plain'))
+				{
+					if ($this->debugLevel>0)
+					{
+						ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") 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) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__." no html Body found use modified plaintext body for txt/html: ".$AltBody);
+					if ($this->debugLevel>0)
+					{
+						ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__." no html Body found use modified plaintext body for txt/html: ".$AltBody);
+					}
 					$isforward = true;
 				}
 				// get all the attachments and add them too.
@@ -689,7 +845,10 @@ 
 					ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' gather Attachments for BodyCreation of/for MessageID:'.$uid.' found:'.count($attachments));
 					foreach((array)$attachments as $key => $attachment)
 					{
-						if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' Key:'.$key.'->'.array2string($attachment));
+						if ($this->debugLevel>0)
+						{
+							ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' Key:'.$key.'->'.array2string($attachment));
+						}
 						$attachmentNames .= $attachment['name']."\n";
 						$attachmentData	= $this->mail->getAttachment($uid, $attachment['partID'],0,false,false,$folder);
 						/*$x =*/ $mailObject->AddStringAttachment($attachmentData['attachment'], $attachment['name'], $attachment['mimeType']);
@@ -708,20 +867,29 @@ 
 		// now set the body
 		if ($AltBody && ($html_body = $mailObject->findBody('html')))
 		{
-			if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' -> '.$AltBody);
+			if ($this->debugLevel>1)
+			{
+				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' -> '.$AltBody);
+			}
 			//error_log(__METHOD__.__LINE__.' html:'.$AltBody);
 			$html_body->setContents($AltBody,array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
 		}
 		if ($Body && ($text_body = $mailObject->findBody('plain')))
 		{
-			if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' -> '.$Body);
+			if ($this->debugLevel>1)
+			{
+				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' -> '.$Body);
+			}
 			//error_log(__METHOD__.__LINE__.' text:'.$Body);
 			$text_body->setContents($Body,array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
 		}
 		//advanced debugging
 		// Horde SMTP Class uses utf-8 by default.
         //ZLog::Write(LOGLEVEL_DEBUG, "IMAP-SendMail: parsed message: ". print_r($message,1));
-		if ($this->debugLevel>2) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__."): MailObject:".array2string($mailObject));
+		if ($this->debugLevel>2)
+		{
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__."): MailObject:".array2string($mailObject));
+		}
 
 		// set a higher timeout for big messages
 		@set_time_limit(120);
@@ -748,7 +916,9 @@ 
 			if ($this->mail->isDraftFolder($folder) && !$this->mail->isTemplateFolder($folder))
 			{
 				$this->mail->deleteMessages(array($uid),$folder);
-			} else {
+			}
+			else
+			{
 				$this->mail->flagMessages("answered", array($uid),$folder);
 				if ($smartdata_task== "forward")
 				{
@@ -762,7 +932,8 @@ 
 		{
 			$asf = false;
 			$sentFolder = $this->mail->getSentFolder();
-			if ($this->_sentID) {
+			if ($this->_sentID)
+			{
 				$folderArray[] = $this->_sentID;
 			}
 			else if(isset($sentFolder) && $sentFolder != 'none')
@@ -776,28 +947,41 @@ 
 				// we dont try guessing
 				$asf = true;
 			}
-			if (count($folderArray) > 0) {
-				foreach((array)$bccMailAddr as $address) {
-					foreach(Mail::parseAddressList((get_magic_quotes_gpc()?stripslashes($address):$address)) as $addressObject) {
+			if (count($folderArray) > 0)
+			{
+				foreach((array)$bccMailAddr as $address)
+				{
+					foreach(Mail::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) $mailObject->forceBccHeader();
+				if (count($mailAddr)>0)
+				{
+					$mailObject->forceBccHeader();
+				}
 				//$BCCmail = $mailObject->AddrAppend("Bcc",$mailAddr);
-				foreach($folderArray as $folderName) {
-					if($this->mail->isSentFolder($folderName)) {
+				foreach($folderArray as $folderName)
+				{
+					if($this->mail->isSentFolder($folderName))
+					{
 						$flags = '\\Seen';
-					} elseif($this->mail->isDraftFolder($folderName)) {
+					}
+					elseif($this->mail->isDraftFolder($folderName))
+					{
 						$flags = '\\Draft';
-					} else {
+					}
+					else
+					{
 						$flags = '';
 					}
 					$asf = true;
 					//ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.'->'.array2string($this->mail->icServer));
 					$this->mail->openConnection(self::$profileID,false);
-					if ($this->mail->folderExists($folderName)) {
+					if ($this->mail->folderExists($folderName))
+					{
 						try
 						{
 							$this->mail->appendMessage($folderName,$mailObject->getRaw(), null,
@@ -855,17 +1039,26 @@ 
 		$bodypreference = $contentparameters->GetBodyPreference(); /* fmbiete's contribution r1528, ZP-320 */
 
 		// fix for z-push bug returning additional bodypreference type 4, even if only 1 is requested and mimessupport = 0
-		if (!$mimesupport && ($key = array_search('4', $bodypreference))) unset($bodypreference[$key]);
+		if (!$mimesupport && ($key = array_search('4', $bodypreference)))
+		{
+			unset($bodypreference[$key]);
+		}
 
 		//$this->debugLevel=4;
-		if (!isset($this->mail)) $this->mail = Mail::getInstance(false,self::$profileID,true,false,true);
+		if (!isset($this->mail))
+		{
+			$this->mail = Mail::getInstance(false,self::$profileID,true,false,true);
+		}
 		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' FolderID:'.$folderid.' ID:'.$id.' TruncSize:'.$truncsize.' Bodypreference: '.array2string($bodypreference));
 		$account = $_folderName = $xid = null;
 		$this->splitID($folderid,$account,$_folderName,$xid);
 		$this->mail->reopen($_folderName);
 		$messages = $this->fetchMessages($folderid, NULL, $id, true);	// true: return all headers
 		$headers = $messages[$id];
-		if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($headers));
+		if ($this->debugLevel>3)
+		{
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($headers));
+		}
 		// StatMessage should reopen the folder in question, so we dont need folderids in the following statements.
 		if ($headers)
 		{
@@ -875,16 +1068,25 @@ 
 			//$rawHeaders = $this->mail->getMessageRawHeader($id);
 			// simple style
 			// start AS12 Stuff (bodypreference === false) case = old behaviour
-			if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__. ' for message with ID:'.$id.' with headers:'.array2string($headers));
+			if ($this->debugLevel>0)
+			{
+				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__. ' for message with ID:'.$id.' with headers:'.array2string($headers));
+			}
 
-			if ($bodypreference === false) {
+			if ($bodypreference === false)
+			{
 				$bodyStruct = $this->mail->getMessageBody($id, 'only_if_no_text', '', null, true,$_folderName);
 				$raw_body = $this->mail->getdisplayableBody($this->mail,$bodyStruct,false,false);
 				//$body = html_entity_decode($body,ENT_QUOTES,$this->mail->detect_encoding($body));
-				if (stripos($raw_body,'<style')!==false) $body = preg_replace("/<style.*?<\/style>/is", "", $raw_body); // in case there is only a html part
+				if (stripos($raw_body,'<style')!==false)
+				{
+					$body = preg_replace("/<style.*?<\/style>/is", "", $raw_body);
+				}
+				// in case there is only a html part
 				// remove all other html
 				$body = strip_tags($raw_body);
-				if(strlen($body) > $truncsize) {
+				if(strlen($body) > $truncsize)
+				{
 					$body = Utils::Utf8_truncate($body, $truncsize);
 					$output->bodytruncated = 1;
 				}
@@ -899,7 +1101,8 @@ 
 			{
 				//Select body type preference
 				$bpReturnType = 1;//SYNC_BODYPREFERENCE_PLAIN;
-				if ($bodypreference !== false) {
+				if ($bodypreference !== false)
+				{
 					// bodypreference can occur multiple times
 					// usually we would use Utils::GetBodyPreferenceBestMatch($bodypreference);
 					$bpReturnType = Utils::GetBodyPreferenceBestMatch($bodypreference);
@@ -933,25 +1136,49 @@ 
 					// fetch the body (try to gather data only once)
 					$css ='';
 					$bodyStruct = $this->mail->getMessageBody($id, 'html_only', '', null, true,$_folderName);
-					if ($this->debugLevel>2) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' html_only Struct:'.array2string($bodyStruct));
+					if ($this->debugLevel>2)
+					{
+						ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' html_only Struct:'.array2string($bodyStruct));
+					}
 					$body = $this->mail->getdisplayableBody($this->mail,$bodyStruct,true,false);
-					if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' html_only:'.$body);
-					if ($body != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/html')) {
+					if ($this->debugLevel>3)
+					{
+						ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' html_only:'.$body);
+					}
+					if ($body != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/html'))
+					{
 						// may be html
-						if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG, "MIME Body".' Type:html (fetched with html_only)');
+						if ($this->debugLevel>0)
+						{
+							ZLog::Write(LOGLEVEL_DEBUG, "MIME Body".' Type:html (fetched with html_only)');
+						}
 						$css = $this->mail->getStyles($bodyStruct);
 						$output->nativebodytype=2;
-					} else {
+					}
+					else
+					{
 						// plain text Message
-						if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG, "MIME Body".' Type:plain, fetch text (HTML, if no text available)');
+						if ($this->debugLevel>0)
+						{
+							ZLog::Write(LOGLEVEL_DEBUG, "MIME Body".' Type:plain, fetch text (HTML, if no text available)');
+						}
 						$output->nativebodytype=1;
 						$bodyStruct = $this->mail->getMessageBody($id,'never_display', '', null, true,$_folderName); //'only_if_no_text');
-						if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' plain text Struct:'.array2string($bodyStruct));
+						if ($this->debugLevel>3)
+						{
+							ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' plain text Struct:'.array2string($bodyStruct));
+						}
 						$body = $this->mail->getdisplayableBody($this->mail,$bodyStruct,false,false);
-						if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' never display html(plain text only):'.$body);
+						if ($this->debugLevel>3)
+						{
+							ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' never display html(plain text only):'.$body);
+						}
 					}
 					// whatever format decode (using the correct encoding)
-					if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__."MIME Body".' Type:'.($output->nativebodytype==2?' html ':' plain ').$body);
+					if ($this->debugLevel>3)
+					{
+						ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__."MIME Body".' Type:'.($output->nativebodytype==2?' html ':' plain ').$body);
+					}
 					//$body = html_entity_decode($body,ENT_QUOTES,$this->mail->detect_encoding($body));
 					// prepare plaintextbody
 					$plainBody='';
@@ -972,12 +1199,18 @@ 
 					// remove all other html
 					$plainBody = preg_replace("/<br.*>/is","\r\n",$plainBody);
 					$plainBody = strip_tags($plainBody);
-					if ($this->debugLevel>3 && $output->nativebodytype==1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' Plain Text:'.$plainBody);
+					if ($this->debugLevel>3 && $output->nativebodytype==1)
+					{
+						ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' Plain Text:'.$plainBody);
+					}
 					//$body = str_replace("\n","\r\n", str_replace("\r","",$body)); // do we need that?
 
-					if ($bpReturnType==2) //SYNC_BODYPREFERENCE_HTML
+					if ($bpReturnType==2)
+					{
+						//SYNC_BODYPREFERENCE_HTML
 					{
 						if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG, "HTML Body with requested pref 2");
+					}
 						// Send HTML if requested and native type was html
 						$output->asbody->type = 2;
 						$htmlbody = '<html>'.
@@ -1013,7 +1246,10 @@ 
 					else
 					{
 						// Send Plaintext as Fallback or if original body is plainttext
-						if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG, "Plaintext Body:".$plainBody);
+						if ($this->debugLevel>0)
+						{
+							ZLog::Write(LOGLEVEL_DEBUG, "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);
@@ -1050,7 +1286,9 @@ 
 			{
 				$output->flag->flagstatus = 2;
 				//$output->flag->flagtype = "Flag for Follow up";
-			} else {
+			}
+			else
+			{
 				$output->flag->flagstatus = 0;
 			}
 			if ($headers['answered'])
@@ -1066,10 +1304,20 @@ 
 				($headers['priority'] < 3 ? 2 : 1) ;
 			$output->datereceived = $this->mail->_strtotime($headers['date'],'ts',true);
 			$output->to = $headers['to_address'];
-			if ($headers['to']) $output->displayto = $headers['to_address']; //$headers['FETCHED_HEADER']['to_name']
+			if ($headers['to'])
+			{
+				$output->displayto = $headers['to_address'];
+			}
+			//$headers['FETCHED_HEADER']['to_name']
 			$output->from = $headers['sender_address'];
-			if (isset($headers['cc_addresses']) && $headers['cc_addresses']) $output->cc = $headers['cc_addresses'];
-			if (isset($headers['reply_to_address']) && $headers['reply_to_address']) $output->reply_to = $headers['reply_to_address'];
+			if (isset($headers['cc_addresses']) && $headers['cc_addresses'])
+			{
+				$output->cc = $headers['cc_addresses'];
+			}
+			if (isset($headers['reply_to_address']) && $headers['reply_to_address'])
+			{
+				$output->reply_to = $headers['reply_to_address'];
+			}
 
 			$output->messageclass = "IPM.Note";
 			if (stripos($headers['mimetype'],'multipart')!== false &&
@@ -1077,7 +1325,8 @@ 
 			{
 				$output->messageclass = "IPM.Note.SMIME.MultipartSigned";
 			}
-			if (Request::GetProtocolVersion() >= 12.0) {
+			if (Request::GetProtocolVersion() >= 12.0)
+			{
 				$output->contentclass = "urn:content-classes:message";
 			}
 
@@ -1090,7 +1339,10 @@ 
 				//error_log(__METHOD__.__LINE__.array2string($attachments));
 				foreach ($attachments as $key => $attach)
 				{
-					if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' Key:'.$key.'->'.array2string($attach));
+					if ($this->debugLevel>0)
+					{
+						ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' Key:'.$key.'->'.array2string($attach));
+					}
 
 					// pass meeting requests to calendar plugin
 					if (strtolower($attach['mimeType']) == 'text/calendar' && strtolower($attach['method']) == 'request' &&
@@ -1107,17 +1359,24 @@ 
 						unset($attachment);
 						continue;	// do NOT add attachment as attachment
 					}
-					if (Request::GetProtocolVersion() >= 12.0) {
+					if (Request::GetProtocolVersion() >= 12.0)
+					{
 						$attachment = new SyncBaseAttachment();
 						if (!isset($output->asattachments) || !is_array($output->asattachments))
-							$output->asattachments = array();
+						{
+													$output->asattachments = array();
+						}
 						$attachment->estimatedDataSize = $attach['size'];
 						$attachment->method = 1;
 						$attachment->filereference = $folderid . ":" . $id . ":" . $attach['partID'];
-					} else {
+					}
+					else
+					{
 						$attachment = new SyncAttachment();
 						if (!isset($output->attachments) || !is_array($output->attachments))
-							$output->attachments = array();
+						{
+													$output->attachments = array();
+						}
 						$attachment->attsize = $attach['size'];
 						$attachment->attmethod = 1;
 						$attachment->attname = $folderid . ":" . $id . ":" . $attach['partID'];//$key;
@@ -1134,10 +1393,13 @@ 
 						{
 							$attachment->isinline = true;
 						}
-						if (Request::GetProtocolVersion() >= 12.0) {
+						if (Request::GetProtocolVersion() >= 12.0)
+						{
 							$attachment->method=1;
 							$attachment->contentid= str_replace(array("<",">"), "",$attach['cid']);
-						} else {
+						}
+						else
+						{
 							$attachment->attmethod=6;
 							$attachment->attoid = str_replace(array("<",">"), "",$attach['cid']);
 						}
@@ -1145,9 +1407,12 @@ 
 						$attachment->contenttype = trim($attach['mimeType']);
 						//	ZLog::Write(LOGLEVEL_DEBUG, "'".$part->headers['content-type']."'  ".$attachment->contentid);
 					}
-					if (Request::GetProtocolVersion() >= 12.0) {
+					if (Request::GetProtocolVersion() >= 12.0)
+					{
 						array_push($output->asattachments, $attachment);
-					} else {
+					}
+					else
+					{
 						array_push($output->attachments, $attachment);
 					}
 					unset($attachment);
@@ -1160,8 +1425,11 @@ 
             // Language Code Page ID: http://msdn.microsoft.com/en-us/library/windows/desktop/dd317756%28v=vs.85%29.aspx
             $output->internetcpid = INTERNET_CPID_UTF8;
 
-			if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($output));
-//$this->debugLevel=0;
+			if ($this->debugLevel>3)
+			{
+				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($output));
+			}
+			//$this->debugLevel=0;
 			return $output;
 		}
 //$this->debugLevel=0;
@@ -1220,7 +1488,8 @@ 
      * @param string $attname - should contain (folder)id
 	 * @return SyncItemOperationsAttachment-object
 	 */
-	function GetAttachmentData($fid,$attname) {
+	function GetAttachmentData($fid,$attname)
+	{
 		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.": $fid (attname: '$attname')");
 		return $this->_GetAttachmentData($fid,$attname);
 	}
@@ -1235,7 +1504,8 @@ 
      * @param string $attname - should contain (folder)id
 	 * @return SyncItemOperationsAttachment-object
 	 */
-	function ItemOperationsGetAttachmentData($fid,$attname) {
+	function ItemOperationsGetAttachmentData($fid,$attname)
+	{
 		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.": $fid (attname: '$attname')");
 		return $this->_GetAttachmentData($fid,$attname);
 	}
@@ -1257,7 +1527,10 @@ 
 
 		$this->splitID($folderid, $account, $folder);
 
-		if (!isset($this->mail)) $this->mail = Mail::getInstance(false,self::$profileID,true,false,true);
+		if (!isset($this->mail))
+		{
+			$this->mail = Mail::getInstance(false,self::$profileID,true,false,true);
+		}
 
 		$this->mail->reopen($folder);
 		$attachment = $this->mail->getAttachment($id,$part,0,false,true,$folder);
@@ -1266,7 +1539,9 @@ 
 		$SIOattachment->data = $attachment['attachment'];
 		//ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.": $fid (attname: '$attname') Data:".$attachment['attachment']);
 		if (isset($attachment['type']) )
-			$SIOattachment->contenttype = $attachment['type'];
+		{
+					$SIOattachment->contenttype = $attachment['type'];
+		}
 
 		unset($attachment);
 
@@ -1312,11 +1587,15 @@ 
 		//unset($folderid, $id, $message, $contentParameters);
 		$account = $folder = null;
 		$this->splitID($folderid, $account, $folder);
-		if (isset($message->flag)) {
-			if (isset($message->flag->flagstatus) && $message->flag->flagstatus == 2) {
+		if (isset($message->flag))
+		{
+			if (isset($message->flag->flagstatus) && $message->flag->flagstatus == 2)
+			{
 				$rv = $this->mail->flagMessages((($message->flag->flagstatus == 2) ? "flagged" : "unflagged"), $id,$folder);
 				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__." -> set ".array2string($id).' in Folder '.$folder." as " . (($message->flag->flagstatus == 2) ? "flagged" : "unflagged") . "-->". $rv);
-			} else {
+			}
+			else
+			{
 				$rv = $this->mail->flagMessages("unflagged", $id,$folder);
 				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__." -> set ".array2string($id).' in Folder '.$folder." as " . "unflagged" . "-->". $rv);
 			}
@@ -1346,7 +1625,10 @@ 
 		$this->splitID($folderid, $account, $srcFolder);
 		$this->splitID($newfolderid, $account, $destFolder);
 		ZLog::Write(LOGLEVEL_DEBUG, "IMAP-MoveMessage: (SourceFolder: '$srcFolder'  id: '$id'  DestFolder: '$destFolder' )");
-		if (!isset($this->mail)) $this->mail = Mail::getInstance(false,self::$profileID,true,false,true);
+		if (!isset($this->mail))
+		{
+			$this->mail = Mail::getInstance(false,self::$profileID,true,false,true);
+		}
 		$this->mail->reopen($destFolder);
 		$status = $this->mail->getFolderStatus($destFolder);
 		$uidNext = $status['uidnext'];
@@ -1378,7 +1660,10 @@ 
 				$maximumSyncRangeInDays = $GLOBALS['egw_info']['user']['preferences']['activesync']['mail-maximumSyncRange'];
 			}
 			$cutoffdate = (is_numeric($maximumSyncRangeInDays) ? Api\DateTime::to('now','ts')-(3600*24*$maximumSyncRangeInDays):null);
-			if (is_numeric($maximumSyncRangeInDays)) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.' Client set no truncationdate. Using '.$maximumSyncRangeInDays.' days.'.date("d-M-Y", $cutoffdate));
+			if (is_numeric($maximumSyncRangeInDays))
+			{
+				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.' Client set no truncationdate. Using '.$maximumSyncRangeInDays.' days.'.date("d-M-Y", $cutoffdate));
+			}
 		}
 		return $this->fetchMessages($folderid, $cutoffdate);
 	}
@@ -1400,7 +1685,10 @@ 
 	{
 		static $headers = array();
 
-		if ($this->debugLevel>1) $gstarttime = microtime (true);
+		if ($this->debugLevel>1)
+		{
+			$gstarttime = microtime (true);
+		}
 		//ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__);
 		$rv_messages = array();
 		// if the message is still available within the class, we use it instead of fetching it again
@@ -1413,7 +1701,10 @@ 
 		{
 			$headers = array();	// clear cache to not use too much memory
 
-			if ($this->debugLevel>1) $starttime = microtime (true);
+			if ($this->debugLevel>1)
+			{
+				$starttime = microtime (true);
+			}
 			$this->_connect($this->account);
 			if ($this->debugLevel>1)
 			{
@@ -1422,8 +1713,14 @@ 
 			}
 			$messagelist = $_filter = array();
 			// if not connected, any further action must fail
-			if (!empty($cutoffdate)) $_filter = array('status'=>array('UNDELETED'),'range'=>"SINCE",'date'=> date("d-M-Y", $cutoffdate));
-			if ($this->debugLevel>1) $starttime = microtime (true);
+			if (!empty($cutoffdate))
+			{
+				$_filter = array('status'=>array('UNDELETED'),'range'=>"SINCE",'date'=> date("d-M-Y", $cutoffdate));
+			}
+			if ($this->debugLevel>1)
+			{
+				$starttime = microtime (true);
+			}
 			$account = $_folderName = $id = null;
 			$this->splitID($folderid,$account,$_folderName,$id);
 			if ($this->debugLevel>1)
@@ -1431,8 +1728,14 @@ 
 				$endtime = microtime(true) - $starttime;
 				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__. " splitID took : ".$endtime.' for FolderID:'.$folderid);
 			}
-			if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.' for Folder:'.$_folderName.' Filter:'.array2string($_filter).' Ids:'.array2string($_id).'/'.$id);
-			if ($this->debugLevel>1) $starttime = microtime (true);
+			if ($this->debugLevel>1)
+			{
+				ZLog::Write(LOGLEVEL_DEBUG,__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)
@@ -1441,27 +1744,56 @@ 
 				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__. " getHeaders call took : ".$endtime.' for FolderID:'.$_folderName);
 			}
 		}
-		if ($_id == NULL && $this->debugLevel>1)  ZLog::Write(LOGLEVEL_DEBUG,__METHOD__." found :". count($rv_messages['header']));
+		if ($_id == NULL && $this->debugLevel>1)
+		{
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__." found :". count($rv_messages['header']));
+		}
 		//ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' Result:'.array2string($rv_messages));
 		$messagelist = array();
-		if (!isset($rv_messages['header'])||empty($rv_messages['header'])) return $messagelist;
+		if (!isset($rv_messages['header'])||empty($rv_messages['header']))
+		{
+			return $messagelist;
+		}
 		//if ($_returnModHash) $messageFolderHash = array();
 		foreach ((array)$rv_messages['header'] as $k => $vars)
 		{
-			if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' ID to process:'.$vars['uid'].' Subject:'.$vars['subject']);
+			if ($this->debugLevel>3)
+			{
+				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' ID to process:'.$vars['uid'].' Subject:'.$vars['subject']);
+			}
 			$headers[$vars['uid']] = $vars;
-			if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__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) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' ID to report:'.$vars['uid'].' Subject:'.$vars['subject']);
+			if ($this->debugLevel>3)
+			{
+				ZLog::Write(LOGLEVEL_DEBUG,__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)
+			{
+				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' ID to report:'.$vars['uid'].' Subject:'.$vars['subject']);
+			}
 			$mess = $return_all_headers ? $vars : array();
 			$mess["mod"] = self::doFlagsMod($vars).$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
-			if($vars["seen"]) $mess["flags"] = 1;
-			if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($mess));
+			if($vars["seen"])
+			{
+				$mess["flags"] = 1;
+			}
+			if ($this->debugLevel>3)
+			{
+				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($mess));
+			}
 			$messagelist[$vars['uid']] = $mess;
 			unset($mess);
 		}
@@ -1486,9 +1818,18 @@ 
 	static function doFlagsMod($headerFlags)
 	{
 		$flags = 'nnn';
-		if ($headerFlags['flagged']) $flags[0] = 'f';
-		if ($headerFlags['answered']) $flags[1] = 'a';
-		if ($headerFlags['forwarded']) $flags[2] = 'f';
+		if ($headerFlags['flagged'])
+		{
+			$flags[0] = 'f';
+		}
+		if ($headerFlags['answered'])
+		{
+			$flags[1] = 'a';
+		}
+		if ($headerFlags['forwarded'])
+		{
+			$flags[2] = 'f';
+		}
 		//ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.'('.array2string($headerFlags).') returning '.array2string($flags));
 		return $flags;
 	}
@@ -1520,31 +1861,55 @@ 
 	{
 		//$this->debugLevel=1;
 		$searchquery=$_searchquery->GetDataArray();
-		if (!is_array($searchquery)) return array();
-		if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($searchquery));
+		if (!is_array($searchquery))
+		{
+			return array();
+		}
+		if ($this->debugLevel>0)
+		{
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($searchquery));
+		}
 
-		if (isset($searchquery['searchrebuildresults'])) {
+		if (isset($searchquery['searchrebuildresults']))
+		{
 			$rebuildresults = $searchquery['searchrebuildresults'];
-		} else {
+		}
+		else
+		{
 			$rebuildresults = false;
 		}
-		if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,  'RebuildResults ['.$rebuildresults.']' );
+		if ($this->debugLevel>0)
+		{
+			ZLog::Write(LOGLEVEL_DEBUG,  'RebuildResults ['.$rebuildresults.']' );
+		}
 
-		if (isset($searchquery['deeptraversal'])) {
+		if (isset($searchquery['deeptraversal']))
+		{
 			$deeptraversal = $searchquery['deeptraversal'];
-		} else {
+		}
+		else
+		{
 			$deeptraversal = false;
 		}
-		if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,  'DeepTraversal ['.$deeptraversal.']' );
+		if ($this->debugLevel>0)
+		{
+			ZLog::Write(LOGLEVEL_DEBUG,  'DeepTraversal ['.$deeptraversal.']' );
+		}
 
-		if (isset($searchquery['searchrange'])) {
+		if (isset($searchquery['searchrange']))
+		{
 			$range = explode("-",$_searchquery->GetSearchRange());
 			$start =$range[0] + 1;
 			$limit = $range[1] - $range[0] + 1;
-		} else {
+		}
+		else
+		{
 			$range = false;
 		}
-		if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,  'Range ['.print_r($range, true).']' );
+		if ($this->debugLevel>0)
+		{
+			ZLog::Write(LOGLEVEL_DEBUG,  'Range ['.print_r($range, true).']' );
+		}
 
 		//foreach($searchquery['query'] as $k => $value) {
 		//	$query = $value;
@@ -1596,7 +1961,10 @@ 
 			$_filter['since'] = date("d-M-Y", Api\DateTime::to($sincedate,'ts'));
 		}
 		//$_filter[] = array('type'=>"SINCE",'string'=> date("d-M-Y", $cutoffdate));
-		if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.' for Folder:'.$_folderName.' Filter:'.array2string($_filter));
+		if ($this->debugLevel>1)
+		{
+			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.' for Folder:'.$_folderName.' Filter:'.array2string($_filter));
+		}
 		$rv_messages = $this->mail->getHeaders($_folderName, $_startMessage=($range?$start:1), $_numberOfMessages=($limit?$limit:9999999), $_sort=0, $_reverse=false, $_filter, $_id=NULL);
 		//ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($rv_messages));
 		$list=array();
@@ -1628,17 +1996,26 @@ 
 	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;
+		if (!isset($mailFolder))
+		{
+			return false;
+		}
 		$delimiter = (isset($mailFolder->delimiter)?$mailFolder->delimiter:$this->mail->getHierarchyDelimiter());
 		$parent = explode($delimiter,$folder);
 		array_pop($parent);
 		$parent = implode($delimiter,$parent);
 
 		$id = $parent && $this->folders[$parent] ? $this->createID($account, $parent) : '0';
-		if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."('$folder') --> parent=$parent --> $id");
+		if ($this->debugLevel>1)
+		{
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."('$folder') --> parent=$parent --> $id");
+		}
 		return $id;
 	}
 
@@ -1652,7 +2029,10 @@ 
 	{
 		static $last_id = null;
 		static $folderObj = null;
-		if (isset($last_id) && $last_id === $id) return $folderObj;
+		if (isset($last_id) && $last_id === $id)
+		{
+			return $folderObj;
+		}
 
 		try {
 			$account = $folder = null;
@@ -1663,18 +2043,30 @@ 
 			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->displayname = $mailFolder->shortDisplayName;
-		if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__." ID: $id, Account:$account, Folder:$folder");
+		if ($this->debugLevel>1)
+		{
+			ZLog::Write(LOGLEVEL_DEBUG,__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;
@@ -1711,7 +2103,10 @@ 
 			$folderObj->type = SYNC_FOLDER_TYPE_USER_MAIL;
 		}
 
-		if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."($id) --> $folder --> type=$folderObj->type, parentID=$folderObj->parentid, displayname=$folderObj->displayname");
+		if ($this->debugLevel>1)
+		{
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."($id) --> $folder --> type=$folderObj->type, parentID=$folderObj->parentid, displayname=$folderObj->displayname");
+		}
 		return $folderObj;
 	}
 
@@ -1755,11 +2150,20 @@ 
 	{
 		$account = $folder = null;
 		$this->splitID($folderid, $account, $folder);
-		if (is_numeric($account)) $type = 'mail';
+		if (is_numeric($account))
+		{
+			$type = 'mail';
+		}
 
-		if ($type != 'mail') return false;
+		if ($type != 'mail')
+		{
+			return false;
+		}
 
-		if (!isset($this->mail)) $this->mail = Mail::getInstance(false,self::$profileID,true,false,true);
+		if (!isset($this->mail))
+		{
+			$this->mail = Mail::getInstance(false,self::$profileID,true,false,true);
+		}
 
         $this->mail->reopen($folder);
 
@@ -1804,7 +2208,7 @@ 
      * @throws StatusException              could throw specific SYNC_STATUS_* exceptions
      */
     public function DeleteMessage($folderid, $id, $contentParameters)
-	{
+    {
 		unset($contentParameters);	// not used, but required by function signature
 		ZLog::Write(LOGLEVEL_DEBUG, "IMAP-DeleteMessage: (fid: '$folderid'  id: '$id' )");
 		/*
@@ -1830,7 +2234,10 @@ 
 			$error = $e->getMessage();
 			ZLog::Write(LOGLEVEL_DEBUG,__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;
 		}
 
@@ -1863,7 +2270,7 @@ 
      * @throws StatusException              could throw specific SYNC_STATUS_* exceptions
      */
     public function SetReadFlag($folderid, $id, $flags, $contentParameters)
-	{
+    {
 		unset($contentParameters);	// not used, but required by function signature
 		// ZLog::Write(LOGLEVEL_DEBUG, "IMAP-SetReadFlag: (fid: '$folderid'  id: '$id'  flags: '$flags' )");
 		$account = $folder = null;
@@ -1949,7 +2356,10 @@ 
 
 		$str = $this->backend->createID($account, $folder, $id);
 
-		if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."($account,'$f',$id) type=$account, folder=$folder --> '$str'");
+		if ($this->debugLevel>1)
+		{
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."($account,'$f',$id) type=$account, folder=$folder --> '$str'");
+		}
 
 		return $str;
 	}
@@ -1970,7 +2380,10 @@ 
 		// convert numeric folder-id back to folder name
 		$folder = $this->hash2folder($account,$f=$folder);
 
-		if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."('$str','$account','$folder',$id)");
+		if ($this->debugLevel>1)
+		{
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."('$str','$account','$folder',$id)");
+		}
 	}
 
 	/**
@@ -1989,7 +2402,10 @@ 
 	 */
 	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)
 		{
@@ -2012,7 +2428,10 @@ 
 	 */
 	private function hash2folder($account,$index)
 	{
-		if(!isset($this->folderHashes)) $this->readFolderHashes();
+		if(!isset($this->folderHashes))
+		{
+			$this->readFolderHashes();
+		}
 
 		return isset($this->folderHashes[$account]) ? $this->folderHashes[$account][$index] : null;
 	}