EGroupware / egroupware

mail/inc/class.mail_compose.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -1960,7 +1960,7 @@
 	/**
 	 * Gather the replyData and save it with the session, to be used then
 	 *
-	 * @param $_mode can be:
+	 * @param string $_mode can be:
 	 * 		single: for a reply to one address
 	 * 		all: for a reply to all
 	 * 		forward: inlineforwarding of a message with its attachments

Indentation +4 added lines, -4 removed lines

@@ -2126,11 +2126,11 @@ 
 		} else {
 			//$this->sessionData['body']	= @htmlspecialchars(lang("on")." ".$headers['DATE']." ".$mail_bo->decode_header($fromAddress), ENT_QUOTES) . " ".lang("wrote").":\r\n";
 			// take care the way the ReplyHeader is created here, is used later on in uicompose::compose, in case you force replys to be HTML (prefs)
-            $this->sessionData['body']  = " \r\n \r\n".'----------------'.lang("original message").'-----------------'."\r\n".
-                @htmlspecialchars(lang("from")).": ".$fromAddress."\r\n".
+			$this->sessionData['body']  = " \r\n \r\n".'----------------'.lang("original message").'-----------------'."\r\n".
+				@htmlspecialchars(lang("from")).": ".$fromAddress."\r\n".
 				$toAddress.$ccAddress.
 				@htmlspecialchars(lang("date").": ".$headers['DATE'], ENT_QUOTES | ENT_IGNORE,Mail::$displayCharset, false)."\r\n".
-                '-------------------------------------------------'."\r\n \r\n ";
+				'-------------------------------------------------'."\r\n \r\n ";
 			$this->sessionData['mimeType']	= 'plain';
 
 			for($i=0; $i<count($bodyParts); $i++) {
@@ -2968,7 +2968,7 @@ 
 		//error_log(__METHOD__.__LINE__."Number of Folders to move copy the message to:".count($folder));
 		//error_log(__METHOD__.__LINE__.array2string($folder));
 		if ((count($folder) > 0) || (isset($this->sessionData['uid']) && isset($this->sessionData['messageFolder']))
-            || (isset($this->sessionData['forwardFlag']) && isset($this->sessionData['sourceFolder']))) {
+			|| (isset($this->sessionData['forwardFlag']) && isset($this->sessionData['sourceFolder']))) {
 			$mail_bo = $this->mail_bo;
 			$mail_bo->openConnection();
 			//$mail_bo->reopen($this->sessionData['messageFolder']);

Braces +803 added lines, -269 removed lines

@@ -82,7 +82,10 @@ 
 		{
 			$this->mailPreferences['message_forwarding'] = 'asmail';
 		}
-		if (is_null(Mail::$mailConfig)) Mail::$mailConfig = Api\Config::read('mail');
+		if (is_null(Mail::$mailConfig))
+		{
+			Mail::$mailConfig = Api\Config::read('mail');
+		}
 
 		$this->mailPreferences  =& $this->mail_bo->mailPreferences;
 	}
@@ -96,11 +99,21 @@ 
 	{
 		if ($this->mail_bo->profileID!=$_icServerID)
 		{
-			if (Mail::$debug) error_log(__METHOD__.__LINE__.'->'.$this->mail_bo->profileID.'<->'.$_icServerID);
+			if (Mail::$debug)
+			{
+				error_log(__METHOD__.__LINE__.'->'.$this->mail_bo->profileID.'<->'.$_icServerID);
+			}
 			$this->mail_bo = Mail::getInstance(false,$_icServerID);
-			if (Mail::$debug) error_log(__METHOD__.__LINE__.' Fetched IC Server:'.$this->mail_bo->profileID.':'.function_backtrace());
+			if (Mail::$debug)
+			{
+				error_log(__METHOD__.__LINE__.' Fetched IC Server:'.$this->mail_bo->profileID.':'.function_backtrace());
+			}
 			// no icServer Object: something failed big time
-			if (!isset($this->mail_bo->icServer)) exit; // ToDo: Exception or the dialog for setting up a server config
+			if (!isset($this->mail_bo->icServer))
+			{
+				exit;
+			}
+			// ToDo: Exception or the dialog for setting up a server config
 			$this->mail_bo->openConnection($this->mail_bo->profileID);
 			$this->mailPreferences  =& $this->mail_bo->mailPreferences;
 		}
@@ -242,7 +255,8 @@ 
 		{
 			foreach (array_keys($actions) as $key)
 			{
-				if (!in_array($key, array('send','button[saveAsDraft]','uploadForCompose' ))) {
+				if (!in_array($key, array('send','button[saveAsDraft]','uploadForCompose' )))
+				{
 					$actions[$key]['toolbarDefault'] = false;
 				}
 			}
@@ -262,7 +276,10 @@ 
 	 */
 	function compose(array $_content=null,$msg=null, $_focusElement='to',$suppressSigOnTop=false, $isReply=false)
 	{
-		if ($msg) Framework::message($msg);
+		if ($msg)
+		{
+			Framework::message($msg);
+		}
 
 		if (!empty($GLOBALS['egw_info']['user']['preferences']['mail']['LastSignatureIDUsed']))
 		{
@@ -283,8 +300,14 @@ 
 		//error_log(__METHOD__.__LINE__.array2string($_content).function_backtrace());
 		$_contentHasSigID = $_content?array_key_exists('mailidentity',(array)$_content):false;
 		$_contentHasMimeType = $_content? array_key_exists('mimeType',(array)$_content):false;
-		if (isset($_GET['reply_id'])) $replyID = $_GET['reply_id'];
-		if (!$replyID && isset($_GET['id'])) $replyID = $_GET['id'];
+		if (isset($_GET['reply_id']))
+		{
+			$replyID = $_GET['reply_id'];
+		}
+		if (!$replyID && isset($_GET['id']))
+		{
+			$replyID = $_GET['id'];
+		}
 
 		// Process different places we can use as a start for composing an email
 		$actionToProcess = 'compose';
@@ -351,7 +374,10 @@ 
 			$suppressSigOnTop = true;
 			foreach ($_content['uploadForCompose'] as $i => &$upload)
 			{
-				if (!isset($upload['file'])) $upload['file'] = $upload['tmp_name'];
+				if (!isset($upload['file']))
+				{
+					$upload['file'] = $upload['tmp_name'];
+				}
 				try
 				{
 					$upload['file'] = $upload['tmp_name'] = Mail::checkFileBasics($upload,$this->composeID,false);
@@ -385,9 +411,15 @@ 
 				$remove=false;
 				foreach(array_keys($toDelete) as $k)
 				{
-					if ($att['tmp_name']==$k) $remove=true;
+					if ($att['tmp_name']==$k)
+					{
+						$remove=true;
+					}
+				}
+				if (!$remove)
+				{
+					$_content['attachments'][] = $att;
 				}
-				if (!$remove) $_content['attachments'][] = $att;
 			}
 		}
 		// someone clicked something like send, or saveAsDraft
@@ -402,8 +434,7 @@ 
 		//error_log(__METHOD__.__LINE__.array2string($_content));
 		if (!empty($_content['serverID']) && $_content['serverID'] != $this->mail_bo->profileID &&
 			($_content['composeToolbar'] === 'send' || $_content['button']['saveAsDraft']||$_content['button']['saveAsDraftAndPrint'])
-		)
-		{
+		) {
 			$this->changeProfile($_content['serverID']);
 			$composeProfile = $this->mail_bo->profileID;
 		}
@@ -483,7 +514,10 @@ 
 							//$this->sessionData['uid'][] = $fhA['msgUID'];
 							//$this->sessionData['forwardedUID'][] = $fhA['msgUID'];
 							$idsForRefresh[] = mail_ui::generateRowID($fhA['profileID'], $fhA['folder'], $fhA['msgUID'], $_prependApp=false);
-							if (!empty($fhA['folder'])) $workingFolder = $fhA['folder'];
+							if (!empty($fhA['folder']))
+							{
+								$workingFolder = $fhA['folder'];
+							}
 						}
 					}
 					if ($_content['mode']=='reply' && !empty($_content['processedmail_id']))
@@ -534,7 +568,10 @@ 
 			}
 		}
 
-		if ($activeProfile != $composeProfile) $this->changeProfile($activeProfile);
+		if ($activeProfile != $composeProfile)
+		{
+			$this->changeProfile($activeProfile);
+		}
 		$insertSigOnTop = false;
 		$content = (is_array($_content)?$_content:array());
 		if ($_contentHasMimeType)
@@ -563,7 +600,10 @@ 
 				{
 					foreach ($contentArr as $k =>&$elem)
 					{
-						if (stripos($elem,'<pre>')!==false) $elem = str_replace(array("\r\n","\n","\r"),array("<br>","<br>","<br>"),$elem);
+						if (stripos($elem,'<pre>')!==false)
+						{
+							$elem = str_replace(array("\r\n","\n","\r"),array("<br>","<br>","<br>"),$elem);
+						}
 					}
 					$content['mail_htmltext'] = implode('',$contentArr);
 				}
@@ -600,8 +640,7 @@ 
 		if ( !empty($content['body']) &&
 			(!empty($composeCache['mailaccount']) && !empty($_content['mailaccount']) && $_content['mailaccount'] != $composeCache['mailaccount']) ||
 			(!empty($composeCache['mailidentity']) && !empty($_content['mailidentity']) && $_content['mailidentity'] != $composeCache['mailidentity'])
-		)
-		{
+		) {
 			$buttonClicked = true;
 			$suppressSigOnTop = true;
 			if (!empty($composeCache['mailaccount']) && !empty($_content['mailaccount']) && $_content['mailaccount'] != $composeCache['mailaccount'])
@@ -617,7 +656,10 @@ 
 				else
 				{
 					$newSig = $this->mail_bo->getDefaultIdentity();
-					if ($newSig === false) $newSig = -2;
+					if ($newSig === false)
+					{
+						$newSig = -2;
+					}
 				}
 			}
 			$_oldSig = $composeCache['mailidentity'];
@@ -625,7 +667,10 @@ 
 			$_currentMode = $_content['mimeType'];
 			if ($_oldSig != $_signatureid)
 			{
-				if($this->_debug) error_log(__METHOD__.__LINE__.' old,new ->'.$_oldSig.','.$_signatureid.'#'.$content['body']);
+				if($this->_debug)
+				{
+					error_log(__METHOD__.__LINE__.' old,new ->'.$_oldSig.','.$_signatureid.'#'.$content['body']);
+				}
 				// prepare signatures, the selected sig may be used on top of the body
 				try
 				{
@@ -655,7 +700,10 @@ 
 				{
 					$oldSigText = $this->convertHTMLToText($oldSigText,true,true);
 					$sigText = $this->convertHTMLToText($sigText,true,true);
-					if($this->_debug) error_log(__METHOD__." Old signature:".$oldSigText);
+					if($this->_debug)
+					{
+						error_log(__METHOD__." Old signature:".$oldSigText);
+					}
 				}
 
 				//$oldSigText = Mail::merge($oldSigText,array($GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'],'person_id')));
@@ -672,7 +720,11 @@ 
 				{
 					$content['body'] = str_replace("\n",'\n',$content['body']);	// dont know why, but \n screws up preg_replace
 					$styles = Mail::getStyles(array(array('body'=>$content['body'])));
-					if (stripos($content['body'],'style')!==false) Api\Mail\Html::replaceTagsCompletley($content['body'],'style',$endtag='',true); // clean out empty or pagewide style definitions / left over tags
+					if (stripos($content['body'],'style')!==false)
+					{
+						Api\Mail\Html::replaceTagsCompletley($content['body'],'style',$endtag='',true);
+					}
+					// clean out empty or pagewide style definitions / left over tags
 				}
 				$content['body'] = str_replace(array("\r", "\t", "<br />\n", ": "), array("", "", "<br />", ":"),
 					$_currentMode == 'html' ? Api\Html::purify($content['body'], Mail::$htmLawed_config, array(), true) : $content['body']);
@@ -717,8 +769,14 @@ 
 
 				if ($found === false)
 				{
-					if($this->_debug) error_log(__METHOD__." Old Signature failed to match:".$oldSigTextCleaned);
-					if($this->_debug) error_log(__METHOD__." Compare content:".$content['body']);
+					if($this->_debug)
+					{
+						error_log(__METHOD__." Old Signature failed to match:".$oldSigTextCleaned);
+					}
+					if($this->_debug)
+					{
+						error_log(__METHOD__." Compare content:".$content['body']);
+					}
 				}
 				else
 				{
@@ -733,7 +791,10 @@ 
 		}
 
 		// do not double insert a signature on a server roundtrip
-		if ($buttonClicked) $suppressSigOnTop = true;
+		if ($buttonClicked)
+		{
+			$suppressSigOnTop = true;
+		}
 		if ($isFirstLoad)
 		{
 			$alwaysAttachVCardAtCompose = false; // we use this to eliminate double attachments, if users VCard is already present/attached
@@ -772,7 +833,8 @@ 
 							}
 						}
 						$content['subject'] = lang($app).' #'.$res['id'].': ';
-						foreach(array('subject','body','mimetype') as $name) {
+						foreach(array('subject','body','mimetype') as $name)
+						{
 							$sName = $name;
 							if ($name=='mimetype'&&$res[$name])
 							{
@@ -781,7 +843,10 @@ 
 							}
 							else
 							{
-								if ($res[$name]) $content[$sName] .= (strlen($content[$sName])>0 ? ' ':'') .$res[$name];
+								if ($res[$name])
+								{
+									$content[$sName] .= (strlen($content[$sName])>0 ? ' ':'') .$res[$name];
+								}
 							}
 						}
 					}
@@ -792,7 +857,8 @@ 
 			{
 				$alreadyProcessed=array();
 				//_debug_array($_REQUEST);
-				if ($_REQUEST['preset']['mailto']) {
+				if ($_REQUEST['preset']['mailto'])
+				{
 					// handle mailto strings such as
 					// mailto:larry,dan?cc=mike&bcc=sue&subject=test&body=type+your&body=message+here
 					// the above string may be htmlentyty encoded, then multiple body tags are supported
@@ -800,10 +866,12 @@ 
 					$tmp_send_to = (stripos($_REQUEST['preset']['mailto'],'mailto')===false?$_REQUEST['preset']['mailto']:trim(substr(html_entity_decode($_REQUEST['preset']['mailto']),7)));
 					// check if there is more than the to address
 					$mailtoArray = explode('?',$tmp_send_to,2);
-					if ($mailtoArray[1]) {
+					if ($mailtoArray[1])
+					{
 						// check if there are more than one requests
 						$addRequests = explode('&',$mailtoArray[1]);
-						foreach ($addRequests as $key => $reqval) {
+						foreach ($addRequests as $key => $reqval)
+						{
 							// the additional requests should have a =, to separate key from value.
 							$keyValuePair = explode('=',$reqval,2);
 							$content[$keyValuePair[0]] .= (strlen($content[$keyValuePair[0]])>0 ? ' ':'') . $keyValuePair[1];
@@ -812,17 +880,24 @@ 
 					$content['to']=$mailtoArray[0];
 					$alreadyProcessed['to']='to';
 					// if the mailto string is not htmlentity decoded the arguments are passed as simple requests
-					foreach(array('cc','bcc','subject','body') as $name) {
+					foreach(array('cc','bcc','subject','body') as $name)
+					{
 						$alreadyProcessed[$name]=$name;
-						if ($_REQUEST[$name]) $content[$name] .= (strlen($content[$name])>0 ? ( $name == 'cc' || $name == 'bcc' ? ',' : ' ') : '') . $_REQUEST[$name];
+						if ($_REQUEST[$name])
+						{
+							$content[$name] .= (strlen($content[$name])>0 ? ( $name == 'cc' || $name == 'bcc' ? ',' : ' ') : '') . $_REQUEST[$name];
+						}
 					}
 				}
 
-				if ($_REQUEST['preset']['mailtocontactbyid']) {
-					if ($GLOBALS['egw_info']['user']['apps']['addressbook']) {
+				if ($_REQUEST['preset']['mailtocontactbyid'])
+				{
+					if ($GLOBALS['egw_info']['user']['apps']['addressbook'])
+					{
 						$contacts_obj = new Api\Contacts();
 						$addressbookprefs =& $GLOBALS['egw_info']['user']['preferences']['addressbook'];
-						if (method_exists($contacts_obj,'search')) {
+						if (method_exists($contacts_obj,'search'))
+						{
 
 							$addressArray = explode(',',$_REQUEST['preset']['mailtocontactbyid']);
 							foreach ((array)$addressArray as $id => $addressID)
@@ -837,7 +912,10 @@ 
 							{
 								$_searchCond = array('contact_id'=>$addressArray);
 								//error_log(__METHOD__.__LINE__.$_searchString);
-								if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts']) $showAccounts=false;
+								if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'])
+								{
+									$showAccounts=false;
+								}
 								$filter = ($showAccounts?array():array('account_id' => null));
 								$filter['cols_to_search']=array('n_fn','email','email_home');
 								$contacts = $contacts_obj->search($_searchCond,array('n_fn','email','email_home'),'n_fn','','%',false,'OR',array(0,100),$filter);
@@ -863,21 +941,28 @@ 
 									unset($accounts);
 								}
 							}
-							if(is_array($contacts)) {
+							if(is_array($contacts))
+							{
 								$mailtoArray = array();
 								$primary = $addressbookprefs['distributionListPreferredMail'];
-								if ($primary != 'email' && $primary != 'email_home') $primary = 'email';
+								if ($primary != 'email' && $primary != 'email_home')
+								{
+									$primary = 'email';
+								}
 								$secondary = ($primary == 'email'?'email_home':'email');
 								//error_log(__METHOD__.__LINE__.array2string($contacts));
-								foreach($contacts as $contact) {
+								foreach($contacts as $contact)
+								{
 									$innerCounter=0;
-									foreach(array($contact[$primary],$contact[$secondary]) as $email) {
+									foreach(array($contact[$primary],$contact[$secondary]) as $email)
+									{
 										// use pref distributionListPreferredMail for the primary address
 										// avoid wrong addresses, if an rfc822 encoded address is in addressbook
 										$email = preg_replace("/(^.*<)([a-zA-Z0-9_\-]+@[a-zA-Z0-9_\-\.]+)(.*)/",'$2',$email);
 										$contact['n_fn'] = str_replace(array(',','@'),' ',$contact['n_fn']);
 										$completeMailString = addslashes(trim($contact['n_fn'] ? $contact['n_fn'] : $contact['fn']) .' <'. trim($email) .'>');
-										if($innerCounter==0 && !empty($email) && in_array($completeMailString ,$mailtoArray) === false) {
+										if($innerCounter==0 && !empty($email) && in_array($completeMailString ,$mailtoArray) === false)
+										{
 											$i++;
 											$innerCounter++;
 											$mailtoArray[$i] = $completeMailString;
@@ -969,7 +1054,10 @@ 
 							}
 						}
 					}
-					if(!empty($remember)) $content = array_merge($content,$remember);
+					if(!empty($remember))
+					{
+						$content = array_merge($content,$remember);
+					}
 				}
 				foreach(array('to','cc','bcc','subject','body','mimeType') as $name)
 				{
@@ -979,9 +1067,15 @@ 
 						$_content[$name]=$content[$name]=$_REQUEST['preset'][$name];
 					}
 					//skip if already processed by "preset Routines"
-					if ($alreadyProcessed[$name]) continue;
+					if ($alreadyProcessed[$name])
+					{
+						continue;
+					}
 					//error_log(__METHOD__.__LINE__.':'.$name.'->'. $_REQUEST['preset'][$name]);
-					if ($_REQUEST['preset'][$name]) $content[$name] = $_REQUEST['preset'][$name];
+					if ($_REQUEST['preset'][$name])
+					{
+						$content[$name] = $_REQUEST['preset'][$name];
+					}
 				}
 			}
 			// is the to address set already?
@@ -989,7 +1083,10 @@ 
 			{
 				$content['to'] = base64_decode($_REQUEST['send_to']);
 				// first check if there is a questionmark or ampersand
-				if (strpos($content['to'],'?')!== false) list($content['to'],$rest) = explode('?',$content['to'],2);
+				if (strpos($content['to'],'?')!== false)
+				{
+					list($content['to'],$rest) = explode('?',$content['to'],2);
+				}
 				$content['to'] = html_entity_decode($content['to']);
 				if (($at_pos = strpos($content['to'],'@')) !== false)
 				{
@@ -1002,9 +1099,15 @@ 
 						$content['to'] = $email;
 					}
 				}
-				if (strpos($content['to'],'%40')!== false) $content['to'] = Api\Html::purify(str_replace('%40','@',$content['to']));
+				if (strpos($content['to'],'%40')!== false)
+				{
+					$content['to'] = Api\Html::purify(str_replace('%40','@',$content['to']));
+				}
 				$rarr = array(Api\Html::purify($rest));
-				if (isset($rest)&&!empty($rest) && strpos($rest,'&')!== false) $rarr = explode('&',$rest);
+				if (isset($rest)&&!empty($rest) && strpos($rest,'&')!== false)
+				{
+					$rarr = explode('&',$rest);
+				}
 				//error_log(__METHOD__.__LINE__.$content['to'].'->'.array2string($rarr));
 				$karr = array();
 				foreach ($rarr as &$rval)
@@ -1020,9 +1123,15 @@ 
 				//error_log(__METHOD__.__LINE__.$content['to'].'->'.array2string($karr));
 				foreach(array('cc','bcc','subject','body') as $name)
 				{
-					if ($karr[$name]) $content[$name] = $karr[$name];
+					if ($karr[$name])
+					{
+						$content[$name] = $karr[$name];
+					}
+				}
+				if (!empty($_REQUEST['subject']))
+				{
+					$content['subject'] = Api\Html::purify(trim(html_entity_decode($_REQUEST['subject'])));
 				}
-				if (!empty($_REQUEST['subject'])) $content['subject'] = Api\Html::purify(trim(html_entity_decode($_REQUEST['subject'])));
 			}
 		}
 		//error_log(__METHOD__.__LINE__.array2string($content));
@@ -1040,7 +1149,10 @@ 
 				$_content['mimeType'] = $content['mimeType']  = 'html';
 				$content['body'] = "<pre>".$content['body']."</pre>";
 				// take care this assumption is made on the creation of the reply header in bocompose::getReplyData
-				if (strpos($content['body'],"<pre> \r\n \r\n---")===0) $content['body'] = substr_replace($content['body']," <br>\r\n<pre>---",0,strlen("<pre> \r\n \r\n---")-1);
+				if (strpos($content['body'],"<pre> \r\n \r\n---")===0)
+				{
+					$content['body'] = substr_replace($content['body']," <br>\r\n<pre>---",0,strlen("<pre> \r\n \r\n---")-1);
+				}
 			}
 		}
 		else
@@ -1060,7 +1172,10 @@ 
 					$_content['mimeType'] = $content['mimeType']  = 'html';
 					$content['body'] = "<pre>".$content['body']."</pre>";
 					// take care this assumption is made on the creation of the reply header in bocompose::getReplyData
-					if (strpos($content['body'],"<pre> \r\n \r\n---")===0) $content['body'] = substr_replace($content['body']," <br>\r\n<pre>---",0,strlen("<pre> \r\n \r\n---")-1);
+					if (strpos($content['body'],"<pre> \r\n \r\n---")===0)
+					{
+						$content['body'] = substr_replace($content['body']," <br>\r\n<pre>---",0,strlen("<pre> \r\n \r\n---")-1);
+					}
 				}
 			}
 		}
@@ -1098,24 +1213,33 @@ 
 			$disableRuler = true;
 		}
 		$font_span = $font_part = '';
-		if($content['mimeType'] == 'html' /*&& trim($content['body'])==''*/) {
+		if($content['mimeType'] == 'html' /*&& trim($content['body'])==''*/)
+		{
 			// User preferences for style
 			$font = $GLOBALS['egw_info']['user']['preferences']['common']['rte_font'];
 			$font_size = Api\Html\CkEditorConfig::font_size_from_prefs();
 			$font_part = '<span style="width:100%; display: inline; '.($font?'font-family:'.$font.'; ':'').($font_size?'font-size:'.$font_size.'; ':'').'">';
 			$font_span = $font_part.'&#8203;</span>';
-			if (empty($font) && empty($font_size)) $font_span = '';
+			if (empty($font) && empty($font_size))
+			{
+				$font_span = '';
+			}
 		}
 		// the font span should only be applied on first load or on switch plain->html and the absence of the font_part of the span
-		if (!$isFirstLoad && !empty($font_span) && stripos($content['body'],$font_part)===false) $font_span = '';
+		if (!$isFirstLoad && !empty($font_span) && stripos($content['body'],$font_part)===false)
+		{
+			$font_span = '';
+		}
 		//remove possible html header stuff
-		if (stripos($content['body'],'<html><head></head><body>')!==false) $content['body'] = str_ireplace(array('<html><head></head><body>','</body></html>'),array('',''),$content['body']);
+		if (stripos($content['body'],'<html><head></head><body>')!==false)
+		{
+			$content['body'] = str_ireplace(array('<html><head></head><body>','</body></html>'),array('',''),$content['body']);
+		}
 		//error_log(__METHOD__.__LINE__.array2string($this->mailPreferences));
 		$blockElements = array('address','blockquote','center','del','dir','div','dl','fieldset','form','h1','h2','h3','h4','h5','h6','hr','ins','isindex','menu','noframes','noscript','ol','p','pre','table','ul');
 		if ($this->mailPreferences['insertSignatureAtTopOfMessage']!='no_belowaftersend' &&
 			!(isset($_POST['mySigID']) && !empty($_POST['mySigID']) ) && !$suppressSigOnTop
-		)
-		{
+		) {
 			// ON tOP OR BELOW? pREF CAN TELL
 			/*
 				Signature behavior preference changed. New default, if not set -> 0
@@ -1130,14 +1254,23 @@ 
 				$sigTextStartsWithBlockElement = ($disableRuler?false:true);
 				foreach($blockElements as $e)
 				{
-					if ($sigTextStartsWithBlockElement) break;
-					if (stripos(trim($sigText),'<'.$e)===0) $sigTextStartsWithBlockElement = true;
+					if ($sigTextStartsWithBlockElement)
+					{
+						break;
+					}
+					if (stripos(trim($sigText),'<'.$e)===0)
+					{
+						$sigTextStartsWithBlockElement = true;
+					}
 				}
 			}
-			if($content['mimeType'] == 'html') {
+			if($content['mimeType'] == 'html')
+			{
 				$before = $disableRuler ? '' : '<hr style="border:1px dotted silver; width:100%;">';
 				$inbetween = '';
-			} else {
+			}
+			else
+			{
 				$before = ($disableRuler ?"\r\n\r\n":"\r\n\r\n-- \r\n");
 				$inbetween = "\r\n";
 			}
@@ -1181,16 +1314,24 @@ 
 		//$content['bcc'] = array('kl@stylite.de','kl@leithoff.net');
 		// address stuff like from, to, cc, replyto
 		$destinationRows = 0;
-		foreach(self::$destinations as $destination) {
+		foreach(self::$destinations as $destination)
+		{
 			if (!is_array($content[$destination]))
 			{
-				if (!empty($content[$destination])) $content[$destination] = (array)$content[$destination];
+				if (!empty($content[$destination]))
+				{
+					$content[$destination] = (array)$content[$destination];
+				}
 			}
 			$addr_content = $content[strtolower($destination)];
 			// we clear the given address array and rebuild it
 			unset($content[strtolower($destination)]);
-			foreach((array)$addr_content as $key => $value) {
-				if ($value=="NIL@NIL") continue;
+			foreach((array)$addr_content as $key => $value)
+			{
+				if ($value=="NIL@NIL")
+				{
+					continue;
+				}
 				if ($destination=='replyto' && str_replace('"','',$value) ==
 					str_replace('"','',$identities[$this->mail_bo->getDefaultIdentity()]))
 				{
@@ -1200,8 +1341,12 @@ 
 				}
 				//error_log(__METHOD__.__LINE__.array2string(array('key'=>$key,'value'=>$value)));
 				$value = str_replace("\"\"",'"', htmlspecialchars_decode($value, ENT_COMPAT));
-				foreach(Mail::parseAddressList($value) as $addressObject) {
-					if ($addressObject->host == '.SYNTAX-ERROR.') continue;
+				foreach(Mail::parseAddressList($value) as $addressObject)
+				{
+					if ($addressObject->host == '.SYNTAX-ERROR.')
+					{
+						continue;
+					}
 					$address = imap_rfc822_write_address($addressObject->mailbox,$addressObject->host,$addressObject->personal);
 					//$address = Mail::htmlentities($address, $this->displayCharset);
 					$content[strtolower($destination)][]=$address;
@@ -1212,11 +1357,20 @@ 
 		if ($_content)
 		{
 			//input array of _content had no signature information but was seeded later, and content has a valid setting
-			if (!$_contentHasSigID && $content['mailidentity'] && array_key_exists('mailidentity',$_content)) unset($_content['mailidentity']);
+			if (!$_contentHasSigID && $content['mailidentity'] && array_key_exists('mailidentity',$_content))
+			{
+				unset($_content['mailidentity']);
+			}
 			$content = array_merge($content,$_content);
 
-			if (!empty($content['folder'])) $sel_options['folder']=$this->ajax_searchFolder(0,true);
-			if (empty($content['mailaccount'])) $content['mailaccount'] = $this->mail_bo->profileID;
+			if (!empty($content['folder']))
+			{
+				$sel_options['folder']=$this->ajax_searchFolder(0,true);
+			}
+			if (empty($content['mailaccount']))
+			{
+				$content['mailaccount'] = $this->mail_bo->profileID;
+			}
 		}
 		else
 		{
@@ -1259,11 +1413,17 @@ 
 		//error_log(__METHOD__.__LINE__.' ComposeID:'.$preserv['composeID']);
 		$preserv['is_html'] = $content['is_html'];
 		$preserv['is_plain'] = $content['is_plain'];
-		if (isset($content['mimeType'])) $preserv['mimeType'] = $content['mimeType'];
+		if (isset($content['mimeType']))
+		{
+			$preserv['mimeType'] = $content['mimeType'];
+		}
 		$sel_options['mimeType'] = self::$mimeTypes;
 		$sel_options['priority'] = self::$priorities;
 		$sel_options['filemode'] = Vfs\Sharing::$modes;
-		if (!isset($content['priority']) || empty($content['priority'])) $content['priority']=3;
+		if (!isset($content['priority']) || empty($content['priority']))
+		{
+			$content['priority']=3;
+		}
 		//$GLOBALS['egw_info']['flags']['currentapp'] = 'mail';//should not be needed
 		$etpl = new Etemplate('mail.compose');
 
@@ -1310,9 +1470,12 @@ 
 		$preserv['list-id'] = $content['list-id'];
 		$preserv['mode'] = $content['mode'];
 		// convert it back to checkbox expectations
-		if($content['mimeType'] == 'html') {
+		if($content['mimeType'] == 'html')
+		{
 			$content['mimeType']=1;
-		} else {
+		}
+		else
+		{
 			$content['mimeType']=0;
 		}
 		// set the current selected mailaccount as param for folderselection
@@ -1323,7 +1486,10 @@ 
 		// Resolve distribution list before send content to client
 		foreach(array('to', 'cc', 'bcc', 'replyto')  as $f)
 		{
-			if (is_array($content[$f])) $content[$f]= self::resolveEmailAddressList ($content[$f]);
+			if (is_array($content[$f]))
+			{
+				$content[$f]= self::resolveEmailAddressList ($content[$f]);
+			}
 		}
 
 		$content['to'] = self::resolveEmailAddressList($content['to']);
@@ -1371,7 +1537,10 @@ 
 				case 'composefromdraft':
 				case 'composeasnew':
 					$content = $this->getDraftData($icServer, $folder, $msgUID, $part_id);
-					if ($from =='composefromdraft') $content['mode'] = 'composefromdraft';
+					if ($from =='composefromdraft')
+					{
+						$content['mode'] = 'composefromdraft';
+					}
 					$content['processedmail_id'] = $mail_id;
 
 					$_focusElement = 'body';
@@ -1419,7 +1588,10 @@ 
 			$document_merge = new $merge_class();
 			$this->mail_bo->openConnection();
 			$merge_ids = $_REQUEST['preset']['mailtocontactbyid'] ? $_REQUEST['preset']['mailtocontactbyid'] : $mail_id;
-			if (!is_array($merge_ids)) $merge_ids = explode(',',$merge_ids);
+			if (!is_array($merge_ids))
+			{
+				$merge_ids = explode(',',$merge_ids);
+			}
 			try
 			{
 				$merged_mail_id = '';
@@ -1450,7 +1622,10 @@ 
 				{
 					$success = implode(', ',$results['success']);
 					$fail = implode(', ', $results['failed']);
-					if($success) Framework::message($success, 'success');
+					if($success)
+					{
+						Framework::message($success, 'success');
+					}
 					Framework::window_close($fail);
 				}
 			}
@@ -1482,17 +1657,25 @@ 
 	{
 		$stripalltags = true;
 		// third param is stripalltags, we may not need that, if the source is already in ascii
-		if (!$sourceishtml) $stripalltags=false;
+		if (!$sourceishtml)
+		{
+			$stripalltags=false;
+		}
 		return Api\Mail\Html::convertHTMLToText($_html,$this->displayCharset,$stripcrl,$stripalltags);
 	}
 
 	function generateRFC822Address($_addressObject)
 	{
-		if($_addressObject->personal && $_addressObject->mailbox && $_addressObject->host) {
+		if($_addressObject->personal && $_addressObject->mailbox && $_addressObject->host)
+		{
 			return sprintf('"%s" <%s@%s>', $this->mail_bo->decode_header($_addressObject->personal), $_addressObject->mailbox, $this->mail_bo->decode_header($_addressObject->host,'FORCE'));
-		} elseif($_addressObject->mailbox && $_addressObject->host) {
+		}
+		elseif($_addressObject->mailbox && $_addressObject->host)
+		{
 			return sprintf("%s@%s", $_addressObject->mailbox, $this->mail_bo->decode_header($_addressObject->host,'FORCE'));
-		} else {
+		}
+		else
+		{
 			return $this->mail_bo->decode_header($_addressObject->mailbox,true);
 		}
 	}
@@ -1526,16 +1709,28 @@ 
 		//if ($addHeadInfo['THREAD-TOPIC']) $this->sessionData['thread-topic'] = $addHeadInfo['THREAD-TOPIC'];
 
 		//error_log(__METHOD__.__LINE__.array2string($headers));
-		if (!empty($addHeadInfo['X-MAILFOLDER'])) {
-			foreach ( explode('|',$addHeadInfo['X-MAILFOLDER']) as $val ) {
+		if (!empty($addHeadInfo['X-MAILFOLDER']))
+		{
+			foreach ( explode('|',$addHeadInfo['X-MAILFOLDER']) as $val )
+			{
 				$fval=$val;
 				$icServerID = $mail_bo->icServer->ImapServerId;
-				if (stripos($val,'::')!==false) list($icServerID,$fval) = explode('::',$val,2);
-				if ($icServerID != $mail_bo->icServer->ImapServerId) continue;
-				if ($mail_bo->folderExists($fval)) $this->sessionData['folder'][] = $val;
+				if (stripos($val,'::')!==false)
+				{
+					list($icServerID,$fval) = explode('::',$val,2);
+				}
+				if ($icServerID != $mail_bo->icServer->ImapServerId)
+				{
+					continue;
+				}
+				if ($mail_bo->folderExists($fval))
+				{
+					$this->sessionData['folder'][] = $val;
+				}
 			}
 		}
-		if (!empty($addHeadInfo['X-MAILIDENTITY'])) {
+		if (!empty($addHeadInfo['X-MAILIDENTITY']))
+		{
 			// with the new system it would be the identity
 			try
 			{
@@ -1551,7 +1746,8 @@ 
 			$this->sessionData['stationeryID'] = $addHeadInfo['X-STATIONERY'];
 		}
 		*/
-		if (!empty($addHeadInfo['X-MAILACCOUNT'])) {
+		if (!empty($addHeadInfo['X-MAILACCOUNT']))
+		{
 			// with the new system it would the identity is the account id
 			try
 			{
@@ -1566,27 +1762,38 @@ 
 			}
 		}
 		// if the message is located within the draft folder, add it as last drafted version (for possible cleanup on abort))
-		if ($mail_bo->isDraftFolder($_folder)) $this->sessionData['lastDrafted'] = mail_ui::generateRowID($this->mail_bo->profileID, $_folder, $_uid);//array('uid'=>$_uid,'folder'=>$_folder);
+		if ($mail_bo->isDraftFolder($_folder))
+		{
+			$this->sessionData['lastDrafted'] = mail_ui::generateRowID($this->mail_bo->profileID, $_folder, $_uid);
+		}
+		//array('uid'=>$_uid,'folder'=>$_folder);
 		$this->sessionData['uid'] = $_uid;
 		$this->sessionData['messageFolder'] = $_folder;
 		$this->sessionData['isDraft'] = true;
 		$foundAddresses = array();
-		foreach((array)$headers['CC'] as $val) {
+		foreach((array)$headers['CC'] as $val)
+		{
 			$rfcAddr=Mail::parseAddressList($val);
 			$_rfcAddr = $rfcAddr[0];
-			if (!$_rfcAddr->valid) continue;
-			if($_rfcAddr->mailbox == 'undisclosed-recipients' || (!$_rfcAddr->mailbox && !$_rfcAddr->host) ) {
+			if (!$_rfcAddr->valid)
+			{
+				continue;
+			}
+			if($_rfcAddr->mailbox == 'undisclosed-recipients' || (!$_rfcAddr->mailbox && !$_rfcAddr->host) )
+			{
 				continue;
 			}
 			$keyemail=$_rfcAddr->mailbox.'@'.$_rfcAddr->host;
-			if(!$foundAddresses[$keyemail]) {
+			if(!$foundAddresses[$keyemail])
+			{
 				$address = $this->mail_bo->decode_header($val,true);
 				$this->sessionData['cc'][] = $val;
 				$foundAddresses[$keyemail] = true;
 			}
 		}
 
-		foreach((array)$headers['TO'] as $val) {
+		foreach((array)$headers['TO'] as $val)
+		{
 			if(!is_array($val))
 			{
 				$this->sessionData['to'][] = $val;
@@ -1594,42 +1801,59 @@ 
 			}
 			$rfcAddr=Mail::parseAddressList($val);
 			$_rfcAddr = $rfcAddr[0];
-			if (!$_rfcAddr->valid) continue;
-			if($_rfcAddr->mailbox == 'undisclosed-recipients' || (!$_rfcAddr->mailbox && !$_rfcAddr->host) ) {
+			if (!$_rfcAddr->valid)
+			{
+				continue;
+			}
+			if($_rfcAddr->mailbox == 'undisclosed-recipients' || (!$_rfcAddr->mailbox && !$_rfcAddr->host) )
+			{
 				continue;
 			}
 			$keyemail=$_rfcAddr->mailbox.'@'.$_rfcAddr->host;
-			if(!$foundAddresses[$keyemail]) {
+			if(!$foundAddresses[$keyemail])
+			{
 				$address = $this->mail_bo->decode_header($val,true);
 				$this->sessionData['to'][] = $val;
 				$foundAddresses[$keyemail] = true;
 			}
 		}
 
-		foreach((array)$headers['REPLY-TO'] as $val) {
+		foreach((array)$headers['REPLY-TO'] as $val)
+		{
 			$rfcAddr=Mail::parseAddressList($val);
 			$_rfcAddr = $rfcAddr[0];
-			if (!$_rfcAddr->valid) continue;
-			if($_rfcAddr->mailbox == 'undisclosed-recipients' || (empty($_rfcAddr->mailbox) && empty($_rfcAddr->host)) ) {
+			if (!$_rfcAddr->valid)
+			{
+				continue;
+			}
+			if($_rfcAddr->mailbox == 'undisclosed-recipients' || (empty($_rfcAddr->mailbox) && empty($_rfcAddr->host)) )
+			{
 				continue;
 			}
 			$keyemail=$_rfcAddr->mailbox.'@'.$_rfcAddr->host;
-			if(!$foundAddresses[$keyemail]) {
+			if(!$foundAddresses[$keyemail])
+			{
 				$address = $this->mail_bo->decode_header($val,true);
 				$this->sessionData['replyto'][] = $val;
 				$foundAddresses[$keyemail] = true;
 			}
 		}
 
-		foreach((array)$headers['BCC'] as $val) {
+		foreach((array)$headers['BCC'] as $val)
+		{
 			$rfcAddr=Mail::parseAddressList($val);
 			$_rfcAddr = $rfcAddr[0];
-			if (!$_rfcAddr->valid) continue;
-			if($_rfcAddr->mailbox == 'undisclosed-recipients' || (empty($_rfcAddr->mailbox) && empty($_rfcAddr->host)) ) {
+			if (!$_rfcAddr->valid)
+			{
+				continue;
+			}
+			if($_rfcAddr->mailbox == 'undisclosed-recipients' || (empty($_rfcAddr->mailbox) && empty($_rfcAddr->host)) )
+			{
 				continue;
 			}
 			$keyemail=$_rfcAddr->mailbox.'@'.$_rfcAddr->host;
-			if(!$foundAddresses[$keyemail]) {
+			if(!$foundAddresses[$keyemail])
+			{
 				$address = $this->mail_bo->decode_header($val,true);
 				$this->sessionData['bcc'][] = $val;
 				$foundAddresses[$keyemail] = true;
@@ -1643,32 +1867,46 @@ 
 		$bodyParts = $mail_bo->getMessageBody($_uid,'always_display', $_partID);
 		//_debug_array($bodyParts);
 		#$fromAddress = ($headers['FROM'][0]['PERSONAL_NAME'] != 'NIL') ? $headers['FROM'][0]['RFC822_EMAIL'] : $headers['FROM'][0]['EMAIL'];
-		if($bodyParts['0']['mimeType'] == 'text/html') {
+		if($bodyParts['0']['mimeType'] == 'text/html')
+		{
 			$this->sessionData['mimeType'] 	= 'html';
 
-			for($i=0; $i<count($bodyParts); $i++) {
-				if($i>0) {
+			for($i=0; $i<count($bodyParts); $i++)
+			{
+				if($i>0)
+				{
 					$this->sessionData['body'] .= '<hr>';
 				}
-				if($bodyParts[$i]['mimeType'] == 'text/plain') {
+				if($bodyParts[$i]['mimeType'] == 'text/plain')
+				{
 					#$bodyParts[$i]['body'] = nl2br($bodyParts[$i]['body']);
 					$bodyParts[$i]['body'] = "<pre>".$bodyParts[$i]['body']."</pre>";
 				}
-				if ($bodyParts[$i]['charSet']===false) $bodyParts[$i]['charSet'] = Mail::detect_encoding($bodyParts[$i]['body']);
+				if ($bodyParts[$i]['charSet']===false)
+				{
+					$bodyParts[$i]['charSet'] = Mail::detect_encoding($bodyParts[$i]['body']);
+				}
 				$bodyParts[$i]['body'] = Api\Translation::convert_jsonsafe($bodyParts[$i]['body'], $bodyParts[$i]['charSet']);
 				#error_log( "GetDraftData (HTML) CharSet:".mb_detect_encoding($bodyParts[$i]['body'] . 'a' , strtoupper($bodyParts[$i]['charSet']).','.strtoupper($this->displayCharset).',UTF-8, ISO-8859-1'));
 				$this->sessionData['body'] .= ($i>0?"<br>":""). $bodyParts[$i]['body'] ;
 			}
 			$this->sessionData['body'] = mail_ui::resolve_inline_images($this->sessionData['body'], $_folder, $_uid, $_partID);
 
-		} else {
+		}
+		else
+		{
 			$this->sessionData['mimeType']	= 'plain';
 
-			for($i=0; $i<count($bodyParts); $i++) {
-				if($i>0) {
+			for($i=0; $i<count($bodyParts); $i++)
+			{
+				if($i>0)
+				{
 					$this->sessionData['body'] .= "<hr>";
 				}
-				if ($bodyParts[$i]['charSet']===false) $bodyParts[$i]['charSet'] = Mail::detect_encoding($bodyParts[$i]['body']);
+				if ($bodyParts[$i]['charSet']===false)
+				{
+					$bodyParts[$i]['charSet'] = Mail::detect_encoding($bodyParts[$i]['body']);
+				}
 				$bodyParts[$i]['body'] = Api\Translation::convert_jsonsafe($bodyParts[$i]['body'], $bodyParts[$i]['charSet']);
 				#error_log( "GetDraftData (Plain) CharSet".mb_detect_encoding($bodyParts[$i]['body'] . 'a' , strtoupper($bodyParts[$i]['charSet']).','.strtoupper($this->displayCharset).',UTF-8, ISO-8859-1'));
 				$this->sessionData['body'] .= ($i>0?"\r\n":""). $bodyParts[$i]['body'] ;
@@ -1676,8 +1914,10 @@ 
 			$this->sessionData['body'] = mail_ui::resolve_inline_images($this->sessionData['body'], $_folder, $_uid, $_partID,'plain');
 		}
 
-		if(($attachments = $mail_bo->getMessageAttachments($_uid,$_partID))) {
-			foreach($attachments as $attachment) {
+		if(($attachments = $mail_bo->getMessageAttachments($_uid,$_partID)))
+		{
+			foreach($attachments as $attachment)
+			{
 				//error_log(__METHOD__.__LINE__.array2string($attachment));
 				$cid = $attachment['cid'];
 				$match=null;
@@ -1699,7 +1939,8 @@ 
 
 	function getErrorInfo()
 	{
-		if(isset($this->errorInfo)) {
+		if(isset($this->errorInfo))
+		{
 			$errorInfo = $this->errorInfo;
 			unset($this->errorInfo);
 			return $errorInfo;
@@ -1714,7 +1955,8 @@ 
 			$modebuff = $this->mailPreferences['message_forwarding'];
 			$this->mailPreferences['message_forwarding'] = $_mode;
 		}
-		if  ($this->mailPreferences['message_forwarding'] == 'inline') {
+		if  ($this->mailPreferences['message_forwarding'] == 'inline')
+		{
 			$this->getReplyData('forward', $_icServer, $_folder, $_uid, $_partID);
 		}
 		$mail_bo    = $this->mail_bo;
@@ -1731,12 +1973,16 @@ 
 		//$this->sessionData['sourceFolder']=$_folder;
 		//$this->sessionData['forwardFlag']='forwarded';
 		//$this->sessionData['forwardedUID']=$_uid;
-		if  ($this->mailPreferences['message_forwarding'] == 'asmail') {
+		if  ($this->mailPreferences['message_forwarding'] == 'asmail')
+		{
 			$this->sessionData['mimeType']  = $this->mailPreferences['composeOptions'];
 			if($headers['SIZE'])
-				$size				= $headers['SIZE'];
-			else
-				$size				= lang('unknown');
+			{
+							$size				= $headers['SIZE'];
+			}
+			else {
+							$size				= lang('unknown');
+			}
 
 			$this->addMessageAttachment($_uid, $_partID, $_folder,
 				$mail_bo->decode_header(($headers['SUBJECT']?$headers['SUBJECT']:lang('no subject'))).'.eml',
@@ -1747,9 +1993,11 @@ 
 			unset($this->sessionData['in-reply-to']);
 			unset($this->sessionData['to']);
 			unset($this->sessionData['cc']);
-			if(($attachments = $mail_bo->getMessageAttachments($_uid,$_partID))) {
+			if(($attachments = $mail_bo->getMessageAttachments($_uid,$_partID)))
+			{
 				//error_log(__METHOD__.__LINE__.':'.array2string($attachments));
-				foreach($attachments as $attachment) {
+				foreach($attachments as $attachment)
+				{
 					if (!($attachment['cid'] && preg_match("/image\//",$attachment['mimeType'])))
 					{
 						$this->addMessageAttachment($_uid, $attachment['partID'],
@@ -1805,7 +2053,10 @@ 
 			{
 				if ($attach['name'] && $attach['name'] == $_formData['name'] &&
 					strtolower($_formData['type'])== strtolower($attach['type']) &&
-					stripos($_formData['file'],'vfs://') !== false) return;
+					stripos($_formData['file'],'vfs://') !== false)
+				{
+					return;
+				}
 			}
 		}
 		if ($attachfailed === false)
@@ -1817,7 +2068,10 @@ 
 				'tmp_name'	=> $tmpFileName,
 				'size'	=> $_formData['size']
 			);
-			if (!is_array($_content['attachments'])) $_content['attachments']=array();
+			if (!is_array($_content['attachments']))
+			{
+				$_content['attachments']=array();
+			}
 			$_content['attachments'][] = $buffer;
 			unset($buffer);
 		}
@@ -1847,7 +2101,10 @@ 
 		{
 			foreach($request->preserv['attachments'] as $attachment)
 			{
-				if ($_GET['tmpname'] === $attachment['tmp_name']) break;
+				if ($_GET['tmpname'] === $attachment['tmp_name'])
+				{
+					break;
+				}
 			}
 		}
 		if (!$request || $_GET['tmpname'] !== $attachment['tmp_name'])
@@ -1881,10 +2138,20 @@ 
 				$sfxMimeType = $attachment['type'];
 				$buff = explode('.',$attachment['tmp_name']);
 				$suffix = '';
-				if (is_array($buff)) $suffix = array_pop($buff); // take the last extension to check with ext2mime
-				if (!empty($suffix)) $sfxMimeType = Api\MimeMagic::ext2mime($suffix);
+				if (is_array($buff))
+				{
+					$suffix = array_pop($buff);
+				}
+				// take the last extension to check with ext2mime
+				if (!empty($suffix))
+				{
+					$sfxMimeType = Api\MimeMagic::ext2mime($suffix);
+				}
 				$attachment['type'] = $sfxMimeType;
-				if (strtoupper($sfxMimeType) == 'TEXT/VCARD' || strtoupper($sfxMimeType) == 'TEXT/X-VCARD') $attachment['type'] = strtoupper($sfxMimeType);
+				if (strtoupper($sfxMimeType) == 'TEXT/VCARD' || strtoupper($sfxMimeType) == 'TEXT/X-VCARD')
+				{
+					$attachment['type'] = strtoupper($sfxMimeType);
+				}
 			}
 			//error_log(__METHOD__.print_r($attachment,true));
 			if (strtoupper($attachment['type']) == 'TEXT/CALENDAR' || strtoupper($attachment['type']) == 'TEXT/X-VCALENDAR')
@@ -1893,7 +2160,10 @@ 
 				$calendar_ical = new calendar_ical();
 				$eventid = $calendar_ical->search($attachment['attachment'],-1);
 				//error_log(__METHOD__.array2string($eventid));
-				if (!$eventid) $eventid = -1;
+				if (!$eventid)
+				{
+					$eventid = -1;
+				}
 				$event = $calendar_ical->importVCal($attachment['attachment'],(is_array($eventid)?$eventid[0]:$eventid),null,true);
 				//error_log(__METHOD__.$event);
 				if ((int)$event > 0)
@@ -1919,7 +2189,10 @@ 
 					//error_log(__METHOD__.__LINE__.print_r($vcard,true));
 					$contact = $addressbook_vcal->find_contact($vcard,false);
 				}
-				if (!$contact) $contact = null;
+				if (!$contact)
+				{
+					$contact = null;
+				}
 				// if there are not enough fields in the vcard (or the parser was unable to correctly parse the vcard (as of VERSION:3.0 created by MSO))
 				if ($contact || count($vcard)>2)
 				{
@@ -1950,7 +2223,8 @@ 
 	 * @param string haystack
 	 * @return boolean
 	 */
-	function testIfOneKeyInArrayDoesExistInString($arrayToTestAgainst,$haystack) {
+	function testIfOneKeyInArrayDoesExistInString($arrayToTestAgainst,$haystack)
+	{
 		foreach (array_keys($arrayToTestAgainst) as $k)
 		{
 			//error_log(__METHOD__.__LINE__.':'.$k.'<->'.$haystack);
@@ -1997,21 +2271,34 @@ 
 		// thread-topic is a proprietary microsoft header and deprecated with the current version
 		// horde does not support the encoding of thread-topic, and probably will not no so in the future
 		//if ($headers['THREAD-TOPIC']) $this->sessionData['thread-topic'] = $headers['THREAD-TOPIC'];
-		if ($headers['THREAD-INDEX']) $this->sessionData['thread-index'] = $headers['THREAD-INDEX'];
-		if ($headers['LIST-ID']) $this->sessionData['list-id'] = $headers['LIST-ID'];
+		if ($headers['THREAD-INDEX'])
+		{
+			$this->sessionData['thread-index'] = $headers['THREAD-INDEX'];
+		}
+		if ($headers['LIST-ID'])
+		{
+			$this->sessionData['list-id'] = $headers['LIST-ID'];
+		}
 		//error_log(__METHOD__.__LINE__.' Mode:'.$_mode.':'.array2string($headers));
 		// check for Reply-To: header and use if available
-		if(!empty($headers['REPLY-TO']) && ($headers['REPLY-TO'] != $headers['FROM'])) {
-			foreach($headers['REPLY-TO'] as $val) {
-				if(!$foundAddresses[$val]) {
+		if(!empty($headers['REPLY-TO']) && ($headers['REPLY-TO'] != $headers['FROM']))
+		{
+			foreach($headers['REPLY-TO'] as $val)
+			{
+				if(!$foundAddresses[$val])
+				{
 					$oldTo[] = $val;
 					$foundAddresses[$val] = true;
 				}
 			}
 			$oldToAddress	= (is_array($headers['REPLY-TO'])?$headers['REPLY-TO'][0]:$headers['REPLY-TO']);
-		} else {
-			foreach($headers['FROM'] as $val) {
-				if(!$foundAddresses[$val]) {
+		}
+		else
+		{
+			foreach($headers['FROM'] as $val)
+			{
+				if(!$foundAddresses[$val])
+				{
 					$oldTo[] = $val;
 					$foundAddresses[$val] = true;
 				}
@@ -2019,18 +2306,23 @@ 
 			$oldToAddress	= (is_array($headers['FROM'])?$headers['FROM'][0]:$headers['FROM']);
 		}
 		//error_log(__METHOD__.__LINE__.' OldToAddress:'.$oldToAddress.'#');
-		if($_mode != 'all' || ($_mode == 'all' && !empty($oldToAddress) && !$this->testIfOneKeyInArrayDoesExistInString($userEMailAddresses,$oldToAddress)) ) {
+		if($_mode != 'all' || ($_mode == 'all' && !empty($oldToAddress) && !$this->testIfOneKeyInArrayDoesExistInString($userEMailAddresses,$oldToAddress)) )
+		{
 			$this->sessionData['to'] = $oldTo;
 		}
 
-		if($_mode == 'all') {
+		if($_mode == 'all')
+		{
 			// reply to any address which is cc, but not to my self
 			#if($headers->cc) {
-				foreach($headers['CC'] as $val) {
-					if($this->testIfOneKeyInArrayDoesExistInString($userEMailAddresses,$val)) {
+				foreach($headers['CC'] as $val)
+				{
+					if($this->testIfOneKeyInArrayDoesExistInString($userEMailAddresses,$val))
+					{
 						continue;
 					}
-					if(!$foundAddresses[$val]) {
+					if(!$foundAddresses[$val])
+					{
 						$this->sessionData['cc'][] = $val;
 						$foundAddresses[$val] = true;
 					}
@@ -2039,11 +2331,14 @@ 
 
 			// reply to any address which is to, but not to my self
 			#if($headers->to) {
-				foreach($headers['TO'] as $val) {
-					if($this->testIfOneKeyInArrayDoesExistInString($userEMailAddresses,$val)) {
+				foreach($headers['TO'] as $val)
+				{
+					if($this->testIfOneKeyInArrayDoesExistInString($userEMailAddresses,$val))
+					{
 						continue;
 					}
-					if(!$foundAddresses[$val]) {
+					if(!$foundAddresses[$val])
+					{
 						$this->sessionData['to'][] = $val;
 						$foundAddresses[$val] = true;
 					}
@@ -2051,12 +2346,15 @@ 
 			#}
 
 			#if($headers->from) {
-				foreach($headers['FROM'] as $val) {
-					if($this->testIfOneKeyInArrayDoesExistInString($userEMailAddresses,$val)) {
+				foreach($headers['FROM'] as $val)
+				{
+					if($this->testIfOneKeyInArrayDoesExistInString($userEMailAddresses,$val))
+					{
 						continue;
 					}
 					//error_log(__METHOD__.__LINE__.' '.$val);
-					if(!$foundAddresses[$val]) {
+					if(!$foundAddresses[$val])
+					{
 						$this->sessionData['to'][] = $val;
 						$foundAddresses[$val] = true;
 					}
@@ -2065,9 +2363,12 @@ 
 		}
 
 		// check for Re: in subject header
-		if(strtolower(substr(trim($mail_bo->decode_header($headers['SUBJECT'])), 0, 3)) == "re:") {
+		if(strtolower(substr(trim($mail_bo->decode_header($headers['SUBJECT'])), 0, 3)) == "re:")
+		{
 			$this->sessionData['subject'] = $mail_bo->decode_header($headers['SUBJECT']);
-		} else {
+		}
+		else
+		{
 			$this->sessionData['subject'] = "Re: " . $mail_bo->decode_header($headers['SUBJECT']);
 		}
 
@@ -2081,7 +2382,8 @@ 
 
 		$toAddressA = array();
 		$toAddress = '';
-		foreach ($headers['TO'] as $mailheader) {
+		foreach ($headers['TO'] as $mailheader)
+		{
 			$toAddressA[] =  $mailheader;
 		}
 		if (count($toAddressA)>0)
@@ -2091,7 +2393,8 @@ 
 		}
 		$ccAddressA = array();
 		$ccAddress = '';
-		foreach ($headers['CC'] as $mailheader) {
+		foreach ($headers['CC'] as $mailheader)
+		{
 			$ccAddressA[] =  $mailheader;
 		}
 		if (count($ccAddressA)>0)
@@ -2099,25 +2402,35 @@ 
 			$ccAddress = implode(', ', str_replace(array('<','>'),array('[',']'),$ccAddressA));
 			$ccAddress = @htmlspecialchars(lang("cc")).": ".$ccAddress.($bodyParts['0']['mimeType'] == 'text/html'?"<br>":"\r\n");
 		}
-		if($bodyParts['0']['mimeType'] == 'text/html') {
+		if($bodyParts['0']['mimeType'] == 'text/html')
+		{
 			$this->sessionData['body']	= /*"<br>".*//*"&nbsp;".*/"<div>".'----------------'.lang("original message").'-----------------'."".'<br>'.
 				@htmlspecialchars(lang("from")).": ".$fromAddress."<br>".
 				$toAddress.$ccAddress.
 				@htmlspecialchars(lang("date").": ".$headers['DATE'],ENT_QUOTES | ENT_IGNORE,Mail::$displayCharset, false)."<br>".
 				'----------------------------------------------------------'."</div>";
 			$this->sessionData['mimeType'] 	= 'html';
-			if (!empty($styles)) $this->sessionData['body'] .= $styles;
+			if (!empty($styles))
+			{
+				$this->sessionData['body'] .= $styles;
+			}
 			$this->sessionData['body']	.= '<blockquote type="cite">';
 
-			for($i=0; $i<count($bodyParts); $i++) {
-				if($i>0) {
+			for($i=0; $i<count($bodyParts); $i++)
+			{
+				if($i>0)
+				{
 					$this->sessionData['body'] .= '<hr>';
 				}
-				if($bodyParts[$i]['mimeType'] == 'text/plain') {
+				if($bodyParts[$i]['mimeType'] == 'text/plain')
+				{
 					#$bodyParts[$i]['body'] = nl2br($bodyParts[$i]['body'])."<br>";
 					$bodyParts[$i]['body'] = "<pre>".$bodyParts[$i]['body']."</pre>";
 				}
-				if ($bodyParts[$i]['charSet']===false) $bodyParts[$i]['charSet'] = Mail::detect_encoding($bodyParts[$i]['body']);
+				if ($bodyParts[$i]['charSet']===false)
+				{
+					$bodyParts[$i]['charSet'] = Mail::detect_encoding($bodyParts[$i]['body']);
+				}
 
 				$_htmlConfig = Mail::$htmLawed_config;
 				Mail::$htmLawed_config['comment'] = 2;
@@ -2129,7 +2442,9 @@ 
 
 			$this->sessionData['body']	.= '</blockquote><br>';
 			$this->sessionData['body'] =  mail_ui::resolve_inline_images($this->sessionData['body'], $_folder, $_uid, $_partID, 'html');
-		} else {
+		}
+		else
+		{
 			//$this->sessionData['body']	= @htmlspecialchars(lang("on")." ".$headers['DATE']." ".$mail_bo->decode_header($fromAddress), ENT_QUOTES) . " ".lang("wrote").":\r\n";
 			// take care the way the ReplyHeader is created here, is used later on in uicompose::compose, in case you force replys to be HTML (prefs)
             $this->sessionData['body']  = " \r\n \r\n".'----------------'.lang("original message").'-----------------'."\r\n".
@@ -2139,8 +2454,10 @@ 
                 '-------------------------------------------------'."\r\n \r\n ";
 			$this->sessionData['mimeType']	= 'plain';
 
-			for($i=0; $i<count($bodyParts); $i++) {
-				if($i>0) {
+			for($i=0; $i<count($bodyParts); $i++)
+			{
+				if($i>0)
+				{
 					$this->sessionData['body'] .= "<hr>";
 				}
 
@@ -2150,9 +2467,11 @@ 
 				$newBody = mail_ui::resolve_inline_images($newBody2, $_folder, $_uid, $_partID, 'plain');
 				$this->sessionData['body'] .= "\r\n";
 				// create body new, with good line breaks and indention
-				foreach(explode("\n",$newBody) as $value) {
+				foreach(explode("\n",$newBody) as $value)
+				{
 					// the explode is removing the character
-					if (trim($value) != '') {
+					if (trim($value) != '')
+					{
 						#if ($value != "\r") $value .= "\n";
 					}
 					$numberOfChars = strspn(trim($value), ">");
@@ -2160,9 +2479,12 @@ 
 
 					$bodyAppend = $this->mail_bo->wordwrap($value, 76-strlen("\r\n$appendString "), "\r\n$appendString ",'>');
 
-					if($bodyAppend[0] == '>') {
+					if($bodyAppend[0] == '>')
+					{
 						$bodyAppend = '>'. $bodyAppend;
-					} else {
+					}
+					else
+					{
 						$bodyAppend = '> '. $bodyAppend;
 					}
 
@@ -2211,9 +2533,12 @@ 
 
 	static function _getHostName()
 	{
-		if (isset($_SERVER['SERVER_NAME'])) {
+		if (isset($_SERVER['SERVER_NAME']))
+		{
 			$result = $_SERVER['SERVER_NAME'];
-		} else {
+		}
+		else
+		{
 			$result = 'localhost.localdomain';
 		}
 		return $result;
@@ -2250,13 +2575,21 @@ 
 
 		$_mailObject->addHeader('X-Priority', $_formData['priority']);
 		$_mailObject->addHeader('X-Mailer', 'EGroupware-Mail');
-		if(!empty($_formData['in-reply-to'])) {
-			if (stripos($_formData['in-reply-to'],'<')===false) $_formData['in-reply-to']='<'.trim($_formData['in-reply-to']).'>';
+		if(!empty($_formData['in-reply-to']))
+		{
+			if (stripos($_formData['in-reply-to'],'<')===false)
+			{
+				$_formData['in-reply-to']='<'.trim($_formData['in-reply-to']).'>';
+			}
 			//error_log(__METHOD__.__LINE__.'$_mailObject->addHeader(In-Reply-To', $_formData['in-reply-to'].")");
 			$_mailObject->addHeader('In-Reply-To', $_formData['in-reply-to']);
 		}
-		if(!empty($_formData['references'])) {
-			if (stripos($_formData['references'],'<')===false) $_formData['references']='<'.trim($_formData['references']).'>';
+		if(!empty($_formData['references']))
+		{
+			if (stripos($_formData['references'],'<')===false)
+			{
+				$_formData['references']='<'.trim($_formData['references']).'>';
+			}
 			//error_log(__METHOD__.__LINE__.'$_mailObject->addHeader(References', $_formData['references'].")");
 			$_mailObject->addHeader('References', $_formData['references']);
 		}
@@ -2267,16 +2600,19 @@ 
 		//	$_mailObject->addHeader('Thread-Topic', $_formData['thread-topic']);
 		//}
 
-		if(!empty($_formData['thread-index'])) {
+		if(!empty($_formData['thread-index']))
+		{
 			//error_log(__METHOD__.__LINE__.'$_mailObject->addHeader(Tread-Index', $_formData['thread-index'].")");
 			$_mailObject->addHeader('Thread-Index', $_formData['thread-index']);
 		}
-		if(!empty($_formData['list-id'])) {
+		if(!empty($_formData['list-id']))
+		{
 			//error_log(__METHOD__.__LINE__.'$_mailObject->addHeader(List-Id', $_formData['list-id'].")");
 			$_mailObject->addHeader('List-Id', $_formData['list-id']);
 		}
 		//error_log(__METHOD__.__LINE__.' notify to:'.$_identity['ident_email'].'->'.array2string($_formData));
-		if($_formData['disposition']=='on') {
+		if($_formData['disposition']=='on')
+		{
 			$_mailObject->addHeader('Disposition-Notification-To', $_identity['ident_email']);
 		}
 		//error_log(__METHOD__.__LINE__.' Organization:'.array2string($_identity));
@@ -2287,15 +2623,22 @@ 
 		// Expand any mailing lists
 		foreach(array('to', 'cc', 'bcc', 'replyto')  as $field)
 		{
-			if ($field != 'replyto') $_formData[$field] = self::resolveEmailAddressList($_formData[$field]);
+			if ($field != 'replyto')
+			{
+				$_formData[$field] = self::resolveEmailAddressList($_formData[$field]);
+			}
 
-			if ($_formData[$field]) $_mailObject->addAddress($_formData[$field], '', $field);
+			if ($_formData[$field])
+			{
+				$_mailObject->addAddress($_formData[$field], '', $field);
+			}
 		}
 
 		$_mailObject->addHeader('Subject', $_formData['subject']);
 
 		// this should never happen since we come from the edit dialog
-		if (Mail::detect_qp($_formData['body'])) {
+		if (Mail::detect_qp($_formData['body']))
+		{
 			//error_log("Error: bocompose::createMessage found QUOTED-PRINTABLE while Composing Message. Charset:$realCharset Message:".print_r($_formData['body'],true));
 			$_formData['body'] = preg_replace('/=\r\n/', '', $_formData['body']);
 			$_formData['body'] = quoted_printable_decode($_formData['body']);
@@ -2361,7 +2704,10 @@ 
 				$_mailObject->setBody($this->convertHTMLToText($body, true, true));
 			}
 			// convert URL Images to inline images - if possible
-			if (!$_autosaving) $inline_images = Mail::processURL2InlineImages($_mailObject, $body, $mail_bo);
+			if (!$_autosaving)
+			{
+				$inline_images = Mail::processURL2InlineImages($_mailObject, $body, $mail_bo);
+			}
 			if (strpos($body,"<!-- HTMLSIGBEGIN -->")!==false)
 			{
 				$body = str_replace(array('<!-- HTMLSIGBEGIN -->','<!-- HTMLSIGEND -->'),'',$body);
@@ -2376,10 +2722,14 @@ 
 		{
 			$body = $this->convertHTMLToText($_formData['body'],false);
 
-			if ($attachment_links) $body .= $attachment_links;
+			if ($attachment_links)
+			{
+				$body .= $attachment_links;
+			}
 
 			#$_mailObject->Body = $_formData['body'];
-			if(!empty($signature)) {
+			if(!empty($signature))
+			{
 				$body .= ($disableRuler ?"\r\n":"\r\n-- \r\n").
 					$this->convertHTMLToText($signature,true,true);
 			}
@@ -2392,11 +2742,13 @@ 
 			$connection_opened = false;
 			//error_log(__METHOD__.__LINE__.array2string($_formData['attachments']));
 			$tnfattachments = null;
-			foreach((array)$_formData['attachments'] as $attachment) {
+			foreach((array)$_formData['attachments'] as $attachment)
+			{
 				//error_log(__METHOD__.__LINE__.array2string($attachment));
 				if(is_array($attachment))
 				{
-					if (!empty($attachment['uid']) && !empty($attachment['folder'])) {
+					if (!empty($attachment['uid']) && !empty($attachment['folder']))
+					{
 						/* Example:
 						Array([0] => Array(
 						[uid] => 21178
@@ -2412,14 +2764,18 @@ 
 							$connection_opened = true;
 						}
 						$mail_bo->reopen($attachment['folder']);
-						switch(strtoupper($attachment['type'])) {
+						switch(strtoupper($attachment['type']))
+						{
 							case 'MESSAGE/RFC':
 							case 'MESSAGE/RFC822':
 								$rawBody='';
-								if (isset($attachment['partID'])) {
+								if (isset($attachment['partID']))
+								{
 									$eml = $mail_bo->getAttachment($attachment['uid'],$attachment['partID'],0,false,true,$attachment['folder']);
 									$rawBody=$eml['attachment'];
-								} else {
+								}
+								else
+								{
 									$rawBody        = $mail_bo->getMessageRawBody($attachment['uid'], $attachment['partID'],$attachment['folder']);
 								}
 								$_mailObject->addStringAttachment($rawBody, $attachment['name'], 'message/rfc822');
@@ -2428,7 +2784,10 @@ 
 								$attachmentData	= $mail_bo->getAttachment($attachment['uid'], $attachment['partID'],0,false);
 								if ($attachmentData['type'] == 'APPLICATION/MS-TNEF')
 								{
-									if (!is_array($tnfattachments)) $tnfattachments = $mail_bo->decode_winmail($attachment['uid'], $attachment['partID']);
+									if (!is_array($tnfattachments))
+									{
+										$tnfattachments = $mail_bo->decode_winmail($attachment['uid'], $attachment['partID']);
+									}
 									foreach ($tnfattachments as $k)
 									{
 										if ($k['name'] == $attachment['name'])
@@ -2464,7 +2823,10 @@ 
 					}
 				}
 			}
-			if ($connection_opened) $mail_bo->closeConnection();
+			if ($connection_opened)
+			{
+				$mail_bo->closeConnection();
+			}
 		}
 		return is_array($inline_images)?$inline_images:array();
 	}
@@ -2484,13 +2846,20 @@ 
 	 */
 	protected function getAttachmentLinks(array $attachments, $filemode, $html, $recipients=array(), $expiration=null, $password=null)
 	{
-		if ($filemode == Vfs\Sharing::ATTACH) return '';
+		if ($filemode == Vfs\Sharing::ATTACH)
+		{
+			return '';
+		}
 
 		$links = array();
 		foreach($attachments as $attachment)
 		{
 			$path = $attachment['file'];
-			if (empty($path)) continue;	// we only care about file attachments, not forwarded messages or parts
+			if (empty($path))
+			{
+				continue;
+			}
+			// we only care about file attachments, not forwarded messages or parts
 			if (parse_url($attachment['file'],PHP_URL_SCHEME) != 'vfs')
 			{
 				$path = $GLOBALS['egw_info']['server']['temp_dir'].'/'.basename($path);
@@ -2593,13 +2962,19 @@ 
 								$success = false;
 								error_log(__METHOD__.__LINE__.$msg);
 							}
-						} else {
+						}
+						else
+						{
 							error_log(__METHOD__.__LINE__.': original message ('.$pMuid.') has attachments and lastDrafted ID ('.$duid.') equals the former');
 						}
-					} else {
+					}
+					else
+					{
 						error_log(__METHOD__.__LINE__." No current draftID (".$draft_id."), or no lastDrafted Info (".$content['lastDrafted'].") or the former being equal:".array2string($content)."(, action=$action)");
 					}
-				} else {
+				}
+				else
+				{
 					error_log(__METHOD__.__LINE__.' No headerdata found for messageUID='.$messageUid.' in Folder:'.$folder.':'.array2string($content)."(, action=$action)");
 				}
 			}
@@ -2615,7 +2990,10 @@ 
 			$success = false;
 		}
 
-		if ($success) $msg = lang('Message saved successfully.');
+		if ($success)
+		{
+			$msg = lang('Message saved successfully.');
+		}
 
 		// Include new information to json respose, because we need them in client-side callback
 		$response->data(array(
@@ -2639,7 +3017,10 @@ 
 		{
 			if(is_int($address))
 			{
-				if (!isset($contacts_obs)) $contacts_obj = new Api\Contacts();
+				if (!isset($contacts_obs))
+				{
+					$contacts_obj = new Api\Contacts();
+				}
 				// List was selected, expand to addresses
 				unset($_emailAddressList[$ak]);
 				$list = $contacts_obj->search('',array('n_fn','n_prefix','n_given','n_family','org_name','email','email_home'),'','','',False,'AND',false,array('list' =>(int)$address));
@@ -2654,7 +3035,10 @@ 
 		{
 			foreach ($addrFromList as $addr)
 			{
-				if (!empty($addr)) $_emailAddressList[]=$addr;
+				if (!empty($addr))
+				{
+					$_emailAddressList[]=$addr;
+				}
 			}
 		}
 		return is_array($_emailAddressList) ? array_values($_emailAddressList) : (array)$_emailAddressList;
@@ -2708,7 +3092,10 @@ 
 		// decide where to save the message (default to draft folder, if we find nothing else)
 		// if the current folder is in draft or template folder save it there
 		// if it is called from printview then save it with the draft folder
-		if (empty($savingDestination)) $savingDestination = $mail_bo->getDraftFolder();
+		if (empty($savingDestination))
+		{
+			$savingDestination = $mail_bo->getDraftFolder();
+		}
 		if (empty($this->sessionData['messageFolder']) && !empty($this->sessionData['mailbox']))
 		{
 			$this->sessionData['messageFolder'] = $this->sessionData['mailbox'];
@@ -2719,13 +3106,17 @@ 
 			$savingDestination = $this->sessionData['messageFolder'];
 			//error_log(__METHOD__.__LINE__.' SavingDestination:'.$savingDestination);
 		}
-		if (  !empty($_formData['printit']) && $_formData['printit'] == 0 ) $savingDestination = $mail_bo->getDraftFolder();
+		if (  !empty($_formData['printit']) && $_formData['printit'] == 0 )
+		{
+			$savingDestination = $mail_bo->getDraftFolder();
+		}
 
 		// normaly Bcc is only added to recipients, but not as header visible to all recipients
 		$mail->forceBccHeader();
 
 		$mail_bo->openConnection();
-		if ($mail_bo->folderExists($savingDestination,true)) {
+		if ($mail_bo->folderExists($savingDestination,true))
+		{
 			try
 			{
 				$messageUid = $mail_bo->appendMessage($savingDestination, $mail->getRaw(), null, $flags);
@@ -2736,7 +3127,9 @@ 
 				return false;
 			}
 
-		} else {
+		}
+		else
+		{
 			error_log(__METHOD__.__LINE__."->".lang("folder")." ". $savingDestination." ".lang("does not exist on IMAP Server."));
 			return false;
 		}
@@ -2784,7 +3177,10 @@ 
 					$fhA = mail_ui::splitRowID($rowid);
 					$this->sessionData['uid'][] = $fhA['msgUID'];
 					$this->sessionData['forwardedUID'][] = $fhA['msgUID'];
-					if (!empty($fhA['folder'])) $this->sessionData['sourceFolder'] = $fhA['folder'];
+					if (!empty($fhA['folder']))
+					{
+						$this->sessionData['sourceFolder'] = $fhA['folder'];
+					}
 				}
 			}
 			if ($_formData['mode']=='reply' && !empty($_formData['processedmail_id']))
@@ -2816,7 +3212,8 @@ 
 			#error_log($this->sessionData['body']);
 		}
 		if(empty($this->sessionData['to']) && empty($this->sessionData['cc']) &&
-		   empty($this->sessionData['bcc']) && empty($this->sessionData['folder'])) {
+		   empty($this->sessionData['bcc']) && empty($this->sessionData['folder']))
+		{
 		   	$messageIsDraft = true;
 		}
 		try
@@ -2832,7 +3229,11 @@ 
 		// create the messages and store inline images
 		$inline_images = $this->createMessage($mail, $_formData, $identity);
 		// remember the identity
-		if ($_formData['to_infolog'] == 'on' || $_formData['to_tracker'] == 'on') $fromAddress = $mail->From;//$mail->FromName.($mail->FromName?' <':'').$mail->From.($mail->FromName?'>':'');
+		if ($_formData['to_infolog'] == 'on' || $_formData['to_tracker'] == 'on')
+		{
+			$fromAddress = $mail->From;
+		}
+		//$mail->FromName.($mail->FromName?' <':'').$mail->From.($mail->FromName?'>':'');
 		#print "<pre>". $mail->getMessageHeader() ."</pre><hr><br>";
 		#print "<pre>". $mail->getMessageBody() ."</pre><hr><br>";
 		#exit;
@@ -2845,7 +3246,10 @@ 
 		{
 			$fval=$f;
 			$icServerID = $_formData['serverID'];//folders always assumed with serverID
-			if (stripos($f,'::')!==false) list($icServerID,$fval) = explode('::',$f,2);
+			if (stripos($f,'::')!==false)
+			{
+				list($icServerID,$fval) = explode('::',$f,2);
+			}
 			if ($_formData['serverID']!=$_formData['mailaccount'])
 			{
 				if ($icServerID == $_formData['serverID'] )
@@ -2886,13 +3290,19 @@ 
 			// sentFolder is account specific
 			$sentFolder = $this->mail_bo->getSentFolder();
 			//error_log(__METHOD__.__LINE__.' SentFolder configured:'.$sentFolder.'#');
-			if ($sentFolder&& $sentFolder!= 'none' && !$this->mail_bo->folderExists($sentFolder, true)) $sentFolder=false;
+			if ($sentFolder&& $sentFolder!= 'none' && !$this->mail_bo->folderExists($sentFolder, true))
+			{
+				$sentFolder=false;
+			}
 		}
 		else
 		{
 			$sentFolder = $mail_bo->getSentFolder();
 			//error_log(__METHOD__.__LINE__.' SentFolder configured:'.$sentFolder.'#');
-			if ($sentFolder&& $sentFolder!= 'none' && !$mail_bo->folderExists($sentFolder, true)) $sentFolder=false;
+			if ($sentFolder&& $sentFolder!= 'none' && !$mail_bo->folderExists($sentFolder, true))
+			{
+				$sentFolder=false;
+			}
 		}
 		//error_log(__METHOD__.__LINE__.' SentFolder configured:'.$sentFolder.'#');
 
@@ -2928,19 +3338,30 @@ 
 		{
 			if (((!isset($sentFolder)||$sentFolder==false) && $this->mailPreferences['sendOptions'] != 'send_only') ||
 				($this->mailPreferences['sendOptions'] != 'send_only' &&
-				$sentFolder != 'none')) $this->errorInfo = lang("No Send Folder set in preferences");
+				$sentFolder != 'none'))
+			{
+				$this->errorInfo = lang("No Send Folder set in preferences");
+			}
 		}
 		// draftFolder is on Server we start from
-		if($messageIsDraft == true) {
+		if($messageIsDraft == true)
+		{
 			$draftFolder = $mail_bo->getDraftFolder();
-			if(!empty($draftFolder) && $mail_bo->folderExists($draftFolder,true)) {
+			if(!empty($draftFolder) && $mail_bo->folderExists($draftFolder,true))
+			{
 				$this->sessionData['folder'] = array($draftFolder);
 				$folderOnServerID[] = $draftFolder;
 				$folder[$draftFolder] = $draftFolder;
 			}
 		}
-		if ($folderOnServerID) $folderOnServerID = array_unique($folderOnServerID);
-		if ($folderOnMailAccount) $folderOnMailAccount = array_unique($folderOnMailAccount);
+		if ($folderOnServerID)
+		{
+			$folderOnServerID = array_unique($folderOnServerID);
+		}
+		if ($folderOnMailAccount)
+		{
+			$folderOnMailAccount = array_unique($folderOnMailAccount);
+		}
 		if (($this->mailPreferences['sendOptions'] != 'send_only' && $sentFolder != 'none') &&
 			!( count($folder) > 0) &&
 			!($_formData['to_infolog']=='on' || $_formData['to_tracker']=='on'))
@@ -2954,7 +3375,8 @@ 
 		@set_time_limit(120);
 		//$mail->SMTPDebug = 10;
 		//error_log("Folder:".count(array($this->sessionData['folder']))."To:".count((array)$this->sessionData['to'])."CC:". count((array)$this->sessionData['cc']) ."bcc:".count((array)$this->sessionData['bcc']));
-		if(count((array)$this->sessionData['to']) > 0 || count((array)$this->sessionData['cc']) > 0 || count((array)$this->sessionData['bcc']) > 0) {
+		if(count((array)$this->sessionData['to']) > 0 || count((array)$this->sessionData['cc']) > 0 || count((array)$this->sessionData['bcc']) > 0)
+		{
 			try {
 				$mail->send();
 			}
@@ -2964,10 +3386,15 @@ 
 				$this->errorInfo = $e->getMessage().($e->details?'<br/>'.$e->details:'');
 				return false;
 			}
-		} else {
-			if (count(array($this->sessionData['folder']))>0 && !empty($this->sessionData['folder'])) {
+		}
+		else
+		{
+			if (count(array($this->sessionData['folder']))>0 && !empty($this->sessionData['folder']))
+			{
 				//error_log(__METHOD__.__LINE__."Folders:".print_r($this->sessionData['folder'],true));
-			} else {
+			}
+			else
+			{
 				$this->errorInfo = lang("Error: ").lang("No Address TO/CC/BCC supplied, and no folder to save message to provided.");
 				//error_log(__METHOD__.__LINE__.$this->errorInfo);
 				return false;
@@ -2977,14 +3404,16 @@ 
 		//error_log(__METHOD__.__LINE__."Number of Folders to move copy the message to:".count($folder));
 		//error_log(__METHOD__.__LINE__.array2string($folder));
 		if ((count($folder) > 0) || (isset($this->sessionData['uid']) && isset($this->sessionData['messageFolder']))
-            || (isset($this->sessionData['forwardFlag']) && isset($this->sessionData['sourceFolder']))) {
+            || (isset($this->sessionData['forwardFlag']) && isset($this->sessionData['sourceFolder'])))
+		{
 			$mail_bo = $this->mail_bo;
 			$mail_bo->openConnection();
 			//$mail_bo->reopen($this->sessionData['messageFolder']);
 			#error_log("(re)opened Connection");
 		}
 		// if copying mail to folder, or saving mail to infolog, we need to gather the needed information
-		if (count($folder) > 0 || $_formData['to_infolog'] == 'on' || $_formData['to_tracker'] == 'on') {
+		if (count($folder) > 0 || $_formData['to_infolog'] == 'on' || $_formData['to_tracker'] == 'on')
+		{
 			//error_log(__METHOD__.__LINE__.array2string($this->sessionData['bcc']));
 
 			// normaly Bcc is only added to recipients, but not as header visible to all recipients
@@ -2993,17 +3422,28 @@ 
 		// copying mail to folder
 		if (count($folder) > 0)
 		{
-			foreach($folderOnServerID as $folderName) {
-				if (is_array($folderName)) $folderName = array_shift($folderName); // should not happen at all
+			foreach($folderOnServerID as $folderName)
+			{
+				if (is_array($folderName))
+				{
+					$folderName = array_shift($folderName);
+				}
+				// should not happen at all
 				//error_log(__METHOD__.__LINE__." attempt to save message to:".array2string($folderName));
 				// if $_formData['serverID']!=$_formData['mailaccount'] skip copying to sentfolder on serverID
 				// if($_formData['serverID']!=$_formData['mailaccount'] && $folderName==$sentFolder && $changeProfileOnSentFolderNeeded) continue;
-				if ($mail_bo->folderExists($folderName,true)) {
-					if($mail_bo->isSentFolder($folderName)) {
+				if ($mail_bo->folderExists($folderName,true))
+				{
+					if($mail_bo->isSentFolder($folderName))
+					{
 						$flags = '\\Seen';
-					} elseif($mail_bo->isDraftFolder($folderName)) {
+					}
+					elseif($mail_bo->isDraftFolder($folderName))
+					{
 						$flags = '\\Draft';
-					} else {
+					}
+					else
+					{
 						$flags = '\\Seen';
 					}
 					#$mailHeader=explode('From:',$mail->getMessageHeader());
@@ -3026,18 +3466,32 @@ 
 				}
 			}
 			// if we choose to send from a differing profile
-			if ($folderOnMailAccount)  $this->changeProfile($_formData['mailaccount']);
-			foreach($folderOnMailAccount as $folderName) {
-				if (is_array($folderName)) $folderName = array_shift($folderName); // should not happen at all
+			if ($folderOnMailAccount)
+			{
+				$this->changeProfile($_formData['mailaccount']);
+			}
+			foreach($folderOnMailAccount as $folderName)
+			{
+				if (is_array($folderName))
+				{
+					$folderName = array_shift($folderName);
+				}
+				// should not happen at all
 				//error_log(__METHOD__.__LINE__." attempt to save message to:".array2string($folderName));
 				// if $_formData['serverID']!=$_formData['mailaccount'] skip copying to sentfolder on serverID
 				// if($_formData['serverID']!=$_formData['mailaccount'] && $folderName==$sentFolder && $changeProfileOnSentFolderNeeded) continue;
-				if ($this->mail_bo->folderExists($folderName,true)) {
-					if($this->mail_bo->isSentFolder($folderName)) {
+				if ($this->mail_bo->folderExists($folderName,true))
+				{
+					if($this->mail_bo->isSentFolder($folderName))
+					{
 						$flags = '\\Seen';
-					} elseif($this->mail_bo->isDraftFolder($folderName)) {
+					}
+					elseif($this->mail_bo->isDraftFolder($folderName))
+					{
 						$flags = '\\Draft';
-					} else {
+					}
+					else
+					{
 						$flags = '\\Seen';
 					}
 					#$mailHeader=explode('From:',$mail->getMessageHeader());
@@ -3059,7 +3513,10 @@ 
 					error_log(__METHOD__.__LINE__.'->'.lang("Import of message %1 failed. Destination Folder %2 does not exist.",$this->sessionData['subject'],$folderName));
 				}
 			}
-			if ($folderOnMailAccount)  $this->changeProfile($_formData['serverID']);
+			if ($folderOnMailAccount)
+			{
+				$this->changeProfile($_formData['serverID']);
+			}
 
 			//$mail_bo->closeConnection();
 		}
@@ -3071,10 +3528,16 @@ 
 			$dhA = mail_ui::splitRowID($this->sessionData['lastDrafted']);
 			$lastDrafted['uid'] = $dhA['msgUID'];
 			$lastDrafted['folder'] = $dhA['folder'];
-			if (isset($lastDrafted['uid']) && !empty($lastDrafted['uid'])) $lastDrafted['uid']=trim($lastDrafted['uid']);
+			if (isset($lastDrafted['uid']) && !empty($lastDrafted['uid']))
+			{
+				$lastDrafted['uid']=trim($lastDrafted['uid']);
+			}
 			// manually drafted, do not delete
 			// will be handled later on IF mode was $_formData['mode']=='composefromdraft'
-			if (isset($lastDrafted['uid']) && (empty($lastDrafted['uid']) || $lastDrafted['uid'] == $this->sessionData['uid'])) $lastDrafted=false;
+			if (isset($lastDrafted['uid']) && (empty($lastDrafted['uid']) || $lastDrafted['uid'] == $this->sessionData['uid']))
+			{
+				$lastDrafted=false;
+			}
 			//error_log(__METHOD__.__LINE__.array2string($lastDrafted));
 		}
 		if ($lastDrafted && is_array($lastDrafted) && $mail_bo->isDraftFolder($lastDrafted['folder']))
@@ -3100,7 +3563,8 @@ 
 
 		//error_log("handling draft messages, flagging and such");
 		if((isset($this->sessionData['uid']) && isset($this->sessionData['messageFolder']))
-			|| (isset($this->sessionData['forwardFlag']) && isset($this->sessionData['sourceFolder']))) {
+			|| (isset($this->sessionData['forwardFlag']) && isset($this->sessionData['sourceFolder'])))
+		{
 			// mark message as answered
 			$mail_bo->openConnection();
 			$mail_bo->reopen(($this->sessionData['messageFolder']?$this->sessionData['messageFolder']:$this->sessionData['sourceFolder']));
@@ -3122,7 +3586,9 @@ 
 					//error_log(__METHOD__.__LINE__." ". str_replace('"',"'",$e->getMessage()));
 					unset($e);
 				}
-			} else {
+			}
+			else
+			{
 				$mail_bo->flagMessages("answered", $this->sessionData['uid'],($this->sessionData['messageFolder']?$this->sessionData['messageFolder']:$this->sessionData['sourceFolder']));
 				//error_log(__METHOD__.__LINE__.array2string(array_keys($this->sessionData)).':'.array2string($this->sessionData['forwardedUID']).' F:'.$this->sessionData['sourceFolder']);
 				if (array_key_exists('forwardFlag',$this->sessionData) && $this->sessionData['forwardFlag']=='forwarded')
@@ -3141,7 +3607,10 @@ 
 			}
 			//$mail_bo->closeConnection();
 		}
-		if ($mail_bo) $mail_bo->closeConnection();
+		if ($mail_bo)
+		{
+			$mail_bo->closeConnection();
+		}
 		//error_log("performing Infolog Stuff");
 		//error_log(print_r($this->sessionData['to'],true));
 		//error_log(print_r($this->sessionData['cc'],true));
@@ -3154,9 +3623,18 @@ 
 		{
 			$mailaddresses = array();
 		}
-		if (is_array($this->sessionData['cc'])) $mailaddresses['cc'] = $this->sessionData['cc'];
-		if (is_array($this->sessionData['bcc'])) $mailaddresses['bcc'] = $this->sessionData['bcc'];
-		if (!empty($mailaddresses)) $mailaddresses['from'] = Mail\Html::decodeMailHeader($fromAddress);
+		if (is_array($this->sessionData['cc']))
+		{
+			$mailaddresses['cc'] = $this->sessionData['cc'];
+		}
+		if (is_array($this->sessionData['bcc']))
+		{
+			$mailaddresses['bcc'] = $this->sessionData['bcc'];
+		}
+		if (!empty($mailaddresses))
+		{
+			$mailaddresses['from'] = Mail\Html::decodeMailHeader($fromAddress);
+		}
 
 		if ($_formData['to_infolog'] == 'on' || $_formData['to_tracker'] == 'on' || $_formData['to_calendar'] == 'on' )
 		{
@@ -3188,7 +3666,10 @@ 
 							$_formData['serverID']),true),
 						'app' => $app_name
 					);
-					if ($entryid) $target['entry_id'] = $entryid;
+					if ($entryid)
+					{
+						$target['entry_id'] = $entryid;
+					}
 					// Open the app called for integration in a popup
 					// and store the mail raw data as egw_data, in order to
 					// be stored from registered app method later
@@ -3199,8 +3680,11 @@ 
 		// only clean up temp-files, if we dont need them for mail_integration::integrate
 		elseif(is_array($this->sessionData['attachments']))
 		{
-			foreach($this->sessionData['attachments'] as $value) {
-				if (!empty($value['file']) && parse_url($value['file'],PHP_URL_SCHEME) != 'vfs') {	// happens when forwarding mails
+			foreach($this->sessionData['attachments'] as $value)
+			{
+				if (!empty($value['file']) && parse_url($value['file'],PHP_URL_SCHEME) != 'vfs')
+				{
+// happens when forwarding mails
 					unlink($GLOBALS['egw_info']['server']['temp_dir'].'/'.$value['file']);
 				}
 			}
@@ -3237,7 +3721,10 @@ 
 				$default_identity = null;
 				foreach(Mail\Account::identities($this->mail_bo->profileID, true, 'params') as $identity)
 				{
-					if (!isset($default_identity)) $default_identity = $identity['ident_id'];
+					if (!isset($default_identity))
+					{
+						$default_identity = $identity['ident_id'];
+					}
 					if (!empty($identity['ident_signature']))
 					{
 						$content['mailidentity'] = $identity['ident_id'];
@@ -3245,12 +3732,18 @@ 
 					}
 				}
 			}
-			if (empty($content['mailidentity'])) $content['mailidentity'] = $default_identity;
+			if (empty($content['mailidentity']))
+			{
+				$content['mailidentity'] = $default_identity;
+			}
 		}
 		if (!isset($content['mimeType']) || empty($content['mimeType']))
 		{
 			$content['mimeType'] = 'html';
-			if (!empty($this->mailPreferences['composeOptions']) && $this->mailPreferences['composeOptions']=="text") $content['mimeType']  = 'plain';
+			if (!empty($this->mailPreferences['composeOptions']) && $this->mailPreferences['composeOptions']=="text")
+			{
+				$content['mimeType']  = 'plain';
+			}
 		}
 		return $content;
 
@@ -3258,9 +3751,12 @@ 
 
 	function stripSlashes($_string)
 	{
-		if (get_magic_quotes_gpc()) {
+		if (get_magic_quotes_gpc())
+		{
 			return stripslashes($_string);
-		} else {
+		}
+		else
+		{
 			return $_string;
 		}
 	}
@@ -3273,15 +3769,25 @@ 
 	 * @param boolean $_noPrefixId = false, if set to true folders name does not get prefixed by account id
 	 * @return type
 	 */
-	function ajax_searchFolder($_searchStringLength=2, $_returnList=false, $_mailaccountToSearch=null, $_noPrefixId=false) {
+	function ajax_searchFolder($_searchStringLength=2, $_returnList=false, $_mailaccountToSearch=null, $_noPrefixId=false)
+	{
 		//error_log(__METHOD__.__LINE__.':'.array2string($_REQUEST));
 		static $useCacheIfPossible = null;
-		if (is_null($useCacheIfPossible)) $useCacheIfPossible = true;
+		if (is_null($useCacheIfPossible))
+		{
+			$useCacheIfPossible = true;
+		}
 		$_searchString = trim($_REQUEST['query']);
 		$results = array();
 		$rememberServerID = $this->mail_bo->icServer->ImapServerId;
-		if (is_null($_mailaccountToSearch) && !empty($_REQUEST['mailaccount'])) $_mailaccountToSearch = $_REQUEST['mailaccount'];
-		if (empty($_mailaccountToSearch)) $_mailaccountToSearch = $this->mail_bo->icServer->ImapServerId;
+		if (is_null($_mailaccountToSearch) && !empty($_REQUEST['mailaccount']))
+		{
+			$_mailaccountToSearch = $_REQUEST['mailaccount'];
+		}
+		if (empty($_mailaccountToSearch))
+		{
+			$_mailaccountToSearch = $this->mail_bo->icServer->ImapServerId;
+		}
 		if ($this->mail_bo->icServer && $_mailaccountToSearch && $this->mail_bo->icServer->ImapServerId != $_mailaccountToSearch)
 		{
 			$this->changeProfile($_mailaccountToSearch);
@@ -3292,7 +3798,8 @@ 
 			$this->mail_bo->openConnection($this->mail_bo->icServer->ImapServerId);
 			//error_log(__METHOD__.__LINE__.array2string($_searchString).'<->'.$searchString);
 			$folderObjects = $this->mail_bo->getFolderObjects(true,false,true,$useCacheIfPossible);
-			if (count($folderObjects)<=1) {
+			if (count($folderObjects)<=1)
+			{
 				$useCacheIfPossible = false;
 			}
 			else
@@ -3343,7 +3850,8 @@ 
 		exit();
 	}
 
-	public static function ajax_searchAddress($_searchStringLength=2) {
+	public static function ajax_searchAddress($_searchStringLength=2)
+	{
 		//error_log(__METHOD__. "request from seachAddress " . $_REQUEST['query']);
 		$_searchString = trim($_REQUEST['query']);
 		$include_lists = (boolean)$_REQUEST['include_lists'];
@@ -3356,7 +3864,10 @@ 
 			$search = explode(' ', $_searchString);
 			foreach ($search as $k => $v)
 			{
-				if (mb_strlen($v) < 3) unset($search[$k]);
+				if (mb_strlen($v) < 3)
+				{
+					unset($search[$k]);
+				}
 			}
 			$search_str = implode(' +', $search);	// tell contacts/so_sql to AND search patterns
 			//error_log(__METHOD__.__LINE__.$_searchString);
@@ -3386,9 +3897,12 @@ 
 			}
 		}
 		$results = array();
-		if(is_array($contacts)) {
-			foreach($contacts as $contact) {
-				foreach(array($contact['email'],$contact['email_home']) as $email) {
+		if(is_array($contacts))
+		{
+			foreach($contacts as $contact)
+			{
+				foreach(array($contact['email'],$contact['email_home']) as $email)
+				{
 					// avoid wrong addresses, if an rfc822 encoded address is in addressbook
 					//$email = preg_replace("/(^.*<)([a-zA-Z0-9_\-]+@[a-zA-Z0-9_\-\.]+)(.*)/",'$2',$email);
 					$rfcAddr = Mail::parseAddressList($email);
@@ -3402,10 +3916,22 @@ 
 					if (method_exists($contacts_obj,'search'))
 					{
 						$contact['n_fn']='';
-						if (!empty($contact['n_prefix'])) $contact['n_fn'] = $contact['n_prefix'];
-						if (!empty($contact['n_given'])) $contact['n_fn'] .= ($contact['n_fn']?' ':'').$contact['n_given'];
-						if (!empty($contact['n_family'])) $contact['n_fn'] .= ($contact['n_fn']?' ':'').$contact['n_family'];
-						if (!empty($contact['org_name'])) $contact['n_fn'] .= ($contact['n_fn']?' ':'').'('.$contact['org_name'].')';
+						if (!empty($contact['n_prefix']))
+						{
+							$contact['n_fn'] = $contact['n_prefix'];
+						}
+						if (!empty($contact['n_given']))
+						{
+							$contact['n_fn'] .= ($contact['n_fn']?' ':'').$contact['n_given'];
+						}
+						if (!empty($contact['n_family']))
+						{
+							$contact['n_fn'] .= ($contact['n_fn']?' ':'').$contact['n_family'];
+						}
+						if (!empty($contact['org_name']))
+						{
+							$contact['n_fn'] .= ($contact['n_fn']?' ':'').'('.$contact['org_name'].')';
+						}
 						$contact['n_fn'] = str_replace(array(',','@'),' ',$contact['n_fn']);
 					}
 					else
@@ -3415,7 +3941,8 @@ 
 					$args = explode('@', trim($email));
 					$args[] = trim($contact['n_fn'] ? $contact['n_fn'] : $contact['fn']);
 					$completeMailString = call_user_func_array('imap_rfc822_write_address', $args);
-					if(!empty($email) && in_array($completeMailString ,$results) === false) {
+					if(!empty($email) && in_array($completeMailString ,$results) === false)
+					{
 						$results[] = array(
 							'id'=>$completeMailString,
 							'label' => $completeMailString,
@@ -3434,7 +3961,10 @@ 
 		foreach($groups as $g_id => $name)
 		{
 			$group = $GLOBALS['egw']->accounts->read($g_id);
-			if(!$group['account_email']) continue;
+			if(!$group['account_email'])
+			{
+				continue;
+			}
 			$args = explode('@', trim($group['account_email']));
 			$args[] = $name;
 			$completeMailString = call_user_func_array('imap_rfc822_write_address', $args);
@@ -3451,7 +3981,8 @@ 
 		{
 			$lists = array_filter(
 				$contacts_obj->get_lists(Acl::READ),
-				function($element) use($_searchString) {
+				function($element) use($_searchString)
+				{
 					return (stripos($element, $_searchString) !== false);
 				}
 			);
@@ -3466,7 +3997,10 @@ 
 					'title' => lang('Mailinglist'),
 					'data'	=> $key
 				);
-				if($list_count++ > 5) break;
+				if($list_count++ > 5)
+				{
+					break;
+				}
 			}
 		}
 		 // switch regular JSON response handling off

Spacing +598 added lines, -599 removed lines

@@ -24,8 +24,7 @@ 
  */
 class mail_compose
 {
-	var $public_functions = array
-	(
+	var $public_functions = array(
 		'compose'		=> True,
 		'getAttachment'		=> True,
 	);
@@ -34,8 +33,8 @@ 
 	 * class vars for destination, priorities, mimeTypes
 	 */
 	static $destinations = array(
-		'to' 		=> 'to',  // lang('to')
-		'cc'		=> 'cc',  // lang('cc')
+		'to' 		=> 'to', // lang('to')
+		'cc'		=> 'cc', // lang('cc')
 		'bcc'		=> 'bcc', // lang('bcc')
 		'replyto'	=> 'replyto', // lang('replyto')
 		'folder'	=> 'folder'  // lang('folder')
@@ -63,20 +62,20 @@ 
 	 * @var array
 	 */
 	var $mailPreferences;
-	var $attachments;	// Array of attachments
+	var $attachments; // Array of attachments
 	var $displayCharset;
 	var $composeID;
 	var $sessionData;
 
 	function __construct()
 	{
-		$this->displayCharset   = Api\Translation::charset();
+		$this->displayCharset = Api\Translation::charset();
 
 		$profileID = (int)$GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'];
-		$this->mail_bo	= Mail::getInstance(true,$profileID);
+		$this->mail_bo = Mail::getInstance(true, $profileID);
 		$GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'] = $this->mail_bo->profileID;
 
-		$this->mailPreferences	=& $this->mail_bo->mailPreferences;
+		$this->mailPreferences = & $this->mail_bo->mailPreferences;
 		//force the default for the forwarding -> asmail
 		if (!is_array($this->mailPreferences) || empty($this->mailPreferences['message_forwarding']))
 		{
@@ -84,7 +83,7 @@ 
 		}
 		if (is_null(Mail::$mailConfig)) Mail::$mailConfig = Api\Config::read('mail');
 
-		$this->mailPreferences  =& $this->mail_bo->mailPreferences;
+		$this->mailPreferences = & $this->mail_bo->mailPreferences;
 	}
 
 	/**
@@ -94,15 +93,15 @@ 
 	 */
 	function changeProfile($_icServerID)
 	{
-		if ($this->mail_bo->profileID!=$_icServerID)
+		if ($this->mail_bo->profileID != $_icServerID)
 		{
 			if (Mail::$debug) error_log(__METHOD__.__LINE__.'->'.$this->mail_bo->profileID.'<->'.$_icServerID);
-			$this->mail_bo = Mail::getInstance(false,$_icServerID);
+			$this->mail_bo = Mail::getInstance(false, $_icServerID);
 			if (Mail::$debug) error_log(__METHOD__.__LINE__.' Fetched IC Server:'.$this->mail_bo->profileID.':'.function_backtrace());
 			// no icServer Object: something failed big time
 			if (!isset($this->mail_bo->icServer)) exit; // ToDo: Exception or the dialog for setting up a server config
 			$this->mail_bo->openConnection($this->mail_bo->profileID);
-			$this->mailPreferences  =& $this->mail_bo->mailPreferences;
+			$this->mailPreferences = & $this->mail_bo->mailPreferences;
 		}
 	}
 
@@ -180,7 +179,7 @@ 
 				'checkbox' => true,
 				'hint' => 'check to save as trackerentry on send',
 				'onExecute' => 'javaScript:app.mail.compose_setToggle',
-				'mail_import' => Api\Hooks::single(array('location' => 'mail_import'),'tracker'),
+				'mail_import' => Api\Hooks::single(array('location' => 'mail_import'), 'tracker'),
 			),
 			'to_calendar' => array(
 				'caption' => 'Calendar',
@@ -205,7 +204,7 @@ 
 				'children' => array(),
 				'hint' => 'Select the message priority tag',
 			),
-			'save2vfs' => array (
+			'save2vfs' => array(
 				'caption' => 'Save to VFS',
 				'icon' => 'filesave',
 				'group' => ++$group,
@@ -242,7 +241,7 @@ 
 		{
 			foreach (array_keys($actions) as $key)
 			{
-				if (!in_array($key, array('send','button[saveAsDraft]','uploadForCompose' ))) {
+				if (!in_array($key, array('send', 'button[saveAsDraft]', 'uploadForCompose'))) {
 					$actions[$key]['toolbarDefault'] = false;
 				}
 			}
@@ -260,7 +259,7 @@ 
 	 * @var boolean $suppressSigOnTop =false
 	 * @var boolean $isReply =false
 	 */
-	function compose(array $_content=null,$msg=null, $_focusElement='to',$suppressSigOnTop=false, $isReply=false)
+	function compose(array $_content = null, $msg = null, $_focusElement = 'to', $suppressSigOnTop = false, $isReply = false)
 	{
 		if ($msg) Framework::message($msg);
 
@@ -281,14 +280,14 @@ 
 		//lang('compose'),lang('from') // needed to be found by translationtools
 		//error_log(__METHOD__.__LINE__.array2string($_REQUEST).function_backtrace());
 		//error_log(__METHOD__.__LINE__.array2string($_content).function_backtrace());
-		$_contentHasSigID = $_content?array_key_exists('mailidentity',(array)$_content):false;
-		$_contentHasMimeType = $_content? array_key_exists('mimeType',(array)$_content):false;
+		$_contentHasSigID = $_content ? array_key_exists('mailidentity', (array)$_content) : false;
+		$_contentHasMimeType = $_content ? array_key_exists('mimeType', (array)$_content) : false;
 		if (isset($_GET['reply_id'])) $replyID = $_GET['reply_id'];
 		if (!$replyID && isset($_GET['id'])) $replyID = $_GET['id'];
 
 		// Process different places we can use as a start for composing an email
 		$actionToProcess = 'compose';
-		if($_GET['from'] && $replyID)
+		if ($_GET['from'] && $replyID)
 		{
 			$_content = array_merge((array)$_content, $this->getComposeFrom(
 				// Parameters needed for fetching appropriate data
@@ -306,10 +305,10 @@ 
 		}
 
 		$composeCache = array();
-		if (isset($_content['composeID'])&&!empty($_content['composeID']))
+		if (isset($_content['composeID']) && !empty($_content['composeID']))
 		{
 			$isFirstLoad = false;
-			$composeCache = Api\Cache::getCache(Api\Cache::SESSION,'mail','composeCache'.trim($GLOBALS['egw_info']['user']['account_id']).'_'.$_content['composeID'],$callback=null,$callback_params=array(),$expiration=60*60*2);
+			$composeCache = Api\Cache::getCache(Api\Cache::SESSION, 'mail', 'composeCache'.trim($GLOBALS['egw_info']['user']['account_id']).'_'.$_content['composeID'], $callback = null, $callback_params = array(), $expiration = 60 * 60 * 2);
 			$this->composeID = $_content['composeID'];
 			//error_log(__METHOD__.__LINE__.array2string($composeCache));
 		}
@@ -319,7 +318,7 @@ 
 			// respect that composeasnew may not want that, as we assume there
 			// is some style already set and our initalStyle always adds a span with &nbsp;
 			// and we want to avoid that
-			$isFirstLoad = !($actionToProcess=='composeasnew');//true;
+			$isFirstLoad = !($actionToProcess == 'composeasnew'); //true;
 			$this->composeID = $_content['composeID'] = $this->generateComposeID();
 			if (!is_array($_content))
 			{
@@ -354,7 +353,7 @@ 
 				if (!isset($upload['file'])) $upload['file'] = $upload['tmp_name'];
 				try
 				{
-					$upload['file'] = $upload['tmp_name'] = Mail::checkFileBasics($upload,$this->composeID,false);
+					$upload['file'] = $upload['tmp_name'] = Mail::checkFileBasics($upload, $this->composeID, false);
 				}
 				catch (Api\Exception\WrongUserinput $e)
 				{
@@ -380,12 +379,12 @@ 
 			unset($_content['attachments']['delete']);
 			$attachments = $_content['attachments'];
 			unset($_content['attachments']);
-			foreach($attachments as $i => $att)
+			foreach ($attachments as $i => $att)
 			{
-				$remove=false;
-				foreach(array_keys($toDelete) as $k)
+				$remove = false;
+				foreach (array_keys($toDelete) as $k)
 				{
-					if ($att['tmp_name']==$k) $remove=true;
+					if ($att['tmp_name'] == $k) $remove = true;
 				}
 				if (!$remove) $_content['attachments'][] = $att;
 			}
@@ -393,7 +392,7 @@ 
 		// someone clicked something like send, or saveAsDraft
 		// make sure, we are connected to the correct server for sending and storing the send message
 		$activeProfile = $composeProfile = $this->mail_bo->profileID; // active profile may not be the profile uised in/for compose
-		$activeFolderCache = Api\Cache::getCache(Api\Cache::INSTANCE,'email','activeMailbox'.trim($GLOBALS['egw_info']['user']['account_id']),$callback=null,$callback_params=array(),$expiration=60*60*10);
+		$activeFolderCache = Api\Cache::getCache(Api\Cache::INSTANCE, 'email', 'activeMailbox'.trim($GLOBALS['egw_info']['user']['account_id']), $callback = null, $callback_params = array(), $expiration = 60 * 60 * 10);
 		if (!empty($activeFolderCache[$this->mail_bo->profileID]))
 		{
 			//error_log(__METHOD__.__LINE__.' CurrentFolder:'.$activeFolderCache[$this->mail_bo->profileID]);
@@ -401,7 +400,7 @@ 
 		}
 		//error_log(__METHOD__.__LINE__.array2string($_content));
 		if (!empty($_content['serverID']) && $_content['serverID'] != $this->mail_bo->profileID &&
-			($_content['composeToolbar'] === 'send' || $_content['button']['saveAsDraft']||$_content['button']['saveAsDraftAndPrint'])
+			($_content['composeToolbar'] === 'send' || $_content['button']['saveAsDraft'] || $_content['button']['saveAsDraftAndPrint'])
 		)
 		{
 			$this->changeProfile($_content['serverID']);
@@ -415,19 +414,19 @@ 
 		{
 			$buttonClicked = $suppressSigOnTop = true;
 			$sendOK = true;
-			$_content['body'] = ($_content['body'] ? $_content['body'] : $_content['mail_'.($_content['mimeType'] == 'html'?'html':'plain').'text']);
+			$_content['body'] = ($_content['body'] ? $_content['body'] : $_content['mail_'.($_content['mimeType'] == 'html' ? 'html' : 'plain').'text']);
 			/*
 			perform some simple checks, before trying to send on:
 			$_content['to'];$_content['cc'];$_content['bcc'];
 			trim($_content['subject']);
 			trim(strip_tags(str_replace('&nbsp;','',$_content['body'])));
 			*/
-			if (strlen(trim(strip_tags(str_replace('&nbsp;','',$_content['body']))))==0 && count($_content['attachments'])==0)
+			if (strlen(trim(strip_tags(str_replace('&nbsp;', '', $_content['body'])))) == 0 && count($_content['attachments']) == 0)
 			{
 				$sendOK = false;
 				$_content['msg'] = $message = lang("no message body supplied");
 			}
-			if ($sendOK && strlen(trim($_content['subject']))==0)
+			if ($sendOK && strlen(trim($_content['subject'])) == 0)
 			{
 				$sendOK = false;
 				$_content['msg'] = $message = lang("no subject supplied");
@@ -442,15 +441,15 @@ 
 				try
 				{
 					$success = $this->send($_content);
-					if ($success==false)
+					if ($success == false)
 					{
-						$sendOK=false;
+						$sendOK = false;
 						$message = $this->errorInfo;
 					}
 					if (!empty($_content['mailidentity']) && $_content['mailidentity'] != $sigPref[$this->mail_bo->profileID])
 					{
-						$sigPref[$this->mail_bo->profileID]=$_content['mailidentity'];
-						$GLOBALS['egw']->preferences->add('mail','LastSignatureIDUsed',$sigPref,'user');
+						$sigPref[$this->mail_bo->profileID] = $_content['mailidentity'];
+						$GLOBALS['egw']->preferences->add('mail', 'LastSignatureIDUsed', $sigPref, 'user');
 						// save prefs
 						$GLOBALS['egw']->preferences->save_repository(true);
 					}
@@ -474,23 +473,23 @@ 
 				if (isset($_content['mode']) && !empty($_content['mode']))
 				{
 					$mode = $_content['mode'];
-					if ($_content['mode']=='forward' && !empty($_content['processedmail_id']))
+					if ($_content['mode'] == 'forward' && !empty($_content['processedmail_id']))
 					{
-						$_content['processedmail_id'] = explode(',',$_content['processedmail_id']);
+						$_content['processedmail_id'] = explode(',', $_content['processedmail_id']);
 						foreach ($_content['processedmail_id'] as $k =>$rowid)
 						{
 							$fhA = mail_ui::splitRowID($rowid);
 							//$this->sessionData['uid'][] = $fhA['msgUID'];
 							//$this->sessionData['forwardedUID'][] = $fhA['msgUID'];
-							$idsForRefresh[] = mail_ui::generateRowID($fhA['profileID'], $fhA['folder'], $fhA['msgUID'], $_prependApp=false);
+							$idsForRefresh[] = mail_ui::generateRowID($fhA['profileID'], $fhA['folder'], $fhA['msgUID'], $_prependApp = false);
 							if (!empty($fhA['folder'])) $workingFolder = $fhA['folder'];
 						}
 					}
-					if ($_content['mode']=='reply' && !empty($_content['processedmail_id']))
+					if ($_content['mode'] == 'reply' && !empty($_content['processedmail_id']))
 					{
 						$rhA = mail_ui::splitRowID($_content['processedmail_id']);
 						//$this->sessionData['uid'] = $rhA['msgUID'];
-						$idsForRefresh[] = mail_ui::generateRowID($rhA['profileID'], $rhA['folder'], $rhA['msgUID'], $_prependApp=false);
+						$idsForRefresh[] = mail_ui::generateRowID($rhA['profileID'], $rhA['folder'], $rhA['msgUID'], $_prependApp = false);
 						$workingFolder = $rhA['folder'];
 					}
 				}
@@ -498,30 +497,30 @@ 
 				if (empty($idsForRefresh) && !empty($_content['processedmail_id']))
 				{
 					$rhA = mail_ui::splitRowID($_content['processedmail_id']);
-					$idsForRefresh[] = mail_ui::generateRowID($rhA['profileID'], $rhA['folder'], $rhA['msgUID'], $_prependApp=false);
+					$idsForRefresh[] = mail_ui::generateRowID($rhA['profileID'], $rhA['folder'], $rhA['msgUID'], $_prependApp = false);
 				}
 				$response = Api\Json\Response::get();
 				if ($activeProfile != $composeProfile)
 				{
 					// we need a message only, when account ids (composeProfile vs. activeProfile) differ
-					$response->call('opener.egw_message',lang('Message send successfully.'));
+					$response->call('opener.egw_message', lang('Message send successfully.'));
 				}
-				elseif ($activeProfile == $composeProfile && ($workingFolder==$activeFolder && $mode != 'compose') || ($this->mail_bo->isSentFolder($workingFolder)||$this->mail_bo->isDraftFolder($workingFolder)))
+				elseif ($activeProfile == $composeProfile && ($workingFolder == $activeFolder && $mode != 'compose') || ($this->mail_bo->isSentFolder($workingFolder) || $this->mail_bo->isDraftFolder($workingFolder)))
 				{
-					if ($this->mail_bo->isSentFolder($workingFolder)||$this->mail_bo->isDraftFolder($workingFolder))
+					if ($this->mail_bo->isSentFolder($workingFolder) || $this->mail_bo->isDraftFolder($workingFolder))
 					{
 						// we may need a refresh when on sent folder or in drafts, as drafted messages will/should be deleted after succeeded send action
-						$response->call('opener.egw_refresh',lang('Message send successfully.'),'mail');
+						$response->call('opener.egw_refresh', lang('Message send successfully.'), 'mail');
 					}
 					else
 					{
 						//error_log(__METHOD__.__LINE__.array2string($idsForRefresh));
-						$response->call('opener.egw_refresh',lang('Message send successfully.'),'mail',$idsForRefresh,'update');
+						$response->call('opener.egw_refresh', lang('Message send successfully.'), 'mail', $idsForRefresh, 'update');
 					}
 				}
 				else
 				{
-					$response->call('opener.egw_message',lang('Message send successfully.'));
+					$response->call('opener.egw_message', lang('Message send successfully.'));
 				}
 				//egw_framework::refresh_opener(lang('Message send successfully.'),'mail');
 				Framework::window_close();
@@ -529,60 +528,60 @@ 
 			if ($sendOK == false)
 			{
 				$response = Api\Json\Response::get();
-				Framework::message(lang('Message send failed: %1',$message),'error');// maybe error is more appropriate
+				Framework::message(lang('Message send failed: %1', $message), 'error'); // maybe error is more appropriate
 				$response->call('app.mail.clearIntevals');
 			}
 		}
 
 		if ($activeProfile != $composeProfile) $this->changeProfile($activeProfile);
 		$insertSigOnTop = false;
-		$content = (is_array($_content)?$_content:array());
+		$content = (is_array($_content) ? $_content : array());
 		if ($_contentHasMimeType)
 		{
 			// mimeType is now a checkbox; convert it here to match expectations
 			// ToDo: match Code to meet checkbox value
-			if ($content['mimeType']==1)
+			if ($content['mimeType'] == 1)
 			{
-				$_content['mimeType'] = $content['mimeType']='html';
+				$_content['mimeType'] = $content['mimeType'] = 'html';
 			}
 			else
 			{
-				$_content['mimeType'] = $content['mimeType']='plain';
+				$_content['mimeType'] = $content['mimeType'] = 'plain';
 			}
 
 		}
 		// user might have switched desired mimetype, so we should convert
-		if ($content['is_html'] && $content['mimeType']=='plain')
+		if ($content['is_html'] && $content['mimeType'] == 'plain')
 		{
 			//error_log(__METHOD__.__LINE__.$content['mail_htmltext']);
 			$suppressSigOnTop = true;
-			if (stripos($content['mail_htmltext'],'<pre>')!==false)
+			if (stripos($content['mail_htmltext'], '<pre>') !== false)
 			{
 				$contentArr = Api\Mail\Html::splithtmlByPRE($content['mail_htmltext']);
 				if (is_array($contentArr))
 				{
 					foreach ($contentArr as $k =>&$elem)
 					{
-						if (stripos($elem,'<pre>')!==false) $elem = str_replace(array("\r\n","\n","\r"),array("<br>","<br>","<br>"),$elem);
+						if (stripos($elem, '<pre>') !== false) $elem = str_replace(array("\r\n", "\n", "\r"), array("<br>", "<br>", "<br>"), $elem);
 					}
-					$content['mail_htmltext'] = implode('',$contentArr);
+					$content['mail_htmltext'] = implode('', $contentArr);
 				}
 			}
 			$content['mail_htmltext'] = $this->_getCleanHTML($content['mail_htmltext']);
-			$content['mail_htmltext'] = Api\Mail\Html::convertHTMLToText($content['mail_htmltext'],$charset=false,false,true);
+			$content['mail_htmltext'] = Api\Mail\Html::convertHTMLToText($content['mail_htmltext'], $charset = false, false, true);
 
 			$content['body'] = $content['mail_htmltext'];
 			unset($content['mail_htmltext']);
 			$content['is_html'] = false;
 			$content['is_plain'] = true;
 		}
-		if ($content['is_plain'] && $content['mimeType']=='html')
+		if ($content['is_plain'] && $content['mimeType'] == 'html')
 		{
 			// the possible font span should only be applied on first load or on switch plain->html
 			$isFirstLoad = "switchedplaintohtml";
 			//error_log(__METHOD__.__LINE__.$content['mail_plaintext']);
 			$suppressSigOnTop = true;
-			$content['mail_plaintext'] = str_replace(array("\r\n","\n","\r"),array("<br>","<br>","<br>"),$content['mail_plaintext']);
+			$content['mail_plaintext'] = str_replace(array("\r\n", "\n", "\r"), array("<br>", "<br>", "<br>"), $content['mail_plaintext']);
 			//$this->replaceEmailAdresses($content['mail_plaintext']);
 			$content['body'] = $content['mail_plaintext'];
 			unset($content['mail_plaintext']);
@@ -590,7 +589,7 @@ 
 			$content['is_plain'] = false;
 		}
 
-		$content['body'] = ($content['body'] ? $content['body'] : $content['mail_'.($content['mimeType'] == 'html'?'html':'plain').'text']);
+		$content['body'] = ($content['body'] ? $content['body'] : $content['mail_'.($content['mimeType'] == 'html' ? 'html' : 'plain').'text']);
 		unset($_content['body']);
 		unset($_content['mail_htmltext']);
 		unset($_content['mail_plaintext']);
@@ -598,7 +597,7 @@ 
 
 		// form was submitted either by clicking a button or by changing one of the triggering selectboxes
 		// identity and signatureid; this might trigger that the signature in mail body may have to be altered
-		if ( !empty($content['body']) &&
+		if (!empty($content['body']) &&
 			(!empty($composeCache['mailaccount']) && !empty($_content['mailaccount']) && $_content['mailaccount'] != $composeCache['mailaccount']) ||
 			(!empty($composeCache['mailidentity']) && !empty($_content['mailidentity']) && $_content['mailidentity'] != $composeCache['mailidentity'])
 		)
@@ -609,7 +608,7 @@ 
 			{
 				$acc = Mail\Account::read($_content['mailaccount']);
 				//error_log(__METHOD__.__LINE__.array2string($acc));
-				$Identities = Mail\Account::read_identity($acc['ident_id'],true);
+				$Identities = Mail\Account::read_identity($acc['ident_id'], true);
 				//error_log(__METHOD__.__LINE__.array2string($Identities));
 				if ($Identities['ident_id'])
 				{
@@ -622,41 +621,41 @@ 
 				}
 			}
 			$_oldSig = $composeCache['mailidentity'];
-			$_signatureid = ($newSig?$newSig:$_content['mailidentity']);
+			$_signatureid = ($newSig ? $newSig : $_content['mailidentity']);
 
 			if ($_oldSig != $_signatureid)
 			{
-				if($this->_debug) error_log(__METHOD__.__LINE__.' old,new ->'.$_oldSig.','.$_signatureid.'#'.$content['body']);
+				if ($this->_debug) error_log(__METHOD__.__LINE__.' old,new ->'.$_oldSig.','.$_signatureid.'#'.$content['body']);
 				// prepare signatures, the selected sig may be used on top of the body
 				try
 				{
-					$oldSignature = Mail\Account::read_identity($_oldSig,true);
+					$oldSignature = Mail\Account::read_identity($_oldSig, true);
 					//error_log(__METHOD__.__LINE__.'Old:'.array2string($oldSignature).'#');
 					$oldSigText = $oldSignature['ident_signature'];
 				}
 				catch (Exception $e)
 				{
-					$oldSignature=array();
+					$oldSignature = array();
 					$oldSigText = null;
 				}
 				try
 				{
-					$signature = Mail\Account::read_identity($_signatureid,true);
+					$signature = Mail\Account::read_identity($_signatureid, true);
 					//error_log(__METHOD__.__LINE__.'New:'.array2string($signature).'#');
 					$sigText = $signature['ident_signature'];
 				}
 				catch (Exception $e)
 				{
-					$signature=array();
+					$signature = array();
 					$sigText = null;
 				}
 				//error_log(__METHOD__.'Old:'.$oldSigText.'#');
 				//error_log(__METHOD__.'New:'.$sigText.'#');
 				if ($_currentMode == 'plain')
 				{
-					$oldSigText = $this->convertHTMLToText($oldSigText,true,true);
-					$sigText = $this->convertHTMLToText($sigText,true,true);
-					if($this->_debug) error_log(__METHOD__." Old signature:".$oldSigText);
+					$oldSigText = $this->convertHTMLToText($oldSigText, true, true);
+					$sigText = $this->convertHTMLToText($sigText, true, true);
+					if ($this->_debug) error_log(__METHOD__." Old signature:".$oldSigText);
 				}
 
 				//$oldSigText = Mail::merge($oldSigText,array($GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'],'person_id')));
@@ -671,9 +670,9 @@ 
 				//error_log(__METHOD__.'Old(clean):'.$oldSigTextCleaned.'#');
 				if ($_currentMode == 'html')
 				{
-					$content['body'] = str_replace("\n",'\n',$content['body']);	// dont know why, but \n screws up preg_replace
+					$content['body'] = str_replace("\n", '\n', $content['body']); // dont know why, but \n screws up preg_replace
 					$styles = Mail::getStyles(array(array('body'=>$content['body'])));
-					if (stripos($content['body'],'style')!==false) Api\Mail\Html::replaceTagsCompletley($content['body'],'style',$endtag='',true); // clean out empty or pagewide style definitions / left over tags
+					if (stripos($content['body'], 'style') !== false) Api\Mail\Html::replaceTagsCompletley($content['body'], 'style', $endtag = '', true); // clean out empty or pagewide style definitions / left over tags
 				}
 				$content['body'] = str_replace(array("\r", "\t", "<br />\n", ": "), array("", "", "<br />", ":"),
 					$_currentMode == 'html' ? Api\Html::purify($content['body'], Mail::$htmLawed_config, array(), true) : $content['body']);
@@ -681,9 +680,9 @@ 
 				if ($_currentMode == 'html')
 				{
 					$replaced = null;
-					$content['body'] = preg_replace($reg='|'.preg_quote('<!-- HTMLSIGBEGIN -->','|').'.*'.preg_quote('<!-- HTMLSIGEND -->','|').'|u',
-						$rep='<!-- HTMLSIGBEGIN -->'.$sigText.'<!-- HTMLSIGEND -->', $in=$content['body'], -1, $replaced);
-					$content['body'] = str_replace(array('\n',"\xe2\x80\x93","\xe2\x80\x94","\xe2\x82\xac"),array("\n",'&ndash;','&mdash;','&euro;'),$content['body']);
+					$content['body'] = preg_replace($reg = '|'.preg_quote('<!-- HTMLSIGBEGIN -->', '|').'.*'.preg_quote('<!-- HTMLSIGEND -->', '|').'|u',
+						$rep = '<!-- HTMLSIGBEGIN -->'.$sigText.'<!-- HTMLSIGEND -->', $in = $content['body'], -1, $replaced);
+					$content['body'] = str_replace(array('\n', "\xe2\x80\x93", "\xe2\x80\x94", "\xe2\x82\xac"), array("\n", '&ndash;', '&mdash;', '&euro;'), $content['body']);
 					//error_log(__METHOD__."() preg_replace('$reg', '$rep', '$in', -1)='".$content['body']."', replaced=$replaced");
 					unset($rep, $in);
 					if ($replaced)
@@ -694,32 +693,32 @@ 
 					else
 					{
 						// try the old way
-						$found = (strlen(trim($oldSigTextCleaned))>0?strpos($content['body'],trim($oldSigTextCleaned)):false);
+						$found = (strlen(trim($oldSigTextCleaned)) > 0 ? strpos($content['body'], trim($oldSigTextCleaned)) : false);
 					}
 				}
 				else
 				{
-					$found = (strlen(trim($oldSigTextCleaned))>0?strpos($content['body'],trim($oldSigTextCleaned)):false);
+					$found = (strlen(trim($oldSigTextCleaned)) > 0 ? strpos($content['body'], trim($oldSigTextCleaned)) : false);
 				}
 
-				if ($found !== false && $_oldSig != -2 && !(empty($oldSigTextCleaned) || trim($this->convertHTMLToText($oldSigTextCleaned,true,true)) ==''))
+				if ($found !== false && $_oldSig != -2 && !(empty($oldSigTextCleaned) || trim($this->convertHTMLToText($oldSigTextCleaned, true, true)) == ''))
 				{
 					//error_log(__METHOD__.'Old Content:'.$content['body'].'#');
-					$_oldSigText = preg_quote($oldSigTextCleaned,'~');
+					$_oldSigText = preg_quote($oldSigTextCleaned, '~');
 					//error_log(__METHOD__.'Old(masked):'.$_oldSigText.'#');
-					$content['body'] = preg_replace('~'.$_oldSigText.'~mi',$sigText,$content['body'],1);
+					$content['body'] = preg_replace('~'.$_oldSigText.'~mi', $sigText, $content['body'], 1);
 					//error_log(__METHOD__.'new Content:'.$content['body'].'#');
 				}
 
-				if ($_oldSig == -2 && (empty($oldSigTextCleaned) || trim($this->convertHTMLToText($oldSigTextCleaned,true,true)) ==''))
+				if ($_oldSig == -2 && (empty($oldSigTextCleaned) || trim($this->convertHTMLToText($oldSigTextCleaned, true, true)) == ''))
 				{
 					// if there is no sig selected, there is no way to replace a signature
 				}
 
 				if ($found === false)
 				{
-					if($this->_debug) error_log(__METHOD__." Old Signature failed to match:".$oldSigTextCleaned);
-					if($this->_debug) error_log(__METHOD__." Compare content:".$content['body']);
+					if ($this->_debug) error_log(__METHOD__." Old Signature failed to match:".$oldSigTextCleaned);
+					if ($this->_debug) error_log(__METHOD__." Compare content:".$content['body']);
 				}
 				else
 				{
@@ -741,7 +740,7 @@ 
 		if ($isFirstLoad)
 		{
 			$alwaysAttachVCardAtCompose = false; // we use this to eliminate double attachments, if users VCard is already present/attached
-			if ( isset($GLOBALS['egw_info']['apps']['stylite']) && (isset($this->mailPreferences['attachVCardAtCompose']) &&
+			if (isset($GLOBALS['egw_info']['apps']['stylite']) && (isset($this->mailPreferences['attachVCardAtCompose']) &&
 				$this->mailPreferences['attachVCardAtCompose']))
 			{
 				$alwaysAttachVCardAtCompose = true;
@@ -750,7 +749,7 @@ 
 					$f = $_REQUEST['preset']['file'];
 					$_REQUEST['preset']['file'] = array($f);
 				}
-				$_REQUEST['preset']['file'][] = "vfs://default/apps/addressbook/".$GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'],'person_id')."/.entry";
+				$_REQUEST['preset']['file'][] = "vfs://default/apps/addressbook/".$GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'], 'person_id')."/.entry";
 			}
 			// an app passed the request for fetching and mailing an entry
 			if (isset($_REQUEST['app']) && isset($_REQUEST['method']) && isset($_REQUEST['id']))
@@ -759,33 +758,33 @@ 
 				$mt = $_REQUEST['method'];
 				$id = $_REQUEST['id'];
 				// passed method MUST be registered
-				$method = Link::get_registry($app,$mt);
+				$method = Link::get_registry($app, $mt);
 				//error_log(__METHOD__.__LINE__.array2string($method));
 				if ($method)
 				{
-					$res = ExecMethod($method,array($id,'html'));
+					$res = ExecMethod($method, array($id, 'html'));
 					//error_log(__METHOD__.__LINE__.array2string($res));
 					if (!empty($res))
 					{
 						$insertSigOnTop = 'below';
 						if (isset($res['attachments']) && is_array($res['attachments']))
 						{
-							foreach($res['attachments'] as $f)
+							foreach ($res['attachments'] as $f)
 							{
 								$_REQUEST['preset']['file'][] = $f;
 							}
 						}
 						$content['subject'] = lang($app).' #'.$res['id'].': ';
-						foreach(array('subject','body','mimetype') as $name) {
+						foreach (array('subject', 'body', 'mimetype') as $name) {
 							$sName = $name;
-							if ($name=='mimetype'&&$res[$name])
+							if ($name == 'mimetype' && $res[$name])
 							{
 								$sName = 'mimeType';
 								$content[$sName] = $res[$name];
 							}
 							else
 							{
-								if ($res[$name]) $content[$sName] .= (strlen($content[$sName])>0 ? ' ':'') .$res[$name];
+								if ($res[$name]) $content[$sName] .= (strlen($content[$sName]) > 0 ? ' ' : '').$res[$name];
 							}
 						}
 					}
@@ -794,45 +793,45 @@ 
 			// handle preset info/values
 			if (is_array($_REQUEST['preset']))
 			{
-				$alreadyProcessed=array();
+				$alreadyProcessed = array();
 				//_debug_array($_REQUEST);
 				if ($_REQUEST['preset']['mailto']) {
 					// handle mailto strings such as
 					// mailto:larry,dan?cc=mike&bcc=sue&subject=test&body=type+your&body=message+here
 					// the above string may be htmlentyty encoded, then multiple body tags are supported
 					// first, strip the mailto: string out of the mailto URL
-					$tmp_send_to = (stripos($_REQUEST['preset']['mailto'],'mailto')===false?$_REQUEST['preset']['mailto']:trim(substr(html_entity_decode($_REQUEST['preset']['mailto']),7)));
+					$tmp_send_to = (stripos($_REQUEST['preset']['mailto'], 'mailto') === false ? $_REQUEST['preset']['mailto'] : trim(substr(html_entity_decode($_REQUEST['preset']['mailto']), 7)));
 					// check if there is more than the to address
-					$mailtoArray = explode('?',$tmp_send_to,2);
+					$mailtoArray = explode('?', $tmp_send_to, 2);
 					if ($mailtoArray[1]) {
 						// check if there are more than one requests
-						$addRequests = explode('&',$mailtoArray[1]);
+						$addRequests = explode('&', $mailtoArray[1]);
 						foreach ($addRequests as $key => $reqval) {
 							// the additional requests should have a =, to separate key from value.
-							$keyValuePair = explode('=',$reqval,2);
-							$content[$keyValuePair[0]] .= (strlen($content[$keyValuePair[0]])>0 ? ' ':'') . $keyValuePair[1];
+							$keyValuePair = explode('=', $reqval, 2);
+							$content[$keyValuePair[0]] .= (strlen($content[$keyValuePair[0]]) > 0 ? ' ' : '').$keyValuePair[1];
 						}
 					}
-					$content['to']=$mailtoArray[0];
-					$alreadyProcessed['to']='to';
+					$content['to'] = $mailtoArray[0];
+					$alreadyProcessed['to'] = 'to';
 					// if the mailto string is not htmlentity decoded the arguments are passed as simple requests
-					foreach(array('cc','bcc','subject','body') as $name) {
-						$alreadyProcessed[$name]=$name;
-						if ($_REQUEST[$name]) $content[$name] .= (strlen($content[$name])>0 ? ( $name == 'cc' || $name == 'bcc' ? ',' : ' ') : '') . $_REQUEST[$name];
+					foreach (array('cc', 'bcc', 'subject', 'body') as $name) {
+						$alreadyProcessed[$name] = $name;
+						if ($_REQUEST[$name]) $content[$name] .= (strlen($content[$name]) > 0 ? ($name == 'cc' || $name == 'bcc' ? ',' : ' ') : '').$_REQUEST[$name];
 					}
 				}
 
 				if ($_REQUEST['preset']['mailtocontactbyid']) {
 					if ($GLOBALS['egw_info']['user']['apps']['addressbook']) {
 						$contacts_obj = new Api\Contacts();
-						$addressbookprefs =& $GLOBALS['egw_info']['user']['preferences']['addressbook'];
-						if (method_exists($contacts_obj,'search')) {
+						$addressbookprefs = & $GLOBALS['egw_info']['user']['preferences']['addressbook'];
+						if (method_exists($contacts_obj, 'search')) {
 
-							$addressArray = explode(',',$_REQUEST['preset']['mailtocontactbyid']);
+							$addressArray = explode(',', $_REQUEST['preset']['mailtocontactbyid']);
 							foreach ((array)$addressArray as $id => $addressID)
 							{
-								$addressID = (int) $addressID;
-								if (!($addressID>0))
+								$addressID = (int)$addressID;
+								if (!($addressID > 0))
 								{
 									unset($addressArray[$id]);
 								}
@@ -841,44 +840,44 @@ 
 							{
 								$_searchCond = array('contact_id'=>$addressArray);
 								//error_log(__METHOD__.__LINE__.$_searchString);
-								if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts']) $showAccounts=false;
-								$filter = ($showAccounts?array():array('account_id' => null));
-								$filter['cols_to_search']=array('n_fn','email','email_home');
-								$contacts = $contacts_obj->search($_searchCond,array('n_fn','email','email_home'),'n_fn','','%',false,'OR',array(0,100),$filter);
+								if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts']) $showAccounts = false;
+								$filter = ($showAccounts ? array() : array('account_id' => null));
+								$filter['cols_to_search'] = array('n_fn', 'email', 'email_home');
+								$contacts = $contacts_obj->search($_searchCond, array('n_fn', 'email', 'email_home'), 'n_fn', '', '%', false, 'OR', array(0, 100), $filter);
 								// additionally search the accounts, if the contact storage is not the account storage
 								if ($showAccounts &&
 									$GLOBALS['egw_info']['server']['account_repository'] == 'ldap' &&
 									$GLOBALS['egw_info']['server']['contact_repository'] == 'sql')
 								{
-									$accounts = $contacts_obj->search($_searchCond,array('n_fn','email','email_home'),'n_fn','','%',false,'OR',array(0,100),array('owner' => 0));
+									$accounts = $contacts_obj->search($_searchCond, array('n_fn', 'email', 'email_home'), 'n_fn', '', '%', false, 'OR', array(0, 100), array('owner' => 0));
 
 									if ($contacts && $accounts)
 									{
-										$contacts = array_merge($contacts,$accounts);
-										usort($contacts,create_function('$a,$b','return strcasecmp($a["n_fn"],$b["n_fn"]);'));
+										$contacts = array_merge($contacts, $accounts);
+										usort($contacts, create_function('$a,$b', 'return strcasecmp($a["n_fn"],$b["n_fn"]);'));
 									}
-									elseif($accounts)
+									elseif ($accounts)
 									{
-										$contacts =& $accounts;
+										$contacts = & $accounts;
 									}
 									unset($accounts);
 								}
 							}
-							if(is_array($contacts)) {
+							if (is_array($contacts)) {
 								$mailtoArray = array();
 								$primary = $addressbookprefs['distributionListPreferredMail'];
 								if ($primary != 'email' && $primary != 'email_home') $primary = 'email';
-								$secondary = ($primary == 'email'?'email_home':'email');
+								$secondary = ($primary == 'email' ? 'email_home' : 'email');
 								//error_log(__METHOD__.__LINE__.array2string($contacts));
-								foreach($contacts as $contact) {
-									$innerCounter=0;
-									foreach(array($contact[$primary],$contact[$secondary]) as $email) {
+								foreach ($contacts as $contact) {
+									$innerCounter = 0;
+									foreach (array($contact[$primary], $contact[$secondary]) as $email) {
 										// use pref distributionListPreferredMail for the primary address
 										// avoid wrong addresses, if an rfc822 encoded address is in addressbook
-										$email = preg_replace("/(^.*<)([a-zA-Z0-9_\-]+@[a-zA-Z0-9_\-\.]+)(.*)/",'$2',$email);
-										$contact['n_fn'] = str_replace(array(',','@'),' ',$contact['n_fn']);
-										$completeMailString = addslashes(trim($contact['n_fn'] ? $contact['n_fn'] : $contact['fn']) .' <'. trim($email) .'>');
-										if($innerCounter==0 && !empty($email) && in_array($completeMailString ,$mailtoArray) === false) {
+										$email = preg_replace("/(^.*<)([a-zA-Z0-9_\-]+@[a-zA-Z0-9_\-\.]+)(.*)/", '$2', $email);
+										$contact['n_fn'] = str_replace(array(',', '@'), ' ', $contact['n_fn']);
+										$completeMailString = addslashes(trim($contact['n_fn'] ? $contact['n_fn'] : $contact['fn']).' <'.trim($email).'>');
+										if ($innerCounter == 0 && !empty($email) && in_array($completeMailString, $mailtoArray) === false) {
 											$i++;
 											$innerCounter++;
 											$mailtoArray[$i] = $completeMailString;
@@ -887,8 +886,8 @@ 
 								}
 							}
 							//error_log(__METHOD__.__LINE__.array2string($mailtoArray));
-							$alreadyProcessed['to']='to';
-							$content['to']=$mailtoArray;
+							$alreadyProcessed['to'] = 'to';
+							$content['to'] = $mailtoArray;
 						}
 					}
 				}
@@ -903,20 +902,20 @@ 
 					$types = (array)$_REQUEST['preset']['type'];
 					//if (!empty($types) && in_array('text/calendar; method=request',$types))
 					$files = (array)$_REQUEST['preset']['file'];
-					foreach($files as $k => $path)
+					foreach ($files as $k => $path)
 					{
-						if (!empty($types[$k]) && stripos($types[$k],'text/calendar')!==false)
+						if (!empty($types[$k]) && stripos($types[$k], 'text/calendar') !== false)
 						{
 							$insertSigOnTop = 'below';
 						}
 						//error_log(__METHOD__.__LINE__.$path.'->'.array2string(parse_url($path,PHP_URL_SCHEME == 'vfs')));
-						if (parse_url($path,PHP_URL_SCHEME == 'vfs'))
+						if (parse_url($path, PHP_URL_SCHEME == 'vfs'))
 						{
 							//Vfs::load_wrapper('vfs');
 							$type = Vfs::mime_content_type($path);
 							// special handling for attaching vCard of iCal --> use their link-title as name
-							if (substr($path,-7) != '/.entry' ||
-								!(list($app,$id) = array_slice(explode('/',$path),-3)) ||
+							if (substr($path, -7) != '/.entry' ||
+								!(list($app, $id) = array_slice(explode('/', $path), -3)) ||
 								!($name = Link::title($app, $id)))
 							{
 								$name = Vfs::decodePath(Vfs::basename($path));
@@ -930,7 +929,7 @@ 
 							{
 								$type = $types[$k];
 							}
-							$path = str_replace('+','%2B',$path);
+							$path = str_replace('+', '%2B', $path);
 							$formData = array(
 								'name' => $name,
 								'type' => $type,
@@ -943,7 +942,7 @@ 
 								Framework::message(lang('Directories have to be shared.'), 'info');
 							}
 						}
-						elseif(is_readable($path))
+						elseif (is_readable($path))
 						{
 							$formData = array(
 								'name' => isset($names[$k]) ? $names[$k] : basename($path),
@@ -956,28 +955,28 @@ 
 						{
 							continue;
 						}
-						$this->addAttachment($formData,$content,($alwaysAttachVCardAtCompose?true:false));
+						$this->addAttachment($formData, $content, ($alwaysAttachVCardAtCompose ? true : false));
 					}
 					$remember = array();
 					if (isset($_REQUEST['preset']['mailto']) || (isset($_REQUEST['app']) && isset($_REQUEST['method']) && isset($_REQUEST['id'])))
 					{
-						foreach(array_keys($content) as $k)
+						foreach (array_keys($content) as $k)
 						{
-							if (in_array($k,array('to','cc','bcc','subject','body','mimeType'))&&isset($this->sessionData[$k]))
+							if (in_array($k, array('to', 'cc', 'bcc', 'subject', 'body', 'mimeType')) && isset($this->sessionData[$k]))
 							{
-								$alreadyProcessed[$k]=$k;
+								$alreadyProcessed[$k] = $k;
 								$remember[$k] = $this->sessionData[$k];
 							}
 						}
 					}
-					if(!empty($remember)) $content = array_merge($content,$remember);
+					if (!empty($remember)) $content = array_merge($content, $remember);
 				}
-				foreach(array('to','cc','bcc','subject','body','mimeType') as $name)
+				foreach (array('to', 'cc', 'bcc', 'subject', 'body', 'mimeType') as $name)
 				{
 					//always handle mimeType
-					if ($name=='mimeType' && $_REQUEST['preset'][$name])
+					if ($name == 'mimeType' && $_REQUEST['preset'][$name])
 					{
-						$_content[$name]=$content[$name]=$_REQUEST['preset'][$name];
+						$_content[$name] = $content[$name] = $_REQUEST['preset'][$name];
 					}
 					//skip if already processed by "preset Routines"
 					if ($alreadyProcessed[$name]) continue;
@@ -990,36 +989,36 @@ 
 			{
 				$content['to'] = base64_decode($_REQUEST['send_to']);
 				// first check if there is a questionmark or ampersand
-				if (strpos($content['to'],'?')!== false) list($content['to'],$rest) = explode('?',$content['to'],2);
+				if (strpos($content['to'], '?') !== false) list($content['to'], $rest) = explode('?', $content['to'], 2);
 				$content['to'] = html_entity_decode($content['to']);
-				if (($at_pos = strpos($content['to'],'@')) !== false)
+				if (($at_pos = strpos($content['to'], '@')) !== false)
 				{
-					if (($amp_pos = strpos(substr($content['to'],$at_pos),'&')) !== false)
+					if (($amp_pos = strpos(substr($content['to'], $at_pos), '&')) !== false)
 					{
 						//list($email,$addoptions) = explode('&',$value,2);
-						$email = substr($content['to'],0,$amp_pos+$at_pos);
-						$rest = substr($content['to'], $amp_pos+$at_pos+1);
+						$email = substr($content['to'], 0, $amp_pos + $at_pos);
+						$rest = substr($content['to'], $amp_pos + $at_pos + 1);
 						//error_log(__METHOD__.__LINE__.$email.' '.$rest);
 						$content['to'] = $email;
 					}
 				}
-				if (strpos($content['to'],'%40')!== false) $content['to'] = Api\Html::purify(str_replace('%40','@',$content['to']));
+				if (strpos($content['to'], '%40') !== false) $content['to'] = Api\Html::purify(str_replace('%40', '@', $content['to']));
 				$rarr = array(Api\Html::purify($rest));
-				if (isset($rest)&&!empty($rest) && strpos($rest,'&')!== false) $rarr = explode('&',$rest);
+				if (isset($rest) && !empty($rest) && strpos($rest, '&') !== false) $rarr = explode('&', $rest);
 				//error_log(__METHOD__.__LINE__.$content['to'].'->'.array2string($rarr));
 				$karr = array();
 				foreach ($rarr as &$rval)
 				{
 					//must contain =
-					if (strpos($rval,'=')!== false)
+					if (strpos($rval, '=') !== false)
 					{
-						list($k,$v) = explode('=',$rval,2);
+						list($k, $v) = explode('=', $rval, 2);
 						$karr[$k] = (string)$v;
-						unset($k,$v);
+						unset($k, $v);
 					}
 				}
 				//error_log(__METHOD__.__LINE__.$content['to'].'->'.array2string($karr));
-				foreach(array('cc','bcc','subject','body') as $name)
+				foreach (array('cc', 'bcc', 'subject', 'body') as $name)
 				{
 					if ($karr[$name]) $content[$name] = $karr[$name];
 				}
@@ -1031,17 +1030,17 @@ 
 		if ($isFirstLoad && !empty($_REQUEST['mimeType']))
 		{
 			$_content['mimeType'] = $content['mimeType'];
-			if (($_REQUEST['mimeType']=="text" ||$_REQUEST['mimeType']=="plain") && $content['mimeType'] == 'html')
+			if (($_REQUEST['mimeType'] == "text" || $_REQUEST['mimeType'] == "plain") && $content['mimeType'] == 'html')
 			{
-				$_content['mimeType'] = $content['mimeType']  = 'plain';
-				$content['body'] = $this->convertHTMLToText(str_replace(array("\n\r","\n"),' ',$content['body']));
+				$_content['mimeType'] = $content['mimeType'] = 'plain';
+				$content['body'] = $this->convertHTMLToText(str_replace(array("\n\r", "\n"), ' ', $content['body']));
 			}
-			if ($_REQUEST['mimeType']=="html" && $content['mimeType'] != 'html')
+			if ($_REQUEST['mimeType'] == "html" && $content['mimeType'] != 'html')
 			{
-				$_content['mimeType'] = $content['mimeType']  = 'html';
+				$_content['mimeType'] = $content['mimeType'] = 'html';
 				$content['body'] = "<pre>".$content['body']."</pre>";
 				// take care this assumption is made on the creation of the reply header in bocompose::getReplyData
-				if (strpos($content['body'],"<pre> \r\n \r\n---")===0) $content['body'] = substr_replace($content['body']," <br>\r\n<pre>---",0,strlen("<pre> \r\n \r\n---")-1);
+				if (strpos($content['body'], "<pre> \r\n \r\n---") === 0) $content['body'] = substr_replace($content['body'], " <br>\r\n<pre>---", 0, strlen("<pre> \r\n \r\n---") - 1);
 			}
 		}
 		else
@@ -1049,24 +1048,24 @@ 
 			// try to enforce a mimeType on reply ( if type is not of the wanted type )
 			if ($isReply)
 			{
-				if (!empty($this->mailPreferences['replyOptions']) && $this->mailPreferences['replyOptions']=="text" &&
+				if (!empty($this->mailPreferences['replyOptions']) && $this->mailPreferences['replyOptions'] == "text" &&
 					$content['mimeType'] == 'html')
 				{
-					$_content['mimeType'] = $content['mimeType']  = 'plain';
-					$content['body'] = $this->convertHTMLToText(str_replace(array("\n\r","\n"),' ',$content['body']));
+					$_content['mimeType'] = $content['mimeType'] = 'plain';
+					$content['body'] = $this->convertHTMLToText(str_replace(array("\n\r", "\n"), ' ', $content['body']));
 				}
-				if (!empty($this->mailPreferences['replyOptions']) && $this->mailPreferences['replyOptions']=="html" &&
+				if (!empty($this->mailPreferences['replyOptions']) && $this->mailPreferences['replyOptions'] == "html" &&
 					$content['mimeType'] != 'html')
 				{
-					$_content['mimeType'] = $content['mimeType']  = 'html';
+					$_content['mimeType'] = $content['mimeType'] = 'html';
 					$content['body'] = "<pre>".$content['body']."</pre>";
 					// take care this assumption is made on the creation of the reply header in bocompose::getReplyData
-					if (strpos($content['body'],"<pre> \r\n \r\n---")===0) $content['body'] = substr_replace($content['body']," <br>\r\n<pre>---",0,strlen("<pre> \r\n \r\n---")-1);
+					if (strpos($content['body'], "<pre> \r\n \r\n---") === 0) $content['body'] = substr_replace($content['body'], " <br>\r\n<pre>---", 0, strlen("<pre> \r\n \r\n---") - 1);
 				}
 			}
 		}
 
-		if ($content['mimeType'] == 'html' && Api\Html::htmlarea_availible()===false)
+		if ($content['mimeType'] == 'html' && Api\Html::htmlarea_availible() === false)
 		{
 			$_content['mimeType'] = $content['mimeType'] = 'plain';
 			$content['body'] = $this->convertHTMLToText($content['body']);
@@ -1085,36 +1084,36 @@ 
 		//_debug_array(($presetSig ? $presetSig : $content['mailidentity']));
 		try
 		{
-			$signature = Mail\Account::read_identity($content['mailidentity'] ? $content['mailidentity'] : $presetSig,true);
+			$signature = Mail\Account::read_identity($content['mailidentity'] ? $content['mailidentity'] : $presetSig, true);
 		}
 		catch (Exception $e)
 		{
 			//PROBABLY NOT FOUND
-			$signature=array();
+			$signature = array();
 		}
 		if ((isset($this->mailPreferences['disableRulerForSignatureSeparation']) &&
 			$this->mailPreferences['disableRulerForSignatureSeparation']) ||
-			empty($signature['ident_signature']) || trim($this->convertHTMLToText($signature['ident_signature'],true,true)) =='')
+			empty($signature['ident_signature']) || trim($this->convertHTMLToText($signature['ident_signature'], true, true)) == '')
 		{
 			$disableRuler = true;
 		}
 		$font_span = $font_part = '';
-		if($content['mimeType'] == 'html' /*&& trim($content['body'])==''*/) {
+		if ($content['mimeType'] == 'html' /*&& trim($content['body'])==''*/) {
 			// User preferences for style
 			$font = $GLOBALS['egw_info']['user']['preferences']['common']['rte_font'];
 			$font_size = Api\Html\CkEditorConfig::font_size_from_prefs();
-			$font_part = '<span style="width:100%; display: inline; '.($font?'font-family:'.$font.'; ':'').($font_size?'font-size:'.$font_size.'; ':'').'">';
+			$font_part = '<span style="width:100%; display: inline; '.($font ? 'font-family:'.$font.'; ' : '').($font_size ? 'font-size:'.$font_size.'; ' : '').'">';
 			$font_span = $font_part.'&#8203;</span>';
 			if (empty($font) && empty($font_size)) $font_span = '';
 		}
 		// the font span should only be applied on first load or on switch plain->html and the absence of the font_part of the span
-		if (!$isFirstLoad && !empty($font_span) && stripos($content['body'],$font_part)===false) $font_span = '';
+		if (!$isFirstLoad && !empty($font_span) && stripos($content['body'], $font_part) === false) $font_span = '';
 		//remove possible html header stuff
-		if (stripos($content['body'],'<html><head></head><body>')!==false) $content['body'] = str_ireplace(array('<html><head></head><body>','</body></html>'),array('',''),$content['body']);
+		if (stripos($content['body'], '<html><head></head><body>') !== false) $content['body'] = str_ireplace(array('<html><head></head><body>', '</body></html>'), array('', ''), $content['body']);
 		//error_log(__METHOD__.__LINE__.array2string($this->mailPreferences));
-		$blockElements = array('address','blockquote','center','del','dir','div','dl','fieldset','form','h1','h2','h3','h4','h5','h6','hr','ins','isindex','menu','noframes','noscript','ol','p','pre','table','ul');
-		if ($this->mailPreferences['insertSignatureAtTopOfMessage']!='no_belowaftersend' &&
-			!(isset($_POST['mySigID']) && !empty($_POST['mySigID']) ) && !$suppressSigOnTop
+		$blockElements = array('address', 'blockquote', 'center', 'del', 'dir', 'div', 'dl', 'fieldset', 'form', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'ins', 'isindex', 'menu', 'noframes', 'noscript', 'ol', 'p', 'pre', 'table', 'ul');
+		if ($this->mailPreferences['insertSignatureAtTopOfMessage'] != 'no_belowaftersend' &&
+			!(isset($_POST['mySigID']) && !empty($_POST['mySigID'])) && !$suppressSigOnTop
 		)
 		{
 			// ON tOP OR BELOW? pREF CAN TELL
@@ -1124,54 +1123,54 @@ 
 						'1' => 'before reply, visible during compose',
 						'no_belowaftersend'  => 'appended after reply before sending',
 			*/
-			$insertSigOnTop = ($insertSigOnTop?$insertSigOnTop:($this->mailPreferences['insertSignatureAtTopOfMessage']?$this->mailPreferences['insertSignatureAtTopOfMessage']:'below'));
-			$sigText = Mail::merge($signature['ident_signature'],array($GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'],'person_id')));
+			$insertSigOnTop = ($insertSigOnTop ? $insertSigOnTop : ($this->mailPreferences['insertSignatureAtTopOfMessage'] ? $this->mailPreferences['insertSignatureAtTopOfMessage'] : 'below'));
+			$sigText = Mail::merge($signature['ident_signature'], array($GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'], 'person_id')));
 			if ($content['mimeType'] == 'html')
 			{
-				$sigTextStartsWithBlockElement = ($disableRuler?false:true);
-				foreach($blockElements as $e)
+				$sigTextStartsWithBlockElement = ($disableRuler ? false : true);
+				foreach ($blockElements as $e)
 				{
 					if ($sigTextStartsWithBlockElement) break;
-					if (stripos(trim($sigText),'<'.$e)===0) $sigTextStartsWithBlockElement = true;
+					if (stripos(trim($sigText), '<'.$e) === 0) $sigTextStartsWithBlockElement = true;
 				}
 			}
-			if($content['mimeType'] == 'html') {
+			if ($content['mimeType'] == 'html') {
 				$before = $disableRuler ? '' : '<hr style="border:1px dotted silver; width:100%;">';
 				$inbetween = '';
 			} else {
-				$before = ($disableRuler ?"\r\n\r\n":"\r\n\r\n-- \r\n");
+				$before = ($disableRuler ? "\r\n\r\n" : "\r\n\r\n-- \r\n");
 				$inbetween = "\r\n";
 			}
 			if ($content['mimeType'] == 'html')
 			{
-				$sigText = ($sigTextStartsWithBlockElement?'':"<div>")."<!-- HTMLSIGBEGIN -->".$sigText."<!-- HTMLSIGEND -->".($sigTextStartsWithBlockElement?'':"</div>");
+				$sigText = ($sigTextStartsWithBlockElement ? '' : "<div>")."<!-- HTMLSIGBEGIN -->".$sigText."<!-- HTMLSIGEND -->".($sigTextStartsWithBlockElement ? '' : "</div>");
 			}
 
 			if ($insertSigOnTop === 'below')
 			{
-				$content['body'] = $font_span.$content['body'].$before.($content['mimeType'] == 'html'?$sigText:$this->convertHTMLToText($sigText,true,true));
+				$content['body'] = $font_span.$content['body'].$before.($content['mimeType'] == 'html' ? $sigText : $this->convertHTMLToText($sigText, true, true));
 			}
 			else
 			{
-				$content['body'] = $font_span.$before.($content['mimeType'] == 'html'?$sigText:$this->convertHTMLToText($sigText,true,true)).$inbetween.$content['body'];
+				$content['body'] = $font_span.$before.($content['mimeType'] == 'html' ? $sigText : $this->convertHTMLToText($sigText, true, true)).$inbetween.$content['body'];
 			}
 		}
 		else
 		{
-			$content['body'] = ($font_span?($isFirstLoad === "switchedplaintohtml"?$font_part:$font_span):/*($content['mimeType'] == 'html'?'&nbsp;':'')*/'').$content['body'].($isFirstLoad === "switchedplaintohtml"?"</span>":"");
+			$content['body'] = ($font_span ? ($isFirstLoad === "switchedplaintohtml" ? $font_part : $font_span) : /*($content['mimeType'] == 'html'?'&nbsp;':'')*/'').$content['body'].($isFirstLoad === "switchedplaintohtml" ? "</span>" : "");
 		}
 		//error_log(__METHOD__.__LINE__.$content['body']);
 
 		// prepare body
 		// in a way, this tests if we are having real utf-8 (the displayCharset) by now; we should if charsets reported (or detected) are correct
-		$content['body'] = Api\Translation::convert_jsonsafe($content['body'],'utf-8');
+		$content['body'] = Api\Translation::convert_jsonsafe($content['body'], 'utf-8');
 		//error_log(__METHOD__.__LINE__.array2string($content));
 
 		// get identities of all accounts as "$acc_id:$ident_id" => $identity
 		$sel_options['mailaccount'] = $identities = array();
-		foreach(Mail\Account::search(true,false) as $acc_id => $account)
+		foreach (Mail\Account::search(true, false) as $acc_id => $account)
 		{
-			foreach($account->identities($acc_id) as $ident_id => $identity)
+			foreach ($account->identities($acc_id) as $ident_id => $identity)
 			{
 				$sel_options['mailaccount'][$acc_id.':'.$ident_id] = $identity;
 				$identities[$ident_id] = $identity;
@@ -1182,7 +1181,7 @@ 
 		//$content['bcc'] = array('kl@egroupware.org','kl@leithoff.net');
 		// address stuff like from, to, cc, replyto
 		$destinationRows = 0;
-		foreach(self::$destinations as $destination) {
+		foreach (self::$destinations as $destination) {
 			if (!is_array($content[$destination]))
 			{
 				if (!empty($content[$destination])) $content[$destination] = (array)$content[$destination];
@@ -1190,22 +1189,22 @@ 
 			$addr_content = $content[strtolower($destination)];
 			// we clear the given address array and rebuild it
 			unset($content[strtolower($destination)]);
-			foreach((array)$addr_content as $key => $value) {
-				if ($value=="NIL@NIL") continue;
-				if ($destination=='replyto' && str_replace('"','',$value) ==
-					str_replace('"','',$identities[$this->mail_bo->getDefaultIdentity()]))
+			foreach ((array)$addr_content as $key => $value) {
+				if ($value == "NIL@NIL") continue;
+				if ($destination == 'replyto' && str_replace('"', '', $value) ==
+					str_replace('"', '', $identities[$this->mail_bo->getDefaultIdentity()]))
 				{
 					// preserve/restore the value to content.
-					$content[strtolower($destination)][]=$value;
+					$content[strtolower($destination)][] = $value;
 					continue;
 				}
 				//error_log(__METHOD__.__LINE__.array2string(array('key'=>$key,'value'=>$value)));
-				$value = str_replace("\"\"",'"', htmlspecialchars_decode($value, ENT_COMPAT));
-				foreach(Mail::parseAddressList($value) as $addressObject) {
+				$value = str_replace("\"\"", '"', htmlspecialchars_decode($value, ENT_COMPAT));
+				foreach (Mail::parseAddressList($value) as $addressObject) {
 					if ($addressObject->host == '.SYNTAX-ERROR.') continue;
-					$address = imap_rfc822_write_address($addressObject->mailbox,$addressObject->host,$addressObject->personal);
+					$address = imap_rfc822_write_address($addressObject->mailbox, $addressObject->host, $addressObject->personal);
 					//$address = Mail::htmlentities($address, $this->displayCharset);
-					$content[strtolower($destination)][]=$address;
+					$content[strtolower($destination)][] = $address;
 					$destinationRows++;
 				}
 			}
@@ -1213,10 +1212,10 @@ 
 		if ($_content)
 		{
 			//input array of _content had no signature information but was seeded later, and content has a valid setting
-			if (!$_contentHasSigID && $content['mailidentity'] && array_key_exists('mailidentity',$_content)) unset($_content['mailidentity']);
-			$content = array_merge($content,$_content);
+			if (!$_contentHasSigID && $content['mailidentity'] && array_key_exists('mailidentity', $_content)) unset($_content['mailidentity']);
+			$content = array_merge($content, $_content);
 
-			if (!empty($content['folder'])) $sel_options['folder']=$this->ajax_searchFolder(0,true);
+			if (!empty($content['folder'])) $sel_options['folder'] = $this->ajax_searchFolder(0, true);
 			if (empty($content['mailaccount'])) $content['mailaccount'] = $this->mail_bo->profileID;
 		}
 		else
@@ -1225,12 +1224,12 @@ 
 			$content['mailaccount'] = $this->mail_bo->profileID;
 			//error_log(__METHOD__.__LINE__.$content['body']);
 		}
-		$content['is_html'] = ($content['mimeType'] == 'html'?true:'');
-		$content['is_plain'] = ($content['mimeType'] == 'html'?'':true);
-		$content['mail_'.($content['mimeType'] == 'html'?'html':'plain').'text'] =$content['body'];
-		$content['showtempname']=0;
+		$content['is_html'] = ($content['mimeType'] == 'html' ? true : '');
+		$content['is_plain'] = ($content['mimeType'] == 'html' ? '' : true);
+		$content['mail_'.($content['mimeType'] == 'html' ? 'html' : 'plain').'text'] = $content['body'];
+		$content['showtempname'] = 0;
 		//if (is_array($content['attachments']))error_log(__METHOD__.__LINE__.'before merging content with uploadforCompose:'.array2string($content['attachments']));
-		$content['attachments']=(is_array($content['attachments'])&&is_array($content['uploadForCompose'])?array_merge($content['attachments'],(!empty($content['uploadForCompose'])?$content['uploadForCompose']:array())):(is_array($content['uploadForCompose'])?$content['uploadForCompose']:(is_array($content['attachments'])?$content['attachments']:null)));
+		$content['attachments'] = (is_array($content['attachments']) && is_array($content['uploadForCompose']) ? array_merge($content['attachments'], (!empty($content['uploadForCompose']) ? $content['uploadForCompose'] : array())) : (is_array($content['uploadForCompose']) ? $content['uploadForCompose'] : (is_array($content['attachments']) ? $content['attachments'] : null)));
 		//if (is_array($content['attachments'])) foreach($content['attachments'] as $k => &$file) $file['delete['.$file['tmp_name'].']']=0;
 		$content['no_griddata'] = empty($content['attachments']);
 		$preserv['attachments'] = $content['attachments'];
@@ -1264,12 +1263,12 @@ 
 		$sel_options['mimeType'] = self::$mimeTypes;
 		$sel_options['priority'] = self::$priorities;
 		$sel_options['filemode'] = Vfs\Sharing::$modes;
-		if (!isset($content['priority']) || empty($content['priority'])) $content['priority']=3;
+		if (!isset($content['priority']) || empty($content['priority'])) $content['priority'] = 3;
 		//$GLOBALS['egw_info']['flags']['currentapp'] = 'mail';//should not be needed
 		$etpl = new Etemplate('mail.compose');
 
 		$etpl->setElementAttribute('composeToolbar', 'actions', $this->getToolbarActions($_content));
-		if ($content['mimeType']=='html')
+		if ($content['mimeType'] == 'html')
 		{
 			//mode="$cont[rtfEditorFeatures]" validation_rules="$cont[validation_rules]" base_href="$cont[upload_dir]"
 			$_htmlConfig = Mail::$htmLawed_config;
@@ -1279,23 +1278,23 @@ 
 			// and not the eGroupware wide pref to prevent users from trying things that will potentially not work
 			// or not work as expected, as a full featured editor that may be wanted in other apps
 			// is way overloading the "normal" needs for composing mails
-			$content['rtfEditorFeatures']='simple-withimage';//Api\Html\CkEditorConfig::get_ckeditor_config();
+			$content['rtfEditorFeatures'] = 'simple-withimage'; //Api\Html\CkEditorConfig::get_ckeditor_config();
 			//$content['rtfEditorFeatures']='advanced';//Api\Html\CkEditorConfig::get_ckeditor_config();
-			$content['validation_rules']= json_encode(Mail::$htmLawed_config);
-			$etpl->setElementAttribute('mail_htmltext','mode',$content['rtfEditorFeatures']);
-			$etpl->setElementAttribute('mail_htmltext','validation_rules',$content['validation_rules']);
+			$content['validation_rules'] = json_encode(Mail::$htmLawed_config);
+			$etpl->setElementAttribute('mail_htmltext', 'mode', $content['rtfEditorFeatures']);
+			$etpl->setElementAttribute('mail_htmltext', 'validation_rules', $content['validation_rules']);
 			Mail::$htmLawed_config = $_htmlConfig;
 		}
 
-		if (isset($content['composeID'])&&!empty($content['composeID']))
+		if (isset($content['composeID']) && !empty($content['composeID']))
 		{
 			$composeCache = $content;
 			unset($composeCache['body']);
 			unset($composeCache['mail_htmltext']);
 			unset($composeCache['mail_plaintext']);
-			Api\Cache::setCache(Api\Cache::SESSION,'mail','composeCache'.trim($GLOBALS['egw_info']['user']['account_id']).'_'.$this->composeID,$composeCache,$expiration=60*60*2);
+			Api\Cache::setCache(Api\Cache::SESSION, 'mail', 'composeCache'.trim($GLOBALS['egw_info']['user']['account_id']).'_'.$this->composeID, $composeCache, $expiration = 60 * 60 * 2);
 		}
-		if (!isset($_content['serverID'])||empty($_content['serverID']))
+		if (!isset($_content['serverID']) || empty($_content['serverID']))
 		{
 			$content['serverID'] = $this->mail_bo->profileID;
 		}
@@ -1311,25 +1310,25 @@ 
 		$preserv['list-id'] = $content['list-id'];
 		$preserv['mode'] = $content['mode'];
 		// convert it back to checkbox expectations
-		if($content['mimeType'] == 'html') {
-			$content['mimeType']=1;
+		if ($content['mimeType'] == 'html') {
+			$content['mimeType'] = 1;
 		} else {
-			$content['mimeType']=0;
+			$content['mimeType'] = 0;
 		}
 		// set the current selected mailaccount as param for folderselection
-		$etpl->setElementAttribute('folder','autocomplete_params',array('mailaccount'=>$content['mailaccount']));
+		$etpl->setElementAttribute('folder', 'autocomplete_params', array('mailaccount'=>$content['mailaccount']));
 		// join again mailaccount and identity
 		$content['mailaccount'] .= ':'.$content['mailidentity'];
 
 		// Resolve distribution list before send content to client
-		foreach(array('to', 'cc', 'bcc', 'replyto')  as $f)
+		foreach (array('to', 'cc', 'bcc', 'replyto')  as $f)
 		{
-			if (is_array($content[$f])) $content[$f]= self::resolveEmailAddressList ($content[$f]);
+			if (is_array($content[$f])) $content[$f] = self::resolveEmailAddressList($content[$f]);
 		}
 
 		$content['to'] = self::resolveEmailAddressList($content['to']);
 		//error_log(__METHOD__.__LINE__.array2string($content));
-		$etpl->exec('mail.mail_compose.compose',$content,$sel_options,array(),$preserv,2);
+		$etpl->exec('mail.mail_compose.compose', $content, $sel_options, array(), $preserv, 2);
 	}
 
 	/**
@@ -1350,9 +1349,9 @@ 
 		$content = array();
 		//error_log(__METHOD__.__LINE__.array2string($mail_id).", $part_id, $from, $_focusElement, $suppressSigOnTop, $isReply");
 		// on forward we may have to support multiple ids
-		if ($from=='forward')
+		if ($from == 'forward')
 		{
-			$replyIds = explode(',',$mail_id);
+			$replyIds = explode(',', $mail_id);
 			$mail_id = $replyIds[0];
 		}
 		$hA = mail_ui::splitRowID($mail_id);
@@ -1364,15 +1363,15 @@ 
 			$this->changeProfile($icServerID);
 		}
 		$icServer = $this->mail_bo->icServer;
-		if (!empty($folder) && !empty($msgUID) )
+		if (!empty($folder) && !empty($msgUID))
 		{
 			// this fill the session data with the values from the original email
-			switch($from)
+			switch ($from)
 			{
 				case 'composefromdraft':
 				case 'composeasnew':
 					$content = $this->getDraftData($icServer, $folder, $msgUID, $part_id);
-					if ($from =='composefromdraft') $content['mode'] = 'composefromdraft';
+					if ($from == 'composefromdraft') $content['mode'] = 'composefromdraft';
 					$content['processedmail_id'] = $mail_id;
 
 					$_focusElement = 'body';
@@ -1388,7 +1387,7 @@ 
 					$isReply = true;
 					break;
 				case 'forward':
-					$mode  = ($_GET['mode']=='forwardinline'?'inline':'asmail');
+					$mode = ($_GET['mode'] == 'forwardinline' ? 'inline' : 'asmail');
 					// this fill the session data with the values from the original email
 					foreach ($replyIds as &$mail_id)
 					{
@@ -1398,14 +1397,14 @@ 
 						$folder = $hA['folder'];
 						$content = $this->getForwardData($icServer, $folder, $msgUID, $part_id, $mode);
 					}
-					$content['processedmail_id'] = implode(',',$replyIds);
+					$content['processedmail_id'] = implode(',', $replyIds);
 					$content['mode'] = 'forward';
-					$isReply = ($mode?$mode=='inline':$this->mailPreferences['message_forwarding'] == 'inline');
-					$suppressSigOnTop = false;// ($mode && $mode=='inline'?true:false);// may be a better solution
+					$isReply = ($mode ? $mode == 'inline' : $this->mailPreferences['message_forwarding'] == 'inline');
+					$suppressSigOnTop = false; // ($mode && $mode=='inline'?true:false);// may be a better solution
 					$_focusElement = 'to';
 					break;
 				default:
-					error_log('Unhandled compose source: ' . $from);
+					error_log('Unhandled compose source: '.$from);
 			}
 		}
 		else if ($from == 'merge' && $_REQUEST['document'])
@@ -1420,12 +1419,12 @@ 
 			$document_merge = new $merge_class();
 			$this->mail_bo->openConnection();
 			$merge_ids = $_REQUEST['preset']['mailtocontactbyid'] ? $_REQUEST['preset']['mailtocontactbyid'] : $mail_id;
-			if (!is_array($merge_ids)) $merge_ids = explode(',',$merge_ids);
+			if (!is_array($merge_ids)) $merge_ids = explode(',', $merge_ids);
 			try
 			{
 				$merged_mail_id = '';
 				$folder = '';
-				if(($error = $document_merge->check_document($_REQUEST['document'],'')))
+				if (($error = $document_merge->check_document($_REQUEST['document'], '')))
 				{
 					$content['msg'] = $error;
 					return $content;
@@ -1435,10 +1434,10 @@ 
 				//$GLOBALS['egw_info']['flags']['currentapp'] = 'addressbook';
 
 				// Actually do the merge
-				if(count($merge_ids) <= 1)
+				if (count($merge_ids) <= 1)
 				{
 					$results = $this->mail_bo->importMessageToMergeAndSend(
-						$document_merge, Vfs::PREFIX . $_REQUEST['document'], $merge_ids, $folder, $merged_mail_id
+						$document_merge, Vfs::PREFIX.$_REQUEST['document'], $merge_ids, $folder, $merged_mail_id
 					);
 
 					// Open compose
@@ -1449,9 +1448,9 @@ 
 				}
 				else
 				{
-					$success = implode(', ',$results['success']);
+					$success = implode(', ', $results['success']);
 					$fail = implode(', ', $results['failed']);
-					if($success) Framework::message($success, 'success');
+					if ($success) Framework::message($success, 'success');
 					Framework::window_close($fail);
 				}
 			}
@@ -1479,22 +1478,22 @@ 
 		return 1;
 	}
 
-	function convertHTMLToText(&$_html,$sourceishtml = true, $stripcrl=false)
+	function convertHTMLToText(&$_html, $sourceishtml = true, $stripcrl = false)
 	{
 		$stripalltags = true;
 		// third param is stripalltags, we may not need that, if the source is already in ascii
-		if (!$sourceishtml) $stripalltags=false;
-		return Api\Mail\Html::convertHTMLToText($_html,$this->displayCharset,$stripcrl,$stripalltags);
+		if (!$sourceishtml) $stripalltags = false;
+		return Api\Mail\Html::convertHTMLToText($_html, $this->displayCharset, $stripcrl, $stripalltags);
 	}
 
 	function generateRFC822Address($_addressObject)
 	{
-		if($_addressObject->personal && $_addressObject->mailbox && $_addressObject->host) {
-			return sprintf('"%s" <%s@%s>', $this->mail_bo->decode_header($_addressObject->personal), $_addressObject->mailbox, $this->mail_bo->decode_header($_addressObject->host,'FORCE'));
-		} elseif($_addressObject->mailbox && $_addressObject->host) {
-			return sprintf("%s@%s", $_addressObject->mailbox, $this->mail_bo->decode_header($_addressObject->host,'FORCE'));
+		if ($_addressObject->personal && $_addressObject->mailbox && $_addressObject->host) {
+			return sprintf('"%s" <%s@%s>', $this->mail_bo->decode_header($_addressObject->personal), $_addressObject->mailbox, $this->mail_bo->decode_header($_addressObject->host, 'FORCE'));
+		} elseif ($_addressObject->mailbox && $_addressObject->host) {
+			return sprintf("%s@%s", $_addressObject->mailbox, $this->mail_bo->decode_header($_addressObject->host, 'FORCE'));
 		} else {
-			return $this->mail_bo->decode_header($_addressObject->mailbox,true);
+			return $this->mail_bo->decode_header($_addressObject->mailbox, true);
 		}
 	}
 
@@ -1509,9 +1508,9 @@ 
 	// $_mode can be:
 	// single: for a reply to one address
 	// all: for a reply to all
-	function getDraftData($_icServer, $_folder, $_uid, $_partID=NULL)
+	function getDraftData($_icServer, $_folder, $_uid, $_partID = NULL)
 	{
-		unset($_icServer);	// not used
+		unset($_icServer); // not used
 		$this->sessionData['to'] = array();
 
 		$mail_bo = $this->mail_bo;
@@ -1520,7 +1519,7 @@ 
 
 		// get message headers for specified message
 		#$headers	= $mail_bo->getMessageHeader($_folder, $_uid);
-		$headers	= $mail_bo->getMessageEnvelope($_uid, $_partID);
+		$headers = $mail_bo->getMessageEnvelope($_uid, $_partID);
 		$addHeadInfo = $mail_bo->getMessageHeader($_uid, $_partID);
 		// thread-topic is a proprietary microsoft header and deprecated with the current version
 		// horde does not support the encoding of thread-topic, and probably will not no so in the future
@@ -1528,10 +1527,10 @@ 
 
 		//error_log(__METHOD__.__LINE__.array2string($headers));
 		if (!empty($addHeadInfo['X-MAILFOLDER'])) {
-			foreach ( explode('|',$addHeadInfo['X-MAILFOLDER']) as $val ) {
-				$fval=$val;
+			foreach (explode('|', $addHeadInfo['X-MAILFOLDER']) as $val) {
+				$fval = $val;
 				$icServerID = $mail_bo->icServer->ImapServerId;
-				if (stripos($val,'::')!==false) list($icServerID,$fval) = explode('::',$val,2);
+				if (stripos($val, '::') !== false) list($icServerID, $fval) = explode('::', $val, 2);
 				if ($icServerID != $mail_bo->icServer->ImapServerId) continue;
 				if ($mail_bo->folderExists($fval)) $this->sessionData['folder'][] = $val;
 			}
@@ -1567,71 +1566,71 @@ 
 			}
 		}
 		// if the message is located within the draft folder, add it as last drafted version (for possible cleanup on abort))
-		if ($mail_bo->isDraftFolder($_folder)) $this->sessionData['lastDrafted'] = mail_ui::generateRowID($this->mail_bo->profileID, $_folder, $_uid);//array('uid'=>$_uid,'folder'=>$_folder);
+		if ($mail_bo->isDraftFolder($_folder)) $this->sessionData['lastDrafted'] = mail_ui::generateRowID($this->mail_bo->profileID, $_folder, $_uid); //array('uid'=>$_uid,'folder'=>$_folder);
 		$this->sessionData['uid'] = $_uid;
 		$this->sessionData['messageFolder'] = $_folder;
 		$this->sessionData['isDraft'] = true;
 		$foundAddresses = array();
-		foreach((array)$headers['CC'] as $val) {
-			$rfcAddr=Mail::parseAddressList($val);
+		foreach ((array)$headers['CC'] as $val) {
+			$rfcAddr = Mail::parseAddressList($val);
 			$_rfcAddr = $rfcAddr[0];
 			if (!$_rfcAddr->valid) continue;
-			if($_rfcAddr->mailbox == 'undisclosed-recipients' || (!$_rfcAddr->mailbox && !$_rfcAddr->host) ) {
+			if ($_rfcAddr->mailbox == 'undisclosed-recipients' || (!$_rfcAddr->mailbox && !$_rfcAddr->host)) {
 				continue;
 			}
-			$keyemail=$_rfcAddr->mailbox.'@'.$_rfcAddr->host;
-			if(!$foundAddresses[$keyemail]) {
-				$address = $this->mail_bo->decode_header($val,true);
+			$keyemail = $_rfcAddr->mailbox.'@'.$_rfcAddr->host;
+			if (!$foundAddresses[$keyemail]) {
+				$address = $this->mail_bo->decode_header($val, true);
 				$this->sessionData['cc'][] = $val;
 				$foundAddresses[$keyemail] = true;
 			}
 		}
 
-		foreach((array)$headers['TO'] as $val) {
-			if(!is_array($val))
+		foreach ((array)$headers['TO'] as $val) {
+			if (!is_array($val))
 			{
 				$this->sessionData['to'][] = $val;
 				continue;
 			}
-			$rfcAddr=Mail::parseAddressList($val);
+			$rfcAddr = Mail::parseAddressList($val);
 			$_rfcAddr = $rfcAddr[0];
 			if (!$_rfcAddr->valid) continue;
-			if($_rfcAddr->mailbox == 'undisclosed-recipients' || (!$_rfcAddr->mailbox && !$_rfcAddr->host) ) {
+			if ($_rfcAddr->mailbox == 'undisclosed-recipients' || (!$_rfcAddr->mailbox && !$_rfcAddr->host)) {
 				continue;
 			}
-			$keyemail=$_rfcAddr->mailbox.'@'.$_rfcAddr->host;
-			if(!$foundAddresses[$keyemail]) {
-				$address = $this->mail_bo->decode_header($val,true);
+			$keyemail = $_rfcAddr->mailbox.'@'.$_rfcAddr->host;
+			if (!$foundAddresses[$keyemail]) {
+				$address = $this->mail_bo->decode_header($val, true);
 				$this->sessionData['to'][] = $val;
 				$foundAddresses[$keyemail] = true;
 			}
 		}
 
-		foreach((array)$headers['REPLY-TO'] as $val) {
-			$rfcAddr=Mail::parseAddressList($val);
+		foreach ((array)$headers['REPLY-TO'] as $val) {
+			$rfcAddr = Mail::parseAddressList($val);
 			$_rfcAddr = $rfcAddr[0];
 			if (!$_rfcAddr->valid) continue;
-			if($_rfcAddr->mailbox == 'undisclosed-recipients' || (empty($_rfcAddr->mailbox) && empty($_rfcAddr->host)) ) {
+			if ($_rfcAddr->mailbox == 'undisclosed-recipients' || (empty($_rfcAddr->mailbox) && empty($_rfcAddr->host))) {
 				continue;
 			}
-			$keyemail=$_rfcAddr->mailbox.'@'.$_rfcAddr->host;
-			if(!$foundAddresses[$keyemail]) {
-				$address = $this->mail_bo->decode_header($val,true);
+			$keyemail = $_rfcAddr->mailbox.'@'.$_rfcAddr->host;
+			if (!$foundAddresses[$keyemail]) {
+				$address = $this->mail_bo->decode_header($val, true);
 				$this->sessionData['replyto'][] = $val;
 				$foundAddresses[$keyemail] = true;
 			}
 		}
 
-		foreach((array)$headers['BCC'] as $val) {
-			$rfcAddr=Mail::parseAddressList($val);
+		foreach ((array)$headers['BCC'] as $val) {
+			$rfcAddr = Mail::parseAddressList($val);
 			$_rfcAddr = $rfcAddr[0];
 			if (!$_rfcAddr->valid) continue;
-			if($_rfcAddr->mailbox == 'undisclosed-recipients' || (empty($_rfcAddr->mailbox) && empty($_rfcAddr->host)) ) {
+			if ($_rfcAddr->mailbox == 'undisclosed-recipients' || (empty($_rfcAddr->mailbox) && empty($_rfcAddr->host))) {
 				continue;
 			}
-			$keyemail=$_rfcAddr->mailbox.'@'.$_rfcAddr->host;
-			if(!$foundAddresses[$keyemail]) {
-				$address = $this->mail_bo->decode_header($val,true);
+			$keyemail = $_rfcAddr->mailbox.'@'.$_rfcAddr->host;
+			if (!$foundAddresses[$keyemail]) {
+				$address = $this->mail_bo->decode_header($val, true);
 				$this->sessionData['bcc'][] = $val;
 				$foundAddresses[$keyemail] = true;
 			}
@@ -1640,48 +1639,48 @@ 
 		$this->sessionData['subject']	= $mail_bo->decode_header($headers['SUBJECT']);
 		// remove a printview tag if composing
 		$searchfor = '/^\['.lang('printview').':\]/';
-		$this->sessionData['subject'] = preg_replace($searchfor,'',$this->sessionData['subject']);
-		$bodyParts = $mail_bo->getMessageBody($_uid,'always_display', $_partID);
+		$this->sessionData['subject'] = preg_replace($searchfor, '', $this->sessionData['subject']);
+		$bodyParts = $mail_bo->getMessageBody($_uid, 'always_display', $_partID);
 		//_debug_array($bodyParts);
 		#$fromAddress = ($headers['FROM'][0]['PERSONAL_NAME'] != 'NIL') ? $headers['FROM'][0]['RFC822_EMAIL'] : $headers['FROM'][0]['EMAIL'];
-		if($bodyParts['0']['mimeType'] == 'text/html') {
-			$this->sessionData['mimeType'] 	= 'html';
+		if ($bodyParts['0']['mimeType'] == 'text/html') {
+			$this->sessionData['mimeType'] = 'html';
 
-			for($i=0; $i<count($bodyParts); $i++) {
-				if($i>0) {
+			for ($i = 0; $i < count($bodyParts); $i++) {
+				if ($i > 0) {
 					$this->sessionData['body'] .= '<hr>';
 				}
-				if($bodyParts[$i]['mimeType'] == 'text/plain') {
+				if ($bodyParts[$i]['mimeType'] == 'text/plain') {
 					#$bodyParts[$i]['body'] = nl2br($bodyParts[$i]['body']);
 					$bodyParts[$i]['body'] = "<pre>".$bodyParts[$i]['body']."</pre>";
 				}
-				if ($bodyParts[$i]['charSet']===false) $bodyParts[$i]['charSet'] = Mail::detect_encoding($bodyParts[$i]['body']);
+				if ($bodyParts[$i]['charSet'] === false) $bodyParts[$i]['charSet'] = Mail::detect_encoding($bodyParts[$i]['body']);
 				$bodyParts[$i]['body'] = Api\Translation::convert_jsonsafe($bodyParts[$i]['body'], $bodyParts[$i]['charSet']);
 				#error_log( "GetDraftData (HTML) CharSet:".mb_detect_encoding($bodyParts[$i]['body'] . 'a' , strtoupper($bodyParts[$i]['charSet']).','.strtoupper($this->displayCharset).',UTF-8, ISO-8859-1'));
-				$this->sessionData['body'] .= ($i>0?"<br>":""). $bodyParts[$i]['body'] ;
+				$this->sessionData['body'] .= ($i > 0 ? "<br>" : "").$bodyParts[$i]['body'];
 			}
 			$this->sessionData['body'] = mail_ui::resolve_inline_images($this->sessionData['body'], $_folder, $_uid, $_partID);
 
 		} else {
-			$this->sessionData['mimeType']	= 'plain';
+			$this->sessionData['mimeType'] = 'plain';
 
-			for($i=0; $i<count($bodyParts); $i++) {
-				if($i>0) {
+			for ($i = 0; $i < count($bodyParts); $i++) {
+				if ($i > 0) {
 					$this->sessionData['body'] .= "<hr>";
 				}
-				if ($bodyParts[$i]['charSet']===false) $bodyParts[$i]['charSet'] = Mail::detect_encoding($bodyParts[$i]['body']);
+				if ($bodyParts[$i]['charSet'] === false) $bodyParts[$i]['charSet'] = Mail::detect_encoding($bodyParts[$i]['body']);
 				$bodyParts[$i]['body'] = Api\Translation::convert_jsonsafe($bodyParts[$i]['body'], $bodyParts[$i]['charSet']);
 				#error_log( "GetDraftData (Plain) CharSet".mb_detect_encoding($bodyParts[$i]['body'] . 'a' , strtoupper($bodyParts[$i]['charSet']).','.strtoupper($this->displayCharset).',UTF-8, ISO-8859-1'));
-				$this->sessionData['body'] .= ($i>0?"\r\n":""). $bodyParts[$i]['body'] ;
+				$this->sessionData['body'] .= ($i > 0 ? "\r\n" : "").$bodyParts[$i]['body'];
 			}
-			$this->sessionData['body'] = mail_ui::resolve_inline_images($this->sessionData['body'], $_folder, $_uid, $_partID,'plain');
+			$this->sessionData['body'] = mail_ui::resolve_inline_images($this->sessionData['body'], $_folder, $_uid, $_partID, 'plain');
 		}
 
-		if(($attachments = $mail_bo->getMessageAttachments($_uid,$_partID))) {
-			foreach($attachments as $attachment) {
+		if (($attachments = $mail_bo->getMessageAttachments($_uid, $_partID))) {
+			foreach ($attachments as $attachment) {
 				//error_log(__METHOD__.__LINE__.array2string($attachment));
 				$cid = $attachment['cid'];
-				$match=null;
+				$match = null;
 				preg_match("/cid:{$cid}/", $bodyParts['0']['body'], $match);
 				//error_log(__METHOD__.__LINE__.'searching for cid:'."/cid:{$cid}/".'#'.$r.'#'.array2string($match));
 				if (!$match || !$attachment['cid'])
@@ -1700,7 +1699,7 @@ 
 
 	function getErrorInfo()
 	{
-		if(isset($this->errorInfo)) {
+		if (isset($this->errorInfo)) {
 			$errorInfo = $this->errorInfo;
 			unset($this->errorInfo);
 			return $errorInfo;
@@ -1708,39 +1707,39 @@ 
 		return false;
 	}
 
-	function getForwardData($_icServer, $_folder, $_uid, $_partID, $_mode=false)
+	function getForwardData($_icServer, $_folder, $_uid, $_partID, $_mode = false)
 	{
 		if ($_mode)
 		{
 			$modebuff = $this->mailPreferences['message_forwarding'];
 			$this->mailPreferences['message_forwarding'] = $_mode;
 		}
-		if  ($this->mailPreferences['message_forwarding'] == 'inline') {
+		if ($this->mailPreferences['message_forwarding'] == 'inline') {
 			$this->getReplyData('forward', $_icServer, $_folder, $_uid, $_partID);
 		}
-		$mail_bo    = $this->mail_bo;
+		$mail_bo = $this->mail_bo;
 		$mail_bo->openConnection();
 		$mail_bo->reopen($_folder);
 
 		// get message headers for specified message
-		$headers	= $mail_bo->getMessageEnvelope($_uid, $_partID,false,$_folder);
+		$headers = $mail_bo->getMessageEnvelope($_uid, $_partID, false, $_folder);
 		//error_log(__METHOD__.__LINE__.array2string($headers));
 		//_debug_array($headers); exit;
 		// check for Re: in subject header
-		$this->sessionData['subject'] 	= "[FWD] " . $mail_bo->decode_header($headers['SUBJECT']);
+		$this->sessionData['subject'] = "[FWD] ".$mail_bo->decode_header($headers['SUBJECT']);
 		// the three attributes below are substituted by processedmail_id and mode
 		//$this->sessionData['sourceFolder']=$_folder;
 		//$this->sessionData['forwardFlag']='forwarded';
 		//$this->sessionData['forwardedUID']=$_uid;
-		if  ($this->mailPreferences['message_forwarding'] == 'asmail') {
-			$this->sessionData['mimeType']  = $this->mailPreferences['composeOptions'];
-			if($headers['SIZE'])
+		if ($this->mailPreferences['message_forwarding'] == 'asmail') {
+			$this->sessionData['mimeType'] = $this->mailPreferences['composeOptions'];
+			if ($headers['SIZE'])
 				$size				= $headers['SIZE'];
 			else
 				$size				= lang('unknown');
 
 			$this->addMessageAttachment($_uid, $_partID, $_folder,
-				$mail_bo->decode_header(($headers['SUBJECT']?$headers['SUBJECT']:lang('no subject'))).'.eml',
+				$mail_bo->decode_header(($headers['SUBJECT'] ? $headers['SUBJECT'] : lang('no subject'))).'.eml',
 				'MESSAGE/RFC822', $size);
 		}
 		else
@@ -1748,10 +1747,10 @@ 
 			unset($this->sessionData['in-reply-to']);
 			unset($this->sessionData['to']);
 			unset($this->sessionData['cc']);
-			if(($attachments = $mail_bo->getMessageAttachments($_uid,$_partID))) {
+			if (($attachments = $mail_bo->getMessageAttachments($_uid, $_partID))) {
 				//error_log(__METHOD__.__LINE__.':'.array2string($attachments));
-				foreach($attachments as $attachment) {
-					if (!($attachment['cid'] && preg_match("/image\//",$attachment['mimeType'])) || $attachment['disposition'] == 'attachment')
+				foreach ($attachments as $attachment) {
+					if (!($attachment['cid'] && preg_match("/image\//", $attachment['mimeType'])) || $attachment['disposition'] == 'attachment')
 					{
 						$this->addMessageAttachment($_uid, $attachment['partID'],
 							$_folder,
@@ -1780,7 +1779,7 @@ 
 	 * @param array $_content the content passed to the function and to be modified
 	 * @return void
 	 */
-	function addAttachment($_formData,&$_content,$eliminateDoubleAttachments=false)
+	function addAttachment($_formData, &$_content, $eliminateDoubleAttachments = false)
 	{
 		//error_log(__METHOD__.__LINE__.' Formdata:'.array2string($_formData).' Content:'.array2string($_content));
 
@@ -1789,7 +1788,7 @@ 
 		// check if formdata meets basic restrictions (in tmp dir, or vfs, mimetype, etc.)
 		try
 		{
-			$tmpFileName = Mail::checkFileBasics($_formData,$this->composeID,false);
+			$tmpFileName = Mail::checkFileBasics($_formData, $this->composeID, false);
 		}
 		catch (Api\Exception\WrongUserinput $e)
 		{
@@ -1805,8 +1804,8 @@ 
 			foreach ((array)$_content['attachments'] as $attach)
 			{
 				if ($attach['name'] && $attach['name'] == $_formData['name'] &&
-					strtolower($_formData['type'])== strtolower($attach['type']) &&
-					stripos($_formData['file'],'vfs://') !== false) return;
+					strtolower($_formData['type']) == strtolower($attach['type']) &&
+					stripos($_formData['file'], 'vfs://') !== false) return;
 			}
 		}
 		if ($attachfailed === false)
@@ -1818,7 +1817,7 @@ 
 				'tmp_name'	=> $tmpFileName,
 				'size'	=> $_formData['size']
 			);
-			if (!is_array($_content['attachments'])) $_content['attachments']=array();
+			if (!is_array($_content['attachments'])) $_content['attachments'] = array();
 			$_content['attachments'][] = $buffer;
 			unset($buffer);
 		}
@@ -1830,14 +1829,14 @@ 
 
 	function addMessageAttachment($_uid, $_partID, $_folder, $_name, $_type, $_size)
 	{
-		$this->sessionData['attachments'][]=array (
+		$this->sessionData['attachments'][] = array(
 			'uid'		=> $_uid,
 			'partID'	=> $_partID,
 			'name'		=> $_name,
 			'type'		=> $_type,
 			'size'		=> $_size,
 			'folder'	=> $_folder,
-			'tmp_name'	=> mail_ui::generateRowID($this->mail_bo->profileID, $_folder, $_uid).'_'.(!empty($_partID)?$_partID:count($this->sessionData['attachments'])+1),
+			'tmp_name'	=> mail_ui::generateRowID($this->mail_bo->profileID, $_folder, $_uid).'_'.(!empty($_partID) ? $_partID : count($this->sessionData['attachments']) + 1),
 		);
 	}
 
@@ -1846,7 +1845,7 @@ 
 		// read attachment data from etemplate request, use tmpname only to identify it
 		if (($request = Etemplate\Request::read($_GET['etemplate_exec_id'])))
 		{
-			foreach($request->preserv['attachments'] as $attachment)
+			foreach ($request->preserv['attachments'] as $attachment)
 			{
 				if ($_GET['tmpname'] === $attachment['tmp_name']) break;
 			}
@@ -1858,7 +1857,7 @@ 
 		}
 
 		//error_log(__METHOD__.__LINE__.array2string($_GET));
-		if (parse_url($attachment['tmp_name'],PHP_URL_SCHEME) == 'vfs')
+		if (parse_url($attachment['tmp_name'], PHP_URL_SCHEME) == 'vfs')
 		{
 			Vfs::load_wrapper('vfs');
 		}
@@ -1867,7 +1866,7 @@ 
 		{
 			$attachment['tmp_name'] = $GLOBALS['egw_info']['server']['temp_dir'].'/'.basename($attachment['tmp_name']);
 		}
-		if(!file_exists($attachment['tmp_name']))
+		if (!file_exists($attachment['tmp_name']))
 		{
 			header('HTTP/1.1 404 Not found');
 			die('Attachment '.htmlspecialchars($attachment['tmp_name']).' NOT found!');
@@ -1880,7 +1879,7 @@ 
 			if (strtoupper($attachment['type']) == 'TEXT/DIRECTORY')
 			{
 				$sfxMimeType = $attachment['type'];
-				$buff = explode('.',$attachment['tmp_name']);
+				$buff = explode('.', $attachment['tmp_name']);
 				$suffix = '';
 				if (is_array($buff)) $suffix = array_pop($buff); // take the last extension to check with ext2mime
 				if (!empty($suffix)) $sfxMimeType = Api\MimeMagic::ext2mime($suffix);
@@ -1892,10 +1891,10 @@ 
 			{
 				//error_log(__METHOD__."about to call calendar_ical");
 				$calendar_ical = new calendar_ical();
-				$eventid = $calendar_ical->search($attachment['attachment'],-1);
+				$eventid = $calendar_ical->search($attachment['attachment'], -1);
 				//error_log(__METHOD__.array2string($eventid));
 				if (!$eventid) $eventid = -1;
-				$event = $calendar_ical->importVCal($attachment['attachment'],(is_array($eventid)?$eventid[0]:$eventid),null,true);
+				$event = $calendar_ical->importVCal($attachment['attachment'], (is_array($eventid) ? $eventid[0] : $eventid), null, true);
 				//error_log(__METHOD__.$event);
 				if ((int)$event > 0)
 				{
@@ -1903,7 +1902,7 @@ 
 						'menuaction'      => 'calendar.calendar_uiforms.edit',
 						'cal_id'      => $event,
 					);
-					$GLOBALS['egw']->redirect_link('../index.php',$vars);
+					$GLOBALS['egw']->redirect_link('../index.php', $vars);
 				}
 				//Import failed, download content anyway
 			}
@@ -1918,13 +1917,13 @@ 
 				{
 					$vcard['uid'] = trim($vcard['uid']);
 					//error_log(__METHOD__.__LINE__.print_r($vcard,true));
-					$contact = $addressbook_vcal->find_contact($vcard,false);
+					$contact = $addressbook_vcal->find_contact($vcard, false);
 				}
 				if (!$contact) $contact = null;
 				// if there are not enough fields in the vcard (or the parser was unable to correctly parse the vcard (as of VERSION:3.0 created by MSO))
-				if ($contact || count($vcard)>2)
+				if ($contact || count($vcard) > 2)
 				{
-					$contact = $addressbook_vcal->addVCard($attachment['attachment'],(is_array($contact)?array_shift($contact):$contact),true);
+					$contact = $addressbook_vcal->addVCard($attachment['attachment'], (is_array($contact) ? array_shift($contact) : $contact), true);
 				}
 				if ((int)$contact > 0)
 				{
@@ -1932,13 +1931,13 @@ 
 						'menuaction'	=> 'addressbook.addressbook_ui.edit',
 						'contact_id'	=> $contact,
 					);
-					$GLOBALS['egw']->redirect_link('../index.php',$vars);
+					$GLOBALS['egw']->redirect_link('../index.php', $vars);
 				}
 				//Import failed, download content anyway
 			}
 		}
 		//error_log(__METHOD__.__LINE__.'->'.array2string($attachment));
-		Api\Header\Content::safe($attachment['attachment'], $attachment['name'], $attachment['type'], $size=0, true, $_GET['mode'] == "save");
+		Api\Header\Content::safe($attachment['attachment'], $attachment['name'], $attachment['type'], $size = 0, true, $_GET['mode'] == "save");
 		echo $attachment['attachment'];
 
 		exit();
@@ -1951,11 +1950,11 @@ 
 	 * @param string haystack
 	 * @return boolean
 	 */
-	function testIfOneKeyInArrayDoesExistInString($arrayToTestAgainst,$haystack) {
+	function testIfOneKeyInArrayDoesExistInString($arrayToTestAgainst, $haystack) {
 		foreach (array_keys($arrayToTestAgainst) as $k)
 		{
 			//error_log(__METHOD__.__LINE__.':'.$k.'<->'.$haystack);
-			if (stripos($haystack,$k)!==false)
+			if (stripos($haystack, $k) !== false)
 			{
 				//error_log(__METHOD__.__LINE__.':FOUND:'.$k.'<->'.$haystack.function_backtrace());
 				return true;
@@ -1978,10 +1977,10 @@ 
 	 */
 	function getReplyData($_mode, $_icServer, $_folder, $_uid, $_partID)
 	{
-		unset($_icServer);	// not used
+		unset($_icServer); // not used
 		$foundAddresses = array();
 
-		$mail_bo  = $this->mail_bo;
+		$mail_bo = $this->mail_bo;
 		$mail_bo->openConnection();
 		$mail_bo->reopen($_folder);
 
@@ -1989,12 +1988,12 @@ 
 
 		// get message headers for specified message
 		//print "AAAA: $_folder, $_uid, $_partID<br>";
-		$headers	= $mail_bo->getMessageEnvelope($_uid, $_partID,false,$_folder,$useHeaderInsteadOfEnvelope=true);
+		$headers = $mail_bo->getMessageEnvelope($_uid, $_partID, false, $_folder, $useHeaderInsteadOfEnvelope = true);
 		//$headers	= $mail_bo->getMessageHeader($_uid, $_partID, true, true, $_folder);
 		$this->sessionData['uid'] = $_uid;
 		$this->sessionData['messageFolder'] = $_folder;
-		$this->sessionData['in-reply-to'] = ($headers['IN-REPLY-TO']?$headers['IN-REPLY-TO']:$headers['MESSAGE_ID']);
-		$this->sessionData['references'] = ($headers['REFERENCES']?$headers['REFERENCES']:$headers['MESSAGE_ID']);
+		$this->sessionData['in-reply-to'] = ($headers['IN-REPLY-TO'] ? $headers['IN-REPLY-TO'] : $headers['MESSAGE_ID']);
+		$this->sessionData['references'] = ($headers['REFERENCES'] ? $headers['REFERENCES'] : $headers['MESSAGE_ID']);
 		// thread-topic is a proprietary microsoft header and deprecated with the current version
 		// horde does not support the encoding of thread-topic, and probably will not no so in the future
 		//if ($headers['THREAD-TOPIC']) $this->sessionData['thread-topic'] = $headers['THREAD-TOPIC'];
@@ -2002,36 +2001,36 @@ 
 		if ($headers['LIST-ID']) $this->sessionData['list-id'] = $headers['LIST-ID'];
 		//error_log(__METHOD__.__LINE__.' Mode:'.$_mode.':'.array2string($headers));
 		// check for Reply-To: header and use if available
-		if(!empty($headers['REPLY-TO']) && ($headers['REPLY-TO'] != $headers['FROM'])) {
-			foreach($headers['REPLY-TO'] as $val) {
-				if(!$foundAddresses[$val]) {
+		if (!empty($headers['REPLY-TO']) && ($headers['REPLY-TO'] != $headers['FROM'])) {
+			foreach ($headers['REPLY-TO'] as $val) {
+				if (!$foundAddresses[$val]) {
 					$oldTo[] = $val;
 					$foundAddresses[$val] = true;
 				}
 			}
-			$oldToAddress	= (is_array($headers['REPLY-TO'])?$headers['REPLY-TO'][0]:$headers['REPLY-TO']);
+			$oldToAddress = (is_array($headers['REPLY-TO']) ? $headers['REPLY-TO'][0] : $headers['REPLY-TO']);
 		} else {
-			foreach($headers['FROM'] as $val) {
-				if(!$foundAddresses[$val]) {
+			foreach ($headers['FROM'] as $val) {
+				if (!$foundAddresses[$val]) {
 					$oldTo[] = $val;
 					$foundAddresses[$val] = true;
 				}
 			}
-			$oldToAddress	= (is_array($headers['FROM'])?$headers['FROM'][0]:$headers['FROM']);
+			$oldToAddress = (is_array($headers['FROM']) ? $headers['FROM'][0] : $headers['FROM']);
 		}
 		//error_log(__METHOD__.__LINE__.' OldToAddress:'.$oldToAddress.'#');
-		if($_mode != 'all' || ($_mode == 'all' && !empty($oldToAddress) && !$this->testIfOneKeyInArrayDoesExistInString($userEMailAddresses,$oldToAddress)) ) {
+		if ($_mode != 'all' || ($_mode == 'all' && !empty($oldToAddress) && !$this->testIfOneKeyInArrayDoesExistInString($userEMailAddresses, $oldToAddress))) {
 			$this->sessionData['to'] = $oldTo;
 		}
 
-		if($_mode == 'all') {
+		if ($_mode == 'all') {
 			// reply to any address which is cc, but not to my self
 			#if($headers->cc) {
-				foreach($headers['CC'] as $val) {
-					if($this->testIfOneKeyInArrayDoesExistInString($userEMailAddresses,$val)) {
+				foreach ($headers['CC'] as $val) {
+					if ($this->testIfOneKeyInArrayDoesExistInString($userEMailAddresses, $val)) {
 						continue;
 					}
-					if(!$foundAddresses[$val]) {
+					if (!$foundAddresses[$val]) {
 						$this->sessionData['cc'][] = $val;
 						$foundAddresses[$val] = true;
 					}
@@ -2040,11 +2039,11 @@ 
 
 			// reply to any address which is to, but not to my self
 			#if($headers->to) {
-				foreach($headers['TO'] as $val) {
-					if($this->testIfOneKeyInArrayDoesExistInString($userEMailAddresses,$val)) {
+				foreach ($headers['TO'] as $val) {
+					if ($this->testIfOneKeyInArrayDoesExistInString($userEMailAddresses, $val)) {
 						continue;
 					}
-					if(!$foundAddresses[$val]) {
+					if (!$foundAddresses[$val]) {
 						$this->sessionData['to'][] = $val;
 						$foundAddresses[$val] = true;
 					}
@@ -2052,12 +2051,12 @@ 
 			#}
 
 			#if($headers->from) {
-				foreach($headers['FROM'] as $val) {
-					if($this->testIfOneKeyInArrayDoesExistInString($userEMailAddresses,$val)) {
+				foreach ($headers['FROM'] as $val) {
+					if ($this->testIfOneKeyInArrayDoesExistInString($userEMailAddresses, $val)) {
 						continue;
 					}
 					//error_log(__METHOD__.__LINE__.' '.$val);
-					if(!$foundAddresses[$val]) {
+					if (!$foundAddresses[$val]) {
 						$this->sessionData['to'][] = $val;
 						$foundAddresses[$val] = true;
 					}
@@ -2066,59 +2065,59 @@ 
 		}
 
 		// check for Re: in subject header
-		if(strtolower(substr(trim($mail_bo->decode_header($headers['SUBJECT'])), 0, 3)) == "re:") {
+		if (strtolower(substr(trim($mail_bo->decode_header($headers['SUBJECT'])), 0, 3)) == "re:") {
 			$this->sessionData['subject'] = $mail_bo->decode_header($headers['SUBJECT']);
 		} else {
-			$this->sessionData['subject'] = "Re: " . $mail_bo->decode_header($headers['SUBJECT']);
+			$this->sessionData['subject'] = "Re: ".$mail_bo->decode_header($headers['SUBJECT']);
 		}
 
 		//_debug_array($headers);
 		//error_log(__METHOD__.__LINE__.'->'.array2string($this->mailPreferences['htmlOptions']));
-		$bodyParts = $mail_bo->getMessageBody($_uid, ($this->mailPreferences['htmlOptions']?$this->mailPreferences['htmlOptions']:''), $_partID);
+		$bodyParts = $mail_bo->getMessageBody($_uid, ($this->mailPreferences['htmlOptions'] ? $this->mailPreferences['htmlOptions'] : ''), $_partID);
 		//_debug_array($bodyParts);
 		$styles = Mail::getStyles($bodyParts);
 
-		$fromAddress = implode(', ', str_replace(array('<','>'),array('[',']'),$headers['FROM']));
+		$fromAddress = implode(', ', str_replace(array('<', '>'), array('[', ']'), $headers['FROM']));
 
 		$toAddressA = array();
 		$toAddress = '';
 		foreach ($headers['TO'] as $mailheader) {
-			$toAddressA[] =  $mailheader;
+			$toAddressA[] = $mailheader;
 		}
-		if (count($toAddressA)>0)
+		if (count($toAddressA) > 0)
 		{
-			$toAddress = implode(', ', str_replace(array('<','>'),array('[',']'),$toAddressA));
-			$toAddress = @htmlspecialchars(lang("to")).": ".$toAddress.($bodyParts['0']['mimeType'] == 'text/html'?"<br>":"\r\n");
+			$toAddress = implode(', ', str_replace(array('<', '>'), array('[', ']'), $toAddressA));
+			$toAddress = @htmlspecialchars(lang("to")).": ".$toAddress.($bodyParts['0']['mimeType'] == 'text/html' ? "<br>" : "\r\n");
 		}
 		$ccAddressA = array();
 		$ccAddress = '';
 		foreach ($headers['CC'] as $mailheader) {
-			$ccAddressA[] =  $mailheader;
+			$ccAddressA[] = $mailheader;
 		}
-		if (count($ccAddressA)>0)
+		if (count($ccAddressA) > 0)
 		{
-			$ccAddress = implode(', ', str_replace(array('<','>'),array('[',']'),$ccAddressA));
-			$ccAddress = @htmlspecialchars(lang("cc")).": ".$ccAddress.($bodyParts['0']['mimeType'] == 'text/html'?"<br>":"\r\n");
+			$ccAddress = implode(', ', str_replace(array('<', '>'), array('[', ']'), $ccAddressA));
+			$ccAddress = @htmlspecialchars(lang("cc")).": ".$ccAddress.($bodyParts['0']['mimeType'] == 'text/html' ? "<br>" : "\r\n");
 		}
-		if($bodyParts['0']['mimeType'] == 'text/html') {
-			$this->sessionData['body']	= /*"<br>".*//*"&nbsp;".*/"<div>".'----------------'.lang("original message").'-----------------'."".'<br>'.
+		if ($bodyParts['0']['mimeType'] == 'text/html') {
+			$this->sessionData['body'] = /*"<br>".*//*"&nbsp;".*/"<div>".'----------------'.lang("original message").'-----------------'."".'<br>'.
 				@htmlspecialchars(lang("from")).": ".$fromAddress."<br>".
 				$toAddress.$ccAddress.
-				@htmlspecialchars(lang("date").": ".$headers['DATE'],ENT_QUOTES | ENT_IGNORE,Mail::$displayCharset, false)."<br>".
+				@htmlspecialchars(lang("date").": ".$headers['DATE'], ENT_QUOTES|ENT_IGNORE, Mail::$displayCharset, false)."<br>".
 				'----------------------------------------------------------'."</div>";
-			$this->sessionData['mimeType'] 	= 'html';
+			$this->sessionData['mimeType'] = 'html';
 			if (!empty($styles)) $this->sessionData['body'] .= $styles;
-			$this->sessionData['body']	.= '<blockquote type="cite">';
+			$this->sessionData['body'] .= '<blockquote type="cite">';
 
-			for($i=0; $i<count($bodyParts); $i++) {
-				if($i>0) {
+			for ($i = 0; $i < count($bodyParts); $i++) {
+				if ($i > 0) {
 					$this->sessionData['body'] .= '<hr>';
 				}
-				if($bodyParts[$i]['mimeType'] == 'text/plain') {
+				if ($bodyParts[$i]['mimeType'] == 'text/plain') {
 					#$bodyParts[$i]['body'] = nl2br($bodyParts[$i]['body'])."<br>";
 					$bodyParts[$i]['body'] = "<pre>".$bodyParts[$i]['body']."</pre>";
 				}
-				if ($bodyParts[$i]['charSet']===false) $bodyParts[$i]['charSet'] = Mail::detect_encoding($bodyParts[$i]['body']);
+				if ($bodyParts[$i]['charSet'] === false) $bodyParts[$i]['charSet'] = Mail::detect_encoding($bodyParts[$i]['body']);
 
 				$_htmlConfig = Mail::$htmLawed_config;
 				Mail::$htmLawed_config['comment'] = 2;
@@ -2128,30 +2127,30 @@ 
 				#error_log( "GetReplyData (HTML) CharSet:".mb_detect_encoding($bodyParts[$i]['body'] . 'a' , strtoupper($bodyParts[$i]['charSet']).','.strtoupper($this->displayCharset).',UTF-8, ISO-8859-1'));
 			}
 
-			$this->sessionData['body']	.= '</blockquote><br>';
-			$this->sessionData['body'] =  mail_ui::resolve_inline_images($this->sessionData['body'], $_folder, $_uid, $_partID, 'html');
+			$this->sessionData['body'] .= '</blockquote><br>';
+			$this->sessionData['body'] = mail_ui::resolve_inline_images($this->sessionData['body'], $_folder, $_uid, $_partID, 'html');
 		} else {
 			//$this->sessionData['body']	= @htmlspecialchars(lang("on")." ".$headers['DATE']." ".$mail_bo->decode_header($fromAddress), ENT_QUOTES) . " ".lang("wrote").":\r\n";
 			// take care the way the ReplyHeader is created here, is used later on in uicompose::compose, in case you force replys to be HTML (prefs)
-            $this->sessionData['body']  = " \r\n \r\n".'----------------'.lang("original message").'-----------------'."\r\n".
+            $this->sessionData['body'] = " \r\n \r\n".'----------------'.lang("original message").'-----------------'."\r\n".
                 @htmlspecialchars(lang("from")).": ".$fromAddress."\r\n".
 				$toAddress.$ccAddress.
-				@htmlspecialchars(lang("date").": ".$headers['DATE'], ENT_QUOTES | ENT_IGNORE,Mail::$displayCharset, false)."\r\n".
+				@htmlspecialchars(lang("date").": ".$headers['DATE'], ENT_QUOTES|ENT_IGNORE, Mail::$displayCharset, false)."\r\n".
                 '-------------------------------------------------'."\r\n \r\n ";
-			$this->sessionData['mimeType']	= 'plain';
+			$this->sessionData['mimeType'] = 'plain';
 
-			for($i=0; $i<count($bodyParts); $i++) {
-				if($i>0) {
+			for ($i = 0; $i < count($bodyParts); $i++) {
+				if ($i > 0) {
 					$this->sessionData['body'] .= "<hr>";
 				}
 
 				// add line breaks to $bodyParts
-				$newBody2 = Api\Translation::convert_jsonsafe($bodyParts[$i]['body'],$bodyParts[$i]['charSet']);
+				$newBody2 = Api\Translation::convert_jsonsafe($bodyParts[$i]['body'], $bodyParts[$i]['charSet']);
 				#error_log( "GetReplyData (Plain) CharSet:".mb_detect_encoding($bodyParts[$i]['body'] . 'a' , strtoupper($bodyParts[$i]['charSet']).','.strtoupper($this->displayCharset).',UTF-8, ISO-8859-1'));
 				$newBody = mail_ui::resolve_inline_images($newBody2, $_folder, $_uid, $_partID, 'plain');
 				$this->sessionData['body'] .= "\r\n";
 				// create body new, with good line breaks and indention
-				foreach(explode("\n",$newBody) as $value) {
+				foreach (explode("\n", $newBody) as $value) {
 					// the explode is removing the character
 					if (trim($value) != '') {
 						#if ($value != "\r") $value .= "\n";
@@ -2159,12 +2158,12 @@ 
 					$numberOfChars = strspn(trim($value), ">");
 					$appendString = str_repeat('>', $numberOfChars + 1);
 
-					$bodyAppend = $this->mail_bo->wordwrap($value, 76-strlen("\r\n$appendString "), "\r\n$appendString ",'>');
+					$bodyAppend = $this->mail_bo->wordwrap($value, 76 - strlen("\r\n$appendString "), "\r\n$appendString ", '>');
 
-					if($bodyAppend[0] == '>') {
-						$bodyAppend = '>'. $bodyAppend;
+					if ($bodyAppend[0] == '>') {
+						$bodyAppend = '>'.$bodyAppend;
 					} else {
-						$bodyAppend = '> '. $bodyAppend;
+						$bodyAppend = '> '.$bodyAppend;
 					}
 
 					$this->sessionData['body'] .= $bodyAppend;
@@ -2187,16 +2186,16 @@ 
 	 */
 	static function _getCleanHTML($_body, $_useTidy = false)
 	{
-		static $nonDisplayAbleCharacters = array('[\016]','[\017]',
-				'[\020]','[\021]','[\022]','[\023]','[\024]','[\025]','[\026]','[\027]',
-				'[\030]','[\031]','[\032]','[\033]','[\034]','[\035]','[\036]','[\037]');
+		static $nonDisplayAbleCharacters = array('[\016]', '[\017]',
+				'[\020]', '[\021]', '[\022]', '[\023]', '[\024]', '[\025]', '[\026]', '[\027]',
+				'[\030]', '[\031]', '[\032]', '[\033]', '[\034]', '[\035]', '[\036]', '[\037]');
 
-		if ($_useTidy && extension_loaded('tidy') )
+		if ($_useTidy && extension_loaded('tidy'))
 		{
 			$tidy = new tidy();
-			$cleaned = $tidy->repairString($_body, Mail::$tidy_config,'utf8');
+			$cleaned = $tidy->repairString($_body, Mail::$tidy_config, 'utf8');
 			// Found errors. Strip it all so there's some output
-			if($tidy->getStatus() == 2)
+			if ($tidy->getStatus() == 2)
 			{
 				error_log(__METHOD__.' ('.__LINE__.') '.' ->'.$tidy->errorBuffer);
 			}
@@ -2230,14 +2229,14 @@ 
 	 *
 	 * @return array returns found inline images as attachment structure
 	 */
-	function createMessage(Api\Mailer $_mailObject, array $_formData, array $_identity, $_autosaving=false)
+	function createMessage(Api\Mailer $_mailObject, array $_formData, array $_identity, $_autosaving = false)
 	{
 		if (substr($_formData['body'], 0, 27) == '-----BEGIN PGP MESSAGE-----')
 		{
 			$_formData['mimeType'] = 'openpgp';
 		}
 		//error_log(__METHOD__."(, formDate[filemode]=$_formData[filemode], _autosaving=".array2string($_autosaving).') '.function_backtrace());
-		$mail_bo	= $this->mail_bo;
+		$mail_bo = $this->mail_bo;
 		$activeMailProfile = Mail\Account::read($this->mail_bo->profileID);
 
 		// you need to set the sender, if you work with different identities, since most smtp servers, dont allow
@@ -2247,17 +2246,17 @@ 
 			error_log(__METHOD__.__LINE__.' Faking From/SenderInfo for '.$activeMailProfile['ident_email'].' with ID:'.$activeMailProfile['ident_id'].'. Identitiy to use for sending:'.array2string($_identity));
 		}
 		$_mailObject->setFrom($_identity['ident_email'] ? $_identity['ident_email'] : $activeMailProfile['ident_email'],
-			Mail::generateIdentityString($_identity,false));
+			Mail::generateIdentityString($_identity, false));
 
 		$_mailObject->addHeader('X-Priority', $_formData['priority']);
 		$_mailObject->addHeader('X-Mailer', 'EGroupware-Mail');
-		if(!empty($_formData['in-reply-to'])) {
-			if (stripos($_formData['in-reply-to'],'<')===false) $_formData['in-reply-to']='<'.trim($_formData['in-reply-to']).'>';
+		if (!empty($_formData['in-reply-to'])) {
+			if (stripos($_formData['in-reply-to'], '<') === false) $_formData['in-reply-to'] = '<'.trim($_formData['in-reply-to']).'>';
 			//error_log(__METHOD__.__LINE__.'$_mailObject->addHeader(In-Reply-To', $_formData['in-reply-to'].")");
 			$_mailObject->addHeader('In-Reply-To', $_formData['in-reply-to']);
 		}
-		if(!empty($_formData['references'])) {
-			if (stripos($_formData['references'],'<')===false) $_formData['references']='<'.trim($_formData['references']).'>';
+		if (!empty($_formData['references'])) {
+			if (stripos($_formData['references'], '<') === false) $_formData['references'] = '<'.trim($_formData['references']).'>';
 			//error_log(__METHOD__.__LINE__.'$_mailObject->addHeader(References', $_formData['references'].")");
 			$_mailObject->addHeader('References', $_formData['references']);
 		}
@@ -2268,16 +2267,16 @@ 
 		//	$_mailObject->addHeader('Thread-Topic', $_formData['thread-topic']);
 		//}
 
-		if(!empty($_formData['thread-index'])) {
+		if (!empty($_formData['thread-index'])) {
 			//error_log(__METHOD__.__LINE__.'$_mailObject->addHeader(Tread-Index', $_formData['thread-index'].")");
 			$_mailObject->addHeader('Thread-Index', $_formData['thread-index']);
 		}
-		if(!empty($_formData['list-id'])) {
+		if (!empty($_formData['list-id'])) {
 			//error_log(__METHOD__.__LINE__.'$_mailObject->addHeader(List-Id', $_formData['list-id'].")");
 			$_mailObject->addHeader('List-Id', $_formData['list-id']);
 		}
 		//error_log(__METHOD__.__LINE__.' notify to:'.$_identity['ident_email'].'->'.array2string($_formData));
-		if($_formData['disposition']=='on') {
+		if ($_formData['disposition'] == 'on') {
 			$_mailObject->addHeader('Disposition-Notification-To', $_identity['ident_email']);
 		}
 		//error_log(__METHOD__.__LINE__.' Organization:'.array2string($_identity));
@@ -2286,7 +2285,7 @@ 
 		//}
 
 		// Expand any mailing lists
-		foreach(array('to', 'cc', 'bcc', 'replyto')  as $field)
+		foreach (array('to', 'cc', 'bcc', 'replyto')  as $field)
 		{
 			if ($field != 'replyto') $_formData[$field] = self::resolveEmailAddressList($_formData[$field]);
 
@@ -2309,7 +2308,7 @@ 
 					'1' => 'before reply, visible during compose',
 					'no_belowaftersend'  => 'appended after reply before sending',
 		*/
-		$sigAlreadyThere = $this->mailPreferences['insertSignatureAtTopOfMessage']!='no_belowaftersend'?1:0;
+		$sigAlreadyThere = $this->mailPreferences['insertSignatureAtTopOfMessage'] != 'no_belowaftersend' ? 1 : 0;
 		if ($sigAlreadyThere)
 		{
 			// note: if you use stationery ' s the insert signatures at the top does not apply here anymore, as the signature
@@ -2318,7 +2317,7 @@ 
 		}
 		if ((isset($this->mailPreferences['disableRulerForSignatureSeparation']) &&
 			$this->mailPreferences['disableRulerForSignatureSeparation']) ||
-			empty($signature) || trim($this->convertHTMLToText($signature)) =='')
+			empty($signature) || trim($this->convertHTMLToText($signature)) == '')
 		{
 			$disableRuler = true;
 		}
@@ -2335,7 +2334,7 @@ 
 				array_unique(array_merge((array)$_formData['to'], (array)$_formData['cc'], (array)$_formData['bcc'])),
 				$_formData['expiration'], $_formData['password']);
 		}
-		if($_formData['mimeType'] == 'html')
+		if ($_formData['mimeType'] == 'html')
 		{
 			$body = $_formData['body'];
 			if ($attachment_links)
@@ -2349,13 +2348,13 @@ 
 					$body .= $attachment_links;
 				}
 			}
-			if(!empty($signature))
+			if (!empty($signature))
 			{
 				$_mailObject->setBody($this->convertHTMLToText($body, true, true).
 					($disableRuler ? "\r\n" : "\r\n-- \r\n").
 					$this->convertHTMLToText($signature, true, true));
 
-				$body .= ($disableRuler ?'<br>':'<hr style="border:1px dotted silver; width:90%;">').$signature;
+				$body .= ($disableRuler ? '<br>' : '<hr style="border:1px dotted silver; width:90%;">').$signature;
 			}
 			else
 			{
@@ -2363,11 +2362,11 @@ 
 			}
 			// convert URL Images to inline images - if possible
 			if (!$_autosaving) $inline_images = Mail::processURL2InlineImages($_mailObject, $body, $mail_bo);
-			if (strpos($body,"<!-- HTMLSIGBEGIN -->")!==false)
+			if (strpos($body, "<!-- HTMLSIGBEGIN -->") !== false)
 			{
-				$body = str_replace(array('<!-- HTMLSIGBEGIN -->','<!-- HTMLSIGEND -->'),'',$body);
+				$body = str_replace(array('<!-- HTMLSIGBEGIN -->', '<!-- HTMLSIGEND -->'), '', $body);
 			}
-			$_mailObject->setHtmlBody($body, null, false);	// false = no automatic alternative, we called setBody()
+			$_mailObject->setHtmlBody($body, null, false); // false = no automatic alternative, we called setBody()
 		}
 		elseif ($_formData['mimeType'] == 'openpgp')
 		{
@@ -2375,14 +2374,14 @@ 
 		}
 		else
 		{
-			$body = $this->convertHTMLToText($_formData['body'],false);
+			$body = $this->convertHTMLToText($_formData['body'], false);
 
 			if ($attachment_links) $body .= $attachment_links;
 
 			#$_mailObject->Body = $_formData['body'];
-			if(!empty($signature)) {
-				$body .= ($disableRuler ?"\r\n":"\r\n-- \r\n").
-					$this->convertHTMLToText($signature,true,true);
+			if (!empty($signature)) {
+				$body .= ($disableRuler ? "\r\n" : "\r\n-- \r\n").
+					$this->convertHTMLToText($signature, true, true);
 			}
 			$_mailObject->setBody($body);
 		}
@@ -2393,9 +2392,9 @@ 
 			$connection_opened = false;
 			//error_log(__METHOD__.__LINE__.array2string($_formData['attachments']));
 			$tnfattachments = null;
-			foreach((array)$_formData['attachments'] as $attachment) {
+			foreach ((array)$_formData['attachments'] as $attachment) {
 				//error_log(__METHOD__.__LINE__.array2string($attachment));
-				if(is_array($attachment))
+				if (is_array($attachment))
 				{
 					if (!empty($attachment['uid']) && !empty($attachment['folder'])) {
 						/* Example:
@@ -2413,20 +2412,20 @@ 
 							$connection_opened = true;
 						}
 						$mail_bo->reopen($attachment['folder']);
-						switch(strtoupper($attachment['type'])) {
+						switch (strtoupper($attachment['type'])) {
 							case 'MESSAGE/RFC':
 							case 'MESSAGE/RFC822':
-								$rawBody='';
+								$rawBody = '';
 								if (isset($attachment['partID'])) {
-									$eml = $mail_bo->getAttachment($attachment['uid'],$attachment['partID'],0,false,true,$attachment['folder']);
-									$rawBody=$eml['attachment'];
+									$eml = $mail_bo->getAttachment($attachment['uid'], $attachment['partID'], 0, false, true, $attachment['folder']);
+									$rawBody = $eml['attachment'];
 								} else {
-									$rawBody        = $mail_bo->getMessageRawBody($attachment['uid'], $attachment['partID'],$attachment['folder']);
+									$rawBody = $mail_bo->getMessageRawBody($attachment['uid'], $attachment['partID'], $attachment['folder']);
 								}
 								$_mailObject->addStringAttachment($rawBody, $attachment['name'], 'message/rfc822');
 								break;
 							default:
-								$attachmentData	= $mail_bo->getAttachment($attachment['uid'], $attachment['partID'],0,false);
+								$attachmentData = $mail_bo->getAttachment($attachment['uid'], $attachment['partID'], 0, false);
 								if ($attachmentData['type'] == 'APPLICATION/MS-TNEF')
 								{
 									if (!is_array($tnfattachments)) $tnfattachments = $mail_bo->decode_winmail($attachment['uid'], $attachment['partID']);
@@ -2434,7 +2433,7 @@ 
 									{
 										if ($k['name'] == $attachment['name'])
 										{
-											$tnfpart = $mail_bo->decode_winmail($attachment['uid'], $attachment['partID'],$k['is_winmail']);
+											$tnfpart = $mail_bo->decode_winmail($attachment['uid'], $attachment['partID'], $k['is_winmail']);
 											$attachmentData['attachment'] = $tnfpart['attachment'];
 											//error_log(__METHOD__.__LINE__.$k['name'].'<->'.$attachment['name'].':'.array2string($attachmentData['attachment']));
 											break;
@@ -2448,7 +2447,7 @@ 
 					// attach files not for autosaving
 					elseif ($_formData['filemode'] == Vfs\Sharing::ATTACH && !$_autosaving)
 					{
-						if (isset($attachment['file']) && parse_url($attachment['file'],PHP_URL_SCHEME) == 'vfs')
+						if (isset($attachment['file']) && parse_url($attachment['file'], PHP_URL_SCHEME) == 'vfs')
 						{
 							Vfs::load_wrapper('vfs');
 							$tmp_path = $attachment['file'];
@@ -2457,7 +2456,7 @@ 
 						{
 							$tmp_path = $GLOBALS['egw_info']['server']['temp_dir'].'/'.basename($attachment['file']);
 						}
-						$_mailObject->addAttachment (
+						$_mailObject->addAttachment(
 							$tmp_path,
 							$attachment['name'],
 							$attachment['type']
@@ -2467,7 +2466,7 @@ 
 			}
 			if ($connection_opened) $mail_bo->closeConnection();
 		}
-		return is_array($inline_images)?$inline_images:array();
+		return is_array($inline_images) ? $inline_images : array();
 	}
 
 	/**
@@ -2483,16 +2482,16 @@ 
 	 * @param string $password =null
 	 * @return string might be empty if no file attachments found
 	 */
-	protected function getAttachmentLinks(array $attachments, $filemode, $html, $recipients=array(), $expiration=null, $password=null)
+	protected function getAttachmentLinks(array $attachments, $filemode, $html, $recipients = array(), $expiration = null, $password = null)
 	{
 		if ($filemode == Vfs\Sharing::ATTACH) return '';
 
 		$links = array();
-		foreach($attachments as $attachment)
+		foreach ($attachments as $attachment)
 		{
 			$path = $attachment['file'];
-			if (empty($path)) continue;	// we only care about file attachments, not forwarded messages or parts
-			if (parse_url($attachment['file'],PHP_URL_SCHEME) != 'vfs')
+			if (empty($path)) continue; // we only care about file attachments, not forwarded messages or parts
+			if (parse_url($attachment['file'], PHP_URL_SCHEME) != 'vfs')
 			{
 				$path = $GLOBALS['egw_info']['server']['temp_dir'].'/'.basename($path);
 			}
@@ -2522,7 +2521,7 @@ 
 		}
 		if (!$links)
 		{
-			return null;	// no file attachments found
+			return null; // no file attachments found
 		}
 		elseif ($html)
 		{
@@ -2537,7 +2536,7 @@ 
 	 * @param array $content content sent from client-side
 	 * @param string $action ='button[saveAsDraft]' 'autosaving', 'button[saveAsDraft]' or 'button[saveAsDraftAndPrint]'
 	 */
-	public function ajax_saveAsDraft ($content, $action='button[saveAsDraft]')
+	public function ajax_saveAsDraft($content, $action = 'button[saveAsDraft]')
 	{
 		//error_log(__METHOD__.__LINE__.array2string($content)."(, action=$action)");
 		$response = Api\Json\Response::get();
@@ -2551,8 +2550,8 @@ 
 
 		$formData = array_merge($content, array(
 			'isDrafted' => 1,
-			'body' => $content['mail_'.($content['mimeType']?'htmltext':'plaintext')],
-			'mimeType' => $content['mimeType']?'html':'plain' // checkbox has only true|false value
+			'body' => $content['mail_'.($content['mimeType'] ? 'htmltext' : 'plaintext')],
+			'mimeType' => $content['mimeType'] ? 'html' : 'plain' // checkbox has only true|false value
 		));
 
 		//Saving draft procedure
@@ -2564,8 +2563,8 @@ 
 			if (($messageUid = $this->saveAsDraft($formData, $folder, $action)))
 			{
 				// saving as draft, does not mean closing the message
-				$messageUid = ($messageUid===true ? $status['uidnext'] : $messageUid);
-				if (is_array($this->mail_bo->getMessageHeader($messageUid, '',false, false, $folder)))
+				$messageUid = ($messageUid === true ? $status['uidnext'] : $messageUid);
+				if (is_array($this->mail_bo->getMessageHeader($messageUid, '', false, false, $folder)))
 				{
 					$draft_id = mail_ui::generateRowID($this->mail_bo->profileID, $folder, $messageUid);
 					if ($content['lastDrafted'] != $draft_id && isset($content['lastDrafted']))
@@ -2574,7 +2573,7 @@ 
 						$duid = $dhA['msgUID'];
 						$dmailbox = $dhA['folder'];
 						// beware: do not delete the original mail as found in processedmail_id
-						$pMuid='';
+						$pMuid = '';
 						if ($content['processedmail_id'])
 						{
 							$pMhA = mail_ui::splitRowID($content['processedmail_id']);
@@ -2582,15 +2581,15 @@ 
 						}
 						//error_log(__METHOD__.__LINE__."#$pMuid#$pMuid!=$duid#".array2string($content['attachments']));
 						// do not delete the original message if attachments are present
-						if (empty($pMuid) || $pMuid!=$duid || empty($content['attachments']))
+						if (empty($pMuid) || $pMuid != $duid || empty($content['attachments']))
 						{
 							try
 							{
-								$this->mail_bo->deleteMessages($duid,$dmailbox,'remove_immediately');
+								$this->mail_bo->deleteMessages($duid, $dmailbox, 'remove_immediately');
 							}
 							catch (Api\Exception $e)
 							{
-								$msg = str_replace('"',"'",$e->getMessage());
+								$msg = str_replace('"', "'", $e->getMessage());
 								$success = false;
 								error_log(__METHOD__.__LINE__.$msg);
 							}
@@ -2611,7 +2610,7 @@ 
 		}
 		catch (Api\Exception\WrongUserinput $e)
 		{
-			$msg = str_replace('"',"'",$e->getMessage());
+			$msg = str_replace('"', "'", $e->getMessage());
 			error_log(__METHOD__.__LINE__.$msg);
 			$success = false;
 		}
@@ -2635,17 +2634,17 @@ 
 	static function resolveEmailAddressList($_emailAddressList)
 	{
 		$contacts_obs = null;
-		$addrFromList=array();
-		foreach((array)$_emailAddressList as $ak => $address)
+		$addrFromList = array();
+		foreach ((array)$_emailAddressList as $ak => $address)
 		{
-			if(is_int($address))
+			if (is_int($address))
 			{
 				if (!isset($contacts_obs)) $contacts_obj = new Api\Contacts();
 				// List was selected, expand to addresses
 				unset($_emailAddressList[$ak]);
-				$list = $contacts_obj->search('',array('n_fn','n_prefix','n_given','n_family','org_name','email','email_home'),'','','',False,'AND',false,array('list' =>(int)$address));
+				$list = $contacts_obj->search('', array('n_fn', 'n_prefix', 'n_given', 'n_family', 'org_name', 'email', 'email_home'), '', '', '', False, 'AND', false, array('list' =>(int)$address));
 				// Just add email addresses, they'll be checked below
-				foreach($list as $email)
+				foreach ($list as $email)
 				{
 					$addrFromList[] = $email['email'] ? $email['email'] : $email['email_home'];
 				}
@@ -2655,7 +2654,7 @@ 
 		{
 			foreach ($addrFromList as $addr)
 			{
-				if (!empty($addr)) $_emailAddressList[]=$addr;
+				if (!empty($addr)) $_emailAddressList[] = $addr;
 			}
 		}
 		return is_array($_emailAddressList) ? array_values($_emailAddressList) : (array)$_emailAddressList;
@@ -2669,15 +2668,15 @@ 
 	 * @param string $action ='button[saveAsDraft]' 'autosaving', 'button[saveAsDraft]' or 'button[saveAsDraftAndPrint]'
 	 * @return boolean return messageUID| false due to an error
 	 */
-	function saveAsDraft($_formData, &$savingDestination='', $action='button[saveAsDraft]')
+	function saveAsDraft($_formData, &$savingDestination = '', $action = 'button[saveAsDraft]')
 	{
 		//error_log(__METHOD__."(..., $savingDestination, action=$action)");
-		$mail_bo	= $this->mail_bo;
-		$mail		= new Api\Mailer($this->mail_bo->profileID);
+		$mail_bo = $this->mail_bo;
+		$mail = new Api\Mailer($this->mail_bo->profileID);
 
 		// preserve the bcc and if possible the save to folder information
-		$this->sessionData['folder']    = $_formData['folder'];
-		$this->sessionData['bcc']   = $_formData['bcc'];
+		$this->sessionData['folder'] = $_formData['folder'];
+		$this->sessionData['bcc'] = $_formData['bcc'];
 		$this->sessionData['mailidentity'] = $_formData['mailidentity'];
 		//$this->sessionData['stationeryID'] = $_formData['stationeryID'];
 		$this->sessionData['mailaccount']  = $_formData['mailaccount'];
@@ -2686,11 +2685,11 @@ 
 		{
 			$acc = Mail\Account::read($this->sessionData['mailaccount']);
 			//error_log(__METHOD__.__LINE__.array2string($acc));
-			$identity = Mail\Account::read_identity($acc['ident_id'],true);
+			$identity = Mail\Account::read_identity($acc['ident_id'], true);
 		}
 		catch (Exception $e)
 		{
-			$identity=array();
+			$identity = array();
 		}
 
 		$flags = '\\Seen \\Draft';
@@ -2700,7 +2699,7 @@ 
 		// folder list as Customheader
 		if (!empty($this->sessionData['folder']))
 		{
-			$folders = implode('|',array_unique($this->sessionData['folder']));
+			$folders = implode('|', array_unique($this->sessionData['folder']));
 			$mail->addHeader('X-Mailfolder', $folders);
 		}
 		$mail->addHeader('X-Mailidentity', $this->sessionData['mailidentity']);
@@ -2720,25 +2719,25 @@ 
 			$savingDestination = $this->sessionData['messageFolder'];
 			//error_log(__METHOD__.__LINE__.' SavingDestination:'.$savingDestination);
 		}
-		if (  !empty($_formData['printit']) && $_formData['printit'] == 0 ) $savingDestination = $mail_bo->getDraftFolder();
+		if (!empty($_formData['printit']) && $_formData['printit'] == 0) $savingDestination = $mail_bo->getDraftFolder();
 
 		// normaly Bcc is only added to recipients, but not as header visible to all recipients
 		$mail->forceBccHeader();
 
 		$mail_bo->openConnection();
-		if ($mail_bo->folderExists($savingDestination,true)) {
+		if ($mail_bo->folderExists($savingDestination, true)) {
 			try
 			{
 				$messageUid = $mail_bo->appendMessage($savingDestination, $mail->getRaw(), null, $flags);
 			}
 			catch (Api\Exception\WrongUserinput $e)
 			{
-				error_log(__METHOD__.__LINE__.lang("Save of message %1 failed. Could not save message to folder %2 due to: %3",__METHOD__,$savingDestination,$e->getMessage()));
+				error_log(__METHOD__.__LINE__.lang("Save of message %1 failed. Could not save message to folder %2 due to: %3", __METHOD__, $savingDestination, $e->getMessage()));
 				return false;
 			}
 
 		} else {
-			error_log(__METHOD__.__LINE__."->".lang("folder")." ". $savingDestination." ".lang("does not exist on IMAP Server."));
+			error_log(__METHOD__.__LINE__."->".lang("folder")." ".$savingDestination." ".lang("does not exist on IMAP Server."));
 			return false;
 		}
 		$mail_bo->closeConnection();
@@ -2747,26 +2746,26 @@ 
 
 	function send($_formData)
 	{
-		$mail_bo	= $this->mail_bo;
-		$mail 		= new Api\Mailer($mail_bo->profileID);
-		$messageIsDraft	=  false;
+		$mail_bo = $this->mail_bo;
+		$mail = new Api\Mailer($mail_bo->profileID);
+		$messageIsDraft = false;
 
-		$this->sessionData['mailaccount']	= $_formData['mailaccount'];
+		$this->sessionData['mailaccount'] = $_formData['mailaccount'];
 		$this->sessionData['to']	= self::resolveEmailAddressList($_formData['to']);
 		$this->sessionData['cc']	= self::resolveEmailAddressList($_formData['cc']);
-		$this->sessionData['bcc']	= self::resolveEmailAddressList($_formData['bcc']);
-		$this->sessionData['folder']	= $_formData['folder'];
+		$this->sessionData['bcc'] = self::resolveEmailAddressList($_formData['bcc']);
+		$this->sessionData['folder'] = $_formData['folder'];
 		$this->sessionData['replyto']	= $_formData['replyto'];
 		$this->sessionData['subject']	= trim($_formData['subject']);
-		$this->sessionData['body']	= $_formData['body'];
-		$this->sessionData['priority']	= $_formData['priority'];
+		$this->sessionData['body'] = $_formData['body'];
+		$this->sessionData['priority'] = $_formData['priority'];
 		$this->sessionData['mailidentity'] = $_formData['mailidentity'];
 		//$this->sessionData['stationeryID'] = $_formData['stationeryID'];
 		$this->sessionData['disposition'] = $_formData['disposition'];
-		$this->sessionData['mimeType']	= $_formData['mimeType'];
+		$this->sessionData['mimeType'] = $_formData['mimeType'];
 		$this->sessionData['to_infolog'] = $_formData['to_infolog'];
 		$this->sessionData['to_tracker'] = $_formData['to_tracker'];
-		$this->sessionData['attachments']  = $_formData['attachments'];
+		$this->sessionData['attachments'] = $_formData['attachments'];
 
 		if (isset($_formData['lastDrafted']) && !empty($_formData['lastDrafted']))
 		{
@@ -2775,11 +2774,11 @@ 
 		//error_log(__METHOD__.__LINE__.' Mode:'.$_formData['mode'].' PID:'.$_formData['processedmail_id']);
 		if (isset($_formData['mode']) && !empty($_formData['mode']))
 		{
-			if ($_formData['mode']=='forward' && !empty($_formData['processedmail_id']))
+			if ($_formData['mode'] == 'forward' && !empty($_formData['processedmail_id']))
 			{
-				$this->sessionData['forwardFlag']='forwarded';
-				$_formData['processedmail_id'] = explode(',',$_formData['processedmail_id']);
-				$this->sessionData['uid']=array();
+				$this->sessionData['forwardFlag'] = 'forwarded';
+				$_formData['processedmail_id'] = explode(',', $_formData['processedmail_id']);
+				$this->sessionData['uid'] = array();
 				foreach ($_formData['processedmail_id'] as $k =>$rowid)
 				{
 					$fhA = mail_ui::splitRowID($rowid);
@@ -2788,13 +2787,13 @@ 
 					if (!empty($fhA['folder'])) $this->sessionData['sourceFolder'] = $fhA['folder'];
 				}
 			}
-			if ($_formData['mode']=='reply' && !empty($_formData['processedmail_id']))
+			if ($_formData['mode'] == 'reply' && !empty($_formData['processedmail_id']))
 			{
 				$rhA = mail_ui::splitRowID($_formData['processedmail_id']);
 				$this->sessionData['uid'] = $rhA['msgUID'];
 				$this->sessionData['messageFolder'] = $rhA['folder'];
 			}
-			if ($_formData['mode']=='composefromdraft' && !empty($_formData['processedmail_id']))
+			if ($_formData['mode'] == 'composefromdraft' && !empty($_formData['processedmail_id']))
 			{
 				$dhA = mail_ui::splitRowID($_formData['processedmail_id']);
 				$this->sessionData['uid'] = $dhA['msgUID'];
@@ -2803,26 +2802,26 @@ 
 		}
 		// if the body is empty, maybe someone pasted something with scripts, into the message body
 		// this should not happen anymore, unless you call send directly, since the check was introduced with the action command
-		if(empty($this->sessionData['body']))
+		if (empty($this->sessionData['body']))
 		{
 			// this is to be found with the egw_unset_vars array for the _POST['body'] array
-			$name='_POST';
-			$key='body';
+			$name = '_POST';
+			$key = 'body';
 			#error_log($GLOBALS['egw_unset_vars'][$name.'['.$key.']']);
 			if (isset($GLOBALS['egw_unset_vars'][$name.'['.$key.']']))
 			{
-				$this->sessionData['body'] = self::_getCleanHTML( $GLOBALS['egw_unset_vars'][$name.'['.$key.']']);
-				$_formData['body']=$this->sessionData['body'];
+				$this->sessionData['body'] = self::_getCleanHTML($GLOBALS['egw_unset_vars'][$name.'['.$key.']']);
+				$_formData['body'] = $this->sessionData['body'];
 			}
 			#error_log($this->sessionData['body']);
 		}
-		if(empty($this->sessionData['to']) && empty($this->sessionData['cc']) &&
+		if (empty($this->sessionData['to']) && empty($this->sessionData['cc']) &&
 		   empty($this->sessionData['bcc']) && empty($this->sessionData['folder'])) {
 		   	$messageIsDraft = true;
 		}
 		try
 		{
-			$identity = Mail\Account::read_identity((int)$this->sessionData['mailidentity'],true);
+			$identity = Mail\Account::read_identity((int)$this->sessionData['mailidentity'], true);
 		}
 		catch (Exception $e)
 		{
@@ -2833,7 +2832,7 @@ 
 		// create the messages and store inline images
 		$inline_images = $this->createMessage($mail, $_formData, $identity);
 		// remember the identity
-		if ($_formData['to_infolog'] == 'on' || $_formData['to_tracker'] == 'on') $fromAddress = $mail->From;//$mail->FromName.($mail->FromName?' <':'').$mail->From.($mail->FromName?'>':'');
+		if ($_formData['to_infolog'] == 'on' || $_formData['to_tracker'] == 'on') $fromAddress = $mail->From; //$mail->FromName.($mail->FromName?' <':'').$mail->From.($mail->FromName?'>':'');
 		#print "<pre>". $mail->getMessageHeader() ."</pre><hr><br>";
 		#print "<pre>". $mail->getMessageBody() ."</pre><hr><br>";
 		#exit;
@@ -2844,12 +2843,12 @@ 
 		$folderOnMailAccount = array();
 		foreach ($folderToCheck as $k => $f)
 		{
-			$fval=$f;
-			$icServerID = $_formData['serverID'];//folders always assumed with serverID
-			if (stripos($f,'::')!==false) list($icServerID,$fval) = explode('::',$f,2);
-			if ($_formData['serverID']!=$_formData['mailaccount'])
+			$fval = $f;
+			$icServerID = $_formData['serverID']; //folders always assumed with serverID
+			if (stripos($f, '::') !== false) list($icServerID, $fval) = explode('::', $f, 2);
+			if ($_formData['serverID'] != $_formData['mailaccount'])
 			{
-				if ($icServerID == $_formData['serverID'] )
+				if ($icServerID == $_formData['serverID'])
 				{
 					$folder[$fval] = $fval;
 					$folderOnServerID[] = $fval;
@@ -2862,7 +2861,7 @@ 
 			}
 			else
 			{
-				if ($icServerID == $_formData['serverID'] )
+				if ($icServerID == $_formData['serverID'])
 				{
 					$folder[$fval] = $fval;
 					$folderOnServerID[] = $fval;
@@ -2879,7 +2878,7 @@ 
 		// we use the sentFolder settings of the choosen mailaccount
 		// sentFolder is account specific
 		$changeProfileOnSentFolderNeeded = false;
-		if ($_formData['serverID']!=$_formData['mailaccount'])
+		if ($_formData['serverID'] != $_formData['mailaccount'])
 		{
 			$this->changeProfile($_formData['mailaccount']);
 			//error_log(__METHOD__.__LINE__.'#'.$this->mail_bo->profileID.'<->'.$mail_bo->profileID.'#');
@@ -2887,30 +2886,30 @@ 
 			// sentFolder is account specific
 			$sentFolder = $this->mail_bo->getSentFolder();
 			//error_log(__METHOD__.__LINE__.' SentFolder configured:'.$sentFolder.'#');
-			if ($sentFolder&& $sentFolder!= 'none' && !$this->mail_bo->folderExists($sentFolder, true)) $sentFolder=false;
+			if ($sentFolder && $sentFolder != 'none' && !$this->mail_bo->folderExists($sentFolder, true)) $sentFolder = false;
 		}
 		else
 		{
 			$sentFolder = $mail_bo->getSentFolder();
 			//error_log(__METHOD__.__LINE__.' SentFolder configured:'.$sentFolder.'#');
-			if ($sentFolder&& $sentFolder!= 'none' && !$mail_bo->folderExists($sentFolder, true)) $sentFolder=false;
+			if ($sentFolder && $sentFolder != 'none' && !$mail_bo->folderExists($sentFolder, true)) $sentFolder = false;
 		}
 		//error_log(__METHOD__.__LINE__.' SentFolder configured:'.$sentFolder.'#');
 
 		// we switch $this->mail_bo back to the account we used to work on
-		if ($_formData['serverID']!=$_formData['mailaccount'])
+		if ($_formData['serverID'] != $_formData['mailaccount'])
 		{
 			$this->changeProfile($_formData['serverID']);
 		}
 
 
-		if(isset($sentFolder) && $sentFolder && $sentFolder != 'none' &&
+		if (isset($sentFolder) && $sentFolder && $sentFolder != 'none' &&
 			$this->mailPreferences['sendOptions'] != 'send_only' &&
 			$messageIsDraft == false)
 		{
 			if ($sentFolder)
 			{
-				if ($_formData['serverID']!=$_formData['mailaccount'])
+				if ($_formData['serverID'] != $_formData['mailaccount'])
 				{
 					$folderOnMailAccount[] = $sentFolder;
 				}
@@ -2927,14 +2926,14 @@ 
 		}
 		else
 		{
-			if (((!isset($sentFolder)||$sentFolder==false) && $this->mailPreferences['sendOptions'] != 'send_only') ||
+			if (((!isset($sentFolder) || $sentFolder == false) && $this->mailPreferences['sendOptions'] != 'send_only') ||
 				($this->mailPreferences['sendOptions'] != 'send_only' &&
 				$sentFolder != 'none')) $this->errorInfo = lang("No Send Folder set in preferences");
 		}
 		// draftFolder is on Server we start from
-		if($messageIsDraft == true) {
+		if ($messageIsDraft == true) {
 			$draftFolder = $mail_bo->getDraftFolder();
-			if(!empty($draftFolder) && $mail_bo->folderExists($draftFolder,true)) {
+			if (!empty($draftFolder) && $mail_bo->folderExists($draftFolder, true)) {
 				$this->sessionData['folder'] = array($draftFolder);
 				$folderOnServerID[] = $draftFolder;
 				$folder[$draftFolder] = $draftFolder;
@@ -2943,10 +2942,10 @@ 
 		if ($folderOnServerID) $folderOnServerID = array_unique($folderOnServerID);
 		if ($folderOnMailAccount) $folderOnMailAccount = array_unique($folderOnMailAccount);
 		if (($this->mailPreferences['sendOptions'] != 'send_only' && $sentFolder != 'none') &&
-			!( count($folder) > 0) &&
-			!($_formData['to_infolog']=='on' || $_formData['to_tracker']=='on'))
+			!(count($folder) > 0) &&
+			!($_formData['to_infolog'] == 'on' || $_formData['to_tracker'] == 'on'))
 		{
-			$this->errorInfo = lang("Error: ").lang("No Folder destination supplied, and no folder to save message or other measure to store the mail (save to infolog/tracker) provided, but required.").($this->errorInfo?' '.$this->errorInfo:'');
+			$this->errorInfo = lang("Error: ").lang("No Folder destination supplied, and no folder to save message or other measure to store the mail (save to infolog/tracker) provided, but required.").($this->errorInfo ? ' '.$this->errorInfo : '');
 			#error_log($this->errorInfo);
 			return false;
 		}
@@ -2955,18 +2954,18 @@ 
 		@set_time_limit(120);
 		//$mail->SMTPDebug = 10;
 		//error_log("Folder:".count(array($this->sessionData['folder']))."To:".count((array)$this->sessionData['to'])."CC:". count((array)$this->sessionData['cc']) ."bcc:".count((array)$this->sessionData['bcc']));
-		if(count((array)$this->sessionData['to']) > 0 || count((array)$this->sessionData['cc']) > 0 || count((array)$this->sessionData['bcc']) > 0) {
+		if (count((array)$this->sessionData['to']) > 0 || count((array)$this->sessionData['cc']) > 0 || count((array)$this->sessionData['bcc']) > 0) {
 			try {
 				$mail->send();
 			}
-			catch(Exception $e) {
+			catch (Exception $e) {
 				_egw_log_exception($e);
 				//if( $e->details ) error_log(__METHOD__.__LINE__.array2string($e->details));
-				$this->errorInfo = $e->getMessage().($e->details?'<br/>'.$e->details:'');
+				$this->errorInfo = $e->getMessage().($e->details ? '<br/>'.$e->details : '');
 				return false;
 			}
 		} else {
-			if (count(array($this->sessionData['folder']))>0 && !empty($this->sessionData['folder'])) {
+			if (count(array($this->sessionData['folder'])) > 0 && !empty($this->sessionData['folder'])) {
 				//error_log(__METHOD__.__LINE__."Folders:".print_r($this->sessionData['folder'],true));
 			} else {
 				$this->errorInfo = lang("Error: ").lang("No Address TO/CC/BCC supplied, and no folder to save message to provided.");
@@ -2994,15 +2993,15 @@ 
 		// copying mail to folder
 		if (count($folder) > 0)
 		{
-			foreach($folderOnServerID as $folderName) {
+			foreach ($folderOnServerID as $folderName) {
 				if (is_array($folderName)) $folderName = array_shift($folderName); // should not happen at all
 				//error_log(__METHOD__.__LINE__." attempt to save message to:".array2string($folderName));
 				// if $_formData['serverID']!=$_formData['mailaccount'] skip copying to sentfolder on serverID
 				// if($_formData['serverID']!=$_formData['mailaccount'] && $folderName==$sentFolder && $changeProfileOnSentFolderNeeded) continue;
-				if ($mail_bo->folderExists($folderName,true)) {
-					if($mail_bo->isSentFolder($folderName)) {
+				if ($mail_bo->folderExists($folderName, true)) {
+					if ($mail_bo->isSentFolder($folderName)) {
 						$flags = '\\Seen';
-					} elseif($mail_bo->isDraftFolder($folderName)) {
+					} elseif ($mail_bo->isDraftFolder($folderName)) {
 						$flags = '\\Draft';
 					} else {
 						$flags = '\\Seen';
@@ -3018,25 +3017,25 @@ 
 					}
 					catch (Api\Exception\WrongUserinput $e)
 					{
-						error_log(__METHOD__.__LINE__.'->'.lang("Import of message %1 failed. Could not save message to folder %2 due to: %3",$this->sessionData['subject'],$folderName,$e->getMessage()));
+						error_log(__METHOD__.__LINE__.'->'.lang("Import of message %1 failed. Could not save message to folder %2 due to: %3", $this->sessionData['subject'], $folderName, $e->getMessage()));
 					}
 				}
 				else
 				{
-					error_log(__METHOD__.__LINE__.'->'.lang("Import of message %1 failed. Destination Folder %2 does not exist.",$this->sessionData['subject'],$folderName));
+					error_log(__METHOD__.__LINE__.'->'.lang("Import of message %1 failed. Destination Folder %2 does not exist.", $this->sessionData['subject'], $folderName));
 				}
 			}
 			// if we choose to send from a differing profile
 			if ($folderOnMailAccount)  $this->changeProfile($_formData['mailaccount']);
-			foreach($folderOnMailAccount as $folderName) {
+			foreach ($folderOnMailAccount as $folderName) {
 				if (is_array($folderName)) $folderName = array_shift($folderName); // should not happen at all
 				//error_log(__METHOD__.__LINE__." attempt to save message to:".array2string($folderName));
 				// if $_formData['serverID']!=$_formData['mailaccount'] skip copying to sentfolder on serverID
 				// if($_formData['serverID']!=$_formData['mailaccount'] && $folderName==$sentFolder && $changeProfileOnSentFolderNeeded) continue;
-				if ($this->mail_bo->folderExists($folderName,true)) {
-					if($this->mail_bo->isSentFolder($folderName)) {
+				if ($this->mail_bo->folderExists($folderName, true)) {
+					if ($this->mail_bo->isSentFolder($folderName)) {
 						$flags = '\\Seen';
-					} elseif($this->mail_bo->isDraftFolder($folderName)) {
+					} elseif ($this->mail_bo->isDraftFolder($folderName)) {
 						$flags = '\\Draft';
 					} else {
 						$flags = '\\Seen';
@@ -3052,12 +3051,12 @@ 
 					}
 					catch (Api\Exception\WrongUserinput $e)
 					{
-						error_log(__METHOD__.__LINE__.'->'.lang("Import of message %1 failed. Could not save message to folder %2 due to: %3",$this->sessionData['subject'],$folderName,$e->getMessage()));
+						error_log(__METHOD__.__LINE__.'->'.lang("Import of message %1 failed. Could not save message to folder %2 due to: %3", $this->sessionData['subject'], $folderName, $e->getMessage()));
 					}
 				}
 				else
 				{
-					error_log(__METHOD__.__LINE__.'->'.lang("Import of message %1 failed. Destination Folder %2 does not exist.",$this->sessionData['subject'],$folderName));
+					error_log(__METHOD__.__LINE__.'->'.lang("Import of message %1 failed. Destination Folder %2 does not exist.", $this->sessionData['subject'], $folderName));
 				}
 			}
 			if ($folderOnMailAccount)  $this->changeProfile($_formData['serverID']);
@@ -3068,27 +3067,27 @@ 
 		$lastDrafted = false;
 		if (isset($this->sessionData['lastDrafted']))
 		{
-			$lastDrafted=array();
+			$lastDrafted = array();
 			$dhA = mail_ui::splitRowID($this->sessionData['lastDrafted']);
 			$lastDrafted['uid'] = $dhA['msgUID'];
 			$lastDrafted['folder'] = $dhA['folder'];
-			if (isset($lastDrafted['uid']) && !empty($lastDrafted['uid'])) $lastDrafted['uid']=trim($lastDrafted['uid']);
+			if (isset($lastDrafted['uid']) && !empty($lastDrafted['uid'])) $lastDrafted['uid'] = trim($lastDrafted['uid']);
 			// manually drafted, do not delete
 			// will be handled later on IF mode was $_formData['mode']=='composefromdraft'
-			if (isset($lastDrafted['uid']) && (empty($lastDrafted['uid']) || $lastDrafted['uid'] == $this->sessionData['uid'])) $lastDrafted=false;
+			if (isset($lastDrafted['uid']) && (empty($lastDrafted['uid']) || $lastDrafted['uid'] == $this->sessionData['uid'])) $lastDrafted = false;
 			//error_log(__METHOD__.__LINE__.array2string($lastDrafted));
 		}
 		if ($lastDrafted && is_array($lastDrafted) && $mail_bo->isDraftFolder($lastDrafted['folder']))
 		{
 			try
 			{
-				if ($this->sessionData['lastDrafted'] != $this->sessionData['uid'] || !($_formData['mode']=='composefromdraft' &&
-					($_formData['to_infolog'] == 'on' || $_formData['to_tracker'] == 'on' || $_formData['to_calendar'] == 'on' )&&$this->sessionData['attachments']))
+				if ($this->sessionData['lastDrafted'] != $this->sessionData['uid'] || !($_formData['mode'] == 'composefromdraft' &&
+					($_formData['to_infolog'] == 'on' || $_formData['to_tracker'] == 'on' || $_formData['to_calendar'] == 'on') && $this->sessionData['attachments']))
 				{
 					//error_log(__METHOD__.__LINE__."#".$lastDrafted['uid'].'#'.$lastDrafted['folder'].array2string($_formData));
 					//error_log(__METHOD__.__LINE__."#".array2string($_formData));
 					//error_log(__METHOD__.__LINE__."#".array2string($this->sessionData));
-					$mail_bo->deleteMessages($lastDrafted['uid'],$lastDrafted['folder'],'remove_immediately');
+					$mail_bo->deleteMessages($lastDrafted['uid'], $lastDrafted['folder'], 'remove_immediately');
 				}
 			}
 			catch (Api\Exception $e)
@@ -3100,22 +3099,22 @@ 
 		unset($this->sessionData['lastDrafted']);
 
 		//error_log("handling draft messages, flagging and such");
-		if((isset($this->sessionData['uid']) && isset($this->sessionData['messageFolder']))
+		if ((isset($this->sessionData['uid']) && isset($this->sessionData['messageFolder']))
 			|| (isset($this->sessionData['forwardFlag']) && isset($this->sessionData['sourceFolder']))) {
 			// mark message as answered
 			$mail_bo->openConnection();
-			$mail_bo->reopen(($this->sessionData['messageFolder']?$this->sessionData['messageFolder']:$this->sessionData['sourceFolder']));
+			$mail_bo->reopen(($this->sessionData['messageFolder'] ? $this->sessionData['messageFolder'] : $this->sessionData['sourceFolder']));
 			// if the draft folder is a starting part of the messages folder, the draft message will be deleted after the send
 			// unless your templatefolder is a subfolder of your draftfolder, and the message is in there
 			if ($mail_bo->isDraftFolder($this->sessionData['messageFolder']) && !$mail_bo->isTemplateFolder($this->sessionData['messageFolder']))
 			{
 				try // message may be deleted already, as it maybe done by autosave
 				{
-					if ($_formData['mode']=='composefromdraft' &&
+					if ($_formData['mode'] == 'composefromdraft' &&
 						!(($_formData['to_infolog'] == 'on' || $_formData['to_tracker'] == 'on' || $_formData['to_calendar'] == 'on') && $this->sessionData['attachments']))
 					{
 						//error_log(__METHOD__.__LINE__."#".$this->sessionData['uid'].'#'.$this->sessionData['messageFolder']);
-						$mail_bo->deleteMessages(array($this->sessionData['uid']),$this->sessionData['messageFolder']);
+						$mail_bo->deleteMessages(array($this->sessionData['uid']), $this->sessionData['messageFolder']);
 					}
 				}
 				catch (Api\Exception $e)
@@ -3124,14 +3123,14 @@ 
 					unset($e);
 				}
 			} else {
-				$mail_bo->flagMessages("answered", $this->sessionData['uid'],($this->sessionData['messageFolder']?$this->sessionData['messageFolder']:$this->sessionData['sourceFolder']));
+				$mail_bo->flagMessages("answered", $this->sessionData['uid'], ($this->sessionData['messageFolder'] ? $this->sessionData['messageFolder'] : $this->sessionData['sourceFolder']));
 				//error_log(__METHOD__.__LINE__.array2string(array_keys($this->sessionData)).':'.array2string($this->sessionData['forwardedUID']).' F:'.$this->sessionData['sourceFolder']);
-				if (array_key_exists('forwardFlag',$this->sessionData) && $this->sessionData['forwardFlag']=='forwarded')
+				if (array_key_exists('forwardFlag', $this->sessionData) && $this->sessionData['forwardFlag'] == 'forwarded')
 				{
 					try
 					{
 						//error_log(__METHOD__.__LINE__.':'.array2string($this->sessionData['forwardedUID']).' F:'.$this->sessionData['sourceFolder']);
-						$mail_bo->flagMessages("forwarded", $this->sessionData['forwardedUID'],$this->sessionData['sourceFolder']);
+						$mail_bo->flagMessages("forwarded", $this->sessionData['forwardedUID'], $this->sessionData['sourceFolder']);
 					}
 					catch (Api\Exception $e)
 					{
@@ -3159,49 +3158,49 @@ 
 		if (is_array($this->sessionData['bcc'])) $mailaddresses['bcc'] = $this->sessionData['bcc'];
 		if (!empty($mailaddresses)) $mailaddresses['from'] = Mail\Html::decodeMailHeader($fromAddress);
 
-		if ($_formData['to_infolog'] == 'on' || $_formData['to_tracker'] == 'on' || $_formData['to_calendar'] == 'on' )
+		if ($_formData['to_infolog'] == 'on' || $_formData['to_tracker'] == 'on' || $_formData['to_calendar'] == 'on')
 		{
 			$this->sessionData['attachments'] = array_merge((array)$this->sessionData['attachments'], (array)$inline_images);
 
-			foreach(array('to_infolog','to_tracker','to_calendar') as $app_key)
+			foreach (array('to_infolog', 'to_tracker', 'to_calendar') as $app_key)
 			{
 				$entryid = $_formData['to_integrate_ids'][0][$app_key];
 				if ($_formData[$app_key] == 'on')
 				{
-					$app_name = substr($app_key,3);
+					$app_name = substr($app_key, 3);
 					// Get registered hook data of the app called for integration
-					$hook = Api\Hooks::single(array('location'=> 'mail_import'),$app_name);
+					$hook = Api\Hooks::single(array('location'=> 'mail_import'), $app_name);
 
 					// store mail / eml in temp. file to not have to download it from mail-server again
-					$eml = tempnam($GLOBALS['egw_info']['server']['temp_dir'],'mail_integrate');
+					$eml = tempnam($GLOBALS['egw_info']['server']['temp_dir'], 'mail_integrate');
 					$eml_fp = fopen($eml, 'w');
 					stream_copy_to_stream($mail->getRaw(), $eml_fp);
 					fclose($eml_fp);
 					$target = array(
 						'menuaction' => $hook['menuaction'],
-						'egw_data' => Link::set_data(null,'mail_integration::integrate',array(
+						'egw_data' => Link::set_data(null, 'mail_integration::integrate', array(
 							$mailaddresses,
 							$this->sessionData['subject'],
 							$this->convertHTMLToText($this->sessionData['body']),
 							$this->sessionData['attachments'],
 							false, // date
 							$eml,
-							$_formData['serverID']),true),
+							$_formData['serverID']), true),
 						'app' => $app_name
 					);
 					if ($entryid) $target['entry_id'] = $entryid;
 					// Open the app called for integration in a popup
 					// and store the mail raw data as egw_data, in order to
 					// be stored from registered app method later
-					Framework::popup(Egw::link('/index.php', $target),'_blank',$hook['popup']);
+					Framework::popup(Egw::link('/index.php', $target), '_blank', $hook['popup']);
 				}
 			}
 		}
 		// only clean up temp-files, if we dont need them for mail_integration::integrate
-		elseif(is_array($this->sessionData['attachments']))
+		elseif (is_array($this->sessionData['attachments']))
 		{
-			foreach($this->sessionData['attachments'] as $value) {
-				if (!empty($value['file']) && parse_url($value['file'],PHP_URL_SCHEME) != 'vfs') {	// happens when forwarding mails
+			foreach ($this->sessionData['attachments'] as $value) {
+				if (!empty($value['file']) && parse_url($value['file'], PHP_URL_SCHEME) != 'vfs') {	// happens when forwarding mails
 					unlink($GLOBALS['egw_info']['server']['temp_dir'].'/'.$value['file']);
 				}
 			}
@@ -3218,7 +3217,7 @@ 
 	 * @param array $content
 	 * @return array - the input, enriched with some not set attributes
 	 */
-	function setDefaults($content=array())
+	function setDefaults($content = array())
 	{
 		// if there's not already an identity selected for current account
 		if (empty($content['mailidentity']))
@@ -3227,7 +3226,7 @@ 
 			if (!empty($GLOBALS['egw_info']['user']['preferences']['mail']['LastSignatureIDUsed']))
 			{
 				$sigPref = $GLOBALS['egw_info']['user']['preferences']['mail']['LastSignatureIDUsed'];
-				if (!empty($sigPref[$this->mail_bo->profileID]) && $sigPref[$this->mail_bo->profileID]>0)
+				if (!empty($sigPref[$this->mail_bo->profileID]) && $sigPref[$this->mail_bo->profileID] > 0)
 				{
 					$content['mailidentity'] = $sigPref[$this->mail_bo->profileID];
 				}
@@ -3236,7 +3235,7 @@ 
 			if (empty($content['mailidentity']))
 			{
 				$default_identity = null;
-				foreach(Mail\Account::identities($this->mail_bo->profileID, true, 'params') as $identity)
+				foreach (Mail\Account::identities($this->mail_bo->profileID, true, 'params') as $identity)
 				{
 					if (!isset($default_identity)) $default_identity = $identity['ident_id'];
 					if (!empty($identity['ident_signature']))
@@ -3251,7 +3250,7 @@ 
 		if (!isset($content['mimeType']) || empty($content['mimeType']))
 		{
 			$content['mimeType'] = 'html';
-			if (!empty($this->mailPreferences['composeOptions']) && $this->mailPreferences['composeOptions']=="text") $content['mimeType']  = 'plain';
+			if (!empty($this->mailPreferences['composeOptions']) && $this->mailPreferences['composeOptions'] == "text") $content['mimeType'] = 'plain';
 		}
 		return $content;
 
@@ -3274,7 +3273,7 @@ 
 	 * @param boolean $_noPrefixId = false, if set to true folders name does not get prefixed by account id
 	 * @return type
 	 */
-	function ajax_searchFolder($_searchStringLength=2, $_returnList=false, $_mailaccountToSearch=null, $_noPrefixId=false) {
+	function ajax_searchFolder($_searchStringLength = 2, $_returnList = false, $_mailaccountToSearch = null, $_noPrefixId = false) {
 		//error_log(__METHOD__.__LINE__.':'.array2string($_REQUEST));
 		static $useCacheIfPossible = null;
 		if (is_null($useCacheIfPossible)) $useCacheIfPossible = true;
@@ -3287,36 +3286,36 @@ 
 		{
 			$this->changeProfile($_mailaccountToSearch);
 		}
-		if (strlen($_searchString)>=$_searchStringLength && isset($this->mail_bo->icServer))
+		if (strlen($_searchString) >= $_searchStringLength && isset($this->mail_bo->icServer))
 		{
 			//error_log(__METHOD__.__LINE__.':'.$this->mail_bo->icServer->ImapServerId);
 			$this->mail_bo->openConnection($this->mail_bo->icServer->ImapServerId);
 			//error_log(__METHOD__.__LINE__.array2string($_searchString).'<->'.$searchString);
-			$folderObjects = $this->mail_bo->getFolderObjects(true,false,true,$useCacheIfPossible);
-			if (count($folderObjects)<=1) {
+			$folderObjects = $this->mail_bo->getFolderObjects(true, false, true, $useCacheIfPossible);
+			if (count($folderObjects) <= 1) {
 				$useCacheIfPossible = false;
 			}
 			else
 			{
 				$useCacheIfPossible = true;
 			}
-			$searchString = Api\Translation::convert($_searchString, Mail::$displayCharset,'UTF7-IMAP');
+			$searchString = Api\Translation::convert($_searchString, Mail::$displayCharset, 'UTF7-IMAP');
 			foreach ($folderObjects as $k =>$fA)
 			{
 				//error_log(__METHOD__.__LINE__.$_searchString.'/'.$searchString.' in '.$k.'->'.$fA->displayName);
-				$f=false;
-				$key = $_noPrefixId?$k:$_mailaccountToSearch.'::'.$k;
-				if ($_searchStringLength<=0)
+				$f = false;
+				$key = $_noPrefixId ? $k : $_mailaccountToSearch.'::'.$k;
+				if ($_searchStringLength <= 0)
 				{
-					$f=true;
+					$f = true;
 					$results[] = array('id'=>$key, 'label' => htmlspecialchars($fA->displayName));
 				}
-				if ($f==false && stripos($fA->displayName,$_searchString)!==false)
+				if ($f == false && stripos($fA->displayName, $_searchString) !== false)
 				{
-					$f=true;
+					$f = true;
 					$results[] = array('id'=>$key, 'label' => htmlspecialchars($fA->displayName));
 				}
-				if ($f==false && stripos($k,$searchString)!==false)
+				if ($f == false && stripos($k, $searchString) !== false)
 				{
 					$results[] = array('id'=>$key, 'label' => htmlspecialchars($fA->displayName));
 				}
@@ -3344,13 +3343,13 @@ 
 		exit();
 	}
 
-	public static function ajax_searchAddress($_searchStringLength=2) {
+	public static function ajax_searchAddress($_searchStringLength = 2) {
 		//error_log(__METHOD__. "request from seachAddress " . $_REQUEST['query']);
 		$_searchString = trim($_REQUEST['query']);
 		$include_lists = (boolean)$_REQUEST['include_lists'];
 
 		$contacts_obj = new Api\Contacts();
-		if ($GLOBALS['egw_info']['user']['apps']['addressbook'] && strlen($_searchString)>=$_searchStringLength)
+		if ($GLOBALS['egw_info']['user']['apps']['addressbook'] && strlen($_searchString) >= $_searchStringLength)
 		{
 			//error_log(__METHOD__.__LINE__.array2string($_searchString));
 			$showAccounts = empty($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts']);
@@ -3359,64 +3358,64 @@ 
 			{
 				if (mb_strlen($v) < 3) unset($search[$k]);
 			}
-			$search_str = implode(' +', $search);	// tell contacts/so_sql to AND search patterns
+			$search_str = implode(' +', $search); // tell contacts/so_sql to AND search patterns
 			//error_log(__METHOD__.__LINE__.$_searchString);
 			$filter = $showAccounts ? array() : array('account_id' => null);
-			$filter['cols_to_search'] = array('n_prefix','n_given','n_family','org_name','email','email_home');
-			$cols = array('n_fn','n_prefix','n_given','n_family','org_name','email','email_home');
-			$contacts = $contacts_obj->search($search_str, $cols, 'n_fn', '', '%', false, 'OR', array(0,100), $filter);
+			$filter['cols_to_search'] = array('n_prefix', 'n_given', 'n_family', 'org_name', 'email', 'email_home');
+			$cols = array('n_fn', 'n_prefix', 'n_given', 'n_family', 'org_name', 'email', 'email_home');
+			$contacts = $contacts_obj->search($search_str, $cols, 'n_fn', '', '%', false, 'OR', array(0, 100), $filter);
 			// additionally search the accounts, if the contact storage is not the account storage
 			if ($showAccounts && $contacts_obj->so_accounts)
 			{
 				$filter['owner'] = 0;
-				$accounts = $contacts_obj->search($search_str, $cols, 'n_fn', '', '%', false,'OR', array(0,100), $filter);
+				$accounts = $contacts_obj->search($search_str, $cols, 'n_fn', '', '%', false, 'OR', array(0, 100), $filter);
 
 				if ($contacts && $accounts)
 				{
-					$contacts = array_merge($contacts,$accounts);
-					usort($contacts,function($a, $b)
+					$contacts = array_merge($contacts, $accounts);
+					usort($contacts, function($a, $b)
 					{
 						return strcasecmp($a['n_fn'], $b['n_fn']);
 					});
 				}
-				elseif($accounts)
+				elseif ($accounts)
 				{
-					$contacts =& $accounts;
+					$contacts = & $accounts;
 				}
 				unset($accounts);
 			}
 		}
 		$results = array();
-		if(is_array($contacts)) {
-			foreach($contacts as $contact) {
-				foreach(array($contact['email'],$contact['email_home']) as $email) {
+		if (is_array($contacts)) {
+			foreach ($contacts as $contact) {
+				foreach (array($contact['email'], $contact['email_home']) as $email) {
 					// avoid wrong addresses, if an rfc822 encoded address is in addressbook
 					//$email = preg_replace("/(^.*<)([a-zA-Z0-9_\-]+@[a-zA-Z0-9_\-\.]+)(.*)/",'$2',$email);
 					$rfcAddr = Mail::parseAddressList($email);
-					$_rfcAddr=$rfcAddr->first();
+					$_rfcAddr = $rfcAddr->first();
 					if (!$_rfcAddr->valid)
 					{
 						continue; // skip address if we encounter an error here
 					}
 					$email = $_rfcAddr->mailbox.'@'.$_rfcAddr->host;
 
-					if (method_exists($contacts_obj,'search'))
+					if (method_exists($contacts_obj, 'search'))
 					{
-						$contact['n_fn']='';
+						$contact['n_fn'] = '';
 						if (!empty($contact['n_prefix'])) $contact['n_fn'] = $contact['n_prefix'];
-						if (!empty($contact['n_given'])) $contact['n_fn'] .= ($contact['n_fn']?' ':'').$contact['n_given'];
-						if (!empty($contact['n_family'])) $contact['n_fn'] .= ($contact['n_fn']?' ':'').$contact['n_family'];
-						if (!empty($contact['org_name'])) $contact['n_fn'] .= ($contact['n_fn']?' ':'').'('.$contact['org_name'].')';
-						$contact['n_fn'] = str_replace(array(',','@'),' ',$contact['n_fn']);
+						if (!empty($contact['n_given'])) $contact['n_fn'] .= ($contact['n_fn'] ? ' ' : '').$contact['n_given'];
+						if (!empty($contact['n_family'])) $contact['n_fn'] .= ($contact['n_fn'] ? ' ' : '').$contact['n_family'];
+						if (!empty($contact['org_name'])) $contact['n_fn'] .= ($contact['n_fn'] ? ' ' : '').'('.$contact['org_name'].')';
+						$contact['n_fn'] = str_replace(array(',', '@'), ' ', $contact['n_fn']);
 					}
 					else
 					{
-						$contact['n_fn'] = str_replace(array(',','@'),' ',$contact['n_fn']);
+						$contact['n_fn'] = str_replace(array(',', '@'), ' ', $contact['n_fn']);
 					}
 					$args = explode('@', trim($email));
 					$args[] = trim($contact['n_fn'] ? $contact['n_fn'] : $contact['fn']);
 					$completeMailString = call_user_func_array('imap_rfc822_write_address', $args);
-					if(!empty($email) && in_array($completeMailString ,$results) === false) {
+					if (!empty($email) && in_array($completeMailString, $results) === false) {
 						$results[] = array(
 							'id'=>$completeMailString,
 							'label' => $completeMailString,
@@ -3432,10 +3431,10 @@ 
 		// Add groups
 		$group_options = array('account_type' => 'groups');
 		$groups = $GLOBALS['egw']->accounts->link_query($_searchString, $group_options);
-		foreach($groups as $g_id => $name)
+		foreach ($groups as $g_id => $name)
 		{
 			$group = $GLOBALS['egw']->accounts->read($g_id);
-			if(!$group['account_email']) continue;
+			if (!$group['account_email']) continue;
 			$args = explode('@', trim($group['account_email']));
 			$args[] = $name;
 			$completeMailString = call_user_func_array('imap_rfc822_write_address', $args);
@@ -3448,7 +3447,7 @@ 
 		}
 
 		// Add up to 5 matching mailing lists
-		if($include_lists)
+		if ($include_lists)
 		{
 			$lists = array_filter(
 				$contacts_obj->get_lists(Acl::READ),
@@ -3457,7 +3456,7 @@ 
 				}
 			);
 			$list_count = 0;
-			foreach($lists as $key => $list_name)
+			foreach ($lists as $key => $list_name)
 			{
 				$results[] = array(
 					'id'	=> $key,
@@ -3467,7 +3466,7 @@ 
 					'title' => lang('Mailinglist'),
 					'data'	=> $key
 				);
-				if($list_count++ > 5) break;
+				if ($list_count++ > 5) break;
 			}
 		}
 		 // switch regular JSON response handling off
@@ -3488,7 +3487,7 @@ 
 	public function ajax_merge($contact_id)
 	{
 		$response = Api\Json\Response::get();
-		if(class_exists($_REQUEST['merge']) && is_subclass_of($_REQUEST['merge'], 'EGroupware\\Api\\Storage\\Merge'))
+		if (class_exists($_REQUEST['merge']) && is_subclass_of($_REQUEST['merge'], 'EGroupware\\Api\\Storage\\Merge'))
 		{
 			$document_merge = new $_REQUEST['merge']();
 		}
@@ -3498,7 +3497,7 @@ 
 		}
 		$this->mail_bo->openConnection();
 
-		if(($error = $document_merge->check_document($_REQUEST['document'],'')))
+		if (($error = $document_merge->check_document($_REQUEST['document'], '')))
 		{
 			$response->error($error);
 			return;
@@ -3509,11 +3508,11 @@ 
 		try
 		{
 			$results = $this->mail_bo->importMessageToMergeAndSend(
-				$document_merge, Vfs::PREFIX . $_REQUEST['document'],
+				$document_merge, Vfs::PREFIX.$_REQUEST['document'],
 				// Send an extra non-numeric ID to force actual send of document
 				// instead of save as draft
 				array((int)$contact_id, ''),
-				$folder,$merged_mail_id
+				$folder, $merged_mail_id
 			);
 		}
 		catch (Exception $e)
@@ -3527,13 +3526,13 @@ 
 			);
 		}
 
-		if($results['success'])
+		if ($results['success'])
 		{
-			$response->data(implode(',',$results['success']));
+			$response->data(implode(',', $results['success']));
 		}
-		if($results['failed'])
+		if ($results['failed'])
 		{
-			$response->error(implode(',',$results['failed']));
+			$response->error(implode(',', $results['failed']));
 		}
 	}
 }

mail/inc/class.mail_sieve.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -1278,7 +1278,7 @@
 	 * int $_searchStringLength
 	 * @param boolean $_returnList
 	 * @param int $_mailaccountToSearch
-	 * @param boolean $_noPrefixID = false, if set to true folders name does not get prefixed by account id
+	 * @param boolean $_noPrefixId = false, if set to true folders name does not get prefixed by account id
 	 */
 	function ajax_getFolders ($_searchStringLength=2, $_returnList=false, $_mailaccountToSearch=null, $_noPrefixId=false)
 	{

Indentation +6 added lines, -6 removed lines

@@ -275,7 +275,7 @@ 
 
 			//$ruleID is calculated by priority from the selected rule and is an unique ID
 			$content['ruleID'] = $ruleID = ($this->rulesByID['priority'] -1) / 2;
-            $error = 0;
+			$error = 0;
 			switch ($button)
 			{
 				case 'save':
@@ -1202,7 +1202,7 @@ 
 	/**
 	 *
 	 * Get the data for iterating the rows on rules list grid
- 	 *
+	 *
 	 * @return {boolean|array} Array of rows | false if failed
 	 */
 	function get_rows()
@@ -1222,7 +1222,7 @@ 
 				{
 					$row['class'] = 'mail_sieve_DISABLED';
 				}
-            }
+			}
 		}
 		else
 		{
@@ -1247,7 +1247,7 @@ 
 				'caption' => 'Edit',
 				'default' => true,
 				'onExecute' => 'javaScript:app.mail.action',
-                'disableClass' => 'th'
+				'disableClass' => 'th'
 			),
 			'add' => array(
 				'caption' => 'Add',
@@ -1257,13 +1257,13 @@ 
 				'caption' => 'Enable',
 				'onExecute' => 'javaScript:app.mail.action',
 				'enableClass' => 'mail_sieve_DISABLED',
-                'hideOnDisabled' => true
+				'hideOnDisabled' => true
 			),
 			'disable' => array(
 				'caption' => 'Disable',
 				'onExecute' => 'javaScript:app.mail.action',
 				'disableClass' => 'mail_sieve_DISABLED',
-                'hideOnDisabled' => true
+				'hideOnDisabled' => true
 			),
 			'delete' => array(
 				'caption' => 'Delete',

Braces +39 added lines, -11 removed lines

@@ -305,11 +305,21 @@ 
 						unset($newRule['action_reject_text']);
 
 						$newRule['flg'] = 0 ;
-						if( $newRule['continue'] ) { $newRule['flg'] += 1; }
-						if( $newRule['gthan'] )    { $newRule['flg'] += 2; }
-						if( $newRule['anyof'] )    { $newRule['flg'] += 4; }
-						if( $newRule['keep'] )     { $newRule['flg'] += 8; }
-						if( $newRule['regexp'] )   { $newRule['flg'] += 128; }
+						if( $newRule['continue'] )
+						{
+$newRule['flg'] += 1; }
+						if( $newRule['gthan'] )
+						{
+$newRule['flg'] += 2; }
+						if( $newRule['anyof'] )
+						{
+$newRule['flg'] += 4; }
+						if( $newRule['keep'] )
+						{
+$newRule['flg'] += 8; }
+						if( $newRule['regexp'] )
+						{
+$newRule['flg'] += 128; }
 
 						if($newRule['action'] && $this->rulesByID['priority'])
 						{
@@ -443,7 +453,10 @@ 
 		{
 			Framework::window_close(lang($e->getMessage()));
 		}
-		if (is_null($accountID)) $accountID = $GLOBALS['egw_info']['user']['account_id'];
+		if (is_null($accountID))
+		{
+			$accountID = $GLOBALS['egw_info']['user']['account_id'];
+		}
 
 		$accAllIdentities = $this->account->smtpServer()->getAccountEmailAddress(Api\Accounts::id2name($accountID));
 		$allAliases = array($this->account->ident_email);
@@ -473,7 +486,10 @@ 
 		$vtmpl = new Etemplate('mail.sieve.vacation');
 		$vacation = array();
 
-		if (isset($_GET['account_id'])) $account_id = $preserv['account_id'] = $_GET['account_id'];
+		if (isset($_GET['account_id']))
+		{
+			$account_id = $preserv['account_id'] = $_GET['account_id'];
+		}
 
 		if (isset($content['account_id']))
 		{
@@ -543,7 +559,10 @@ 
 				if (!is_array($content) || ($content['acc_id'] && !isset($content['button'])) || (strlen(trim($content['text']))==0 && in_array($content['status'],array('on','by_date'))))
 				{
 					$content = $vacation = $vacRules['vacation'];
-					if (!empty($profileID)) $content['acc_id'] = $profileID;
+					if (!empty($profileID))
+					{
+						$content['acc_id'] = $profileID;
+					}
 					if (empty($vacation['addresses']) || implode('',$vacation['addresses']) == '')
 					{
 						$content['addresses'] = $vacRules['aliases'];
@@ -556,7 +575,10 @@ 
 					{
 						$content['forwards'] = '';
 					}
-					if (strlen(trim($vacation['text']))==0 && $this->mailConfig['default_vacation_text']) $content['text'] = $this->mailConfig['default_vacation_text'];
+					if (strlen(trim($vacation['text']))==0 && $this->mailConfig['default_vacation_text'])
+					{
+						$content['text'] = $this->mailConfig['default_vacation_text'];
+					}
 					if (strlen(trim($content['text']))==0)
 					{
 						$content['msg'] = $msg = lang('error').': '.lang('No vacation notice text provided. Please enter a message.');
@@ -746,7 +768,10 @@ 
 		}
 		// setting up an async job to enable/disable the vacation message
 		$async = new Api\Asyncservice();
-		if (empty($_vacation['account_id'])) $_vacation['account_id'] = $GLOBALS['egw_info']['user']['account_id'];
+		if (empty($_vacation['account_id']))
+		{
+			$_vacation['account_id'] = $GLOBALS['egw_info']['user']['account_id'];
+		}
 		$async_id = !empty($_vacation['id']) ? $_vacation['id'] : 'mail-vacation-'.$_vacation['account_id'];
 		$async->delete($async_id);
 
@@ -1283,7 +1308,10 @@ 
 	function ajax_getFolders ($_searchStringLength=2, $_returnList=false, $_mailaccountToSearch=null, $_noPrefixId=false)
 	{
 		$mailCompose = new mail_compose();
-		if ($_REQUEST['noPrefixId']) $_noPrefixId = $_REQUEST['noPrefixId'];
+		if ($_REQUEST['noPrefixId'])
+		{
+			$_noPrefixId = $_REQUEST['noPrefixId'];
+		}
 		$mailCompose->ajax_searchFolder($_searchStringLength, $_returnList, $_mailaccountToSearch, $_noPrefixId);
 	}
 }

Spacing +139 added lines, -139 removed lines

@@ -74,8 +74,8 @@ 
 		if ($acc_id > 0)
 		{
 			$this->account = Mail\Account::read($acc_id);
-			$identity = Mail\Account::read_identity($this->account->ident_id,true);
-			$this->currentIdentity = Mail::generateIdentityString($identity,false);
+			$identity = Mail\Account::read_identity($this->account->ident_id, true);
+			$this->currentIdentity = Mail::generateIdentityString($identity, false);
 		}
 
 		$this->restoreSessionData();
@@ -87,7 +87,7 @@ 
 	 * @param {array} $content
 	 * @param {string} $msg
 	 */
-	function index(array $content=null,$msg=null)
+	function index(array $content = null, $msg = null)
 	{
 		if (!is_array($content))
 		{
@@ -104,10 +104,10 @@ 
 		if ($this->account->acc_sieve_enabled)
 		{
 			//Initializes the Grid contents
-			$content['rg']= $this->get_rows();
+			$content['rg'] = $this->get_rows();
 
 			// Set content-menu actions
-			$tmpl->setElementAttribute('rg', 'actions',$this->get_actions());
+			$tmpl->setElementAttribute('rg', 'actions', $this->get_actions());
 
 			$sel_options = array(
 				'status' => array(
@@ -118,10 +118,10 @@ 
 		}
 		else
 		{
-			$content['msg'] = lang('error').':'.lang('Serverside Filterrules (Sieve) are not activated').'. '.lang('Please contact your Administrator to validate if your Server supports Serverside Filterrules, and how to enable them in EGroupware for your active Account (%1) with ID:%2.',$this->currentIdentity,$this->account->acc_id);
-			$content['hideIfSieveDisabled']='mail_DisplayNone';
+			$content['msg'] = lang('error').':'.lang('Serverside Filterrules (Sieve) are not activated').'. '.lang('Please contact your Administrator to validate if your Server supports Serverside Filterrules, and how to enable them in EGroupware for your active Account (%1) with ID:%2.', $this->currentIdentity, $this->account->acc_id);
+			$content['hideIfSieveDisabled'] = 'mail_DisplayNone';
 		}
-		$tmpl->exec('mail.mail_sieve.index',$content,$sel_options,array());
+		$tmpl->exec('mail.mail_sieve.index', $content, $sel_options, array());
 	}
 
 	/**
@@ -131,7 +131,7 @@ 
 	 * @param {array} $content
 	 * @param {string} $msg
 	 */
-	function editEmailNotification($content=null, $msg='')
+	function editEmailNotification($content = null, $msg = '')
 	{
 		//Instantiate an eTemplate object, representing sieve.emailNotification
 		$eNotitmpl = new Etemplate('mail.sieve.emailNotification');
@@ -146,7 +146,7 @@ 
 
 				if (!empty($eNotification['externalEmail']))
 				{
-					$content['externalEmail'] = explode(",",$eNotification['externalEmail']);
+					$content['externalEmail'] = explode(",", $eNotification['externalEmail']);
 				}
 			}
 			else
@@ -155,7 +155,7 @@ 
 				list($button) = @each($content['button']);
 				unset ($content['button']);
 
-				switch($button)
+				switch ($button)
 				{
 					case 'save':
 					case 'apply':
@@ -163,11 +163,11 @@ 
 						{
 							$newEmailNotification = $content;
 							if (empty($this->mailConfig['prefpreventforwarding']) ||
-								$this->mailConfig['prefpreventforwarding'] == 0 )
+								$this->mailConfig['prefpreventforwarding'] == 0)
 							{
 								if (is_array($content['externalEmail']) && !empty($content['externalEmail']))
 								{
-									$newEmailNotification['externalEmail'] = implode(",",$content['externalEmail']);
+									$newEmailNotification['externalEmail'] = implode(",", $content['externalEmail']);
 								}
 							}
 						}
@@ -215,10 +215,10 @@ 
 		}
 		else
 		{
-			$content['msg'] = lang('error').':'.lang('Serverside Filterrules (Sieve) are not activated').'. '.lang('Please contact your Administrator to validate if your Server supports Serverside Filterrules, and how to enable them in EGroupware for your active Account (%1) with ID:%2.',$this->currentIdentity,$this->account->acc_id);
-			$content['hideIfSieveDisabled']='mail_DisplayNone';
+			$content['msg'] = lang('error').':'.lang('Serverside Filterrules (Sieve) are not activated').'. '.lang('Please contact your Administrator to validate if your Server supports Serverside Filterrules, and how to enable them in EGroupware for your active Account (%1) with ID:%2.', $this->currentIdentity, $this->account->acc_id);
+			$content['hideIfSieveDisabled'] = 'mail_DisplayNone';
 		}
-		$eNotitmpl->exec('mail.mail_sieve.editEmailNotification', $content,$sel_options);
+		$eNotitmpl->exec('mail.mail_sieve.editEmailNotification', $content, $sel_options);
 	}
 
 	/**
@@ -226,18 +226,18 @@ 
 	 *
 	 * @param {array} $content
 	 */
-	function edit ($content=null)
+	function edit($content = null)
 	{
 		//Instantiate an eTemplate object, representing sieve.edit template
 		$etmpl = new Etemplate('mail.sieve.edit');
-		$etmpl->setElementAttribute('action_folder_text','autocomplete_params', array('noPrefixId'=> true));
+		$etmpl->setElementAttribute('action_folder_text', 'autocomplete_params', array('noPrefixId'=> true));
 		if (!is_array($content))
 		{
-			if ( $this->getRules($_GET['ruleID']) && isset($_GET['ruleID']))
+			if ($this->getRules($_GET['ruleID']) && isset($_GET['ruleID']))
 			{
 
 				$rules = $this->rulesByID;
-				$content= $rules;
+				$content = $rules;
 				$content ['ruleID'] = $_GET['ruleID'];
 				switch ($rules['action'])
 				{
@@ -257,7 +257,7 @@ 
 			{
 
 				$this->getRules(null);
-				$newRulePriority = count($this->rules)*2+1;
+				$newRulePriority = count($this->rules) * 2 + 1;
 				$newRules ['priority'] = $newRulePriority;
 				$newRules ['status'] = 'ENABLED';
 				$readonlys = array(
@@ -274,19 +274,19 @@ 
 			list($button) = @each($content['button']);
 
 			//$ruleID is calculated by priority from the selected rule and is an unique ID
-			$content['ruleID'] = $ruleID = ($this->rulesByID['priority'] -1) / 2;
+			$content['ruleID'] = $ruleID = ($this->rulesByID['priority'] - 1) / 2;
             $error = 0;
 			switch ($button)
 			{
 				case 'save':
 				case 'apply':
-					if($content)
+					if ($content)
 					{
 						unset($content['button']);
 
 						$newRule = $content;
-						$newRule['priority']	= $this->rulesByID['priority'];
-						$newRule['status']	= $this->rulesByID['status'];
+						$newRule['priority'] = $this->rulesByID['priority'];
+						$newRule['status'] = $this->rulesByID['status'];
 
 						switch ($content['action'])
 						{
@@ -304,14 +304,14 @@ 
 						unset($newRule['action_address_text']);
 						unset($newRule['action_reject_text']);
 
-						$newRule['flg'] = 0 ;
-						if( $newRule['continue'] ) { $newRule['flg'] += 1; }
-						if( $newRule['gthan'] )    { $newRule['flg'] += 2; }
-						if( $newRule['anyof'] )    { $newRule['flg'] += 4; }
-						if( $newRule['keep'] )     { $newRule['flg'] += 8; }
-						if( $newRule['regexp'] )   { $newRule['flg'] += 128; }
+						$newRule['flg'] = 0;
+						if ($newRule['continue']) { $newRule['flg'] += 1; }
+						if ($newRule['gthan']) { $newRule['flg'] += 2; }
+						if ($newRule['anyof']) { $newRule['flg'] += 4; }
+						if ($newRule['keep']) { $newRule['flg'] += 8; }
+						if ($newRule['regexp']) { $newRule['flg'] += 128; }
 
-						if($newRule['action'] && $this->rulesByID['priority'])
+						if ($newRule['action'] && $this->rulesByID['priority'])
 						{
 							$this->rules[$ruleID] = $newRule;
 							$ret = $this->account->imapServer()->setRules($this->rules);
@@ -321,7 +321,7 @@ 
 							}
 							else
 							{
-								$msg .= lang("The rule with priority %1 successfully saved!",$ruleID);
+								$msg .= lang("The rule with priority %1 successfully saved!", $ruleID);
 							}
 							$this->saveSessionData();
 						}
@@ -346,14 +346,14 @@ 
 				case 'delete':
 					if ($button == "delete")
 					{
-						if ($ruleID === count($this->rules)-1)
+						if ($ruleID === count($this->rules) - 1)
 						{
-							$msg = lang('rule with priority ') . $ruleID . lang(' deleted!');
+							$msg = lang('rule with priority ').$ruleID.lang(' deleted!');
 						}
 						else
 						{
 
-							$msg = lang('rule with priority ') . $ruleID . lang(' deleted!') . lang(' And the rule with priority %1, now got the priority %2',$ruleID+1,$ruleID);
+							$msg = lang('rule with priority ').$ruleID.lang(' deleted!').lang(' And the rule with priority %1, now got the priority %2', $ruleID + 1, $ruleID);
 						}
 						unset($this->rules[$ruleID]);
 						$this->rules = array_values($this->rules);
@@ -384,9 +384,9 @@ 
 		);
 
 		//Set the preselect_options for mail/folders as we are not allow free entry for folder taglist
-		$sel_options['action_folder_text'] = $this->ajax_getFolders(0,true,null,true);
+		$sel_options['action_folder_text'] = $this->ajax_getFolders(0, true, null, true);
 
-		return $etmpl->exec('mail.mail_sieve.edit',$content,$sel_options,$readonlys,array(),2);
+		return $etmpl->exec('mail.mail_sieve.edit', $content, $sel_options, $readonlys, array(), 2);
 	}
 
 	/**
@@ -398,7 +398,7 @@ 
 	 */
 	function getEmailNotification()
 	{
-		if(!(empty($this->mailConfig['prefpreventnotificationformailviaemail']) || $this->mailConfig['prefpreventnotificationformailviaemail'] == 0))
+		if (!(empty($this->mailConfig['prefpreventnotificationformailviaemail']) || $this->mailConfig['prefpreventnotificationformailviaemail'] == 0))
 		{
 			throw new Api\Exception\NoPermission();
 		}
@@ -406,7 +406,7 @@ 
 		try {
 			$emailNotification = $this->account->imapServer()->getEmailNotification();
 		}
-		catch(Exception $e) {
+		catch (Exception $e) {
 			unset($e);
 			$emailNotification = array();
 		}
@@ -422,7 +422,7 @@ 
 	 */
 	function getVacation($accountID = null)
 	{
-		if(!(empty($this->mailConfig['prefpreventabsentnotice']) || $this->mailConfig['prefpreventabsentnotice'] == 0))
+		if (!(empty($this->mailConfig['prefpreventabsentnotice']) || $this->mailConfig['prefpreventabsentnotice'] == 0))
 		{
 			throw new Api\Exception\NoPermission();
 		}
@@ -439,19 +439,19 @@ 
 				$vacation = $icServer->getVacation();
 			}
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			Framework::window_close(lang($e->getMessage()));
 		}
 		if (is_null($accountID)) $accountID = $GLOBALS['egw_info']['user']['account_id'];
 
 		$accAllIdentities = $this->account->smtpServer()->getAccountEmailAddress(Api\Accounts::id2name($accountID));
-		$allAliases = $this->account->ident_email !=''? array($this->account->ident_email): array();
+		$allAliases = $this->account->ident_email != '' ? array($this->account->ident_email) : array();
 		foreach ($accAllIdentities as &$arrVal)
 		{
-			if ($arrVal['type'] !='default')
+			if ($arrVal['type'] != 'default')
 			{
-				$allAliases[] =  $arrVal['address'];
+				$allAliases[] = $arrVal['address'];
 			}
 		}
 		asort($allAliases);
@@ -467,7 +467,7 @@ 
 	 * @param {array} $content
 	 * @param {string} $msg
 	 */
-	function editVacation($content=null, $msg='')
+	function editVacation($content = null, $msg = '')
 	{
 		//Instantiate an eTemplate object, representing the sieve.vacation template
 		$vtmpl = new Etemplate('mail.sieve.vacation');
@@ -480,27 +480,27 @@ 
 			$account_id = $content['account_id'];
 			$preserv['acc_id'] = $content['acc_id'];
 		}
-		if(isset($account_id) && $this->mail_admin)
+		if (isset($account_id) && $this->mail_admin)
 		{
-			foreach(Mail\Account::search($account_id, false, null, false, 0, false) as $account)
+			foreach (Mail\Account::search($account_id, false, null, false, 0, false) as $account)
 			{
 				try {
 					// check if account is valid for multiple users, has admin credentials and sieve enabled
 					if (Mail\Account::is_multiple($account) &&
-						($icServer = $account->imapServer(true)) &&	// check on icServer object, so plugins can overwrite
+						($icServer = $account->imapServer(true)) && // check on icServer object, so plugins can overwrite
 						$icServer->acc_imap_admin_username && $icServer->acc_sieve_enabled)
 					{
 						$allAccounts[$account->acc_id] = $account->acc_name;
 						$accounts[$account->acc_id] = $account;
 					}
 				}
-				catch(Exception $e) {
+				catch (Exception $e) {
 					unset($e);
 					// ignore broken accounts
 				}
 			}
 
-			$profileID = !isset($content['acc_id']) ? key($accounts):$content['acc_id'];
+			$profileID = !isset($content['acc_id']) ? key($accounts) : $content['acc_id'];
 			if (isset($_GET['acc_id']) && isset($allAccounts[$_GET['acc_id']]))
 			{
 				$profileID = $content['acc_id'] = (int)$_GET['acc_id'];
@@ -512,7 +512,7 @@ 
 			$this->is_admin_vac = true;
 			$preserv['account_id'] = $account_id;
 		}
-		elseif(!is_array($content) && isset($_GET['acc_id']))
+		elseif (!is_array($content) && isset($_GET['acc_id']))
 		{
 			$this->account = Mail\Account::read($_GET['acc_id']);
 			$preserv['acc_id'] = $this->account->acc_id;
@@ -528,11 +528,11 @@ 
 		if ($icServer->acc_sieve_enabled)
 		{
 			$vacRules = $this->getVacation($account_id);
-			if ($vacRules['vacation']===false)
+			if ($vacRules['vacation'] === false)
 			{
 				$content['msg'] = lang('error').':'.lang('Serverside Vacationnotice (via Sieve) are not activated').'. '.
-					lang('Please contact your Administrator to validate if your Server supports Serverside Vacationmessages, and how to enable them in EGroupware for your active Account (%1) with ID:%2.',$this->currentIdentity,$icServer->ImapServerId);
-				$content['hideIfSieveDisabled']='mail_DisplayNone';
+					lang('Please contact your Administrator to validate if your Server supports Serverside Vacationmessages, and how to enable them in EGroupware for your active Account (%1) with ID:%2.', $this->currentIdentity, $icServer->ImapServerId);
+				$content['hideIfSieveDisabled'] = 'mail_DisplayNone';
 			}
 			else
 			{
@@ -540,24 +540,24 @@ 
 				{
 					$ByDate = array('by_date' => lang('By date'));
 				}
-				if (!is_array($content) || ($content['acc_id'] && !isset($content['button'])) || (strlen(trim($content['text']))==0 && in_array($content['status'],array('on','by_date'))))
+				if (!is_array($content) || ($content['acc_id'] && !isset($content['button'])) || (strlen(trim($content['text'])) == 0 && in_array($content['status'], array('on', 'by_date'))))
 				{
 					$content = $vacation = $vacRules['vacation'];
 					if (!empty($profileID)) $content['acc_id'] = $profileID;
-					if (empty($vacation['addresses']) || implode('',$vacation['addresses']) == '')
+					if (empty($vacation['addresses']) || implode('', $vacation['addresses']) == '')
 					{
 						$content['addresses'] = $vacRules['aliases'];
 					}
 					if (!empty($vacation['forwards']))
 					{
-						$content['forwards'] = explode(",",$vacation['forwards']);
+						$content['forwards'] = explode(",", $vacation['forwards']);
 					}
 					else
 					{
 						$content['forwards'] = '';
 					}
-					if (strlen(trim($vacation['text']))==0 && $this->mailConfig['default_vacation_text']) $content['text'] = $this->mailConfig['default_vacation_text'];
-					if (strlen(trim($content['text']))==0)
+					if (strlen(trim($vacation['text'])) == 0 && $this->mailConfig['default_vacation_text']) $content['text'] = $this->mailConfig['default_vacation_text'];
+					if (strlen(trim($content['text'])) == 0)
 					{
 						$content['msg'] = $msg = lang('error').': '.lang('No vacation notice text provided. Please enter a message.');
 						Framework::refresh_opener($msg, 'mail');
@@ -575,7 +575,7 @@ 
 					list($button) = @each($content['button']);
 					unset ($content['button']);
 
-					switch($button)
+					switch ($button)
 					{
 						case 'save':
 						case 'apply':
@@ -593,7 +593,7 @@ 
 								$newVacation = $content;
 
 								if (empty($this->mailConfig['prefpreventforwarding']) ||
-									$this->mailConfig['prefpreventforwarding'] == 0 )
+									$this->mailConfig['prefpreventforwarding'] == 0)
 								{
 									$content['forwards'] = self::strip_rfc882_addresses($content['forwards']);
 									$newVacation['forwards'] = implode(',', $content['forwards']);
@@ -603,7 +603,7 @@ 
 									unset($newVacation ['forwards']);
 								}
 
-								if (!in_array($newVacation['status'],array('on','off','by_date')))
+								if (!in_array($newVacation['status'], array('on', 'off', 'by_date')))
 								{
 									$newVacation['status'] = 'off';
 								}
@@ -615,7 +615,7 @@ 
 										self::strip_rfc882_addresses($content['addresses']);
 								}
 
-								if($this->checkRule($newVacation,$checkAddresses))
+								if ($this->checkRule($newVacation, $checkAddresses))
 								{
 									if (isset($account_id) && $this->mail_admin)
 									{
@@ -628,13 +628,13 @@ 
 
 									if (!$resSetvac)
 									{
-										$msg = lang('vacation update failed') . "\n" . lang('Vacation notice update failed') . ":" . $this->account->imapServer()->error;
+										$msg = lang('vacation update failed')."\n".lang('Vacation notice update failed').":".$this->account->imapServer()->error;
 										break;
 									}
 									// schedule job to switch message on/off, if request and not already in past
 									else
 									{
-										if ($newVacation['status'] == 'by_date' && $newVacation['end_date']+24*3600 > time() ||
+										if ($newVacation['status'] == 'by_date' && $newVacation['end_date'] + 24 * 3600 > time() ||
 											$vacRules && $vacRules['vacation']['status'] == 'by_date')
 										{
 											self::setAsyncJob($newVacation);
@@ -642,29 +642,29 @@ 
 										//Reset vacationNotice cache which is used in mail_ui get_rows
 										if (isset($account_id) && $this->mail_admin)
 										{
-											$account_lid = Api\Accounts::id2name($account_id,'account_lid');
+											$account_lid = Api\Accounts::id2name($account_id, 'account_lid');
 											$cachedVacations = array($icServer->acc_id => $newVacation) + (array)Api\Cache::getCache(Api\Cache::INSTANCE, 'email', 'vacationNotice'.$account_lid);
 											//error_log(__METHOD__.__LINE__.' Setting Cache for '.$account_lid.':'.array2string($cachedVacations));
-											Api\Cache::setCache(Api\Cache::INSTANCE,'email', 'vacationNotice'.$account_lid, $cachedVacations);
+											Api\Cache::setCache(Api\Cache::INSTANCE, 'email', 'vacationNotice'.$account_lid, $cachedVacations);
 										}
 										else
 										{
 											$cachedVacations = array($icServer->acc_id => $newVacation) + (array)Api\Cache::getCache(Api\Cache::INSTANCE, 'email', 'vacationNotice'.$GLOBALS['egw_info']['user']['account_lid']);
 											//error_log(__METHOD__.__LINE__.' Setting Cache for own ('.$GLOBALS['egw_info']['user']['account_lid'].'):'.array2string($cachedVacations));
-											Api\Cache::setCache(Api\Cache::INSTANCE,'email', 'vacationNotice'.$GLOBALS['egw_info']['user']['account_lid'], $cachedVacations);
+											Api\Cache::setCache(Api\Cache::INSTANCE, 'email', 'vacationNotice'.$GLOBALS['egw_info']['user']['account_lid'], $cachedVacations);
 										}
 										$msg = lang('Vacation notice sucessfully updated.');
 									}
 								}
 								else
 								{
-									$msg .= implode("\n",$this->errorStack);
+									$msg .= implode("\n", $this->errorStack);
 								}
 								// refresh vacationNotice on index
 								$response = Api\Json\Response::get();
-								$response->call('app.mail.mail_callRefreshVacationNotice',$icServer->ImapServerId);
+								$response->call('app.mail.mail_callRefreshVacationNotice', $icServer->ImapServerId);
 								Framework::refresh_opener($msg, 'mail');
-								if ($button === 'apply' || $icServer->error !=="")
+								if ($button === 'apply' || $icServer->error !== "")
 								{
 									break;
 								}
@@ -680,7 +680,7 @@ 
 						'on' => lang('Active'),
 						'off' => lang('Deactive'),
 					),
-					'addresses' => array_combine($vacRules['aliases'],$vacRules['aliases']),
+					'addresses' => array_combine($vacRules['aliases'], $vacRules['aliases']),
 				);
 				if (!isset($account_id))
 				{
@@ -704,10 +704,10 @@ 
 		}
 		else
 		{
-			$content['msg'] = lang('error').':'.lang('Serverside Filterrules (Sieve) are not activated').'. '.lang('Please contact your Administrator to validate if your Server supports Serverside Filterrules, and how to enable them in EGroupware for your active Account (%1) with ID:%2.',$this->currentIdentity,$icServer->ImapServerId);
-			$content['hideIfSieveDisabled']='mail_DisplayNone';
+			$content['msg'] = lang('error').':'.lang('Serverside Filterrules (Sieve) are not activated').'. '.lang('Please contact your Administrator to validate if your Server supports Serverside Filterrules, and how to enable them in EGroupware for your active Account (%1) with ID:%2.', $this->currentIdentity, $icServer->ImapServerId);
+			$content['hideIfSieveDisabled'] = 'mail_DisplayNone';
 		}
-		$vtmpl->exec('mail.mail_sieve.editVacation',$content,$sel_options,$readonlys,$preserv,2);
+		$vtmpl->exec('mail.mail_sieve.editVacation', $content, $sel_options, $readonlys, $preserv, 2);
 	}
 
 	/**
@@ -721,7 +721,7 @@ 
 	static function strip_rfc882_addresses($_addresses)
 	{
 		$addresses = array();
-		foreach(Mail::parseAddressList($_addresses) as $addr)
+		foreach (Mail::parseAddressList($_addresses) as $addr)
 		{
 			if ($addr->valid)
 			{
@@ -738,7 +738,7 @@ 
 	 * @param boolean $_reschedule do nothing but reschedule the job by 3 minutes
 	 * @return  void
 	 */
-	static function setAsyncJob (array $_vacation, $_reschedule=false)
+	static function setAsyncJob(array $_vacation, $_reschedule = false)
 	{
 		if (!($_vacation['acc_id'] > 0))
 		{
@@ -750,19 +750,19 @@ 
 		$async_id = !empty($_vacation['id']) ? $_vacation['id'] : 'mail-vacation-'.$_vacation['account_id'];
 		$async->delete($async_id);
 
-		$end_date = $_vacation['end_date'] + 24*3600;   // end-date is inclusive, so we have to add 24h
+		$end_date = $_vacation['end_date'] + 24 * 3600; // end-date is inclusive, so we have to add 24h
 		if ($_vacation['status'] == 'by_date' && time() < $end_date && !$_reschedule)
 		{
 			$time = time() < $_vacation['start_date'] ? $_vacation['start_date'] : $end_date;
-			$async->set_timer($time,$async_id, 'mail_sieve::async_vacation', $_vacation, $_vacation['account_id']);
+			$async->set_timer($time, $async_id, 'mail_sieve::async_vacation', $_vacation, $_vacation['account_id']);
 		}
 		if ($_reschedule)
 		{
-			$_vacation['rescheduled'] = $_vacation['rescheduled'] ? 2*$_vacation['rescheduled'] : 5;
+			$_vacation['rescheduled'] = $_vacation['rescheduled'] ? 2 * $_vacation['rescheduled'] : 5;
 			// only try to reschedule for 2 days max
 			if ($_vacation['rescheduled'] <= 2 * 24 * 60)
 			{
-				$time = time() + 60*($_vacation['rescheduled']);
+				$time = time() + 60 * ($_vacation['rescheduled']);
 				unset($_vacation['next']);
 				unset($_vacation['times']);
 				$async->set_timer($time, $async_id, 'mail_sieve::async_vacation', $_vacation, $_vacation['account_id']);
@@ -798,7 +798,7 @@ 
 		}
 		catch (Exception $e) {
 			error_log(__METHOD__.'('.array2string($_vacation).' failed '.$e->getMessage());
-			self::setAsyncJob($_vacation, true);	// reschedule
+			self::setAsyncJob($_vacation, true); // reschedule
 			$ret = false;
 		}
 
@@ -813,7 +813,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	function checkRule($_vacation,$_checkAddresses=true)
+	function checkRule($_vacation, $_checkAddresses = true)
 	{
 		$this->errorStack = array();
 
@@ -827,12 +827,12 @@ 
 			$this->errorStack['days'] = lang('Please select the number of days to wait between responses').'!';
 		}
 
-		if(is_array($_vacation['addresses']) && !empty($_vacation['addresses']))
+		if (is_array($_vacation['addresses']) && !empty($_vacation['addresses']))
 		{
-			$regexp="/^[a-z0-9]+([_\\.-][a-z0-9]+)*@([a-z0-9]+([\.-][a-z0-9]+)*)+\\.[a-z]{2,}$/i";
+			$regexp = "/^[a-z0-9]+([_\\.-][a-z0-9]+)*@([a-z0-9]+([\.-][a-z0-9]+)*)+\\.[a-z]{2,}$/i";
 			foreach ($_vacation['addresses'] as $addr)
 			{
-				if (!preg_match($regexp,$addr) && $_checkAddresses)
+				if (!preg_match($regexp, $addr) && $_checkAddresses)
 				{
 					$this->errorStack['addresses'] = lang('One address is not valid').'!';
 				}
@@ -848,23 +848,23 @@ 
 			{
 				$this->errorStack['status'] = lang('Activating by date requires a start- AND end-date!');
 			}
-			elseif($_vacation['start_date'] > $_vacation['end_date'])
+			elseif ($_vacation['start_date'] > $_vacation['end_date'])
 			{
 				$this->errorStack['status'] = lang('Vacation start-date must be BEFORE the end-date!');
 			}
 		}
 		if ($_vacation['forwards'])
 		{
-			foreach(preg_split('/, ?/',$_vacation['forwards']) as $addr)
+			foreach (preg_split('/, ?/', $_vacation['forwards']) as $addr)
 			{
-				if (!preg_match($regexp,$addr) && $_checkAddresses)
+				if (!preg_match($regexp, $addr) && $_checkAddresses)
 				{
 					$this->errorStack['forwards'] = lang('One address is not valid'.'!');
 				}
 			}
 		}
 		//error_log(__METHOD__. array2string($this->errorStack));
-		if(count($this->errorStack) == 0)
+		if (count($this->errorStack) == 0)
 		{
 			return true;
 		}
@@ -885,14 +885,14 @@ 
 
 		foreach ($orders as $keys => $val)
 		{
-			$orders[$keys] = $val -1;
+			$orders[$keys] = $val - 1;
 		}
 
 		$this->getRules(null);
 
 		$newrules = $this->rules;
 
-		foreach($orders as $keys => $ruleID)
+		foreach ($orders as $keys => $ruleID)
 		{
 			$newrules[$keys] = $this->rules[$ruleID];
 		}
@@ -921,24 +921,24 @@ 
 		switch ($action)
 		{
 			case 'delete':
-				if ($checked === count($this->rules)-1)
+				if ($checked === count($this->rules) - 1)
 				{
-					$msg = lang('rule with priority ') . $checked . lang(' deleted!');
+					$msg = lang('rule with priority ').$checked.lang(' deleted!');
 				}
 				else
 				{
 
-					$msg = lang('rule with priority ') . $checked . lang(' deleted!') . lang(' And the rule with priority %1, now got the priority %2',$checked+1,$checked);
+					$msg = lang('rule with priority ').$checked.lang(' deleted!').lang(' And the rule with priority %1, now got the priority %2', $checked + 1, $checked);
 				}
 				unset($this->rules[$checked]);
 				$this->rules = array_values($this->rules);
 				break;
 			case 'enable':
-				$msg = lang('rule with priority ') . $checked . lang(' enabled!');
+				$msg = lang('rule with priority ').$checked.lang(' enabled!');
 				$this->rules[$checked][status] = 'ENABLED';
 				break;
 			case 'disable':
-				$msg = lang('rule with priority ') . $checked . lang(' disabled!');
+				$msg = lang('rule with priority ').$checked.lang(' disabled!');
 				$this->rules[$checked][status] = 'DISABLED';
 				break;
 			case 'move':
@@ -950,7 +950,7 @@ 
 
 		$response = Api\Json\Response::get();
 
-		if($result)
+		if ($result)
 		{
 			$response->error($result);
 			return;
@@ -968,11 +968,11 @@ 
 	 */
 	function buildRule($rule)
 	{
-		$andor = ' '. lang('and') .' ';
+		$andor = ' '.lang('and').' ';
 		$started = 0;
 		if ($rule['anyof'])
 		{
-			$andor = ' '. lang('or') .' ';
+			$andor = ' '.lang('or').' ';
 		}
 		$complete = lang('IF').' ';
 		if ($rule['unconditional'])
@@ -981,8 +981,8 @@ 
 		}
 		if ($rule['from'])
 		{
-			$match = $this->setMatchType($rule['from'],$rule['regexp']);
-			$complete .= "'From:' " . $match . " '" . $rule['from'] . "'";
+			$match = $this->setMatchType($rule['from'], $rule['regexp']);
+			$complete .= "'From:' ".$match." '".$rule['from']."'";
 			$started = 1;
 		}
 		if ($rule['to'])
@@ -991,8 +991,8 @@ 
 			{
 				$complete .= $andor;
 			}
-			$match = $this->setMatchType($rule['to'],$rule['regexp']);
-			$complete .= "'To:' " . $match . " '" . $rule['to'] . "'";
+			$match = $this->setMatchType($rule['to'], $rule['regexp']);
+			$complete .= "'To:' ".$match." '".$rule['to']."'";
 			$started = 1;
 		}
 		if ($rule['subject'])
@@ -1001,8 +1001,8 @@ 
 			{
 				$complete .= $andor;
 			}
-			$match = $this->setMatchType($rule['subject'],$rule['regexp']);
-			$complete .= "'Subject:' " . $match . " '" . $rule['subject'] . "'";
+			$match = $this->setMatchType($rule['subject'], $rule['regexp']);
+			$complete .= "'Subject:' ".$match." '".$rule['subject']."'";
 			$started = 1;
 		}
 		if ($rule['field'] && $rule['field_val'])
@@ -1011,8 +1011,8 @@ 
 			{
 				$complete .= $andor;
 			}
-			$match = $this->setMatchType($rule['field_val'],$rule['regexp']);
-			$complete .= "'" . $rule['field'] . "' " . $match . " '" . $rule['field_val'] . "'";
+			$match = $this->setMatchType($rule['field_val'], $rule['regexp']);
+			$complete .= "'".$rule['field']."' ".$match." '".$rule['field_val']."'";
 			$started = 1;
 		}
 		if ($rule['size'])
@@ -1026,7 +1026,7 @@ 
 			{
 				$complete .= $andor;
 			}
-			$complete .= "message " . $xthan . $rule['size'] . "KB'";
+			$complete .= "message ".$xthan.$rule['size']."KB'";
 			$started = 1;
 		}
 		if (!empty($rule['field_bodytransform']))
@@ -1035,7 +1035,7 @@ 
 			{
 				$newruletext .= ", ";
 			}
-			$btransform	= " :raw ";
+			$btransform = " :raw ";
 			$match = ' :contains';
 			if ($rule['bodytransform'])
 			{
@@ -1049,11 +1049,11 @@ 
 			{
 				$match = ':regex';
 			}
-			$complete .= " body " . $btransform . $match . " \"" . $rule['field_bodytransform'] . "\"";
+			$complete .= " body ".$btransform.$match." \"".$rule['field_bodytransform']."\"";
 			$started = 1;
 
 		}
-		if ($rule['ctype']!= '0' && !empty($rule['ctype']))
+		if ($rule['ctype'] != '0' && !empty($rule['ctype']))
 		{
 			if ($started)
 			{
@@ -1065,7 +1065,7 @@ 
 			{
 				$ctype_subtype = "/";
 			}
-			$complete .= " body :content " . " \"" . $btransform_ctype . $ctype_subtype . $rule['field_ctype_val'] . "\"" . " :contains \"\"";
+			$complete .= " body :content "." \"".$btransform_ctype.$ctype_subtype.$rule['field_ctype_val']."\""." :contains \"\"";
 			$started = 1;
 			//error_log(__CLASS__."::".__METHOD__.array2string(Mail\Script::$btransform_ctype_array));
 		}
@@ -1073,19 +1073,19 @@ 
 		{
 			$complete .= ' '.lang('THEN').' ';
 		}
-		if (preg_match("/folder/i",$rule['action']))
+		if (preg_match("/folder/i", $rule['action']))
 		{
-			$complete .= lang('file into')." '" . $rule['action_arg'] . "';";
+			$complete .= lang('file into')." '".$rule['action_arg']."';";
 		}
-		if (preg_match("/reject/i",$rule['action']))
+		if (preg_match("/reject/i", $rule['action']))
 		{
-			$complete .= lang('reject with')." '" . $rule['action_arg'] . "'.";
+			$complete .= lang('reject with')." '".$rule['action_arg']."'.";
 		}
-		if (preg_match("/address/i",$rule['action']))
+		if (preg_match("/address/i", $rule['action']))
 		{
-			$complete .= lang('forward to').' ' . $rule['action_arg'] .'.';
+			$complete .= lang('forward to').' '.$rule['action_arg'].'.';
 		}
-		if (preg_match("/discard/i",$rule['action']))
+		if (preg_match("/discard/i", $rule['action']))
 		{
 			$complete .= lang('discard').'.';
 		}
@@ -1107,7 +1107,7 @@ 
 	 * @param {string} $regex regular expresion as pattern to be matched
 	 * @return {string} return the type
 	 */
-	function setMatchType (&$matchstr, $regex = false)
+	function setMatchType(&$matchstr, $regex = false)
 	{
 		$match = lang('contains');
 		if (preg_match("/^\s*!/", $matchstr))
@@ -1132,11 +1132,11 @@ 
 		}
 		if ($regex && preg_match("/^\s*\\\\!/", $matchstr))
 		{
-			$matchstr = preg_replace("/^\s*\\\\!/","!",$matchstr);
+			$matchstr = preg_replace("/^\s*\\\\!/", "!", $matchstr);
 		}
 		else
 		{
-			$matchstr = preg_replace("/^\s*!/","",$matchstr);
+			$matchstr = preg_replace("/^\s*!/", "", $matchstr);
 		}
 		return $match;
 	}
@@ -1146,9 +1146,9 @@ 
 	 */
 	function saveSessionData()
 	{
-		$sessionData['sieve_rules']		= $this->rules;
+		$sessionData['sieve_rules'] = $this->rules;
 		$sessionData['sieve_rulesByID'] = $this->rulesByID;
-		$sessionData['sieve_scriptToEdit']	= $this->scriptToEdit;
+		$sessionData['sieve_scriptToEdit'] = $this->scriptToEdit;
 		Api\Cache::setSession(__CLASS__, 'sieve_session_data', $sessionData);
 	}
 
@@ -1174,15 +1174,15 @@ 
 	{
 		try {
 			$this->account->imapServer()->retrieveRules();
-			$this->rules	= $this->account->imapServer()->getRules();
+			$this->rules = $this->account->imapServer()->getRules();
 			$this->rulesByID = $this->rules[$ruleID];
-			$this->vacation	= $this->account->imapServer()->getVacation();
+			$this->vacation = $this->account->imapServer()->getVacation();
 		}
-		catch(Exception $e) {
+		catch (Exception $e) {
 			error_log(__METHOD__.__LINE__.$e->getMessage().': '.$e->details);
-			$this->rules	= array();
+			$this->rules = array();
 			$this->rulesByID = array();
-			$this->vacation	= array();
+			$this->vacation = array();
 			return false;
 		}
 		return true;
@@ -1194,9 +1194,9 @@ 
 	function restoreSessionData()
 	{
 		$sessionData = Api\Cache::getSession(__CLASS__, 'sieve_session_data');
-		$this->rules		= $sessionData['sieve_rules'];
+		$this->rules = $sessionData['sieve_rules'];
 		$this->rulesByID = $sessionData['sieve_rulesByID'];
-		$this->scriptToEdit	= $sessionData['sieve_scriptToEdit'];
+		$this->scriptToEdit = $sessionData['sieve_scriptToEdit'];
 	}
 
 	/**
@@ -1210,14 +1210,14 @@ 
 		$rows = array();
 		$this->getRules(null);
 
-		if (is_array($this->rules) && !empty($this->rules) )
+		if (is_array($this->rules) && !empty($this->rules))
 		{
 			$rows = $this->rules;
 
-			foreach ($rows as &$row )
+			foreach ($rows as &$row)
 			{
 				$row['rules'] = $this->buildRule($row);
-				$row['ruleID'] =(string)(($row['priority'] -1) / 2 );
+				$row['ruleID'] = (string)(($row['priority'] - 1) / 2);
 				if ($row ['status'] === 'DISABLED')
 				{
 					$row['class'] = 'mail_sieve_DISABLED';
@@ -1230,7 +1230,7 @@ 
 			return false;
 		}
 		// Shift one down, because in grid the first row is reserved for header
-		array_unshift($rows,array(''=> ''));
+		array_unshift($rows, array(''=> ''));
 		return $rows;
 	}
 
@@ -1241,7 +1241,7 @@ 
 	 */
 	private function get_actions()
 	{
-		$actions =array(
+		$actions = array(
 
 			'edit' => array(
 				'caption' => 'Edit',
@@ -1280,7 +1280,7 @@ 
 	 * @param int $_mailaccountToSearch
 	 * @param boolean $_noPrefixID = false, if set to true folders name does not get prefixed by account id
 	 */
-	function ajax_getFolders ($_searchStringLength=2, $_returnList=false, $_mailaccountToSearch=null, $_noPrefixId=false)
+	function ajax_getFolders($_searchStringLength = 2, $_returnList = false, $_mailaccountToSearch = null, $_noPrefixId = false)
 	{
 		$mailCompose = new mail_compose();
 		if ($_REQUEST['noPrefixId']) $_noPrefixId = $_REQUEST['noPrefixId'];

mail/inc/class.mail_tree.inc.php

Doc Comments +5 added lines, -5 removed lines

@@ -76,7 +76,7 @@ 
 	 * @param string $_profileID icServer profile id
 	 * @param string $_err error message to be shown on tree node
 	 * @param mixed $_path
-	 * @param mixed $_parent
+	 * @param string $_parent
 	 * @return array returns an array of tree node
 	 */
 	static function treeLeafNoConnectionArray($_profileID, $_err, $_path, $_parent)
@@ -123,7 +123,7 @@ 
 	/**
 	 * Check if the given tree id is account node (means root)
 	 *
-	 * @param type $_node a tree id node
+	 * @param string|null $_node a tree id node
 	 * @return boolean returns true if the node is account node otherwise false
 	 */
 	private static function isAccountNode ($_node)
@@ -155,7 +155,7 @@ 
 	 *
 	 * @param string $_parent = null no parent node means root with the first level of folders
 	 * @param string $_profileID = '' icServer id
-	 * @param int|boolean $_openTopLevel = 1 Open top level folders on load if it's set to 1|true,
+	 * @param integer $_openTopLevel = 1 Open top level folders on load if it's set to 1|true,
 	 *  false|0 leaves them in closed state
 	 * @param $_noCheckboxNS = false no checkbox for namesapaces makes sure to not put checkbox for namespaces node
 	 * @param boolean $_subscribedOnly = false get only subscribed folders
@@ -443,7 +443,7 @@ 
 	 *
 	 * @param type $_profileID = null Null means all accounts and giving profileid means fetches node for the account
 	 * @param type $_noCheckbox = false option to switch checkbox of
-	 * @param type $_openTopLevel = 0 option to either start the node opened (1) or closed (0)
+	 * @param integer $_openTopLevel = 0 option to either start the node opened (1) or closed (0)
 	 *
 	 * @return array an array of baseNodes of accounts
 	 */
@@ -491,7 +491,7 @@ 
 	 *
 	 * @param string $_parent = null no parent node means root with the first level of folders
 	 * @param string $_profileID = '' active profile / acc_id
-	 * @param int|boolean $_openTopLevel = 1 Open top level folders on load if it's set to 1|true,
+	 * @param integer $_openTopLevel = 1 Open top level folders on load if it's set to 1|true,
 	 *  false|0 leaves them in closed state
 	 * @param boolean $_subscribedOnly = false get only subscribed folders
 	 * @param boolean $_allInOneGo = false, true will get all folders (dependes on subscribedOnly option) of the account in one go

Spacing +43 added lines, -43 removed lines

@@ -61,11 +61,11 @@ 
 		$this->ui = $mail_ui;
 
 		// check images available in png or svg
-		foreach(self::$leafImages as &$image)
+		foreach (self::$leafImages as &$image)
 		{
 			if (strpos($image, '.') === false)
 			{
-				$image = basename($img=Api\Image::find('mail', 'dhtmlxtree/'.$image));
+				$image = basename($img = Api\Image::find('mail', 'dhtmlxtree/'.$image));
 			}
 		}
 	}
@@ -82,7 +82,7 @@ 
 	static function treeLeafNoConnectionArray($_profileID, $_err, $_path, $_parent)
 	{
 		$baseNode = array('id' => $_profileID);
-		$leaf =  array(
+		$leaf = array(
 			'id' => $_profileID.self::DELIMITER.'INBOX',
 			'text' => $_err,
 			'tooltip' => $_err,
@@ -94,7 +94,7 @@ 
 		);
 		self::setOutStructure($leaf, $baseNode, self::DELIMITER);
 
-		return ($baseNode?$baseNode:array( // fallback not connected array
+		return ($baseNode ? $baseNode : array( // fallback not connected array
 						'id'=>0,
 						'item'=> array(
 							'text'=>'INBOX',
@@ -111,7 +111,7 @@ 
 	 * @param array $_node array of a node
 	 * @return int returns 1 if it has children flag set otherwise 0
 	 */
-	private static function nodeHasChildren ($_node)
+	private static function nodeHasChildren($_node)
 	{
 		$hasChildren = 0;
 		if (in_array('\haschildren', $_node['ATTRIBUTES']) ||
@@ -126,7 +126,7 @@ 
 	 * @param type $_node a tree id node
 	 * @return boolean returns true if the node is account node otherwise false
 	 */
-	private static function isAccountNode ($_node)
+	private static function isAccountNode($_node)
 	{
 		list(,$leaf) = explode(self::DELIMITER, $_node);
 		if ($leaf || $_node == null) return false;
@@ -164,10 +164,10 @@ 
 	 *
 	 * @return array returns an array of mail tree structure according to provided node
 	 */
-	function getTree ($_parent = null, $_profileID = '', $_openTopLevel = 1, $_noCheckboxNS = false, $_subscribedOnly= false, $_allInOneGo = false, $_checkSubscribed = true)
+	function getTree($_parent = null, $_profileID = '', $_openTopLevel = 1, $_noCheckboxNS = false, $_subscribedOnly = false, $_allInOneGo = false, $_checkSubscribed = true)
 	{
 		//Init mail folders
-		$tree = array(Tree::ID=> $_parent?$_parent:0,Tree::CHILDREN => array());
+		$tree = array(Tree::ID=> $_parent ? $_parent : 0, Tree::CHILDREN => array());
 		$hDelimiter = $this->ui->mail_bo->getHierarchyDelimiter();
 
 		if ($_parent) list($_profileID) = explode(self::DELIMITER, $_parent);
@@ -178,7 +178,7 @@ 
 			{
 				$this->ui->changeProfile($_profileID);
 			} catch (Exception $ex) {
-				return self::treeLeafNoConnectionArray($_profileID, $ex->getMessage(),array($_profileID), '');
+				return self::treeLeafNoConnectionArray($_profileID, $ex->getMessage(), array($_profileID), '');
 			}
 		}
 
@@ -190,7 +190,7 @@ 
 			if ($_parent && !self::isAccountNode($_parent)) // Single node loader
 			{
 				$nodeInfo = Mail::pathToFolderData($_parent, $hDelimiter);
-				$folders = $this->ui->mail_bo->getFolderArrays($nodeInfo['mailbox'],false,$_allInOneGo?0:2, $_subscribedOnly);
+				$folders = $this->ui->mail_bo->getFolderArrays($nodeInfo['mailbox'], false, $_allInOneGo ? 0 : 2, $_subscribedOnly);
 
 				$childrenNode = array();
 				foreach ($folders as &$node)
@@ -199,14 +199,14 @@ 
 					$nodeData = Mail::pathToFolderData($nodeId, $node['delimiter']);
 					$childrenNode[] = array(
 						Tree::ID=> $nodeId,
-						Tree::AUTOLOAD_CHILDREN => $_allInOneGo?false:self::nodeHasChildren($node),
+						Tree::AUTOLOAD_CHILDREN => $_allInOneGo ? false : self::nodeHasChildren($node),
 						Tree::CHILDREN =>array(),
 						Tree::LABEL => $nodeData['text'],
 						Tree::TOOLTIP => $nodeData['tooltip'],
 						Tree::IMAGE_LEAF => self::$leafImages['folderLeaf'],
 						Tree::IMAGE_FOLDER_OPEN => self::$leafImages['folderOpen'],
 						Tree::IMAGE_FOLDER_CLOSED => self::$leafImages['folderClosed'],
-						Tree::CHECKED => $_checkSubscribed?$node['SUBSCRIBED']:false,
+						Tree::CHECKED => $_checkSubscribed ? $node['SUBSCRIBED'] : false,
 						'parent' => $_parent
 					);
 				}
@@ -226,7 +226,7 @@ 
 				}
 
 				//List of folders
-				$foldersList = $this->ui->mail_bo->getFolderArrays(null, true, $_allInOneGo?0:2,$_subscribedOnly, false);
+				$foldersList = $this->ui->mail_bo->getFolderArrays(null, true, $_allInOneGo ? 0 : 2, $_subscribedOnly, false);
 
 				// User defined folders based on account
 				$definedFolders = array(
@@ -246,14 +246,14 @@ 
 
 					$data = array(
 						Tree::ID=>$_profileID.self::DELIMITER.$folder['MAILBOX'],
-						Tree::AUTOLOAD_CHILDREN => $_allInOneGo?false:self::nodeHasChildren($folder),
+						Tree::AUTOLOAD_CHILDREN => $_allInOneGo ? false : self::nodeHasChildren($folder),
 						Tree::CHILDREN =>array(),
 						Tree::LABEL =>lang($folder['MAILBOX']),
-						Tree::OPEN => self::getNodeLevel($folder['MAILBOX'], $folder['delimiter']) <= $_openTopLevel?1:0,
+						Tree::OPEN => self::getNodeLevel($folder['MAILBOX'], $folder['delimiter']) <= $_openTopLevel ? 1 : 0,
 						Tree::TOOLTIP => lang($folder['MAILBOX']),
-						Tree::CHECKED => $_checkSubscribed?$folder['SUBSCRIBED']:false,
+						Tree::CHECKED => $_checkSubscribed ? $folder['SUBSCRIBED'] : false,
 						Tree::NOCHECKBOX => 0,
-						'parent' => $parent?$_profileID.self::DELIMITER.implode($folder['delimiter'], $parent):$_profileID,
+						'parent' => $parent ? $_profileID.self::DELIMITER.implode($folder['delimiter'], $parent) : $_profileID,
 						'path' => $path,
 						'folderarray' => $folder
 					);
@@ -291,7 +291,7 @@ 
 		catch (Exception $ex) // Catch exceptions
 		{
 			//mail_ui::callWizard($ex->getMessage(), false, 'error');
-			return self::treeLeafNoConnectionArray($_profileID, $ex->getMessage(),array($_profileID), '');
+			return self::treeLeafNoConnectionArray($_profileID, $ex->getMessage(), array($_profileID), '');
 		}
 
 		return $tree;
@@ -308,19 +308,19 @@ 
 	 *					as clearance for access may be limited to a single branch-node of a tree
 	 * @return void
 	 */
-	static function setOutStructure($data, &$out, $del='.', $createMissingParents=true, $nameSpace=array(), $definedFolders= array())
+	static function setOutStructure($data, &$out, $del = '.', $createMissingParents = true, $nameSpace = array(), $definedFolders = array())
 	{
 		//error_log(__METHOD__."(".array2string($data).', '.array2string($out).", '$del')");
 		$components = $data['path'];
-		array_pop($components);	// remove own name
+		array_pop($components); // remove own name
 
 		$insert = &$out;
 		$parents = array();
-		foreach($components as $component)
+		foreach ($components as $component)
 		{
-			if (count($parents)>1)
+			if (count($parents) > 1)
 			{
-				$helper = array_slice($parents,1,null,true);
+				$helper = array_slice($parents, 1, null, true);
 				$parent = $parents[0].self::DELIMITER.implode($del, $helper);
 				if ($parent) $parent .= $del;
 			}
@@ -343,21 +343,21 @@ 
 				{
 					// if (appropriately padded) namespace prefix of (others or shared) is the leading part of parent
 					// we want to create the node in question as we meet the above considerations
-					if ($nsp['type']!='personal' && $nsp['prefix_present'] && stripos($parent,$data['path'][0].self::DELIMITER.$nsp['prefix'])===0)
+					if ($nsp['type'] != 'personal' && $nsp['prefix_present'] && stripos($parent, $data['path'][0].self::DELIMITER.$nsp['prefix']) === 0)
 					{
 						if (mail_bo::$debug) error_log(__METHOD__.__LINE__.' about to create:'.$parent.' in '.$data['path'][0].self::DELIMITER.$nsp['prefix']);
-						$break=false;
+						$break = false;
 					}
 				}
 				if ($break) break;
 			}
 			if ($insert['item'])
 			{
-				foreach($insert['item'] as &$item)
+				foreach ($insert['item'] as &$item)
 				{
 					if ($item['id'] == $parent.$component)
 					{
-						$insert =& $item;
+						$insert = & $item;
 						break;
 					}
 				}
@@ -375,8 +375,8 @@ 
 						'im2' => self::$leafImages["folderNoSelectClosed"],
 						'tooltip' => lang('no access')
 					);
-					$insert['item'][] =& $item;
-					$insert =& $item;
+					$insert['item'][] = & $item;
+					$insert = & $item;
 				}
 				else
 				{
@@ -409,7 +409,7 @@ 
 					$data[Tree::IMAGE_FOLDER_OPEN] =
 					$data [Tree::IMAGE_FOLDER_CLOSED] = "MailFolder".$key.".png";
 			}
-			elseif(stripos(array2string($data['folderarray']['attributes']),'\noselect')!== false)
+			elseif (stripos(array2string($data['folderarray']['attributes']), '\noselect') !== false)
 			{
 				$data[Tree::IMAGE_LEAF] = self::$leafImages['folderNoSelectClosed'];
 				$data[Tree::IMAGE_FOLDER_OPEN] = self::$leafImages['folderNoSelectOpen'];
@@ -451,20 +451,20 @@ 
 	 *
 	 * @return array an array of baseNodes of accounts
 	 */
-	static function getAccountsRootNode($_profileID = null, $_noCheckbox = false, $_openTopLevel = 0 )
+	static function getAccountsRootNode($_profileID = null, $_noCheckbox = false, $_openTopLevel = 0)
 	{
 		$roots = array(Tree::ID => 0, Tree::CHILDREN => array());
 
-		foreach(Mail\Account::search(true, false) as $acc_id => $accObj)
+		foreach (Mail\Account::search(true, false) as $acc_id => $accObj)
 		{
-			if (!$accObj->is_imap()|| $_profileID && $acc_id != $_profileID) continue;
-			$identity = Mail\Account::identity_name($accObj,true,$GLOBALS['egw_info']['user']['acount_id']);
+			if (!$accObj->is_imap() || $_profileID && $acc_id != $_profileID) continue;
+			$identity = Mail\Account::identity_name($accObj, true, $GLOBALS['egw_info']['user']['acount_id']);
 			// Open top level folders for active account
-			$openActiveAccount = $GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'] == $acc_id?1:0;
+			$openActiveAccount = $GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'] == $acc_id ? 1 : 0;
 
 			$baseNode = array(
 							Tree::ID=> (string)$acc_id,
-							Tree::LABEL => str_replace(array('<','>'),array('[',']'),$identity),
+							Tree::LABEL => str_replace(array('<', '>'), array('[', ']'), $identity),
 							Tree::TOOLTIP => '('.$acc_id.') '.htmlspecialchars_decode($identity),
 							Tree::IMAGE_LEAF => self::$leafImages['folderAccount'],
 							Tree::IMAGE_FOLDER_OPEN => self::$leafImages['folderAccount'],
@@ -473,16 +473,16 @@ 
 							Tree::CHILDREN => array(), // dynamic loading on unfold
 							Tree::AUTOLOAD_CHILDREN => true,
 							'parent' => '',
-							Tree::OPEN => $_openTopLevel?$_openTopLevel:$openActiveAccount,
+							Tree::OPEN => $_openTopLevel ? $_openTopLevel : $openActiveAccount,
 							// mark on account if Sieve is enabled
 							'data' => array(
 										'sieve' => $accObj->imapServer()->acc_sieve_enabled,
-										'spamfolder'=> $accObj->imapServer()->acc_folder_junk&&(strtolower($accObj->imapServer()->acc_folder_junk)!='none')?true:false,
-										'archivefolder'=> $accObj->imapServer()->acc_folder_archive&&(strtolower($accObj->imapServer()->acc_folder_archive)!='none')?true:false
+										'spamfolder'=> $accObj->imapServer()->acc_folder_junk && (strtolower($accObj->imapServer()->acc_folder_junk) != 'none') ? true : false,
+										'archivefolder'=> $accObj->imapServer()->acc_folder_archive && (strtolower($accObj->imapServer()->acc_folder_archive) != 'none') ? true : false
 									),
 							Tree::NOCHECKBOX  => $_noCheckbox
 			);
-			self::setOutStructure($baseNode, $roots,self::DELIMITER);
+			self::setOutStructure($baseNode, $roots, self::DELIMITER);
 		}
 		return $roots;
 	}
@@ -501,15 +501,15 @@ 
 	 * @param boolean $_allInOneGo = false, true will get all folders (dependes on subscribedOnly option) of the account in one go
 	 * @return type an array of tree
 	 */
-	function getInitialIndexTree ($_parent = null, $_profileID = '', $_openTopLevel = 1, $_subscribedOnly= false, $_allInOneGo = false)
+	function getInitialIndexTree($_parent = null, $_profileID = '', $_openTopLevel = 1, $_subscribedOnly = false, $_allInOneGo = false)
 	{
 		$tree = $this->getTree($_parent, '', $_openTopLevel, false, $_subscribedOnly, $_allInOneGo);
-		$branches = $this->getTree($_profileID, $_profileID,1,false,$_subscribedOnly,$_allInOneGo);
+		$branches = $this->getTree($_profileID, $_profileID, 1, false, $_subscribedOnly, $_allInOneGo);
 		foreach ($tree[Tree::CHILDREN] as &$account)
 		{
 			if ($account[Tree::ID] == $_profileID)
 			{
-				$account = array_merge($account , $branches);
+				$account = array_merge($account, $branches);
 			}
 		}
 		return $tree;

Braces +54 added lines, -14 removed lines

@@ -116,7 +116,10 @@ 
 		$hasChildren = 0;
 		if (in_array('\haschildren', $_node['ATTRIBUTES']) ||
 				in_array('\Haschildren', $_node['ATTRIBUTES']) ||
-				in_array('\HasChildren', $_node['ATTRIBUTES'])) $hasChildren = 1;
+				in_array('\HasChildren', $_node['ATTRIBUTES']))
+		{
+			$hasChildren = 1;
+		}
 		return $hasChildren;
 	}
 
@@ -129,7 +132,10 @@ 
 	private static function isAccountNode ($_node)
 	{
 		list(,$leaf) = explode(self::DELIMITER, $_node);
-		if ($leaf || $_node == null) return false;
+		if ($leaf || $_node == null)
+		{
+			return false;
+		}
 		return true;
 	}
 
@@ -168,17 +174,24 @@ 
 	{
 		//Init mail folders
 		$tree = array(Tree::ID=> $_parent?$_parent:0,Tree::CHILDREN => array());
-		if (!isset($this->ui->mail_bo)) throw new Api\Exception\WrongUserinput(lang('Initialization of mail failed. Please use the Wizard to cope with the problem'));
+		if (!isset($this->ui->mail_bo))
+		{
+			throw new Api\Exception\WrongUserinput(lang('Initialization of mail failed. Please use the Wizard to cope with the problem'));
+		}
 		$hDelimiter = $this->ui->mail_bo->getHierarchyDelimiter();
 
-		if ($_parent) list($_profileID) = explode(self::DELIMITER, $_parent);
+		if ($_parent)
+		{
+			list($_profileID) = explode(self::DELIMITER, $_parent);
+		}
 
 		if (is_numeric($_profileID) && $_profileID != $this->ui->mail_bo->profileID)
 		{
 			try
 			{
 				$this->ui->changeProfile($_profileID);
-			} catch (Exception $ex) {
+			}
+			catch (Exception $ex) {
 				return self::treeLeafNoConnectionArray($_profileID, $ex->getMessage(),array($_profileID), '');
 			}
 		}
@@ -188,9 +201,12 @@ 
 			// *** Note: Should not apply any imap transaction, because in case of exception it will stop the
 			// process of rendering root node
 
-			if ($_parent && !self::isAccountNode($_parent)) // Single node loader
+			if ($_parent && !self::isAccountNode($_parent))
+			{
+				// Single node loader
 			{
 				$nodeInfo = Mail::pathToFolderData($_parent, $hDelimiter);
+			}
 				$folders = $this->ui->mail_bo->getFolderArrays($nodeInfo['mailbox'],false,$_allInOneGo?0:2, $_subscribedOnly);
 
 				$childrenNode = array();
@@ -215,15 +231,21 @@ 
 			}
 			else //Top Level Nodes loader
 			{
-				if (self::isAccountNode($_parent)) // An account called for open
+				if (self::isAccountNode($_parent))
+				{
+					// An account called for open
 				{
 					$_openTopLevel = 1;
+				}
 					$tree = self::getAccountsRootNode($_profileID, $_noCheckboxNS, $_openTopLevel);
 				}
 				else // Initial accounts|root nodes
 				{
 					$tree = self::getAccountsRootNode($_profileID, $_noCheckboxNS, $_openTopLevel);
-					if (!$_profileID && !$_openTopLevel) return $tree;
+					if (!$_profileID && !$_openTopLevel)
+					{
+						return $tree;
+					}
 				}
 
 				//List of folders
@@ -323,19 +345,28 @@ 
 			{
 				$helper = array_slice($parents,1,null,true);
 				$parent = $parents[0].self::DELIMITER.implode($del, $helper);
-				if ($parent) $parent .= $del;
+				if ($parent)
+				{
+					$parent .= $del;
+				}
 			}
 			else
 			{
 				$parent = implode(self::DELIMITER, $parents);
-				if ($parent) $parent .= self::DELIMITER;
+				if ($parent)
+				{
+					$parent .= self::DELIMITER;
+				}
 			}
 
 			if (!is_array($insert) || !isset($insert['item']))
 			{
 				// throwing an exeption here seems to be unrecoverable,
 				// even if the cause is a something that can be handeled by the mailserver
-				if (mail_bo::$debug) error_log(__METHOD__.':'.__LINE__." id=$data[id]: Parent '$parent' of '$component' not found!");
+				if (mail_bo::$debug)
+				{
+					error_log(__METHOD__.':'.__LINE__." id=$data[id]: Parent '$parent' of '$component' not found!");
+				}
 				// should we hit the break? if in personal: sure, something is wrong with the folderstructure
 				// if in shared or others we may proceed as access to folders may very well be limited to
 				// a single folder within the tree
@@ -346,11 +377,17 @@ 
 					// we want to create the node in question as we meet the above considerations
 					if ($nsp['type']!='personal' && $nsp['prefix_present'] && stripos($parent,$data['path'][0].self::DELIMITER.$nsp['prefix'])===0)
 					{
-						if (mail_bo::$debug) error_log(__METHOD__.__LINE__.' about to create:'.$parent.' in '.$data['path'][0].self::DELIMITER.$nsp['prefix']);
+						if (mail_bo::$debug)
+						{
+							error_log(__METHOD__.__LINE__.' about to create:'.$parent.' in '.$data['path'][0].self::DELIMITER.$nsp['prefix']);
+						}
 						$break=false;
 					}
 				}
-				if ($break) break;
+				if ($break)
+				{
+					break;
+				}
 			}
 			if ($insert['item'])
 			{
@@ -458,7 +495,10 @@ 
 
 		foreach(Mail\Account::search(true, false) as $acc_id => $accObj)
 		{
-			if (!$accObj->is_imap()|| $_profileID && $acc_id != $_profileID) continue;
+			if (!$accObj->is_imap()|| $_profileID && $acc_id != $_profileID)
+			{
+				continue;
+			}
 			$identity = Mail\Account::identity_name($accObj,true,$GLOBALS['egw_info']['user']['acount_id']);
 			// Open top level folders for active account
 			$openActiveAccount = $GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'] == $acc_id?1:0;

mail/inc/class.mail_ui.inc.php

Doc Comments +12 added lines, -9 removed lines

@@ -1541,7 +1541,7 @@ 
 	 * function splitRowID - split the rowID into its parts
 	 *
 	 * @param string $_rowID string - a colon separated string in the form accountID:profileID:folder:message_uid
-	 * @return array populated named result array (accountID,profileID,folder,msgUID)
+	 * @return string populated named result array (accountID,profileID,folder,msgUID)
 	 */
 	static function splitRowID($_rowID)
 	{
@@ -1623,9 +1623,9 @@ 
 	 * function header2gridelements - to populate the grid elements with the collected Data
 	 *
 	 * @param array $_headers headerdata to process
-	 * @param array $cols cols to populate
+	 * @param string[] $cols cols to populate
 	 * @param array $_folderName to ensure the uniqueness of the uid over all folders
-	 * @param array $_folderType used to determine if we need to populate from/to
+	 * @param integer $_folderType used to determine if we need to populate from/to
 	 * @return array populated result array
 	 */
 	public function header2gridelements($_headers, $cols, $_folderName, $_folderType=0)
@@ -2863,6 +2863,9 @@ 
 		return $GLOBALS['egw']->framework->header();
 	}
 
+	/**
+	 * @param string $body
+	 */
 	function showBody(&$body, $print=true,$fullPageTags=true)
 	{
 		$BeginBody = '<div class="mailDisplayBody">
@@ -3099,9 +3102,9 @@ 
 	 * Replace CID with proper type of content understandable by browser
 	 *
 	 * @param type $_body content of message
-	 * @param type $_mailbox mail box
-	 * @param type $_uid uid
-	 * @param type $_partID part id
+	 * @param string $_mailbox mail box
+	 * @param string $_uid uid
+	 * @param string $_partID part id
 	 * @param type $_type = 'src' type of inline image that needs to be resolved and replaced
 	 *	- types: {plain|src|url|background}
 	 * @return string returns body content including all CID replacements
@@ -3283,7 +3286,7 @@ 
 	 * @param string $_folder (passed by reference) will set the folder used. must be set with a folder, but will hold modifications if
 	 *					folder is modified
 	 * @param string $importID ID for the imported message, used by attachments to identify them unambiguously
-	 * @return mixed $messageUID or exception
+	 * @return string $messageUID or exception
 	 */
 	function importMessageToFolder($_formData,&$_folder,$importID='')
 	{
@@ -3444,7 +3447,7 @@ 
 	 *
 	 * @param string _messageID UID
 	 *
-	 * @return xajax response
+	 * @return string|null response
 	 */
 	function loadEmailBody($_messageID=null,$_partID=null,$_htmloptions=null)
 	{
@@ -3995,7 +3998,7 @@ 
 	 * ajax_deleteFolder - its called via json, so the function must start with ajax (or the class-name must contain ajax)
 	 * @param string $_folderName folder to delete
 	 * @param boolean $_return = false wheter return the success value (true) or send response to client (false)
-	 * @return nothing
+	 * @return null|boolean
 	 */
 	function ajax_deleteFolder($_folderName, $_return = false)
 	{

Indentation +5 added lines, -5 removed lines

@@ -3117,7 +3117,7 @@ 
 		 * @param string $_partID
 		 * @param string $_type
 		 * @return string|boolean returns the replace
-		*/
+		 */
 		$replace_callback = function ($matches) use ($_mailbox,$_uid, $_partID,  $_type)
 		{
 			if (!$_type)	return false;
@@ -3249,10 +3249,10 @@ 
 			try
 			{
 				$messageUid = $this->importMessageToFolder($file,$destination,$importID);
-			    $linkData = array
-			    (
+				$linkData = array
+				(
 					'id' => $this->createRowID($destination, $messageUid, true),
-			    );
+				);
 			}
 			catch (Api\Exception\WrongUserinput $e)
 			{
@@ -3418,7 +3418,7 @@ 
 			$messageUid = $this->importMessageToFolder($formData,$draftFolder,$importID);
 			$linkData = array
 			(
-		        'menuaction'    => ($mode=='display'?'mail.mail_ui.displayMessage':'mail.mail_compose.composeFromDraft'),
+				'menuaction'    => ($mode=='display'?'mail.mail_ui.displayMessage':'mail.mail_compose.composeFromDraft'),
 				'id'		=> $this->createRowID($draftFolder,$messageUid,true),
 				'deleteDraftOnClose' => 1,
 			);

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -1811,7 +1811,7 @@
 
 			$data["class"] = implode(' ', $css_styles);
 			//translate style-classes back to flags
-			$data['flags'] = Array();
+			$data['flags'] = array();
 			if ($header['seen']) $data["flags"]['read'] = 'read';
 			foreach ($css_styles as &$flag) {
 				if ($flag!='mail')

Braces +931 added lines, -259 removed lines

@@ -127,9 +127,15 @@ 
 	function __construct($run_constructor=true)
 	{
 		$this->mail_tree = new mail_tree($this);
-		if (!$run_constructor) return;
+		if (!$run_constructor)
+		{
+			return;
+		}
 
-		if (Mail::$debugTimes) $starttime = microtime (true);
+		if (Mail::$debugTimes)
+		{
+			$starttime = microtime (true);
+		}
 		// no autohide of the sidebox, as we use it for folderlist now.
 		unset($GLOBALS['egw_info']['user']['preferences']['common']['auto_hide_sidebox']);
 
@@ -140,13 +146,19 @@ 
 		if ($_GET["resetConnection"])
 		{
 			unset($_GET["resetConnection"]);
-			if (Mail::$debug) error_log(__METHOD__.__LINE__.' Connection Reset triggered: for Profile with ID:'.self::$icServerID);
+			if (Mail::$debug)
+			{
+				error_log(__METHOD__.__LINE__.' Connection Reset triggered: for Profile with ID:'.self::$icServerID);
+			}
 			Mail::unsetCachedObjects(self::$icServerID);
 		}
 
 		try {
 			$this->mail_bo = Mail::getInstance(true,self::$icServerID, true, false, true);
-			if (Mail::$debug) error_log(__METHOD__.__LINE__.' Fetched IC Server:'.self::$icServerID.'/'.$this->mail_bo->profileID.':'.function_backtrace());
+			if (Mail::$debug)
+			{
+				error_log(__METHOD__.__LINE__.' Fetched IC Server:'.self::$icServerID.'/'.$this->mail_bo->profileID.':'.function_backtrace());
+			}
 			//error_log(__METHOD__.__LINE__.array2string($this->mail_bo->icServer));
 
 			// RegEx to minimize extra openConnection
@@ -167,9 +179,15 @@ 
 				$response->call('egw.message',$e->getMessage(),'error');
 			}
 			// redirect to mail wizard to handle it (redirect works for ajax too), unless index is called. we want the sidebox
-			if ($_GET['menuaction'] != 'mail.mail_ui.index') self::callWizard($e->getMessage(),true,'error',false);
+			if ($_GET['menuaction'] != 'mail.mail_ui.index')
+			{
+				self::callWizard($e->getMessage(),true,'error',false);
+			}
+		}
+		if (Mail::$debugTimes)
+		{
+			Mail::logRunTimes($starttime,null,'',__METHOD__.__LINE__);
 		}
-		if (Mail::$debugTimes) Mail::logRunTimes($starttime,null,'',__METHOD__.__LINE__);
 	}
 
 	/**
@@ -229,16 +247,28 @@ 
 	 */
 	function changeProfile($_icServerID,$unsetCache=false)
 	{
-		if (Mail::$debugTimes) $starttime = microtime (true);
+		if (Mail::$debugTimes)
+		{
+			$starttime = microtime (true);
+		}
 		if (self::$icServerID != $_icServerID)
 		{
 			self::$icServerID = $_icServerID;
 		}
-		if (Mail::$debug) error_log(__METHOD__.__LINE__.'->'.self::$icServerID.'<->'.$_icServerID);
+		if (Mail::$debug)
+		{
+			error_log(__METHOD__.__LINE__.'->'.self::$icServerID.'<->'.$_icServerID);
+		}
 
-		if ($unsetCache) Mail::unsetCachedObjects(self::$icServerID);
+		if ($unsetCache)
+		{
+			Mail::unsetCachedObjects(self::$icServerID);
+		}
 		$this->mail_bo = Mail::getInstance(false,self::$icServerID,true, false, true);
-		if (Mail::$debug) error_log(__METHOD__.__LINE__.' Fetched IC Server:'.self::$icServerID.'/'.$this->mail_bo->profileID.':'.function_backtrace());
+		if (Mail::$debug)
+		{
+			error_log(__METHOD__.__LINE__.' Fetched IC Server:'.self::$icServerID.'/'.$this->mail_bo->profileID.':'.function_backtrace());
+		}
 		// no icServer Object: something failed big time
 		if (!isset($this->mail_bo) || !isset($this->mail_bo->icServer) || $this->mail_bo->icServer->ImapServerId<>$_icServerID)
 		{
@@ -248,14 +278,23 @@ 
 
 		// save session varchar
 		$oldicServerID =& Api\Cache::getSession('mail','activeProfileID');
-		if ($oldicServerID <> self::$icServerID) $this->mail_bo->openConnection(self::$icServerID);
-		if (true) $oldicServerID = self::$icServerID;
+		if ($oldicServerID <> self::$icServerID)
+		{
+			$this->mail_bo->openConnection(self::$icServerID);
+		}
+		if (true)
+		{
+			$oldicServerID = self::$icServerID;
+		}
 		if (!Mail::storeActiveProfileIDToPref($this->mail_bo->icServer, self::$icServerID, true ))
 		{
 			throw new Api\Exception(__METHOD__." failed to change Profile to $_icServerID");
 		}
 
-		if (Mail::$debugTimes) Mail::logRunTimes($starttime,null,'',__METHOD__.__LINE__);
+		if (Mail::$debugTimes)
+		{
+			Mail::logRunTimes($starttime,null,'',__METHOD__.__LINE__);
+		}
 	}
 
 	/**
@@ -296,7 +335,8 @@ 
 		// got subscribed or unsubscribed by the user
 		try {
 			$subscribed = $this->mail_bo->icServer->listSubscribedMailboxes('',0,true);
-		} catch (Exception $ex) {
+		}
+		catch (Exception $ex) {
 			Framework::message($ex->getMessage());
 		}
 
@@ -330,9 +370,18 @@ 
 						list(,$node) = explode($profileId.self::$delimiter, $path);
 						if ($node)
 						{
-							if (is_array($subscribed) && $subscribed[$node] && !$value['value']) $to_unsubscribe []= $node;
-							if (is_array($subscribed) && !$subscribed[$node] && $value['value']) $to_subscribe [] = $node;
-							if ($value['value']) $cont[] = $path;
+							if (is_array($subscribed) && $subscribed[$node] && !$value['value'])
+							{
+								$to_unsubscribe []= $node;
+							}
+							if (is_array($subscribed) && !$subscribed[$node] && $value['value'])
+							{
+								$to_subscribe [] = $node;
+							}
+							if ($value['value'])
+							{
+								$cont[] = $path;
+							}
 						}
 
 					}
@@ -420,9 +469,15 @@ 
 	{
 		//error_log(__METHOD__.__LINE__.array2string($content));
 		try	{
-				if (!isset($this->mail_bo)) throw new Api\Exception\WrongUserinput(lang('Initialization of mail failed. Please use the Wizard to cope with the problem.'));
+				if (!isset($this->mail_bo))
+				{
+					throw new Api\Exception\WrongUserinput(lang('Initialization of mail failed. Please use the Wizard to cope with the problem.'));
+				}
 				//error_log(__METHOD__.__LINE__.function_backtrace());
-				if (Mail::$debugTimes) $starttime = microtime (true);
+				if (Mail::$debugTimes)
+				{
+					$starttime = microtime (true);
+				}
 				$this->mail_bo->restoreSessionData();
 				$sessionFolder = $this->mail_bo->sessionData['mailbox'];
 				if ($this->mail_bo->folderExists($sessionFolder))
@@ -451,7 +506,10 @@ 
 							'sort'           =>	'DESC',	// IO direction of the sort: 'ASC' or 'DESC'
 						);
 					}
-					if (Api\Header\UserAgent::mobile()) $content[self::$nm_index]['header_row'] = 'mail.index.header_right';
+					if (Api\Header\UserAgent::mobile())
+					{
+						$content[self::$nm_index]['header_row'] = 'mail.index.header_right';
+					}
 				}
 
 				// These must always be set, even if $content is an array
@@ -475,13 +533,16 @@ 
 				}
 				// call getQuotaRoot asynchronously in getRows by initiating a client Server roundtrip
 				$quota = false;//$this->mail_bo->getQuotaRoot();
-				if($quota !== false && $quota['limit'] != 'NOT SET') {
+				if($quota !== false && $quota['limit'] != 'NOT SET')
+				{
 					$quotainfo = $this->quotaDisplay($quota['usage'], $quota['limit']);
 					$content[self::$nm_index]['quota'] = $sel_options[self::$nm_index]['quota'] = $quotainfo['text'];
 					$content[self::$nm_index]['quotainpercent'] = $sel_options[self::$nm_index]['quotainpercent'] =  (string)$quotainfo['percent'];
 					$content[self::$nm_index]['quotaclass'] = $sel_options[self::$nm_index]['quotaclass'] = $quotainfo['class'];
 					$content[self::$nm_index]['quotanotsupported'] = $sel_options[self::$nm_index]['quotanotsupported'] = "";
-				} else {
+				}
+				else
+				{
 					$content[self::$nm_index]['quota'] = $sel_options[self::$nm_index]['quota'] = lang("Quota not provided by server");
 					$content[self::$nm_index]['quotaclass'] = $sel_options[self::$nm_index]['quotaclass'] = "mail_DisplayNone";
 					$content[self::$nm_index]['quotanotsupported'] = $sel_options[self::$nm_index]['quotanotsupported'] = "mail_DisplayNone";
@@ -489,7 +550,8 @@ 
 				// call gatherVacation asynchronously in getRows by initiating a client Server roundtrip
 				$vacation = false;//$this->gatherVacation();
 				//error_log(__METHOD__.__LINE__.' Server:'.self::$icServerID.' Sieve Enabled:'.array2string($vacation));
-				if($vacation) {
+				if($vacation)
+				{
 					if (is_array($vacation) && ($vacation['status'] == 'on' || $vacation['status']=='by_date' && $vacation['end_date'] > time()))
 					{
 						$dtfrmt = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat']/*.' '.($GLOBALS['egw_info']['user']['preferences']['common']['timeformat']!='24'?'h:i a':'H:i')*/;
@@ -523,19 +585,31 @@ 
 					$keywords = array('keyword1','keyword2','keyword3','keyword4','keyword5');
 					foreach($keywords as &$k)
 					{
-						if (array_key_exists($k,$this->statusTypes)) unset($this->statusTypes[$k]);
+						if (array_key_exists($k,$this->statusTypes))
+						{
+							unset($this->statusTypes[$k]);
+						}
 					}
 				}
 
-				if (!isset($content[self::$nm_index]['foldertree'])) $content[self::$nm_index]['foldertree'] = $this->mail_bo->profileID.self::$delimiter.'INBOX';
-				if (!isset($content[self::$nm_index]['selectedFolder'])) $content[self::$nm_index]['selectedFolder'] = $this->mail_bo->profileID.self::$delimiter.'INBOX';
+				if (!isset($content[self::$nm_index]['foldertree']))
+				{
+					$content[self::$nm_index]['foldertree'] = $this->mail_bo->profileID.self::$delimiter.'INBOX';
+				}
+				if (!isset($content[self::$nm_index]['selectedFolder']))
+				{
+					$content[self::$nm_index]['selectedFolder'] = $this->mail_bo->profileID.self::$delimiter.'INBOX';
+				}
 
 				$content[self::$nm_index]['foldertree'] = $content[self::$nm_index]['selectedFolder'];
 
 				if (is_null(Mail::$supportsORinQuery) || !isset(Mail::$supportsORinQuery[$this->mail_bo->profileID]))
 				{
 					Mail::$supportsORinQuery = Api\Cache::getCache(Api\Cache::INSTANCE, 'email', 'supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*10);
-					if (!isset(Mail::$supportsORinQuery[$this->mail_bo->profileID])) Mail::$supportsORinQuery[$this->mail_bo->profileID]=true;
+					if (!isset(Mail::$supportsORinQuery[$this->mail_bo->profileID]))
+					{
+						Mail::$supportsORinQuery[$this->mail_bo->profileID]=true;
+					}
 				}
 				if (!Mail::$supportsORinQuery[$this->mail_bo->profileID])
 				{
@@ -557,10 +631,16 @@ 
 				$etpl->setElementAttribute(self::$nm_index.'[foldertree]','actions', $this->get_tree_actions());
 
 				// sending preview toolbar actions
-				if ($content['mailSplitter']) $etpl->setElementAttribute('mailPreview[toolbar]', 'actions', $this->get_toolbar_actions());
+				if ($content['mailSplitter'])
+				{
+					$etpl->setElementAttribute('mailPreview[toolbar]', 'actions', $this->get_toolbar_actions());
+				}
 
 				// We need to send toolbar actions to client-side because view template needs them
-				if (Api\Header\UserAgent::mobile()) $sel_options['toolbar'] = $this->get_toolbar_actions();
+				if (Api\Header\UserAgent::mobile())
+				{
+					$sel_options['toolbar'] = $this->get_toolbar_actions();
+				}
 
 				//we use the category "filter" option as specifier where we want to search (quick, subject, from, to, etc. ....)
 				if (empty($content[self::$nm_index]['cat_id']) || empty($content[self::$nm_index]['search']))
@@ -568,7 +648,10 @@ 
 					$content[self::$nm_index]['cat_id']=($content[self::$nm_index]['cat_id']?(!Mail::$supportsORinQuery[$this->mail_bo->profileID]&&($content[self::$nm_index]['cat_id']=='quick'||$content[self::$nm_index]['cat_id']=='quickwithcc')?'subject':$content[self::$nm_index]['cat_id']):(Mail::$supportsORinQuery[$this->mail_bo->profileID]?'quick':'subject'));
 				}
 				$readonlys = $preserv = array();
-				if (Mail::$debugTimes) Mail::logRunTimes($starttime,null,'',__METHOD__.__LINE__);
+				if (Mail::$debugTimes)
+				{
+					Mail::logRunTimes($starttime,null,'',__METHOD__.__LINE__);
+				}
 		}
 		catch (Exception $e)
 		{
@@ -584,13 +667,19 @@ 
 				$etpl->setElementAttribute(self::$nm_index.'[foldertree]','actions', $this->get_tree_actions(false));
 			}
 			$readonlys = $preserv = array();
-			if (empty($content)) $content=array();
+			if (empty($content))
+			{
+				$content=array();
+			}
 
 			self::callWizard($e->getMessage().($e->details?', '.$e->details:''),(isset($this->mail_bo)?false:true), 'error',false);
 			//return false;
 		}
 		// Check preview pane is enabled, then show splitter
-		if ($this->mail_bo->mailPreferences['previewPane']) $etpl->setElementAttribute('splitter', 'template', 'mail.index.nosplitter');
+		if ($this->mail_bo->mailPreferences['previewPane'])
+		{
+			$etpl->setElementAttribute('splitter', 'template', 'mail.index.nosplitter');
+		}
 
 		return $etpl->exec('mail.mail_ui.index',$content,$sel_options,$readonlys,$preserv);
 	}
@@ -811,7 +900,8 @@ 
 			$this->mail_bo->icServer->subscribeMailbox($_folderName, $_status);
 			$this->mail_bo->resetFolderObjectCache($_acc_id);
 			$this->ajax_reloadNode($_acc_id,!$this->mail_bo->mailPreferences['showAllFoldersInFolderPane']);
-		} catch (Horde_Imap_Client_Exception $ex) {
+		}
+		catch (Horde_Imap_Client_Exception $ex) {
 			error_log(__METHOD__.__LINE__."()". lang('Folder %1 %2 failed because of %3!',$_folderName,$_status?'subscribed':'unsubscribed', $ex));
 			Framework::message(lang('Folder %1 %2 failed!',$_folderName,$_status));
 		}
@@ -828,12 +918,18 @@ 
 	public function ajax_foldertree($_nodeID = null,$_subscribedOnly=null)
 	{
 		$nodeID = $_GET['id'];
-		if (!is_null($_nodeID)) $nodeID = $_nodeID;
+		if (!is_null($_nodeID))
+		{
+			$nodeID = $_nodeID;
+		}
 		$subscribedOnly = (bool)(!is_null($_subscribedOnly)?$_subscribedOnly:!$this->mail_bo->mailPreferences['showAllFoldersInFolderPane']);
 		$fetchCounters = !is_null($_nodeID);
 		list($_profileID,$_folderName) = explode(self::$delimiter,$nodeID,2);
 
-		if (!empty($_folderName)) $fetchCounters = true;
+		if (!empty($_folderName))
+		{
+			$fetchCounters = true;
+		}
 
 		// Check if it is called for refresh root
 		// then we need to reinitialized the index tree
@@ -845,7 +941,10 @@ 
 		{
 			$data = $this->mail_tree->getTree($nodeID,$_profileID,0, false,$subscribedOnly,!$this->mail_bo->mailPreferences['showAllFoldersInFolderPane']);
 		}
-		if (!is_null($_nodeID)) return $data;
+		if (!is_null($_nodeID))
+		{
+			return $data;
+		}
 		Etemplate\Widget\Tree::send_quote_json($data);
 	}
 
@@ -911,7 +1010,10 @@ 
 				$accArray[$acc_id] = str_replace(array('<','>'),array('[',']'),$identity_name);// as angle brackets are quoted, display in Javascript messages when used is ugly, so use square brackets instead
 			}
 		}
-		if (!is_array($lastFoldersUsedForMoveCont)) $lastFoldersUsedForMoveCont=array();
+		if (!is_array($lastFoldersUsedForMoveCont))
+		{
+			$lastFoldersUsedForMoveCont=array();
+		}
 		foreach (array_keys($lastFoldersUsedForMoveCont) as $pid)
 		{
 			if ($this->mail_bo->profileID==$pid && isset($lastFoldersUsedForMoveCont[$this->mail_bo->profileID]))
@@ -927,9 +1029,12 @@ 
 						$moveaction .= $lastFolderUsedForMoveCont;
 						//error_log(__METHOD__.__LINE__.'#'.$moveaction);
 						//error_log(__METHOD__.__LINE__.'#'.$currentArchiveActionKey);
-						if ($this->mail_bo->folderExists($i)) // only 10 entries per mailaccount.Control this on setting the buffered folders
+						if ($this->mail_bo->folderExists($i))
+						{
+							// only 10 entries per mailaccount.Control this on setting the buffered folders
 						{
 							$fS['profileID'] = $this->mail_bo->profileID;
+						}
 							$fS['profileName'] = $accArray[$this->mail_bo->profileID];
 							$fS['shortDisplayName'] = $i;
 							$moveactions[$moveaction] = $fS;
@@ -949,9 +1054,12 @@ 
 				foreach ($lastFoldersUsedForMoveCont[$pid] as $i => $lastFolderUsedForMoveCont)
 				{
 					//error_log(__METHOD__.__LINE__."$i => $lastFolderUsedForMoveCont");
-					if (!empty($lastFolderUsedForMoveCont)) // only 10 entries per mailaccount.Control this on setting the buffered folders
+					if (!empty($lastFolderUsedForMoveCont))
+					{
+						// only 10 entries per mailaccount.Control this on setting the buffered folders
 					{
 						$moveaction = 'move_'.$lastFolderUsedForMoveCont;
+					}
 						//error_log(__METHOD__.__LINE__.'#'.$moveaction);
 						$fS = array();
 						$fS['profileID'] = $pid;
@@ -1054,7 +1162,9 @@ 
 				'children' => $children,
 			);
 
-		} else {
+		}
+		else
+		{
 			$group++;
 		}
 
@@ -1330,7 +1440,10 @@ 
 					$rows=array();
 					return 0;
 				}
-				if (empty($folderName)) $query['selectedFolder'] = $_profileID.self::$delimiter.'INBOX';
+				if (empty($folderName))
+				{
+					$query['selectedFolder'] = $_profileID.self::$delimiter.'INBOX';
+				}
 			}
 		}
 		if (!isset($mail_ui))
@@ -1345,15 +1458,24 @@ 
 				$rows=array();
 				return 0;
 			}
-			if (empty($query['selectedFolder'])) $query['selectedFolder'] = $mail_ui->mail_bo->profileID.self::$delimiter.'INBOX';
+			if (empty($query['selectedFolder']))
+			{
+				$query['selectedFolder'] = $mail_ui->mail_bo->profileID.self::$delimiter.'INBOX';
+			}
 		}
 		//error_log(__METHOD__.__LINE__.' SelectedFolder:'.$query['selectedFolder'].' Start:'.$query['start'].' NumRows:'.$query['num_rows'].array2string($query['order']).'->'.array2string($query['sort']));
 		//Mail::$debugTimes=true;
-		if (Mail::$debugTimes) $starttime = microtime(true);
+		if (Mail::$debugTimes)
+		{
+			$starttime = microtime(true);
+		}
 		//$query['search'] is the phrase in the searchbox
 
 		$mail_ui->mail_bo->restoreSessionData();
-		if (isset($query['selectedFolder'])) $mail_ui->mail_bo->sessionData['mailbox']=$query['selectedFolder'];
+		if (isset($query['selectedFolder']))
+		{
+			$mail_ui->mail_bo->sessionData['mailbox']=$query['selectedFolder'];
+		}
 		$mail_ui->mail_bo->saveSessionData();
 
 		$sRToFetch = null;
@@ -1364,7 +1486,10 @@ 
 			unset($app);
 		}
 		//save selected Folder to sessionData (mailbox)->currentFolder
-		if (isset($query['selectedFolder'])) $mail_ui->mail_bo->sessionData['mailbox']=$_folderName;
+		if (isset($query['selectedFolder']))
+		{
+			$mail_ui->mail_bo->sessionData['mailbox']=$_folderName;
+		}
 		$toSchema = false;//decides to select list schema with column to selected (if false fromaddress is default)
 		if ($mail_ui->mail_bo->folderExists($_folderName))
 		{
@@ -1397,8 +1522,16 @@ 
 			}
 			//error_log(__METHOD__.__LINE__.' Startdate:'.$query['startdate'].' Enddate'.$query['enddate']);
 			$cutoffdate = $cutoffdate2 = null;
-			if ($query['startdate']) $cutoffdate = Api\DateTime::to($query['startdate'],'ts');//SINCE, enddate
-			if ($query['enddate']) $cutoffdate2 = Api\DateTime::to($query['enddate'],'ts');//BEFORE, startdate
+			if ($query['startdate'])
+			{
+				$cutoffdate = Api\DateTime::to($query['startdate'],'ts');
+			}
+			//SINCE, enddate
+			if ($query['enddate'])
+			{
+				$cutoffdate2 = Api\DateTime::to($query['enddate'],'ts');
+			}
+			//BEFORE, startdate
 			//error_log(__METHOD__.__LINE__.' Startdate:'.$cutoffdate2.' Enddate'.$cutoffdate);
 			$filter = array(
 				'filterName' => (Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID]?lang('quicksearch'):lang('subject')),
@@ -1407,15 +1540,24 @@ 
 				'status' => 'any',
 				//'range'=>"BETWEEN",'since'=> date("d-M-Y", $cutoffdate),'before'=> date("d-M-Y", $cutoffdate2)
 			);
-			if ($query['enddate']||$query['startdate']) {
+			if ($query['enddate']||$query['startdate'])
+			{
 				$filter['range'] = "BETWEEN";
-				if ($cutoffdate) {
+				if ($cutoffdate)
+				{
 					$filter[(empty($cutoffdate2)?'date':'since')] =  date("d-M-Y", $cutoffdate);
-					if (empty($cutoffdate2)) $filter['range'] = "SINCE";
+					if (empty($cutoffdate2))
+					{
+						$filter['range'] = "SINCE";
+					}
 				}
-				if ($cutoffdate2) {
+				if ($cutoffdate2)
+				{
 					$filter[(empty($cutoffdate)?'date':'before')] =  date("d-M-Y", $cutoffdate2);
-					if (empty($cutoffdate)) $filter['range'] = "BEFORE";
+					if (empty($cutoffdate))
+					{
+						$filter['range'] = "BEFORE";
+					}
 				}
 			}
 		}
@@ -1468,7 +1610,10 @@ 
 				$rowsFetched['messages'] = $_sR['count'];
 				$ids = $_sR['match']->ids;
 				// if $sR is false, something failed fundamentally
-				if($reverse === true) $ids = ($ids===false?array():array_reverse((array)$ids));
+				if($reverse === true)
+				{
+					$ids = ($ids===false?array():array_reverse((array)$ids));
+				}
 				$sR = array_slice((array)$ids,($offset==0?0:$offset-1),$maxMessages); // we need only $maxMessages of uids
 				$sRToFetch = $sR;//array_slice($sR,0,50); // we fetch only the headers of a subset of the fetched uids
 				//error_log(__METHOD__.__LINE__.' Rows fetched (UID only):'.count($sR).' Data:'.array2string($sR));
@@ -1534,7 +1679,10 @@ 
 				}
 				else
 				{
-					if (!empty($v)) $sortResult['header'][] = array('uid'=>$v);
+					if (!empty($v))
+					{
+						$sortResult['header'][] = array('uid'=>$v);
+					}
 				}
 			}
 		}
@@ -1543,15 +1691,24 @@ 
 			$sortResult = $sortResultwH;
 		}
 		$rowsFetched['rowsFetched'] = count($sortResult['header']);
-		if (empty($rowsFetched['messages'])) $rowsFetched['messages'] = $rowsFetched['rowsFetched'];
+		if (empty($rowsFetched['messages']))
+		{
+			$rowsFetched['messages'] = $rowsFetched['rowsFetched'];
+		}
 
 		//error_log(__METHOD__.__LINE__.' Rows fetched:'.$rowsFetched.' Data:'.array2string($sortResult));
 		$cols = array('row_id','uid','status','attachments','subject','address','toaddress','fromaddress','ccaddress','additionaltoaddress','date','size','modified','bodypreview');
-		if ($GLOBALS['egw_info']['user']['preferences']['common']['select_mode']=='EGW_SELECTMODE_TOGGLE') unset($cols[0]);
+		if ($GLOBALS['egw_info']['user']['preferences']['common']['select_mode']=='EGW_SELECTMODE_TOGGLE')
+		{
+			unset($cols[0]);
+		}
 		$rows = $mail_ui->header2gridelements($sortResult['header'],$cols, $_folderName, $folderType=$toSchema);
 		//error_log(__METHOD__.__LINE__.array2string($rows));
 
-		if (Mail::$debugTimes) Mail::logRunTimes($starttime,null,'Folder:'.$_folderName.' Start:'.$query['start'].' NumRows:'.$query['num_rows'],__METHOD__.__LINE__);
+		if (Mail::$debugTimes)
+		{
+			Mail::logRunTimes($starttime,null,'Folder:'.$_folderName.' Start:'.$query['start'].' NumRows:'.$query['num_rows'],__METHOD__.__LINE__);
+		}
 		return $rowsFetched['messages'];
 	}
 
@@ -1653,7 +1810,10 @@ 
 					$actionsenabled[$act]= $actions['mark']['children']['setLabel']['children'][$act];
 					break;
 				default:
-					if (isset($actions[$act])) $actionsenabled[$act]=$actions[$act];
+					if (isset($actions[$act]))
+					{
+						$actionsenabled[$act]=$actions[$act];
+					}
 			}
 		}
 		unset($actionsenabled['drag_mail']);
@@ -1675,7 +1835,10 @@ 
 	 */
 	public function header2gridelements($_headers, $cols, $_folderName, $_folderType=0)
 	{
-		if (Mail::$debugTimes) $starttime = microtime(true);
+		if (Mail::$debugTimes)
+		{
+			$starttime = microtime(true);
+		}
 		$rv = array();
 		$i=0;
 		foreach((array)$_headers as $header)
@@ -1688,17 +1851,50 @@ 
 			$data['row_id']=$this->createRowID($_folderName,$message_uid);
 
 			$flags = "";
-			if(!empty($header['recent'])) $flags .= "R";
-			if(!empty($header['flagged'])) $flags .= "F";
-			if(!empty($header['answered'])) $flags .= "A";
-			if(!empty($header['forwarded'])) $flags .= "W";
-			if(!empty($header['deleted'])) $flags .= "D";
-			if(!empty($header['seen'])) $flags .= "S";
-			if(!empty($header['label1'])) $flags .= "1";
-			if(!empty($header['label2'])) $flags .= "2";
-			if(!empty($header['label3'])) $flags .= "3";
-			if(!empty($header['label4'])) $flags .= "4";
-			if(!empty($header['label5'])) $flags .= "5";
+			if(!empty($header['recent']))
+			{
+				$flags .= "R";
+			}
+			if(!empty($header['flagged']))
+			{
+				$flags .= "F";
+			}
+			if(!empty($header['answered']))
+			{
+				$flags .= "A";
+			}
+			if(!empty($header['forwarded']))
+			{
+				$flags .= "W";
+			}
+			if(!empty($header['deleted']))
+			{
+				$flags .= "D";
+			}
+			if(!empty($header['seen']))
+			{
+				$flags .= "S";
+			}
+			if(!empty($header['label1']))
+			{
+				$flags .= "1";
+			}
+			if(!empty($header['label2']))
+			{
+				$flags .= "2";
+			}
+			if(!empty($header['label3']))
+			{
+				$flags .= "3";
+			}
+			if(!empty($header['label4']))
+			{
+				$flags .= "4";
+			}
+			if(!empty($header['label5']))
+			{
+				$flags .= "5";
+			}
 
 			$data["status"] = "<span class=\"status_img\"></span>";
 			//error_log(__METHOD__.array2string($header).' Flags:'.$flags);
@@ -1706,41 +1902,53 @@ 
 			// the css for this row
 			$is_recent=false;
 			$css_styles = array("mail");
-			if ($header['deleted']) {
+			if ($header['deleted'])
+			{
 				$css_styles[] = 'deleted';
 			}
-			if ($header['recent'] && !($header['deleted'] || $header['seen'] || $header['answered'] || $header['forwarded'])) {
+			if ($header['recent'] && !($header['deleted'] || $header['seen'] || $header['answered'] || $header['forwarded']))
+			{
 				$css_styles[] = 'recent';
 				$is_recent=true;
 			}
-			if ($header['priority'] < 3) {
+			if ($header['priority'] < 3)
+			{
 				$css_styles[] = 'prio_high';
 			}
-			if ($header['flagged']) {
+			if ($header['flagged'])
+			{
 				$css_styles[] = 'flagged';
 			}
-			if (!$header['seen']) {
+			if (!$header['seen'])
+			{
 				$css_styles[] = 'unseen'; // different status image for recent // solved via css !important
 			}
-			if ($header['answered']) {
+			if ($header['answered'])
+			{
 				$css_styles[] = 'replied';
 			}
-			if ($header['forwarded']) {
+			if ($header['forwarded'])
+			{
 				$css_styles[] = 'forwarded';
 			}
-			if ($header['label1']) {
+			if ($header['label1'])
+			{
 				$css_styles[] = 'labelone';
 			}
-			if ($header['label2']) {
+			if ($header['label2'])
+			{
 				$css_styles[] = 'labeltwo';
 			}
-			if ($header['label3']) {
+			if ($header['label3'])
+			{
 				$css_styles[] = 'labelthree';
 			}
-			if ($header['label4']) {
+			if ($header['label4'])
+			{
 				$css_styles[] = 'labelfour';
 			}
-			if ($header['label5']) {
+			if ($header['label5'])
+			{
 				$css_styles[] = 'labelfive';
 			}
 
@@ -1757,10 +1965,13 @@ 
 				$header['subject'] = preg_replace($search,$replace,$header['subject']);
 				// curly brackets get messed up by the template!
 
-				if (!empty($header['subject'])) {
+				if (!empty($header['subject']))
+				{
 					// make the subject shorter if it is to long
 					$subject = $header['subject'];
-				} else {
+				}
+				else
+				{
 					$subject = '('. lang('no subject') .')';
 				}
 
@@ -1802,15 +2013,22 @@ 
 					}
 
 					$attachmentFlag = $image;
-				} else {
+				}
+				else
+				{
 					$attachmentFlag ='&nbsp;';
 				}
 				// show priority flag
-				if ($header['priority'] < 3) {
+				if ($header['priority'] < 3)
+				{
 					 $image = Api\Html::image('mail','prio_high');
-				} elseif ($header['priority'] > 3) {
+				}
+				elseif ($header['priority'] > 3)
+				{
 					$image = Api\Html::image('mail','prio_low');
-				} else {
+				}
+				else
+				{
 					$image = '';
 				}
 				// show a flag for flagged messages
@@ -1852,26 +2070,53 @@ 
 			}
 
 			if (in_array("size", $cols))
-				$data["size"] = $header['size']; /// size
+			{
+							$data["size"] = $header['size'];
+			}
+			/// size
 
 			$data["class"] = implode(' ', $css_styles);
 			//translate style-classes back to flags
 			$data['flags'] = Array();
-			if ($header['seen']) $data["flags"]['read'] = 'read';
-			foreach ($css_styles as &$flag) {
+			if ($header['seen'])
+			{
+				$data["flags"]['read'] = 'read';
+			}
+			foreach ($css_styles as &$flag)
+			{
 				if ($flag!='mail')
 				{
-					if ($flag=='labelone') {$data["flags"]['label1'] = 'label1';}
-					elseif ($flag=='labeltwo') {$data["flags"]['label2'] = 'label2';}
-					elseif ($flag=='labelthree') {$data["flags"]['label3'] = 'label3';}
-					elseif ($flag=='labelfour') {$data["flags"]['label4'] = 'label4';}
-					elseif ($flag=='labelfive') {$data["flags"]['label5'] = 'label5';}
-					elseif ($flag=='unseen') {unset($data["flags"]['read']);}
-					else $data["flags"][$flag] = $flag;
+					if ($flag=='labelone')
+					{
+$data["flags"]['label1'] = 'label1';}
+					elseif ($flag=='labeltwo')
+					{
+$data["flags"]['label2'] = 'label2';}
+					elseif ($flag=='labelthree')
+					{
+$data["flags"]['label3'] = 'label3';}
+					elseif ($flag=='labelfour')
+					{
+$data["flags"]['label4'] = 'label4';}
+					elseif ($flag=='labelfive')
+					{
+$data["flags"]['label5'] = 'label5';}
+					elseif ($flag=='unseen')
+					{
+unset($data["flags"]['read']);}
+					else {
+						$data["flags"][$flag] = $flag;
+					}
 				}
 			}
-			if ($header['disposition-notification-to']) $data['dispositionnotificationto'] = $header['disposition-notification-to'];
-			if (($header['mdnsent']||$header['mdnnotsent']|$header['seen'])&&isset($data['dispositionnotificationto'])) unset($data['dispositionnotificationto']);
+			if ($header['disposition-notification-to'])
+			{
+				$data['dispositionnotificationto'] = $header['disposition-notification-to'];
+			}
+			if (($header['mdnsent']||$header['mdnnotsent']|$header['seen'])&&isset($data['dispositionnotificationto']))
+			{
+				unset($data['dispositionnotificationto']);
+			}
 			$data['attachmentsBlock'] = $imageHTMLBlock;
 			$data['address'] = ($_folderType?$data["toaddress"]:$data["fromaddress"]);
 			if (in_array("bodypreview", $cols)&&$header['bodypreview'])
@@ -1881,7 +2126,10 @@ 
 			$rv[] = $data;
 			//error_log(__METHOD__.__LINE__.array2string($data));
 		}
-		if (Mail::$debugTimes) Mail::logRunTimes($starttime,null,'Folder:'.$_folderName,__METHOD__.__LINE__);
+		if (Mail::$debugTimes)
+		{
+			Mail::logRunTimes($starttime,null,'Folder:'.$_folderName,__METHOD__.__LINE__);
+		}
 
 		// ToDo: call this ONLY if labels change
 		Etemplate\Widget::setElementAttribute('toolbar', 'actions', $this->get_toolbar_actions());
@@ -1896,8 +2144,14 @@ 
 	 */
 	function displayHeader()
 	{
-		if(isset($_GET['id'])) $rowID	= $_GET['id'];
-		if(isset($_GET['part'])) $partID = $_GET['part'];
+		if(isset($_GET['id']))
+		{
+			$rowID	= $_GET['id'];
+		}
+		if(isset($_GET['part']))
+		{
+			$partID = $_GET['part'];
+		}
 
 		$hA = self::splitRowID($rowID);
 		$uid = $hA['msgUID'];
@@ -1921,7 +2175,8 @@ 
 		$rawheaders 	= "";
 		// create it new, with good line breaks
 		reset($newRawHeaders);
-		while(list($key,$value) = @each($newRawHeaders)) {
+		while(list($key,$value) = @each($newRawHeaders))
+		{
 			$rawheaders .= wordwrap($value, 90, "\n     ");
 		}
 
@@ -1944,12 +2199,24 @@ 
 	 */
 	function displayMessage($_requesteddata = null)
 	{
-		if (is_null($_requesteddata)) $_requesteddata = $_GET;
+		if (is_null($_requesteddata))
+		{
+			$_requesteddata = $_GET;
+		}
 
 		$preventRedirect=false;
-		if(isset($_requesteddata['id'])) $rowID	= $_requesteddata['id'];
-		if(isset($_requesteddata['part'])) $partID = $_requesteddata['part']!='null'?$_requesteddata['part']:null;
-		if(isset($_requesteddata['mode'])) $preventRedirect   = (($_requesteddata['mode']=='display' || $_requesteddata['mode'] == 'print')?true:false);
+		if(isset($_requesteddata['id']))
+		{
+			$rowID	= $_requesteddata['id'];
+		}
+		if(isset($_requesteddata['part']))
+		{
+			$partID = $_requesteddata['part']!='null'?$_requesteddata['part']:null;
+		}
+		if(isset($_requesteddata['mode']))
+		{
+			$preventRedirect   = (($_requesteddata['mode']=='display' || $_requesteddata['mode'] == 'print')?true:false);
+		}
 
 		$hA = self::splitRowID($rowID);
 		$uid = $hA['msgUID'];
@@ -1962,8 +2229,14 @@ 
 			$this->changeProfile($icServerID);
 		}
 		$htmlOptions = $this->mail_bo->htmlOptions;
-		if (!empty($_requesteddata['tryastext'])) $htmlOptions  = "only_if_no_text";
-		if (!empty($_requesteddata['tryashtml'])) $htmlOptions  = "always_display";
+		if (!empty($_requesteddata['tryastext']))
+		{
+			$htmlOptions  = "only_if_no_text";
+		}
+		if (!empty($_requesteddata['tryashtml']))
+		{
+			$htmlOptions  = "always_display";
+		}
 
 		//error_log(__METHOD__.__LINE__.array2string($hA));
 		if (($this->mail_bo->isDraftFolder($mailbox)) && $_requesteddata['mode'] == 'print')
@@ -1987,14 +2260,20 @@ 
 			$error_msg[] = lang("In Mailbox: %1, with ID: %2, and PartID: %3",$mailbox,$uid,$partID);
 			Framework::message($e->getMessage(), 'error');
 		}
-		if (!empty($uid)) $this->mail_bo->getFlags($uid);
+		if (!empty($uid))
+		{
+			$this->mail_bo->getFlags($uid);
+		}
 		$envelope	= $this->mail_bo->getMessageEnvelope($uid, $partID,true,$mailbox);
 		//error_log(__METHOD__.__LINE__.array2string($envelope));
 		$this->mail_bo->getMessageRawHeader($uid, $partID,$mailbox);
 		$fetchEmbeddedImages = false;
 		// if we are in HTML so its likely that we should show the embedded images; as a result
 		// we do NOT want to see those, that are embedded in the list of attachments
-		if ($htmlOptions !='always_display') $fetchEmbeddedImages = true;
+		if ($htmlOptions !='always_display')
+		{
+			$fetchEmbeddedImages = true;
+		}
 		$attachments	= $this->mail_bo->getMessageAttachments($uid, $partID, null, $fetchEmbeddedImages,true,true,$mailbox);
 		//error_log(__METHOD__.__LINE__.array2string($attachments));
 		$attachmentHTMLBlock = self::createAttachmentBlock($attachments, $rowID, $uid, $mailbox);
@@ -2010,11 +2289,17 @@ 
 		$subject = $this->mail_bo->decode_subject(preg_replace($nonDisplayAbleCharacters,'',$envelope['SUBJECT']),false);
 
 		// Set up data for taglist widget(s)
-		if ($envelope['FROM']==$envelope['SENDER']) unset($envelope['SENDER']);
+		if ($envelope['FROM']==$envelope['SENDER'])
+		{
+			unset($envelope['SENDER']);
+		}
 		$sel_options = array();
 		foreach(array('SENDER','FROM','TO','CC','BCC') as $field)
 		{
-			if (!isset($envelope[$field])) continue;
+			if (!isset($envelope[$field]))
+			{
+				continue;
+			}
 			foreach($envelope[$field] as $field_data)
 			{
 				//error_log(__METHOD__.__LINE__.array2string($field_data));
@@ -2028,7 +2313,10 @@ 
 		}
 		$actionsenabled = $this->getDisplayToolbarActions();
 		$content['displayToolbaractions'] = json_encode($actionsenabled);
-		if (empty($subject)) $subject = lang('no subject');
+		if (empty($subject))
+		{
+			$subject = lang('no subject');
+		}
 		$content['msg'] = (is_array($error_msg)?implode("<br>",$error_msg):$error_msg);
 		// Send mail ID so we can use it for actions
 		$content['mail_id'] = $rowID;
@@ -2039,8 +2327,14 @@ 
 		$content['mail_displaydate'] = Mail::_strtotime($headers['DATE'],'ts',true);
 		$content['mail_displaysubject'] = $subject;
 		$linkData = array('menuaction'=>"mail.mail_ui.loadEmailBody","_messageID"=>$rowID);
-		if (!empty($partID)) $linkData['_partID']=$partID;
-		if ($htmlOptions != $this->mail_bo->htmlOptions) $linkData['_htmloptions']=$htmlOptions;
+		if (!empty($partID))
+		{
+			$linkData['_partID']=$partID;
+		}
+		if ($htmlOptions != $this->mail_bo->htmlOptions)
+		{
+			$linkData['_htmloptions']=$htmlOptions;
+		}
 		$content['mailDisplayBodySrc'] = Egw::link('/index.php',$linkData);
 		$content['mail_displayattachments'] = $attachmentHTMLBlock;
 		$content['mail_id']=$rowID;
@@ -2108,7 +2402,8 @@ 
 	{
 		$attachmentHTMLBlock='';
 		$attachmentHTML = array();
-		if (is_array($attachments) && count($attachments) > 0) {
+		if (is_array($attachments) && count($attachments) > 0)
+		{
 			$url_img_vfs = Api\Html::image('filemanager','navbar', lang('Filemanager'), ' height="16"');
 			$url_img_vfs_save_all = Api\Html::image('mail','save_all', lang('Save all'));
 
@@ -2118,7 +2413,10 @@ 
 				$attachmentHTML[$key]['filename'] = Api\Translation::convert_jsonsafe($attachmentHTML[$key]['filename'],'utf-8');
 				//error_log(array2string($value));
 				//error_log(strtoupper($value['mimeType']) .'<->'. Api\MimeMagic::filename2mime($attachmentHTML[$key]['filename']));
-				if (strtoupper($value['mimeType']=='APPLICATION/OCTET-STREAM')) $value['mimeType'] = Api\MimeMagic::filename2mime($attachmentHTML[$key]['filename']);
+				if (strtoupper($value['mimeType']=='APPLICATION/OCTET-STREAM'))
+				{
+					$value['mimeType'] = Api\MimeMagic::filename2mime($attachmentHTML[$key]['filename']);
+				}
 				$attachmentHTML[$key]['type']=$value['mimeType'];
 				$attachmentHTML[$key]['mimetype'] = Api\MimeMagic::mime2label($value['mimeType']);
 				$hA = self::splitRowID($rowID);
@@ -2161,8 +2459,15 @@ 
 						$sfxMimeType = $value['mimeType'];
 						$buff = explode('.',$value['name']);
 						$suffix = '';
-						if (is_array($buff)) $suffix = array_pop($buff); // take the last extension to check with ext2mime
-						if (!empty($suffix)) $sfxMimeType = Api\MimeMagic::ext2mime($suffix);
+						if (is_array($buff))
+						{
+							$suffix = array_pop($buff);
+						}
+						// take the last extension to check with ext2mime
+						if (!empty($suffix))
+						{
+							$sfxMimeType = Api\MimeMagic::ext2mime($suffix);
+						}
 						if (strtoupper($sfxMimeType) == 'TEXT/VCARD' || strtoupper($sfxMimeType) == 'TEXT/X-VCARD')
 						{
 							$attachments[$key]['mimeType'] = $sfxMimeType;
@@ -2331,9 +2636,12 @@ 
 	function quotaDisplay($_usage, $_limit)
 	{
 
-		if($_limit == 0) {
+		if($_limit == 0)
+		{
 			$quotaPercent=100;
-		} else {
+		}
+		else
+		{
 			$quotaPercent=round(($_usage*100)/$_limit);
 		}
 
@@ -2341,22 +2649,33 @@ 
 		$quotaUsage=Mail::show_readable_size($_usage*1024);
 
 
-		if($quotaPercent > 90 && $_limit>0) {
+		if($quotaPercent > 90 && $_limit>0)
+		{
 			$quotaBG='mail-index_QuotaRed';
-		} elseif($quotaPercent > 80 && $_limit>0) {
+		}
+		elseif($quotaPercent > 80 && $_limit>0)
+		{
 			$quotaBG='mail-index_QuotaYellow';
-		} else {
+		}
+		else
+		{
 			$quotaBG='mail-index_QuotaGreen';
 		}
 
-		if($_limit > 0) {
+		if($_limit > 0)
+		{
 			$quotaText = $quotaUsage .'/'.$quotaLimit;
-		} else {
+		}
+		else
+		{
 			$quotaText = $quotaUsage;
 		}
 
-		if($quotaPercent > 50) {
-		} else {
+		if($quotaPercent > 50)
+		{
+		}
+		else
+		{
 		}
 		$quota['class'] = $quotaBG;
 		$quota['text'] = lang('Quota: %1',$quotaText);
@@ -2374,7 +2693,10 @@ 
 		$uid	= $_GET['uid'];
 		$cid	= base64_decode($_GET['cid']);
 		$partID = urldecode($_GET['partID']);
-		if (!empty($_GET['mailbox'])) $mailbox  = base64_decode($_GET['mailbox']);
+		if (!empty($_GET['mailbox']))
+		{
+			$mailbox  = base64_decode($_GET['mailbox']);
+		}
 
 		//error_log(__METHOD__.__LINE__.":$uid, $cid, $partID");
 		$this->mail_bo->reopen($mailbox);
@@ -2406,7 +2728,10 @@ 
 
 	function getAttachment()
 	{
-		if(isset($_GET['id'])) $rowID	= $_GET['id'];
+		if(isset($_GET['id']))
+		{
+			$rowID	= $_GET['id'];
+		}
 
 		$hA = self::splitRowID($rowID);
 		$uid = $hA['msgUID'];
@@ -2439,10 +2764,20 @@ 
 				$sfxMimeType = $attachment['type'];
 				$buff = explode('.',$attachment['filename']);
 				$suffix = '';
-				if (is_array($buff)) $suffix = array_pop($buff); // take the last extension to check with ext2mime
-				if (!empty($suffix)) $sfxMimeType = Api\MimeMagic::ext2mime($suffix);
+				if (is_array($buff))
+				{
+					$suffix = array_pop($buff);
+				}
+				// take the last extension to check with ext2mime
+				if (!empty($suffix))
+				{
+					$sfxMimeType = Api\MimeMagic::ext2mime($suffix);
+				}
 				$attachment['type'] = $sfxMimeType;
-				if (strtoupper($sfxMimeType) == 'TEXT/VCARD' || strtoupper($sfxMimeType) == 'TEXT/X-VCARD') $attachment['type'] = strtoupper($sfxMimeType);
+				if (strtoupper($sfxMimeType) == 'TEXT/VCARD' || strtoupper($sfxMimeType) == 'TEXT/X-VCARD')
+				{
+					$attachment['type'] = strtoupper($sfxMimeType);
+				}
 			}
 			//error_log(__METHOD__.print_r($attachment,true));
 			if (strtoupper($attachment['type']) == 'TEXT/CALENDAR' || strtoupper($attachment['type']) == 'TEXT/X-VCALENDAR')
@@ -2451,7 +2786,10 @@ 
 				$calendar_ical = new calendar_ical();
 				$eventid = $calendar_ical->search($attachment['attachment'],-1);
 				//error_log(__METHOD__.array2string($eventid));
-				if (!$eventid) $eventid = -1;
+				if (!$eventid)
+				{
+					$eventid = -1;
+				}
 				$event = $calendar_ical->importVCal($attachment['attachment'],(is_array($eventid)?$eventid[0]:$eventid),null,true,0,'',null,$attachment['charset']);
 				//error_log(__METHOD__.$event);
 				if ((int)$event > 0)
@@ -2477,7 +2815,10 @@ 
 					//error_log(__METHOD__.__LINE__.print_r($vcard,true));
 					$contact = $addressbook_vcal->find_contact($vcard,false);
 				}
-				if (!$contact) $contact = null;
+				if (!$contact)
+				{
+					$contact = null;
+				}
 				// if there are not enough fields in the vcard (or the parser was unable to correctly parse the vcard (as of VERSION:3.0 created by MSO))
 				if ($contact || count($vcard)>2)
 				{
@@ -2511,9 +2852,18 @@ 
 	function saveMessage()
 	{
 		$display = false;
-		if(isset($_GET['id'])) $rowID	= $_GET['id'];
-		if(isset($_GET['part'])) $partID = $_GET['part'];
-		if (isset($_GET['location'])&& ($_GET['location']=='display'||$_GET['location']=='filemanager')) $display	= $_GET['location'];
+		if(isset($_GET['id']))
+		{
+			$rowID	= $_GET['id'];
+		}
+		if(isset($_GET['part']))
+		{
+			$partID = $_GET['part'];
+		}
+		if (isset($_GET['location'])&& ($_GET['location']=='display'||$_GET['location']=='filemanager'))
+		{
+			$display	= $_GET['location'];
+		}
 
 		$hA = self::splitRowID($rowID);
 		$uid = $hA['msgUID'];
@@ -2602,7 +2952,10 @@ 
 			{
 				$succeeded = true;
 			}
-			if ($fp) fclose($fp);
+			if ($fp)
+			{
+				fclose($fp);
+			}
 			if ($succeeded)
 			{
 				unset($headers['SUBJECT']);//already in filename
@@ -2652,7 +3005,8 @@ 
 		 *
 		 * @return array an array of parameters
 		 */
-		$getParams = function ($id) {
+		$getParams = function ($id)
+		{
 			list($app,$user,$serverID,$mailbox,$uid,$part,$is_winmail,$name) = explode('::',$id,8);
 			$lId = implode('::',array($app,$user,$serverID,$mailbox,$uid));
 			$hA = mail_ui::splitRowID($lId);
@@ -2688,7 +3042,10 @@ 
 		{
 			$params = $getParams($id);
 			// when downloading a single file, name is not set
-			if (!$params['name']&&isset($_GET['name'])&&!$isMultipleDownload) $params['name'] = $_GET['name'];
+			if (!$params['name']&&isset($_GET['name'])&&!$isMultipleDownload)
+			{
+				$params['name'] = $_GET['name'];
+			}
 			if ($params['icServer'] && $params['icServer'] != $this->mail_bo->profileID)
 			{
 				//error_log(__METHOD__.__LINE__.' change Profile to ->'.$icServerID);
@@ -2701,7 +3058,10 @@ 
 				// Try to find the right content for file id
 				foreach ($attachments as $key => $val)
 				{
-					if ($key == $params['is_winmail']) $attachment = $val;
+					if ($key == $params['is_winmail'])
+					{
+						$attachment = $val;
+					}
 				}
 			}
 			else
@@ -2748,7 +3108,10 @@ 
 	{
 		//error_log(__METHOD__.__LINE__.array2string($_GET));
 		// First, get all attachment IDs
-		if(isset($_GET['id'])) $message_id	= $_GET['id'];
+		if(isset($_GET['id']))
+		{
+			$message_id	= $_GET['id'];
+		}
 		//error_log(__METHOD__.__LINE__.$message_id);
 		$rememberServerID = $this->mail_bo->profileID;
 		if(!is_numeric($message_id))
@@ -2775,7 +3138,10 @@ 
 		//get_home_dir may fetch the users startfolder if set; if not writeable, action will fail. TODO: use temp_dir
 		$homedir = '/home/'.$GLOBALS['egw_info']['user']['account_lid'];
 		$temp_path = $homedir/*Vfs::get_home_dir()*/ . "/.mail_$message_id";
-		if(Vfs::is_dir($temp_path)) Vfs::remove ($temp_path);
+		if(Vfs::is_dir($temp_path))
+		{
+			Vfs::remove ($temp_path);
+		}
 
 		// Add subject to path, so it gets used as the file name
 		$path = $temp_path . '/' . ($header['SUBJECT'] ? Vfs::encodePathComponent($header['SUBJECT']) : lang('mail')) .'/';
@@ -2800,7 +3166,10 @@ 
 				foreach ($tnefAttachments as $key => $val)
 				{
 					error_log(__METHOD__.' winmail = '.$key);
-					if ($key == $file['is_winmail']) $attachment = $val;
+					if ($key == $file['is_winmail'])
+					{
+						$attachment = $val;
+					}
 				}
 			}
 			else
@@ -2808,7 +3177,10 @@ 
 				$attachment = $this->mail_bo->getAttachment($message_id,$file['partID'],$file['is_winmail'],false,true);
 			}
 			$success=true;
-			if (empty($file['filename'])) $file['filename'] = $file['name'];
+			if (empty($file['filename']))
+			{
+				$file['filename'] = $file['name'];
+			}
 			if(in_array($path.$file['filename'], $file_list))
 			{
 				$dupe_count[$path.$file['filename']]++;
@@ -2822,8 +3194,14 @@ 
 				$success=false;
 				Framework::message("Unable to zip {$file['filename']}",'error');
 			}
-			if ($success) $file_list[] = $path.$file['filename'];
-			if ($fp) fclose($fp);
+			if ($success)
+			{
+				$file_list[] = $path.$file['filename'];
+			}
+			if ($fp)
+			{
+				fclose($fp);
+			}
 		}
 		$this->mail_bo->closeConnection();
 		if ($rememberServerID != $this->mail_bo->profileID)
@@ -2850,7 +3228,10 @@ 
 		$this->uid = $uid;
 		$this->partID = $partID;
 		$bufferHtmlOptions = $this->mail_bo->htmlOptions;
-		if (empty($htmlOptions)) $htmlOptions = $this->mail_bo->htmlOptions;
+		if (empty($htmlOptions))
+		{
+			$htmlOptions = $this->mail_bo->htmlOptions;
+		}
 		// fetching structure now, to supply it to getMessageBody and getMessageAttachment, so it does not get fetched twice
 		$structure = $this->mail_bo->getStructure($uid, $partID, $mailbox, false);
 		$bodyParts	= $this->mail_bo->getMessageBody($uid, ($htmlOptions?$htmlOptions:''), $partID, $structure, false, $mailbox);
@@ -2914,10 +3295,16 @@ 
 <table width="100%" style="table-layout:fixed"><tr><td class="td_display">';
 
 		$EndBody = '</td></tr></table></div>';
-		if ($fullPageTags) $EndBody .= "</body></html>";
-		if ($print)	{
+		if ($fullPageTags)
+		{
+			$EndBody .= "</body></html>";
+		}
+		if ($print)
+		{
 			print $BeginBody. $body .$EndBody;
-		} else {
+		}
+		else
+		{
 			return $BeginBody. $body .$EndBody;
 		}
 	}
@@ -2933,9 +3320,14 @@ 
 		$body = '';
 
 		//error_log(__METHOD__.array2string($bodyParts)); //exit;
-		if (empty($bodyParts)) return "";
-		foreach((array)$bodyParts as $singleBodyPart) {
-			if (!isset($singleBodyPart['body'])) {
+		if (empty($bodyParts))
+		{
+			return "";
+		}
+		foreach((array)$bodyParts as $singleBodyPart)
+		{
+			if (!isset($singleBodyPart['body']))
+			{
 				$singleBodyPart['body'] = $this->getdisplayableBody($singleBodyPart,$modifyURI,$useTidy);
 				$body .= $singleBodyPart['body'];
 				continue;
@@ -2946,7 +3338,8 @@ 
 				$body .= '';
 				continue;
 			}
-			if(!empty($body)) {
+			if(!empty($body))
+			{
 				$body .= '<hr style="border:dotted 1px silver;">';
 			}
 			//error_log($singleBodyPart['body']);
@@ -2984,16 +3377,25 @@ 
 				$newBody	= @htmlentities($singleBodyPart['body'],ENT_QUOTES, strtoupper(Mail::$displayCharset));
 				//error_log(__METHOD__.__LINE__.'..'.$newBody);
 				// if empty and charset is utf8 try sanitizing the string in question
-				if (empty($newBody) && strtolower($singleBodyPart['charSet'])=='utf-8') $newBody = @htmlentities(iconv('utf-8', 'utf-8', $singleBodyPart['body']),ENT_QUOTES, strtoupper(Mail::$displayCharset));
+				if (empty($newBody) && strtolower($singleBodyPart['charSet'])=='utf-8')
+				{
+					$newBody = @htmlentities(iconv('utf-8', 'utf-8', $singleBodyPart['body']),ENT_QUOTES, strtoupper(Mail::$displayCharset));
+				}
 				// if the conversion to htmlentities fails somehow, try without specifying the charset, which defaults to iso-
-				if (empty($newBody)) $newBody    = htmlentities($singleBodyPart['body'],ENT_QUOTES);
+				if (empty($newBody))
+				{
+					$newBody    = htmlentities($singleBodyPart['body'],ENT_QUOTES);
+				}
 
 				// search http[s] links and make them as links available again
 				// to understand what's going on here, have a look at
 				// http://www.php.net/manual/en/function.preg-replace.php
 
 				// create links for websites
-				if ($modifyURI) $newBody = Api\Html::activate_links($newBody);
+				if ($modifyURI)
+				{
+					$newBody = Api\Html::activate_links($newBody);
+				}
 				//error_log(__METHOD__.__LINE__.'..'.$newBody);
 				// redirect links for websites if you use no cookies
 				#if (!($GLOBALS['egw_info']['server']['usecookies']))
@@ -3035,10 +3437,13 @@ 
 					{
 						$newBody = $cleaned;
 					}
-					if (!$preserveHTML)	// ToDo KL: $preserveHTML is NOT initialised, so always if is dead code
+					if (!$preserveHTML)
+					{
+						// ToDo KL: $preserveHTML is NOT initialised, so always if is dead code
 					{
 						// filter only the 'body', as we only want that part, if we throw away the Api\Html
 						preg_match('`(<htm.+?<body[^>]*>)(.+?)(</body>.*?</html>)`ims', $newBody, $matches=array());
+					}
 						if ($matches[2])
 						{
 							$hasOther = true;
@@ -3060,7 +3465,10 @@ 
 					// as we switched off HTMLaweds tidy functionality
 					$newBody = str_replace(array('&amp;amp;','<DIV><BR></DIV>',"<DIV>&nbsp;</DIV>",'<div>&nbsp;</div>'),array('&amp;','<BR>','<BR>','<BR>'),$newBody);
 					$newBody = $htmLawed->run($newBody,Mail::$htmLawed_config);
-					if ($hasOther && $preserveHTML) $newBody = $matches[1]. $newBody. $matches[3];
+					if ($hasOther && $preserveHTML)
+					{
+						$newBody = $matches[1]. $newBody. $matches[3];
+					}
 					$alreadyHtmlLawed=true;
 				}
 				// do the cleanup, set for the use of purifier
@@ -3165,7 +3573,10 @@ 
 		*/
 		$replace_callback = function ($matches) use ($_mailbox,$_uid, $_partID,  $_type)
 		{
-			if (!$_type)	return false;
+			if (!$_type)
+			{
+				return false;
+			}
 			$CID = '';
 			// Build up matches according to selected type
 			switch ($_type)
@@ -3208,9 +3619,12 @@ 
 							$attachment = $bo->getAttachmentByCID($_uid, $CID, $_partID);
 
 							// only use data uri for "smaller" images, as otherwise the first display of the mail takes to long
-							if (($attachment instanceof Horde_Mime_Part) && $attachment->getBytes() < 8192)	// msie=8 allows max 32k data uris
+							if (($attachment instanceof Horde_Mime_Part) && $attachment->getBytes() < 8192)
+							{
+								// msie=8 allows max 32k data uris
 							{
 								$bo->fetchPartContents($_uid, $attachment);
+							}
 								$cache[$imageURL] = 'data:'.$attachment->getType().';base64,'.base64_encode($attachment->getContents());
 							}
 							else
@@ -3282,7 +3696,10 @@ 
 			}
 			$destination = $content['FOLDER'][0];
 
-			if (stripos($destination,self::$delimiter)!==false) list($icServerID,$destination) = explode(self::$delimiter,$destination,2);
+			if (stripos($destination,self::$delimiter)!==false)
+			{
+				list($icServerID,$destination) = explode(self::$delimiter,$destination,2);
+			}
 			if ($icServerID && $icServerID != $this->mail_bo->profileID)
 			{
 				//error_log(__METHOD__.__LINE__.' change Profile to ->'.$icServerID);
@@ -3307,14 +3724,26 @@ 
 			if (!$importFailed)
 			{
 				list($width, $height) = explode('x', Link::get_registry('mail', 'add_popup'));
-				if ($width > 0 && $height > 0) Api\Json\Response::get()->call('resizeTo', $width, $height);
+				if ($width > 0 && $height > 0)
+				{
+					Api\Json\Response::get()->call('resizeTo', $width, $height);
+				}
 				ExecMethod2('mail.mail_ui.displayMessage',$linkData);
 				return;
 			}
 		}
-		if (!is_array($content)) $content = array();
-		if (empty($content['FOLDER'])) $content['FOLDER']=(array)$this->mail_bo->getDraftFolder();
-		if (!empty($content['FOLDER'])) $sel_options['FOLDER']=mail_compose::ajax_searchFolder(0,true);
+		if (!is_array($content))
+		{
+			$content = array();
+		}
+		if (empty($content['FOLDER']))
+		{
+			$content['FOLDER']=(array)$this->mail_bo->getDraftFolder();
+		}
+		if (!empty($content['FOLDER']))
+		{
+			$sel_options['FOLDER']=mail_compose::ajax_searchFolder(0,true);
+		}
 
 		$etpl = new Etemplate('mail.importMessage');
 		$etpl->setElementAttribute('uploadForImport','onFinish','app.mail.uploadForImport');
@@ -3334,7 +3763,10 @@ 
 	{
 		$importfailed = false;
 		//error_log(__METHOD__.__LINE__.array2string($_formData));
-		if (empty($_formData['file'])) $_formData['file'] = $_formData['tmp_name'];
+		if (empty($_formData['file']))
+		{
+			$_formData['file'] = $_formData['tmp_name'];
+		}
 		// check if formdata meets basic restrictions (in tmp dir, or vfs, mimetype, etc.)
 		try
 		{
@@ -3365,10 +3797,14 @@ 
 				$alert_msg .= lang("Import of message %1 failed. Destination Folder not set.",$_formData['name']);
 			}
 			$delimiter = $this->mail_bo->getHierarchyDelimiter();
-			if($_folder=='INBOX'.$delimiter) $_folder='INBOX';
+			if($_folder=='INBOX'.$delimiter)
+			{
+				$_folder='INBOX';
+			}
 			if ($importfailed === false)
 			{
-				if ($this->mail_bo->folderExists($_folder,true)) {
+				if ($this->mail_bo->folderExists($_folder,true))
+				{
 					try
 					{
 						$messageUid = $this->mail_bo->appendMessage($_folder,
@@ -3429,7 +3865,10 @@ 
 	 */
 	function importMessageFromVFS2DraftAndDisplay($formData='',$mode='display')
 	{
-		if (empty($formData)) if (isset($_REQUEST['formData'])) $formData = $_REQUEST['formData'];
+		if (empty($formData))
+		{
+			if (isset($_REQUEST['formData'])) $formData = $_REQUEST['formData'];
+		}
 		//error_log(__METHOD__.__LINE__.':'.array2string($formData).' Mode:'.$mode.'->'.function_backtrace());
 		$draftFolder = $this->mail_bo->getDraftFolder(false);
 		$importID = Mail::getRandomString();
@@ -3443,15 +3882,26 @@ 
 		if (parse_url($formData['file'],PHP_URL_SCHEME) == 'vfs' && empty($formData['name']))
 		{
 			$buff = explode('/',$formData['file']);
-			if (is_array($buff)) $formData['name'] = array_pop($buff); // take the last part as name
+			if (is_array($buff))
+			{
+				$formData['name'] = array_pop($buff);
+			}
+			// take the last part as name
 		}
 		// type should be set to meet the requirements of checkFileBasics
 		if (parse_url($formData['file'],PHP_URL_SCHEME) == 'vfs' && empty($formData['type']))
 		{
 			$buff = explode('.',$formData['file']);
 			$suffix = '';
-			if (is_array($buff)) $suffix = array_pop($buff); // take the last extension to check with ext2mime
-			if (!empty($suffix)) $formData['type'] = Api\MimeMagic::ext2mime($suffix);
+			if (is_array($buff))
+			{
+				$suffix = array_pop($buff);
+			}
+			// take the last extension to check with ext2mime
+			if (!empty($suffix))
+			{
+				$formData['type'] = Api\MimeMagic::ext2mime($suffix);
+			}
 		}
 		// size should be set to meet the requirements of checkFileBasics
 		if (parse_url($formData['file'],PHP_URL_SCHEME) == 'vfs' && !isset($formData['size']))
@@ -3494,17 +3944,35 @@ 
 	function loadEmailBody($_messageID=null,$_partID=null,$_htmloptions=null)
 	{
 		//error_log(__METHOD__.__LINE__.array2string($_GET));
-		if (!$_messageID && !empty($_GET['_messageID'])) $_messageID = $_GET['_messageID'];
-		if (!$_partID && !empty($_GET['_partID'])) $_partID = $_GET['_partID'];
-		if (!$_htmloptions && !empty($_GET['_htmloptions'])) $_htmloptions = $_GET['_htmloptions'];
-		if(Mail::$debug) error_log(__METHOD__."->".print_r($_messageID,true).",$_partID,$_htmloptions");
-		if (empty($_messageID)) return "";
+		if (!$_messageID && !empty($_GET['_messageID']))
+		{
+			$_messageID = $_GET['_messageID'];
+		}
+		if (!$_partID && !empty($_GET['_partID']))
+		{
+			$_partID = $_GET['_partID'];
+		}
+		if (!$_htmloptions && !empty($_GET['_htmloptions']))
+		{
+			$_htmloptions = $_GET['_htmloptions'];
+		}
+		if(Mail::$debug)
+		{
+			error_log(__METHOD__."->".print_r($_messageID,true).",$_partID,$_htmloptions");
+		}
+		if (empty($_messageID))
+		{
+			return "";
+		}
 		$uidA = self::splitRowID($_messageID);
 		$folder = $uidA['folder']; // all messages in one set are supposed to be within the same folder
 		$messageID = $uidA['msgUID'];
 		$icServerID = $uidA['profileID'];
 		//something went wrong. there is a $_messageID but no $messageID: means $_messageID is crippeled
-		if (empty($messageID)) return "";
+		if (empty($messageID))
+		{
+			return "";
+		}
 		if ($icServerID && $icServerID != $this->mail_bo->profileID)
 		{
 			//error_log(__METHOD__.__LINE__.' change Profile to ->'.$icServerID);
@@ -3537,7 +4005,11 @@ 
 				list($profileID,$folderName) = explode(self::$delimiter,$_folderName,2);
 				if (is_numeric($profileID))
 				{
-					if ($profileID != $this->mail_bo->profileID) continue; // only current connection
+					if ($profileID != $this->mail_bo->profileID)
+					{
+						continue;
+					}
+					// only current connection
 					if ($folderName)
 					{
 						try
@@ -3548,7 +4020,10 @@ 
 						{
 							continue;
 						}
-						if (in_array($fS['shortDisplayName'],Mail::$autoFolders)) $fS['shortDisplayName']=lang($fS['shortDisplayName']);
+						if (in_array($fS['shortDisplayName'],Mail::$autoFolders))
+						{
+							$fS['shortDisplayName']=lang($fS['shortDisplayName']);
+						}
 						//error_log(__METHOD__.__LINE__.array2string($fS));
 						if ($fS['unseen'])
 						{
@@ -3589,7 +4064,11 @@ 
 			list($profileID,$parentFolderName) = explode(self::$delimiter,$decodedFolderName,2);
 			if (is_numeric($profileID))
 			{
-				if ($profileID != $this->mail_bo->profileID) return; // only current connection
+				if ($profileID != $this->mail_bo->profileID)
+				{
+					return;
+				}
+				// only current connection
 				$del = $this->mail_bo->getHierarchyDelimiter(false);
 				//$del = $prefix = '';
 				//$nameSpace = $this->mail_bo->_getNameSpaces();
@@ -3629,7 +4108,10 @@ 
 				$nA = explode($del,$_newName);
 
 				//error_log(__METHOD__.__LINE__."$folderName, $parentFolder, $_newName");
-				if (!!empty($parentFolderName)) $oldFolderInfo = $this->mail_bo->getFolderStatus($parentFolderName,false);
+				if (!!empty($parentFolderName))
+				{
+					$oldFolderInfo = $this->mail_bo->getFolderStatus($parentFolderName,false);
+				}
 				//error_log(__METHOD__.__LINE__.array2string($oldFolderInfo));
 
 				$this->mail_bo->reopen('INBOX');
@@ -3650,9 +4132,15 @@ 
 							$errorMessage .= $error;
 						}
 					}
-					if ($c==count($nA)) $created=true;
+					if ($c==count($nA))
+					{
+						$created=true;
+					}
+				}
+				if (!empty($parentName))
+				{
+					$this->mail_bo->reopen($parentName);
 				}
-				if (!empty($parentName)) $this->mail_bo->reopen($parentName);
 			}
 			//error_log(__METHOD__.__LINE__.array2string($oA));
 			if ($created===true)
@@ -3688,7 +4176,10 @@ 
 	 */
 	function ajax_renameFolder($_folderName, $_newName)
 	{
-		if (Mail::$debug) error_log(__METHOD__.__LINE__.' OldFolderName:'.array2string($_folderName).' NewName:'.array2string($_newName));
+		if (Mail::$debug)
+		{
+			error_log(__METHOD__.__LINE__.' OldFolderName:'.array2string($_folderName).' NewName:'.array2string($_newName));
+		}
 		if ($_folderName)
 		{
 			Api\Translation::add_app('mail');
@@ -3700,7 +4191,11 @@ 
 			$hasChildren = false;
 			if (is_numeric($profileID))
 			{
-				if ($profileID != $this->mail_bo->profileID) return; // only current connection
+				if ($profileID != $this->mail_bo->profileID)
+				{
+					return;
+				}
+				// only current connection
 				$pA = explode($del,$folderName);
 				array_pop($pA);
 				$parentFolder = implode($del,$pA);
@@ -3841,8 +4336,15 @@ 
 		list($profileID,$folderName) = explode(self::$delimiter,$decodedFolderName,2);
 		// if pref and required mode dont match -> reset the folderObject cache to ensure
 		// that we get what we request
-		if ($_subscribedOnly != $oldPrefForSubscribedOnly) $this->mail_bo->resetFolderObjectCache($profileID);
-		if ($profileID != $this->mail_bo->profileID) return; // only current connection
+		if ($_subscribedOnly != $oldPrefForSubscribedOnly)
+		{
+			$this->mail_bo->resetFolderObjectCache($profileID);
+		}
+		if ($profileID != $this->mail_bo->profileID)
+		{
+			return;
+		}
+		// only current connection
 		if (!empty($folderName))
 		{
 			$parentFolder=(!empty($folderName)?$folderName:'INBOX');
@@ -3917,7 +4419,10 @@ 
 	 */
 	function ajax_MoveFolder($_folderName, $_target)
 	{
-		if (Mail::$debug) error_log(__METHOD__.__LINE__."Move Folder: $_folderName to Target: $_target");
+		if (Mail::$debug)
+		{
+			error_log(__METHOD__.__LINE__."Move Folder: $_folderName to Target: $_target");
+		}
 		if ($_folderName)
 		{
 			$decodedFolderName = $this->mail_bo->decodeEntityFolderName($_folderName);
@@ -3928,7 +4433,11 @@ 
 			$hasChildren = false;
 			if (is_numeric($profileID))
 			{
-				if ($profileID != $this->mail_bo->profileID || $profileID != $newProfileID) return; // only current connection
+				if ($profileID != $this->mail_bo->profileID || $profileID != $newProfileID)
+				{
+					return;
+				}
+				// only current connection
 				$pA = explode($del,$folderName);
 				$namePart = array_pop($pA);
 				$_newName = $namePart;
@@ -3939,10 +4448,13 @@ 
 					(($oldParentFolder === $parentFolder) || //$oldParentFolder == $parentFolder means move on same level
 					(($oldParentFolder != $parentFolder &&
 					strlen($parentFolder)>0 && strlen($folderName)>0 &&
-					strpos($parentFolder,$folderName)===false)))) // indicates that we move the older up the tree within its own branch
+					strpos($parentFolder,$folderName)===false))))
+				{
+					// indicates that we move the older up the tree within its own branch
 				{
 					//error_log(__METHOD__.__LINE__."$folderName, $parentFolder, $_newName");
 					$oldFolderInfo = $this->mail_bo->getFolderStatus($folderName,false,false,false);
+				}
 					//error_log(__METHOD__.__LINE__.array2string($oldFolderInfo));
 					if (!empty($oldFolderInfo['attributes']) && stripos(array2string($oldFolderInfo['attributes']),'\hasnochildren')=== false)
 					{
@@ -4025,8 +4537,14 @@ 
 					$profileID.self::$delimiter.$oldParentFolder=>$oldFolderInfo['shortDisplayName'],
 					$profileID.self::$delimiter.$parentFolder=>$folderInfo['shortDisplayName']);
 				// if we move the folder within the same parent-branch of the tree, there is no need no refresh the upper part
-				if (strlen($parentFolder)>strlen($oldParentFolder) && strpos($parentFolder,$oldParentFolder)!==false) unset($refreshData[$profileID.self::$delimiter.$parentFolder]);
-				if (count($refreshData)>1 && strlen($oldParentFolder)>strlen($parentFolder) && strpos($oldParentFolder,$parentFolder)!==false) unset($refreshData[$profileID.self::$delimiter.$oldParentFolder]);
+				if (strlen($parentFolder)>strlen($oldParentFolder) && strpos($parentFolder,$oldParentFolder)!==false)
+				{
+					unset($refreshData[$profileID.self::$delimiter.$parentFolder]);
+				}
+				if (count($refreshData)>1 && strlen($oldParentFolder)>strlen($parentFolder) && strpos($oldParentFolder,$parentFolder)!==false)
+				{
+					unset($refreshData[$profileID.self::$delimiter.$oldParentFolder]);
+				}
 
 				// Send full info back in the response
 				foreach($refreshData as $folder => &$name)
@@ -4062,7 +4580,11 @@ 
 			$hasChildren = false;
 			if (is_numeric($profileID))
 			{
-				if ($profileID != $this->mail_bo->profileID) return; // only current connection
+				if ($profileID != $this->mail_bo->profileID)
+				{
+					return;
+				}
+				// only current connection
 				$pA = explode($del,$folderName);
 				array_pop($pA);
 				if (strtoupper($folderName)!= 'INBOX')
@@ -4088,7 +4610,9 @@ 
 						}
 						krsort($ftD,SORT_NUMERIC);//sort per level
 						//we iterate per level of depth of the subtree, deepest nesting is to be deleted first, and then up the tree
-						foreach($ftD as $k => $lc)//collection per level
+						foreach($ftD as $k => $lc)
+						{
+							//collection per level
 						{
 							foreach($lc as $f)//folders contained in that level
 							{
@@ -4096,8 +4620,12 @@ 
 								{
 									//error_log(__METHOD__.__LINE__.array2string($f).'<->'.$folderName);
 									$this->mail_bo->deleteFolder($f);
+						}
 									$success = true;
-									if ($f==$folderName) $oA[$_folderName] = $oldFolderInfo['shortDisplayName'];
+									if ($f==$folderName)
+									{
+										$oA[$_folderName] = $oldFolderInfo['shortDisplayName'];
+									}
 								}
 								catch (Exception $e)
 								{
@@ -4127,7 +4655,10 @@ 
 					$msg = lang("refused to delete folder INBOX");
 				}
 			}
-			if ($_return) return $success;
+			if ($_return)
+			{
+				return $success;
+			}
 			$response = Api\Json\Response::get();
 			if ($success)
 			{
@@ -4214,24 +4745,35 @@ 
 				// Create mail app object
 				$mail = new mail_ui();
 
-				if (empty($icServerID)) $icServerID = $mail->Mail->profileID;
-				if ($icServerID != $mail->Mail->profileID) return;
+				if (empty($icServerID))
+				{
+					$icServerID = $mail->Mail->profileID;
+				}
+				if ($icServerID != $mail->Mail->profileID)
+				{
+					return;
+				}
 
 				$vacation = $mail->gatherVacation($cachedVacations);
-			} catch (Exception $e) {
+			}
+			catch (Exception $e) {
 				$vacation=false;
 				error_log(__METHOD__.__LINE__." ".$e->getMessage());
 				unset($e);
 			}
 		}
 
-		if($vacation) {
+		if($vacation)
+		{
 			if (is_array($vacation) && ($vacation['status'] == 'on' || $vacation['status']=='by_date'))
 			{
 				$dtfrmt = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'];
 				$refreshData['vacationnotice'] = lang('Vacation notice is active');
 				$refreshData['vacationrange'] = ($vacation['status']=='by_date'? Api\DateTime::server2user($vacation['start_date'],$dtfrmt,true).($vacation['end_date']>$vacation['start_date']?'->'.Api\DateTime::server2user($vacation['end_date']+ 24*3600-1,$dtfrmt,true):''):'');
-				if ($vacation['status'] == 'by_date' && $vacation['end_date']+ 24*3600 < time())$refreshData = '';
+				if ($vacation['status'] == 'by_date' && $vacation['end_date']+ 24*3600 < time())
+				{
+					$refreshData = '';
+				}
 			}
 		}
 		if ($vacation==false)
@@ -4253,11 +4795,17 @@ 
 	function ajax_refreshFilters($icServerID=null)
 	{
 		//error_log(__METHOD__.__LINE__.array2string($icServerId));
-		if (empty($icServerID)) $icServerID = $this->mail_bo->profileID;
+		if (empty($icServerID))
+		{
+			$icServerID = $this->mail_bo->profileID;
+		}
 		if (is_null(Mail::$supportsORinQuery) || !isset(Mail::$supportsORinQuery[$this->mail_bo->profileID]))
 		{
 			Mail::$supportsORinQuery = Api\Cache::getCache(Api\Cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*10);
-			if (!isset(Mail::$supportsORinQuery[$this->mail_bo->profileID])) Mail::$supportsORinQuery[$this->mail_bo->profileID]=true;
+			if (!isset(Mail::$supportsORinQuery[$this->mail_bo->profileID]))
+			{
+				Mail::$supportsORinQuery[$this->mail_bo->profileID]=true;
+			}
 		}
 		if (!Mail::$supportsORinQuery[$this->mail_bo->profileID])
 		{
@@ -4279,7 +4827,10 @@ 
 			$keywords = array('keyword1','keyword2','keyword3','keyword4','keyword5');
 			foreach($keywords as &$k)
 			{
-				if (array_key_exists($k,$this->statusTypes)) unset($this->statusTypes[$k]);
+				if (array_key_exists($k,$this->statusTypes))
+				{
+					unset($this->statusTypes[$k]);
+				}
 			}
 		}
 
@@ -4299,7 +4850,10 @@ 
 	{
 		//error_log(__METHOD__.__LINE__.array2string($icServerID));
 		Api\Translation::add_app('mail');
-		if (is_null($icServerID)) $icServerID = $this->mail_bo->profileID;
+		if (is_null($icServerID))
+		{
+			$icServerID = $this->mail_bo->profileID;
+		}
 		$rememberServerID = $this->mail_bo->profileID;
 		try
 		{
@@ -4309,19 +4863,23 @@ 
 				$this->changeProfile($icServerID);
 			}
 			$quota = $this->mail_bo->getQuotaRoot();
-		} catch (Exception $e) {
+		}
+		catch (Exception $e) {
 			$quota['limit'] = 'NOT SET';
 			error_log(__METHOD__.__LINE__." ".$e->getMessage());
 			unset($e);
 		}
 
-		if($quota !== false && $quota['limit'] != 'NOT SET') {
+		if($quota !== false && $quota['limit'] != 'NOT SET')
+		{
 			$quotainfo = $this->quotaDisplay($quota['usage'], $quota['limit']);
 			$content['quota'] = $sel_options[self::$nm_index]['quota'] = $quotainfo['text'];
 			$content['quotainpercent'] = $sel_options[self::$nm_index]['quotainpercent'] =  (string)$quotainfo['percent'];
 			$content['quotaclass'] = $sel_options[self::$nm_index]['quotaclass'] = $quotainfo['class'];
 			$content['quotanotsupported'] = $sel_options[self::$nm_index]['quotanotsupported'] = "";
-		} else {
+		}
+		else
+		{
 			$content['quota'] = $sel_options[self::$nm_index]['quota'] = lang("Quota not provided by server");
 			$content['quotaclass'] = $sel_options[self::$nm_index]['quotaclass'] = "mail_DisplayNone";
 			$content['quotanotsupported'] = $sel_options[self::$nm_index]['quotanotsupported'] = "mail_DisplayNone";
@@ -4332,7 +4890,8 @@ 
 			{
 				//error_log(__METHOD__.__LINE__.' change Profile back to where we came from ->'.$rememberServerID);
 				$this->changeProfile($rememberServerID);
-			} catch (Exception $e) {
+			}
+			catch (Exception $e) {
 				//error_log(__METHOD__.__LINE__." ".$e->getMessage());
 				unset($e);
 			}
@@ -4360,7 +4919,8 @@ 
 			$this->changeProfile($icServerID);
 		}
 		$junkFolder = $this->mail_bo->getJunkFolder();
-		if(!empty($junkFolder)) {
+		if(!empty($junkFolder))
+		{
 			if ($selectedFolder == $icServerID.self::$delimiter.$junkFolder)
 			{
 				// Lock the tree if the active folder is junk folder
@@ -4410,7 +4970,8 @@ 
 			$this->changeProfile($icServerID);
 		}
 		$trashFolder = $this->mail_bo->getTrashFolder();
-		if(!empty($trashFolder)) {
+		if(!empty($trashFolder))
+		{
 			if ($selectedFolder == $icServerID.self::$delimiter.$trashFolder)
 			{
 				// Lock the tree if the active folder is Trash folder
@@ -4456,7 +5017,10 @@ 
 		$decodedFolderName = $this->mail_bo->decodeEntityFolderName($_folderName);
 		list($icServerID,$folderName) = explode(self::$delimiter,$decodedFolderName,2);
 
-		if (empty($folderName)) $folderName = $this->mail_bo->sessionData['mailbox'];
+		if (empty($folderName))
+		{
+			$folderName = $this->mail_bo->sessionData['mailbox'];
+		}
 		if ($this->mail_bo->folderExists($folderName))
 		{
 			$rememberServerID = $this->mail_bo->profileID;
@@ -4465,7 +5029,8 @@ 
 				//error_log(__METHOD__.__LINE__.' change Profile to ->'.$icServerID);
 				$this->changeProfile($icServerID);
 			}
-			if(!empty($_folderName)) {
+			if(!empty($_folderName))
+			{
 				$this->mail_bo->compressFolder($folderName);
 			}
 			if ($rememberServerID != $this->mail_bo->profileID)
@@ -4487,7 +5052,10 @@ 
 	 */
 	function ajax_sendMDN($_messageList)
 	{
-		if(Mail::$debug) error_log(__METHOD__."->".array2string($_messageList));
+		if(Mail::$debug)
+		{
+			error_log(__METHOD__."->".array2string($_messageList));
+		}
 		$uidA = self::splitRowID($_messageList['msg'][0]);
 		$folder = $uidA['folder']; // all messages in one set are supposed to be within the same folder
 		$this->mail_bo->sendMDN($uidA['msgUID'],$folder);
@@ -4504,7 +5072,10 @@ 
 	 */
 	function ajax_flagMessages($_flag, $_messageList, $_sendJsonResponse=true)
 	{
-		if(Mail::$debug) error_log(__METHOD__."->".$_flag.':'.array2string($_messageList));
+		if(Mail::$debug)
+		{
+			error_log(__METHOD__."->".$_flag.':'.array2string($_messageList));
+		}
 		Api\Translation::add_app('mail');
 		$alreadyFlagged=false;
 		$flag2check='';
@@ -4525,12 +5096,23 @@ 
 						if (is_null(Mail::$supportsORinQuery) || !isset(Mail::$supportsORinQuery[$this->mail_bo->profileID]))
 						{
 							Mail::$supportsORinQuery = Api\Cache::getCache(Api\Cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*10);
-							if (!isset(Mail::$supportsORinQuery[$this->mail_bo->profileID])) Mail::$supportsORinQuery[$this->mail_bo->profileID]=true;
+							if (!isset(Mail::$supportsORinQuery[$this->mail_bo->profileID]))
+							{
+								Mail::$supportsORinQuery[$this->mail_bo->profileID]=true;
+							}
 						}
 						//error_log(__METHOD__.__LINE__.' Startdate:'.$query['startdate'].' Enddate'.$query['enddate']);
 						$cutoffdate = $cutoffdate2 = null;
-						if ($query['startdate']) $cutoffdate = Api\DateTime::to($query['startdate'],'ts');//SINCE, enddate
-						if ($query['enddate']) $cutoffdate2 = Api\DateTime::to($query['enddate'],'ts');//BEFORE, startdate
+						if ($query['startdate'])
+						{
+							$cutoffdate = Api\DateTime::to($query['startdate'],'ts');
+						}
+						//SINCE, enddate
+						if ($query['enddate'])
+						{
+							$cutoffdate2 = Api\DateTime::to($query['enddate'],'ts');
+						}
+						//BEFORE, startdate
 						//error_log(__METHOD__.__LINE__.' Startdate:'.$cutoffdate2.' Enddate'.$cutoffdate);
 						$filter = array(
 							'filterName' => (Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID]?lang('quicksearch'):lang('subject')),
@@ -4539,15 +5121,24 @@ 
 							'status' => 'any',//this is a status change. status will be manipulated later on
 							//'range'=>"BETWEEN",'since'=> date("d-M-Y", $cutoffdate),'before'=> date("d-M-Y", $cutoffdate2)
 						);
-						if ($query['enddate']||$query['startdate']) {
+						if ($query['enddate']||$query['startdate'])
+						{
 							$filter['range'] = "BETWEEN";
-							if ($cutoffdate) {
+							if ($cutoffdate)
+							{
 								$filter[(empty($cutoffdate2)?'date':'since')] =  date("d-M-Y", $cutoffdate);
-								if (empty($cutoffdate2)) $filter['range'] = "SINCE";
+								if (empty($cutoffdate2))
+								{
+									$filter['range'] = "SINCE";
+								}
 							}
-							if ($cutoffdate2) {
+							if ($cutoffdate2)
+							{
 								$filter[(empty($cutoffdate)?'date':'before')] =  date("d-M-Y", $cutoffdate2);
-								if (empty($cutoffdate)) $filter['range'] = "BEFORE";
+								if (empty($cutoffdate))
+								{
+									$filter['range'] = "BEFORE";
+								}
 							}
 						}
 						$filter2toggle = $filter;
@@ -4598,13 +5189,19 @@ 
 						if (count($messageListForToggle)>0)
 						{
 							$flag2set = (strtolower($_flag));
-							if(Mail::$debug) error_log(__METHOD__.__LINE__." toggle un$_flag -> $flag2set ".array2string($filter2toggle).array2string($messageListForToggle));
+							if(Mail::$debug)
+							{
+								error_log(__METHOD__.__LINE__." toggle un$_flag -> $flag2set ".array2string($filter2toggle).array2string($messageListForToggle));
+							}
 							$this->mail_bo->flagMessages($flag2set, $messageListForToggle,$folder);
 						}
 						if (count($messageList)>0)
 						{
 							$flag2set = 'un'.$_flag;
-							if(Mail::$debug) error_log(__METHOD__.__LINE__." $_flag -> $flag2set ".array2string($filter).array2string($messageList));
+							if(Mail::$debug)
+							{
+								error_log(__METHOD__.__LINE__." $_flag -> $flag2set ".array2string($filter).array2string($messageList));
+							}
 							$this->mail_bo->flagMessages($flag2set, $messageList,$folder);
 						}
 						$alreadyFlagged=true;
@@ -4620,7 +5217,10 @@ 
 							// since we toggle and we toggle by the filtered flag we must must change _flag
 							$_flag = ($query['filter']=='unseen' && $_flag=='read' ? 'read' : ($query['filter']=='seen'&& $_flag=='read'?'unread':($_flag==$query['filter']?'un'.$_flag:$_flag)));
 						}
-						if(Mail::$debug) error_log(__METHOD__.__LINE__." flag all with $_flag on filter used:".array2string($filter));
+						if(Mail::$debug)
+						{
+							error_log(__METHOD__.__LINE__." flag all with $_flag on filter used:".array2string($filter));
+						}
 						$rByUid = true;
 						$reverse = 1;
 						$_sR = $this->mail_bo->getSortedList(
@@ -4637,7 +5237,10 @@ 
 					}
 					else
 					{
-						if(Mail::$debug) error_log(__METHOD__.__LINE__." $_flag all ".array2string($filter));
+						if(Mail::$debug)
+						{
+							error_log(__METHOD__.__LINE__." $_flag all ".array2string($filter));
+						}
 						$alreadyFlagged=true;
 						$uidA = self::splitRowID($_messageList['msg'][0]);
 						$folder = $uidA['folder']; // all messages in one set are supposed to be within the same folder
@@ -4657,13 +5260,19 @@ 
 					$hA = self::splitRowID($rowID);
 					$messageList[] = $hA['msgUID'];
 				}
-				if(Mail::$debug) error_log(__METHOD__.__LINE__." $_flag in $folder:".array2string(((isset($_messageList['all']) && $_messageList['all']) ? 'all':$messageList)));
+				if(Mail::$debug)
+				{
+					error_log(__METHOD__.__LINE__." $_flag in $folder:".array2string(((isset($_messageList['all']) && $_messageList['all']) ? 'all':$messageList)));
+				}
 				$this->mail_bo->flagMessages($_flag, ((isset($_messageList['all']) && $_messageList['all']) ? 'all':$messageList),$folder);
 			}
 		}
 		else
 		{
-			if(Mail::$debug) error_log(__METHOD__."-> No messages selected.");
+			if(Mail::$debug)
+			{
+				error_log(__METHOD__."-> No messages selected.");
+			}
 		}
 
 		if ($_sendJsonResponse)
@@ -4700,7 +5309,10 @@ 
 	 */
 	function ajax_deleteMessages($_messageList,$_forceDeleteMethod=null)
 	{
-		if(Mail::$debug) error_log(__METHOD__."->".print_r($_messageList,true).' Method:'.$_forceDeleteMethod);
+		if(Mail::$debug)
+		{
+			error_log(__METHOD__."->".print_r($_messageList,true).' Method:'.$_forceDeleteMethod);
+		}
 		$error = null;
 		$filtered =  false;
 		if ($_messageList=='all' || !empty($_messageList['msg']))
@@ -4719,12 +5331,23 @@ 
 						if (is_null(Mail::$supportsORinQuery) || !isset(Mail::$supportsORinQuery[$this->mail_bo->profileID]))
 						{
 							Mail::$supportsORinQuery = Api\Cache::getCache(Api\Cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*10);
-							if (!isset(Mail::$supportsORinQuery[$this->mail_bo->profileID])) Mail::$supportsORinQuery[$this->mail_bo->profileID]=true;
+							if (!isset(Mail::$supportsORinQuery[$this->mail_bo->profileID]))
+							{
+								Mail::$supportsORinQuery[$this->mail_bo->profileID]=true;
+							}
 						}
 						$filtered =  true;
 						$cutoffdate = $cutoffdate2 = null;
-						if ($query['startdate']) $cutoffdate = Api\DateTime::to($query['startdate'],'ts');//SINCE, enddate
-						if ($query['enddate']) $cutoffdate2 = Api\DateTime::to($query['enddate'],'ts');//BEFORE, startdate
+						if ($query['startdate'])
+						{
+							$cutoffdate = Api\DateTime::to($query['startdate'],'ts');
+						}
+						//SINCE, enddate
+						if ($query['enddate'])
+						{
+							$cutoffdate2 = Api\DateTime::to($query['enddate'],'ts');
+						}
+						//BEFORE, startdate
 						//error_log(__METHOD__.__LINE__.' Startdate:'.$cutoffdate2.' Enddate'.$cutoffdate);
 						$filter = array(
 							'filterName' => (Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID]?lang('quicksearch'):lang('subject')),
@@ -4733,15 +5356,24 @@ 
 							'status' => (!empty($query['filter'])?$query['filter']:'any'),
 							//'range'=>"BETWEEN",'since'=> date("d-M-Y", $cutoffdate),'before'=> date("d-M-Y", $cutoffdate2)
 						);
-						if ($query['enddate']||$query['startdate']) {
+						if ($query['enddate']||$query['startdate'])
+						{
 							$filter['range'] = "BETWEEN";
-							if ($cutoffdate) {
+							if ($cutoffdate)
+							{
 								$filter[(empty($cutoffdate2)?'date':'since')] =  date("d-M-Y", $cutoffdate);
-								if (empty($cutoffdate2)) $filter['range'] = "SINCE";
+								if (empty($cutoffdate2))
+								{
+									$filter['range'] = "SINCE";
+								}
 							}
-							if ($cutoffdate2) {
+							if ($cutoffdate2)
+							{
 								$filter[(empty($cutoffdate)?'date':'before')] =  date("d-M-Y", $cutoffdate2);
-								if (empty($cutoffdate)) $filter['range'] = "BEFORE";
+								if (empty($cutoffdate))
+								{
+									$filter['range'] = "BEFORE";
+								}
 							}
 						}
 					}
@@ -4808,7 +5440,10 @@ 
 		}
 		else
 		{
-			if(Mail::$debug) error_log(__METHOD__."-> No messages selected.");
+			if(Mail::$debug)
+			{
+				error_log(__METHOD__."-> No messages selected.");
+			}
 		}
 	}
 
@@ -4824,11 +5459,17 @@ 
 	 */
 	function ajax_copyMessages($_folderName, $_messageList, $_copyOrMove='copy', $_move2ArchiveMarker='_')
 	{
-		if(Mail::$debug) error_log(__METHOD__."->".$_folderName.':'.print_r($_messageList,true).' Method:'.$_copyOrMove.' ArchiveMarker:'.$_move2ArchiveMarker);
+		if(Mail::$debug)
+		{
+			error_log(__METHOD__."->".$_folderName.':'.print_r($_messageList,true).' Method:'.$_copyOrMove.' ArchiveMarker:'.$_move2ArchiveMarker);
+		}
 		Api\Translation::add_app('mail');
 		$folderName = $this->mail_bo->decodeEntityFolderName($_folderName);
 		// only copy or move are supported as method
-		if (!($_copyOrMove=='copy' || $_copyOrMove=='move')) $_copyOrMove='copy';
+		if (!($_copyOrMove=='copy' || $_copyOrMove=='move'))
+		{
+			$_copyOrMove='copy';
+		}
 		list($targetProfileID,$targetFolder) = explode(self::$delimiter,$folderName,2);
 		// check if move2archive was called with the correct archiveFolder
 		$archiveFolder = $this->mail_bo->getArchiveFolder();
@@ -4851,8 +5492,13 @@ 
 				$keys = array_keys($lastFoldersUsedForMoveCont[$targetProfileID]);
 				foreach( $keys as &$f)
 				{
-					if (count($lastFoldersUsedForMoveCont[$targetProfileID])>9) unset($lastFoldersUsedForMoveCont[$targetProfileID][$f]);
-					else break;
+					if (count($lastFoldersUsedForMoveCont[$targetProfileID])>9)
+					{
+						unset($lastFoldersUsedForMoveCont[$targetProfileID][$f]);
+					}
+					else {
+						break;
+					}
 				}
 				//error_log(__METHOD__.__LINE__.array2string($lastFoldersUsedForMoveCont[$targetProfileID]));
 			}
@@ -4879,12 +5525,23 @@ 
 						if (is_null(Mail::$supportsORinQuery) || !isset(Mail::$supportsORinQuery[$this->mail_bo->profileID]))
 						{
 							Mail::$supportsORinQuery = Api\Cache::getCache(Api\Cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*10);
-							if (!isset(Mail::$supportsORinQuery[$this->mail_bo->profileID])) Mail::$supportsORinQuery[$this->mail_bo->profileID]=true;
+							if (!isset(Mail::$supportsORinQuery[$this->mail_bo->profileID]))
+							{
+								Mail::$supportsORinQuery[$this->mail_bo->profileID]=true;
+							}
 						}
 						$filtered = true;
 						$cutoffdate = $cutoffdate2 = null;
-						if ($query['startdate']) $cutoffdate = Api\DateTime::to($query['startdate'],'ts');//SINCE, enddate
-						if ($query['enddate']) $cutoffdate2 = Api\DateTime::to($query['enddate'],'ts');//BEFORE, startdate
+						if ($query['startdate'])
+						{
+							$cutoffdate = Api\DateTime::to($query['startdate'],'ts');
+						}
+						//SINCE, enddate
+						if ($query['enddate'])
+						{
+							$cutoffdate2 = Api\DateTime::to($query['enddate'],'ts');
+						}
+						//BEFORE, startdate
 						//error_log(__METHOD__.__LINE__.' Startdate:'.$cutoffdate2.' Enddate'.$cutoffdate);
 						$filter = array(
 							'filterName' => (Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID]?lang('quicksearch'):lang('subject')),
@@ -4893,15 +5550,24 @@ 
 							'status' => (!empty($query['filter'])?$query['filter']:'any'),
 							//'range'=>"BETWEEN",'since'=> date("d-M-Y", $cutoffdate),'before'=> date("d-M-Y", $cutoffdate2)
 						);
-						if ($query['enddate']||$query['startdate']) {
+						if ($query['enddate']||$query['startdate'])
+						{
 							$filter['range'] = "BETWEEN";
-							if ($cutoffdate) {
+							if ($cutoffdate)
+							{
 								$filter[(empty($cutoffdate2)?'date':'since')] =  date("d-M-Y", $cutoffdate);
-								if (empty($cutoffdate2)) $filter['range'] = "SINCE";
+								if (empty($cutoffdate2))
+								{
+									$filter['range'] = "SINCE";
+								}
 							}
-							if ($cutoffdate2) {
+							if ($cutoffdate2)
+							{
 								$filter[(empty($cutoffdate)?'date':'before')] =  date("d-M-Y", $cutoffdate2);
-								if (empty($cutoffdate)) $filter['range'] = "BEFORE";
+								if (empty($cutoffdate))
+								{
+									$filter['range'] = "BEFORE";
+								}
 							}
 						}
 					}
@@ -4957,7 +5623,10 @@ 
 						$hA = self::splitRowID($rowID);
 
 						// If folder changes, stop and move what we've got
-						if($hA['folder'] != $folder) break;
+						if($hA['folder'] != $folder)
+						{
+							break;
+						}
 
 						array_shift($_messageList['msg']);
 						$messageList[] = $hA['msgUID'];
@@ -5012,7 +5681,10 @@ 
 		}
 		else
 		{
-			if(Mail::$debug) error_log(__METHOD__."-> No messages selected.");
+			if(Mail::$debug)
+			{
+				error_log(__METHOD__."-> No messages selected.");
+			}
 		}
 	}
 

Spacing +822 added lines, -829 removed lines

@@ -40,8 +40,7 @@ 
 	 *
 	 * @var array
 	 */
-	var $public_functions = array
-	(
+	var $public_functions = array(
 		'index' => True,
 		'displayHeader'	=> True,
 		'displayMessage'	=> True,
@@ -92,17 +91,17 @@ 
 	 * @var array
 	 */
 	var $searchTypes = array(
-		'quick'		=> 'quicksearch',	// lang('quicksearch')
-		'quickwithcc'=> 'quicksearch (with cc)',	// lang('quicksearch (with cc)')
-		'subject'	=> 'subject',		// lang('subject')
-		'body'		=> 'message body',	// lang('message body')
-		'from'		=> 'from',			// lang('from')
-		'to'		=> 'to',			// lang('to')
-		'cc'		=> 'cc',			// lang('cc')
-		'text'		=> 'whole message',	// lang('whole message')
-		'larger'		=> 'greater than',	// lang('greater than')
-		'smaller'		=> 'less than',	// lang('less than')
-		'bydate' 	=> 'Selected date range (with quicksearch)',// lang('Selected date range (with quicksearch)')
+		'quick'		=> 'quicksearch', // lang('quicksearch')
+		'quickwithcc'=> 'quicksearch (with cc)', // lang('quicksearch (with cc)')
+		'subject'	=> 'subject', // lang('subject')
+		'body'		=> 'message body', // lang('message body')
+		'from'		=> 'from', // lang('from')
+		'to'		=> 'to', // lang('to')
+		'cc'		=> 'cc', // lang('cc')
+		'text'		=> 'whole message', // lang('whole message')
+		'larger'		=> 'greater than', // lang('greater than')
+		'smaller'		=> 'less than', // lang('less than')
+		'bydate' 	=> 'Selected date range (with quicksearch)', // lang('Selected date range (with quicksearch)')
 	);
 
 	/**
@@ -111,12 +110,12 @@ 
 	 * @var array
 	 */
 	var $statusTypes = array(
-		'any'		=> 'any status',// lang('any status')
-		'flagged'	=> 'flagged',	// lang('flagged')
-		'unseen'	=> 'unread',	// lang('unread')
-		'answered'	=> 'replied',	// lang('replied')
-		'seen'		=> 'read',		// lang('read')
-		'deleted'	=> 'deleted',	// lang('deleted')
+		'any'		=> 'any status', // lang('any status')
+		'flagged'	=> 'flagged', // lang('flagged')
+		'unseen'	=> 'unread', // lang('unread')
+		'answered'	=> 'replied', // lang('replied')
+		'seen'		=> 'read', // lang('read')
+		'deleted'	=> 'deleted', // lang('deleted')
 	);
 
 	/**
@@ -124,12 +123,12 @@ 
 	 *
 	 * @param boolean $run_constructor =true false: no not run constructor and therefore do NOT connect to imap server
 	 */
-	function __construct($run_constructor=true)
+	function __construct($run_constructor = true)
 	{
 		$this->mail_tree = new mail_tree($this);
 		if (!$run_constructor) return;
 
-		if (Mail::$debugTimes) $starttime = microtime (true);
+		if (Mail::$debugTimes) $starttime = microtime(true);
 		// no autohide of the sidebox, as we use it for folderlist now.
 		unset($GLOBALS['egw_info']['user']['preferences']['common']['auto_hide_sidebox']);
 
@@ -145,13 +144,13 @@ 
 		}
 
 		try {
-			$this->mail_bo = Mail::getInstance(true,self::$icServerID, true, false, true);
+			$this->mail_bo = Mail::getInstance(true, self::$icServerID, true, false, true);
 			if (Mail::$debug) error_log(__METHOD__.__LINE__.' Fetched IC Server:'.self::$icServerID.'/'.$this->mail_bo->profileID.':'.function_backtrace());
 			//error_log(__METHOD__.__LINE__.array2string($this->mail_bo->icServer));
 
 			// RegEx to minimize extra openConnection
 			$needle = '/^(?!mail)/';
-			if (!preg_match($needle,$_GET['menuaction']) && !Api\Json\Request::isJSONRequest())
+			if (!preg_match($needle, $_GET['menuaction']) && !Api\Json\Request::isJSONRequest())
 			{
 				//error_log(__METHOD__.__LINE__.' Fetched IC Server openConnection:'.self::$icServerID.'/'.$this->mail_bo->profileID.':'.function_backtrace());
 				//openConnection gathers SpecialUseFolderInformation and Delimiter Info
@@ -164,12 +163,12 @@ 
 			if (Api\Json\Request::isJSONRequest() && $_GET['menuaction'] != 'mail.mail_ui.index')
 			{
 				$response = Api\Json\Response::get();
-				$response->call('egw.message',$e->getMessage(),'error');
+				$response->call('egw.message', $e->getMessage(), 'error');
 			}
 			// redirect to mail wizard to handle it (redirect works for ajax too), unless index is called. we want the sidebox
-			if ($_GET['menuaction'] != 'mail.mail_ui.index') self::callWizard($e->getMessage(),true,'error',false);
+			if ($_GET['menuaction'] != 'mail.mail_ui.index') self::callWizard($e->getMessage(), true, 'error', false);
 		}
-		if (Mail::$debugTimes) Mail::logRunTimes($starttime,null,'',__METHOD__.__LINE__);
+		if (Mail::$debugTimes) Mail::logRunTimes($starttime, null, '', __METHOD__.__LINE__);
 	}
 
 	/**
@@ -179,10 +178,10 @@ 
 	 * @param boolean $exit If true, will call exit() after opening the wizardpopup
 	 * @param string $msg_type = 'success' message type
 	 */
-	static function callWizard($message, $exit=true, $msg_type='success',$reset_sidebox_on_index=true)
+	static function callWizard($message, $exit = true, $msg_type = 'success', $reset_sidebox_on_index = true)
 	{
 		//error_log(__METHOD__."('$message', $exit) ".function_backtrace());
-		$linkData=(self::$icServerID ? array(
+		$linkData = (self::$icServerID ? array(
 				'menuaction' => 'mail.mail_wizard.edit',
 				'acc_id' => self::$icServerID,
 			) : array(
@@ -196,11 +195,11 @@ 
 		{
 			$response = Api\Json\Response::get();
 			$windowName = "editMailAccount".self::$icServerID;
-			$response->call("egw.open_link", Egw::link('/index.php', $linkData), $windowName, "600x480",null,true);
+			$response->call("egw.open_link", Egw::link('/index.php', $linkData), $windowName, "600x480", null, true);
 			Framework::message($message, 'error');
 			if ($_GET['menuaction'] == 'mail.mail_ui.index' && $reset_sidebox_on_index)
 			{
-				$response->call('framework.setSidebox','mail',array(),'md5');
+				$response->call('framework.setSidebox', 'mail', array(), 'md5');
 			}
 			if ($exit)
 			{
@@ -210,8 +209,8 @@ 
 		else	// regular GET request eg. in idots template
 		{
 			$windowName = "editMailAccount".self::$icServerID;
-			Framework::popup(Framework::link('/index.php',$linkData),$windowName);
-			$GLOBALS['egw']->framework->render($message,'',true);
+			Framework::popup(Framework::link('/index.php', $linkData), $windowName);
+			$GLOBALS['egw']->framework->render($message, '', true);
 			if ($exit)
 			{
 				exit();
@@ -227,9 +226,9 @@ 
 	 *
 	 * @throws Api\Exception
 	 */
-	function changeProfile($_icServerID,$unsetCache=false)
+	function changeProfile($_icServerID, $unsetCache = false)
 	{
-		if (Mail::$debugTimes) $starttime = microtime (true);
+		if (Mail::$debugTimes) $starttime = microtime(true);
 		if (self::$icServerID != $_icServerID)
 		{
 			self::$icServerID = $_icServerID;
@@ -237,35 +236,35 @@ 
 		if (Mail::$debug) error_log(__METHOD__.__LINE__.'->'.self::$icServerID.'<->'.$_icServerID);
 
 		if ($unsetCache) Mail::unsetCachedObjects(self::$icServerID);
-		$this->mail_bo = Mail::getInstance(false,self::$icServerID,true, false, true);
+		$this->mail_bo = Mail::getInstance(false, self::$icServerID, true, false, true);
 		if (Mail::$debug) error_log(__METHOD__.__LINE__.' Fetched IC Server:'.self::$icServerID.'/'.$this->mail_bo->profileID.':'.function_backtrace());
 		// no icServer Object: something failed big time
-		if (!isset($this->mail_bo) || !isset($this->mail_bo->icServer) || $this->mail_bo->icServer->ImapServerId<>$_icServerID)
+		if (!isset($this->mail_bo) || !isset($this->mail_bo->icServer) || $this->mail_bo->icServer->ImapServerId <> $_icServerID)
 		{
 			self::$icServerID = $_icServerID;
 			throw new Api\Exception('Profile change failed!');
 		}
 
 		// save session varchar
-		$oldicServerID =& Api\Cache::getSession('mail','activeProfileID');
+		$oldicServerID = & Api\Cache::getSession('mail', 'activeProfileID');
 		if ($oldicServerID <> self::$icServerID) $this->mail_bo->openConnection(self::$icServerID);
 		if (true) $oldicServerID = self::$icServerID;
-		if (!Mail::storeActiveProfileIDToPref($this->mail_bo->icServer, self::$icServerID, true ))
+		if (!Mail::storeActiveProfileIDToPref($this->mail_bo->icServer, self::$icServerID, true))
 		{
 			throw new Api\Exception(__METHOD__." failed to change Profile to $_icServerID");
 		}
 
-		if (Mail::$debugTimes) Mail::logRunTimes($starttime,null,'',__METHOD__.__LINE__);
+		if (Mail::$debugTimes) Mail::logRunTimes($starttime, null, '', __METHOD__.__LINE__);
 	}
 
 	/**
 	 * Ajax function to request next branch of a tree branch
 	 */
-	static function ajax_tree_autoloading ($_id = null)
+	static function ajax_tree_autoloading($_id = null)
 	{
 		$mail_ui = new mail_ui();
 		$id = $_id ? $_id : $_GET['id'];
-		Etemplate\Widget\Tree::send_quote_json($mail_ui->mail_tree->getTree($id,'',1,false));
+		Etemplate\Widget\Tree::send_quote_json($mail_ui->mail_tree->getTree($id, '', 1, false));
 	}
 
 	/**
@@ -274,11 +273,11 @@ 
 	 * @param array $content
 	 * @param type $msg
 	 */
-	function subscription(array $content=null ,$msg=null)
+	function subscription(array $content = null, $msg = null)
 	{
 		$stmpl = new Etemplate('mail.subscribe');
 
-		if(is_array($content))
+		if (is_array($content))
 		{
 			$profileId = $content['profileId'];
 		}
@@ -288,14 +287,14 @@ 
 		}
 		// Initial tree's options, the rest would be loaded dynamicaly by autoloading,
 		// triggered from client-side. Also, we keep this here as
-		$sel_options['foldertree'] =  $this->mail_tree->getTree(null,$profileId,1,true,false,true);
+		$sel_options['foldertree'] = $this->mail_tree->getTree(null, $profileId, 1, true, false, true);
 
 		//Get all subscribed folders
 		// as getting all subscribed folders is very fast operation
 		// we can use it to get a comparison base for folders which
 		// got subscribed or unsubscribed by the user
 		try {
-			$subscribed = $this->mail_bo->icServer->listSubscribedMailboxes('',0,true);
+			$subscribed = $this->mail_bo->icServer->listSubscribedMailboxes('', 0, true);
 		} catch (Exception $ex) {
 			Framework::message($ex->getMessage());
 		}
@@ -306,7 +305,7 @@ 
 
 			foreach ($subscribed as $folder)
 			{
-				$folderName = $profileId . self::$delimiter . $folder['MAILBOX'];
+				$folderName = $profileId.self::$delimiter.$folder['MAILBOX'];
 				array_push($content['foldertree'], $folderName);
 			}
 		}
@@ -320,9 +319,9 @@ 
 				{
 					// do not let user (un)subscribe namespace roots eg. "other", "user" or "INBOX", same for tree-root/account itself
 					$namespace_roots = array($profileId);
-					foreach($this->mail_bo->_getNameSpaces() as $namespace)
+					foreach ($this->mail_bo->_getNameSpaces() as $namespace)
 					{
-						$namespace_roots[] = $profileId . self::$delimiter . str_replace($namespace['delimiter'], '', $namespace['prefix']);
+						$namespace_roots[] = $profileId.self::$delimiter.str_replace($namespace['delimiter'], '', $namespace['prefix']);
 					}
 					$to_unsubscribe = $to_subscribe = array();
 					foreach ($content['foldertree'] as $path => $value)
@@ -330,7 +329,7 @@ 
 						list(,$node) = explode($profileId.self::$delimiter, $path);
 						if ($node)
 						{
-							if (is_array($subscribed) && $subscribed[$node] && !$value['value']) $to_unsubscribe []= $node;
+							if (is_array($subscribed) && $subscribed[$node] && !$value['value']) $to_unsubscribe [] = $node;
 							if (is_array($subscribed) && !$subscribed[$node] && $value['value']) $to_subscribe [] = $node;
 							if ($value['value']) $cont[] = $path;
 						}
@@ -340,7 +339,7 @@ 
 					// set foldertree options to basic node in order to avoid initial autoloading
 					// from client side, as no options would trigger that.
 					$sel_options['foldertree'] = array('id' => '0', 'item'=> array());
-					foreach(array_merge($to_subscribe, $to_unsubscribe) as $mailbox)
+					foreach (array_merge($to_subscribe, $to_unsubscribe) as $mailbox)
 					{
 						if (in_array($profileId.self::$delimiter.$mailbox, $namespace_roots, true))
 						{
@@ -376,18 +375,18 @@ 
 						}
 					}
 					// update foldertree in main window
-					$parentFolder='INBOX';
+					$parentFolder = 'INBOX';
 					$refreshData = array(
 						$profileId => lang($parentFolder),
 					);
 					$response = Api\Json\Response::get();
-					foreach($refreshData as $folder => &$name)
+					foreach ($refreshData as $folder => &$name)
 					{
-						$name = $this->mail_tree->getTree($folder, $profileId,1,true,true,true);
+						$name = $this->mail_tree->getTree($folder, $profileId, 1, true, true, true);
 					}
 					// give success/error message to opener and popup itself
 					//$response->call('opener.app.mail.subscription_refresh',$refreshData);
-					$response->call('opener.app.mail.mail_reloadNode',$refreshData);
+					$response->call('opener.app.mail.mail_reloadNode', $refreshData);
 
 					Framework::refresh_opener($msg, 'mail', null, null, null, null, null, $msg_type);
 					if ($button == 'apply')
@@ -407,7 +406,7 @@ 
 
 		$readonlys = array();
 
-		$stmpl->exec('mail.mail_ui.subscription', $content,$sel_options,$readonlys,$preserv,2);
+		$stmpl->exec('mail.mail_ui.subscription', $content, $sel_options, $readonlys, $preserv, 2);
 	}
 
 	/**
@@ -416,13 +415,13 @@ 
 	 * @param array $content
 	 * @param string $msg
 	 */
-	function index(array $content=null,$msg=null)
+	function index(array $content = null, $msg = null)
 	{
 		//error_log(__METHOD__.__LINE__.array2string($content));
-		try	{
+		try {
 				if (!isset($this->mail_bo)) throw new Api\Exception\WrongUserinput(lang('Initialization of mail failed. Please use the Wizard to cope with the problem.'));
 				//error_log(__METHOD__.__LINE__.function_backtrace());
-				if (Mail::$debugTimes) $starttime = microtime (true);
+				if (Mail::$debugTimes) $starttime = microtime(true);
 				$this->mail_bo->restoreSessionData();
 				$sessionFolder = $this->mail_bo->sessionData['mailbox'];
 				if ($this->mail_bo->folderExists($sessionFolder))
@@ -443,26 +442,26 @@ 
 					{
 						// These only set on first load
 						$content[self::$nm_index] = array(
-							'filter'         => 'any',	// filter is used to choose the mailbox
-							'lettersearch'   => false,	// I  show a lettersearch
-							'searchletter'   =>	false,	// I0 active letter of the lettersearch or false for [all]
-							'start'          =>	0,		// IO position in list
-							'order'          =>	'date',	// IO name of the column to sort after (optional for the sortheaders)
-							'sort'           =>	'DESC',	// IO direction of the sort: 'ASC' or 'DESC'
+							'filter'         => 'any', // filter is used to choose the mailbox
+							'lettersearch'   => false, // I  show a lettersearch
+							'searchletter'   =>	false, // I0 active letter of the lettersearch or false for [all]
+							'start'          =>	0, // IO position in list
+							'order'          =>	'date', // IO name of the column to sort after (optional for the sortheaders)
+							'sort'           =>	'DESC', // IO direction of the sort: 'ASC' or 'DESC'
 						);
 					}
 					if (Api\Header\UserAgent::mobile()) $content[self::$nm_index]['header_row'] = 'mail.index.header_right';
 				}
 
 				// These must always be set, even if $content is an array
-				$content[self::$nm_index]['cat_is_select'] = true;    // Category select is just a normal selectbox
-				$content[self::$nm_index]['no_filter2'] = false;       // Disable second filter
+				$content[self::$nm_index]['cat_is_select'] = true; // Category select is just a normal selectbox
+				$content[self::$nm_index]['no_filter2'] = false; // Disable second filter
 				$content[self::$nm_index]['actions'] = self::get_actions();
-				$content[self::$nm_index]['row_id'] = 'row_id';	     // is a concatenation of trim($GLOBALS['egw_info']['user']['account_id']):profileID:base64_encode(FOLDERNAME):uid
+				$content[self::$nm_index]['row_id'] = 'row_id'; // is a concatenation of trim($GLOBALS['egw_info']['user']['account_id']):profileID:base64_encode(FOLDERNAME):uid
 				$content[self::$nm_index]['placeholder_actions'] = array('composeasnew');
 				$content[self::$nm_index]['get_rows'] = 'mail_ui::get_rows';
-				$content[self::$nm_index]['num_rows'] = 0;      // Do not send any rows with initial request
-				$content[self::$nm_index]['default_cols'] = 'status,attachments,subject,address,date,size';	// I  columns to use if there's no user or default pref (! as first char uses all but the named columns), default all columns
+				$content[self::$nm_index]['num_rows'] = 0; // Do not send any rows with initial request
+				$content[self::$nm_index]['default_cols'] = 'status,attachments,subject,address,date,size'; // I  columns to use if there's no user or default pref (! as first char uses all but the named columns), default all columns
 				$content[self::$nm_index]['csv_fields'] = false;
 				if ($msg)
 				{
@@ -474,11 +473,11 @@ 
 					unset($content['msg']);
 				}
 				// call getQuotaRoot asynchronously in getRows by initiating a client Server roundtrip
-				$quota = false;//$this->mail_bo->getQuotaRoot();
-				if($quota !== false && $quota['limit'] != 'NOT SET') {
+				$quota = false; //$this->mail_bo->getQuotaRoot();
+				if ($quota !== false && $quota['limit'] != 'NOT SET') {
 					$quotainfo = $this->quotaDisplay($quota['usage'], $quota['limit']);
 					$content[self::$nm_index]['quota'] = $sel_options[self::$nm_index]['quota'] = $quotainfo['text'];
-					$content[self::$nm_index]['quotainpercent'] = $sel_options[self::$nm_index]['quotainpercent'] =  (string)$quotainfo['percent'];
+					$content[self::$nm_index]['quotainpercent'] = $sel_options[self::$nm_index]['quotainpercent'] = (string)$quotainfo['percent'];
 					$content[self::$nm_index]['quotaclass'] = $sel_options[self::$nm_index]['quotaclass'] = $quotainfo['class'];
 					$content[self::$nm_index]['quotanotsupported'] = $sel_options[self::$nm_index]['quotanotsupported'] = "";
 				} else {
@@ -487,43 +486,43 @@ 
 					$content[self::$nm_index]['quotanotsupported'] = $sel_options[self::$nm_index]['quotanotsupported'] = "mail_DisplayNone";
 				}
 				// call gatherVacation asynchronously in getRows by initiating a client Server roundtrip
-				$vacation = false;//$this->gatherVacation();
+				$vacation = false; //$this->gatherVacation();
 				//error_log(__METHOD__.__LINE__.' Server:'.self::$icServerID.' Sieve Enabled:'.array2string($vacation));
-				if($vacation) {
-					if (is_array($vacation) && ($vacation['status'] == 'on' || $vacation['status']=='by_date' && $vacation['end_date'] > time()))
+				if ($vacation) {
+					if (is_array($vacation) && ($vacation['status'] == 'on' || $vacation['status'] == 'by_date' && $vacation['end_date'] > time()))
 					{
 						$dtfrmt = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat']/*.' '.($GLOBALS['egw_info']['user']['preferences']['common']['timeformat']!='24'?'h:i a':'H:i')*/;
 						$content[self::$nm_index]['vacationnotice'] = $sel_options[self::$nm_index]['vacationnotice'] = lang('Vacation notice is active');
-						$content[self::$nm_index]['vacationrange'] = $sel_options[self::$nm_index]['vacationrange'] = ($vacation['status']=='by_date'? Api\DateTime::server2user($vacation['start_date'],$dtfrmt,true).($vacation['end_date']>$vacation['start_date']?'->'.Api\DateTime::server2user($vacation['end_date']+ 24*3600-1,$dtfrmt,true):''):'');
+						$content[self::$nm_index]['vacationrange'] = $sel_options[self::$nm_index]['vacationrange'] = ($vacation['status'] == 'by_date' ? Api\DateTime::server2user($vacation['start_date'], $dtfrmt, true).($vacation['end_date'] > $vacation['start_date'] ? '->'.Api\DateTime::server2user($vacation['end_date'] + 24 * 3600 - 1, $dtfrmt, true) : '') : '');
 					}
 				}
-				if ($vacation==false)
+				if ($vacation == false)
 				{
 					$content[self::$nm_index]['vacationnotice'] = $sel_options[self::$nm_index]['vacationnotice'] = '';
 					$content[self::$nm_index]['vacationrange'] = $sel_options[self::$nm_index]['vacationrange'] = '';
 				}
 				//$zstarttime = microtime (true);
-				$sel_options[self::$nm_index]['foldertree'] = $this->mail_tree->getInitialIndexTree(null, $this->mail_bo->profileID, null, !$this->mail_bo->mailPreferences['showAllFoldersInFolderPane'],!$this->mail_bo->mailPreferences['showAllFoldersInFolderPane']);
+				$sel_options[self::$nm_index]['foldertree'] = $this->mail_tree->getInitialIndexTree(null, $this->mail_bo->profileID, null, !$this->mail_bo->mailPreferences['showAllFoldersInFolderPane'], !$this->mail_bo->mailPreferences['showAllFoldersInFolderPane']);
 				//$zendtime = microtime(true) - $zstarttime;
 				//error_log(__METHOD__.__LINE__. " time used: ".$zendtime);
-				$content[self::$nm_index]['selectedFolder'] = $this->mail_bo->profileID.self::$delimiter.(!empty($this->mail_bo->sessionData['mailbox'])?$this->mail_bo->sessionData['mailbox']:'INBOX');
+				$content[self::$nm_index]['selectedFolder'] = $this->mail_bo->profileID.self::$delimiter.(!empty($this->mail_bo->sessionData['mailbox']) ? $this->mail_bo->sessionData['mailbox'] : 'INBOX');
 				// since we are connected,(and selected the folder) we check for capabilities SUPPORTS_KEYWORDS to eventually add the keyword filters
-				if ( $this->mail_bo->icServer->hasCapability('SUPPORTS_KEYWORDS'))
+				if ($this->mail_bo->icServer->hasCapability('SUPPORTS_KEYWORDS'))
 				{
-					$this->statusTypes = array_merge($this->statusTypes,array(
-						'keyword1'	=> 'important',//lang('important'),
-						'keyword2'	=> 'job',	//lang('job'),
-						'keyword3'	=> 'personal',//lang('personal'),
-						'keyword4'	=> 'to do',	//lang('to do'),
-						'keyword5'	=> 'later',	//lang('later'),
+					$this->statusTypes = array_merge($this->statusTypes, array(
+						'keyword1'	=> 'important', //lang('important'),
+						'keyword2'	=> 'job', //lang('job'),
+						'keyword3'	=> 'personal', //lang('personal'),
+						'keyword4'	=> 'to do', //lang('to do'),
+						'keyword5'	=> 'later', //lang('later'),
 					));
 				}
 				else
 				{
-					$keywords = array('keyword1','keyword2','keyword3','keyword4','keyword5');
-					foreach($keywords as &$k)
+					$keywords = array('keyword1', 'keyword2', 'keyword3', 'keyword4', 'keyword5');
+					foreach ($keywords as &$k)
 					{
-						if (array_key_exists($k,$this->statusTypes)) unset($this->statusTypes[$k]);
+						if (array_key_exists($k, $this->statusTypes)) unset($this->statusTypes[$k]);
 					}
 				}
 
@@ -534,8 +533,8 @@ 
 
 				if (is_null(Mail::$supportsORinQuery) || !isset(Mail::$supportsORinQuery[$this->mail_bo->profileID]))
 				{
-					Mail::$supportsORinQuery = Api\Cache::getCache(Api\Cache::INSTANCE, 'email', 'supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*10);
-					if (!isset(Mail::$supportsORinQuery[$this->mail_bo->profileID])) Mail::$supportsORinQuery[$this->mail_bo->profileID]=true;
+					Mail::$supportsORinQuery = Api\Cache::getCache(Api\Cache::INSTANCE, 'email', 'supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60 * 60 * 10);
+					if (!isset(Mail::$supportsORinQuery[$this->mail_bo->profileID])) Mail::$supportsORinQuery[$this->mail_bo->profileID] = true;
 				}
 				if (!Mail::$supportsORinQuery[$this->mail_bo->profileID])
 				{
@@ -547,14 +546,14 @@ 
 				//error_log(__METHOD__.__LINE__.array2string($GLOBALS['egw_info']['user']['preferences']['mail']['ActiveSearchType']));
 				$content[self::$nm_index]['cat_id'] = $GLOBALS['egw_info']['user']['preferences']['mail']['ActiveSearchType'];
 				$sel_options['filter'] = $this->statusTypes;
-				$sel_options['filter2'] = array(''=>lang('No Sneak Preview in list'),1=>lang('Sneak Preview in list'));
+				$sel_options['filter2'] = array(''=>lang('No Sneak Preview in list'), 1=>lang('Sneak Preview in list'));
 				$content[self::$nm_index]['filter2'] = $GLOBALS['egw_info']['user']['preferences']['mail']['ShowDetails'];
 
 				$etpl = new Etemplate('mail.index');
 				//apply infolog_filter_change javascript method (hide/show of date filter form) over onchange filter
 				$content[self::$nm_index]['cat_id_onchange'] = "app.mail.mail_searchtype_change()";
 				// set the actions on tree
-				$etpl->setElementAttribute(self::$nm_index.'[foldertree]','actions', $this->get_tree_actions());
+				$etpl->setElementAttribute(self::$nm_index.'[foldertree]', 'actions', $this->get_tree_actions());
 
 				// sending preview toolbar actions
 				if ($content['mailSplitter']) $etpl->setElementAttribute('mailPreview[toolbar]', 'actions', $this->get_toolbar_actions());
@@ -565,34 +564,34 @@ 
 				//we use the category "filter" option as specifier where we want to search (quick, subject, from, to, etc. ....)
 				if (empty($content[self::$nm_index]['cat_id']) || empty($content[self::$nm_index]['search']))
 				{
-					$content[self::$nm_index]['cat_id']=($content[self::$nm_index]['cat_id']?(!Mail::$supportsORinQuery[$this->mail_bo->profileID]&&($content[self::$nm_index]['cat_id']=='quick'||$content[self::$nm_index]['cat_id']=='quickwithcc')?'subject':$content[self::$nm_index]['cat_id']):(Mail::$supportsORinQuery[$this->mail_bo->profileID]?'quick':'subject'));
+					$content[self::$nm_index]['cat_id'] = ($content[self::$nm_index]['cat_id'] ? (!Mail::$supportsORinQuery[$this->mail_bo->profileID] && ($content[self::$nm_index]['cat_id'] == 'quick' || $content[self::$nm_index]['cat_id'] == 'quickwithcc') ? 'subject' : $content[self::$nm_index]['cat_id']) : (Mail::$supportsORinQuery[$this->mail_bo->profileID] ? 'quick' : 'subject'));
 				}
 				$readonlys = $preserv = array();
-				if (Mail::$debugTimes) Mail::logRunTimes($starttime,null,'',__METHOD__.__LINE__);
+				if (Mail::$debugTimes) Mail::logRunTimes($starttime, null, '', __METHOD__.__LINE__);
 		}
 		catch (Exception $e)
 		{
 			// do not exit here. mail-tree should be build. if we exit here, we never get there.
-			error_log(__METHOD__.__LINE__.$e->getMessage().($e->details?', '.$e->details:'').' Menuaction:'.$_GET['menuaction'].'.'.function_backtrace());
+			error_log(__METHOD__.__LINE__.$e->getMessage().($e->details ? ', '.$e->details : '').' Menuaction:'.$_GET['menuaction'].'.'.function_backtrace());
 			if (isset($this->mail_bo))
 			{
 				if (empty($etpl))
 				{
-					$sel_options[self::$nm_index]['foldertree'] = $this->mail_tree->getInitialIndexTree(null, $this->mail_bo->profileID, null, !$this->mail_bo->mailPreferences['showAllFoldersInFolderPane'],!$this->mail_bo->mailPreferences['showAllFoldersInFolderPane']);
+					$sel_options[self::$nm_index]['foldertree'] = $this->mail_tree->getInitialIndexTree(null, $this->mail_bo->profileID, null, !$this->mail_bo->mailPreferences['showAllFoldersInFolderPane'], !$this->mail_bo->mailPreferences['showAllFoldersInFolderPane']);
 					$etpl = new Etemplate('mail.index');
 				}
-				$etpl->setElementAttribute(self::$nm_index.'[foldertree]','actions', $this->get_tree_actions(false));
+				$etpl->setElementAttribute(self::$nm_index.'[foldertree]', 'actions', $this->get_tree_actions(false));
 			}
 			$readonlys = $preserv = array();
-			if (empty($content)) $content=array();
+			if (empty($content)) $content = array();
 
-			self::callWizard($e->getMessage().($e->details?', '.$e->details:''),(isset($this->mail_bo)?false:true), 'error',false);
+			self::callWizard($e->getMessage().($e->details ? ', '.$e->details : ''), (isset($this->mail_bo) ? false : true), 'error', false);
 			//return false;
 		}
 		// Check preview pane is enabled, then show splitter
 		if ($this->mail_bo->mailPreferences['previewPane']) $etpl->setElementAttribute('splitter', 'template', 'mail.index.nosplitter');
 
-		return $etpl->exec('mail.mail_ui.index',$content,$sel_options,$readonlys,$preserv);
+		return $etpl->exec('mail.mail_ui.index', $content, $sel_options, $readonlys, $preserv);
 	}
 
 	/**
@@ -602,11 +601,11 @@ 
 	 * @param {boolean} $imap_actions set to false if you want to avoid to talk to the imap-server
 	 * @return array
 	 */
-	function get_tree_actions($imap_actions=true)
+	function get_tree_actions($imap_actions = true)
 	{
 		// Start at 2 so auto-added copy+paste actions show up as second group
 		// Needed because there's no 'select all' action to push things down
-		$group=1;
+		$group = 1;
 		// Set tree actions
 		$tree_actions = array(
 			'drop_move_mail' => array(
@@ -688,12 +687,12 @@ 
 				'onExecute' => 'javaScript:app.mail.edit_sieve',
 
 				'enabled'	=> 'javaScript:app.mail.sieve_enabled',
-				'icon' => 'mail/filter',	// funnel
+				'icon' => 'mail/filter', // funnel
 				'hideOnMobile' => true
 			),
 			'vacation' => array(
 				'caption' => 'Vacation notice',
-				'icon' => 'mail/navbar',	// mail as in admin
+				'icon' => 'mail/navbar', // mail as in admin
 				'onExecute' => 'javaScript:app.mail.edit_vacation',
 				'enabled'	=> 'javaScript:app.mail.sieve_enabled',
 			),
@@ -734,8 +733,8 @@ 
 			unset($tree_actions['subscribe']);
 			unset($tree_actions['unsubscribe']);
 		}
-		++$group;	// put delete in own group
-		switch($GLOBALS['egw_info']['user']['preferences']['mail']['deleteOptions'])
+		++$group; // put delete in own group
+		switch ($GLOBALS['egw_info']['user']['preferences']['mail']['deleteOptions'])
 		{
 			case 'move_to_trash':
 				$tree_actions['empty_trash'] = array(
@@ -754,7 +753,7 @@ 
 				);
 				break;
 		}
-		$junkFolder = ($imap_actions?$this->mail_bo->getJunkFolder():null);
+		$junkFolder = ($imap_actions ? $this->mail_bo->getJunkFolder() : null);
 
 		//error_log(__METHOD__.__LINE__.$junkFolder);
 		if ($junkFolder && !empty($junkFolder))
@@ -767,8 +766,8 @@ 
 				'group'	=> $group,
 			);
 		}
-		$tree_actions['sieve']['group']	= $tree_actions['vacation']['group'] = ++$group;	// new group for filter
-		$tree_actions['edit_account']['group'] = $tree_actions['edit_acl']['group']	= ++$group;
+		$tree_actions['sieve']['group'] = $tree_actions['vacation']['group'] = ++$group; // new group for filter
+		$tree_actions['edit_account']['group'] = $tree_actions['edit_acl']['group'] = ++$group;
 
 
 		// enforce global (group-specific) ACL
@@ -803,17 +802,17 @@ 
 	 * @param {string} $_folderName name of mailbox needs to be subcribe or unsubscribed
 	 * @param {boolean} $_status set true for subscribe and false to unsubscribe
 	 */
-	public function ajax_foldersubscription($_acc_id,$_folderName, $_status)
+	public function ajax_foldersubscription($_acc_id, $_folderName, $_status)
 	{
 		//Change the Mail object to related profileId
 		$this->changeProfile($_acc_id);
-		try{
+		try {
 			$this->mail_bo->icServer->subscribeMailbox($_folderName, $_status);
 			$this->mail_bo->resetFolderObjectCache($_acc_id);
-			$this->ajax_reloadNode($_acc_id,!$this->mail_bo->mailPreferences['showAllFoldersInFolderPane']);
+			$this->ajax_reloadNode($_acc_id, !$this->mail_bo->mailPreferences['showAllFoldersInFolderPane']);
 		} catch (Horde_Imap_Client_Exception $ex) {
-			error_log(__METHOD__.__LINE__."()". lang('Folder %1 %2 failed because of %3!',$_folderName,$_status?'subscribed':'unsubscribed', $ex));
-			Framework::message(lang('Folder %1 %2 failed!',$_folderName,$_status));
+			error_log(__METHOD__.__LINE__."()".lang('Folder %1 %2 failed because of %3!', $_folderName, $_status ? 'subscribed' : 'unsubscribed', $ex));
+			Framework::message(lang('Folder %1 %2 failed!', $_folderName, $_status));
 		}
 	}
 
@@ -825,25 +824,25 @@ 
 	 * @param string $_nodeID if of node whos children are requested
 	 * @param boolean $_subscribedOnly flag to tell wether to fetch all or only subscribed (default)
 	 */
-	public function ajax_foldertree($_nodeID = null,$_subscribedOnly=null)
+	public function ajax_foldertree($_nodeID = null, $_subscribedOnly = null)
 	{
 		$nodeID = $_GET['id'];
 		if (!is_null($_nodeID)) $nodeID = $_nodeID;
-		$subscribedOnly = (bool)(!is_null($_subscribedOnly)?$_subscribedOnly:!$this->mail_bo->mailPreferences['showAllFoldersInFolderPane']);
+		$subscribedOnly = (bool)(!is_null($_subscribedOnly) ? $_subscribedOnly : !$this->mail_bo->mailPreferences['showAllFoldersInFolderPane']);
 		$fetchCounters = !is_null($_nodeID);
-		list($_profileID,$_folderName) = explode(self::$delimiter,$nodeID,2);
+		list($_profileID, $_folderName) = explode(self::$delimiter, $nodeID, 2);
 
 		if (!empty($_folderName)) $fetchCounters = true;
 
 		// Check if it is called for refresh root
 		// then we need to reinitialized the index tree
-		if(!$nodeID && !$_profileID)
+		if (!$nodeID && !$_profileID)
 		{
-			$data = $this->mail_tree->getInitialIndexTree(null,null,null,null,true,!$this->mail_bo->mailPreferences['showAllFoldersInFolderPane']);
+			$data = $this->mail_tree->getInitialIndexTree(null, null, null, null, true, !$this->mail_bo->mailPreferences['showAllFoldersInFolderPane']);
 		}
 		else
 		{
-			$data = $this->mail_tree->getTree($nodeID,$_profileID,0, false,$subscribedOnly,!$this->mail_bo->mailPreferences['showAllFoldersInFolderPane']);
+			$data = $this->mail_tree->getTree($nodeID, $_profileID, 0, false, $subscribedOnly, !$this->mail_bo->mailPreferences['showAllFoldersInFolderPane']);
 		}
 		if (!is_null($_nodeID)) return $data;
 		Etemplate\Widget\Tree::send_quote_json($data);
@@ -859,17 +858,17 @@ 
 	 */
 	static function findNode($_out, $_nodeID, $childElements = false)
 	{
-		foreach($_out['item'] as $node)
+		foreach ($_out['item'] as $node)
 		{
-			if (strcmp($node['id'],$_nodeID)===0)
+			if (strcmp($node['id'], $_nodeID) === 0)
 			{
 				//error_log(__METHOD__.__LINE__.':'.$_nodeID.'->'.$node['id']);
-				return ($childElements?$node['item']:$node);
+				return ($childElements ? $node['item'] : $node);
 			}
-			elseif (is_array($node['item']) && strncmp($node['id'],$_nodeID,strlen($node['id']))===0 && strlen($_nodeID)>strlen($node['id']))
+			elseif (is_array($node['item']) && strncmp($node['id'], $_nodeID, strlen($node['id'])) === 0 && strlen($_nodeID) > strlen($node['id']))
 			{
 				//error_log(__METHOD__.__LINE__.' descend into '.$node['id']);
-				return self::findNode($node,$_nodeID,$childElements);
+				return self::findNode($node, $_nodeID, $childElements);
 			}
 		}
 	}
@@ -883,7 +882,7 @@ 
 	 */
 	private function get_actions()
 	{
-		static $accArray=array(); // buffer identity names on single request
+		static $accArray = array(); // buffer identity names on single request
 		// duplicated from mail_hooks
 		static $deleteOptions = array(
 			'move_to_trash'		=> 'move to trash',
@@ -894,12 +893,12 @@ 
 		$lastFolderUsedForMove = null;
 		$moveactions = array();
 		$archiveFolder = $this->mail_bo->getArchiveFolder();
-		$lastFoldersUsedForMoveCont = Api\Cache::getCache(Api\Cache::INSTANCE,'email','lastFolderUsedForMove'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),$expiration=60*60*1);
+		$lastFoldersUsedForMoveCont = Api\Cache::getCache(Api\Cache::INSTANCE, 'email', 'lastFolderUsedForMove'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), $expiration = 60 * 60 * 1);
 		//error_log(__METHOD__.__LINE__." StoredFolders->".array2string($lastFoldersUsedForMoveCont));
 		//error_log(__METHOD__.__LINE__.' ProfileId:'.$this->mail_bo->profileID." StoredFolders->(".count($lastFoldersUsedForMoveCont[$this->mail_bo->profileID]).") ".array2string($lastFoldersUsedForMoveCont[$this->mail_bo->profileID]));
 		if (is_null($accArray))
 		{
-			foreach(Mail\Account::search($only_current_user=true, false) as $acc_id => $accountObj)
+			foreach (Mail\Account::search($only_current_user = true, false) as $acc_id => $accountObj)
 			{
 				//error_log(__METHOD__.__LINE__.array2string($accountObj));
 				if (!$accountObj->is_imap())
@@ -907,22 +906,22 @@ 
 					// not to be used for IMAP Foldertree, as there is no Imap host
 					continue;
 				}
-				$identity_name = Mail\Account::identity_name($accountObj,true,$GLOBALS['egw_info']['user']['acount_id']);
-				$accArray[$acc_id] = str_replace(array('<','>'),array('[',']'),$identity_name);// as angle brackets are quoted, display in Javascript messages when used is ugly, so use square brackets instead
+				$identity_name = Mail\Account::identity_name($accountObj, true, $GLOBALS['egw_info']['user']['acount_id']);
+				$accArray[$acc_id] = str_replace(array('<', '>'), array('[', ']'), $identity_name); // as angle brackets are quoted, display in Javascript messages when used is ugly, so use square brackets instead
 			}
 		}
-		if (!is_array($lastFoldersUsedForMoveCont)) $lastFoldersUsedForMoveCont=array();
+		if (!is_array($lastFoldersUsedForMoveCont)) $lastFoldersUsedForMoveCont = array();
 		foreach (array_keys($lastFoldersUsedForMoveCont) as $pid)
 		{
-			if ($this->mail_bo->profileID==$pid && isset($lastFoldersUsedForMoveCont[$this->mail_bo->profileID]))
+			if ($this->mail_bo->profileID == $pid && isset($lastFoldersUsedForMoveCont[$this->mail_bo->profileID]))
 			{
 				$_folder = $this->mail_bo->icServer->getCurrentMailbox();
 				//error_log(__METHOD__.__LINE__.' '.$_folder."<->".$lastFoldersUsedForMoveCont[$this->mail_bo->profileID].function_backtrace());
-				$counter =1;
+				$counter = 1;
 				foreach ($lastFoldersUsedForMoveCont[$this->mail_bo->profileID] as $i => $lastFolderUsedForMoveCont)
 				{
 					$moveaction = 'move_';
-					if ($_folder!=$i)
+					if ($_folder != $i)
 					{
 						$moveaction .= $lastFolderUsedForMoveCont;
 						//error_log(__METHOD__.__LINE__.'#'.$moveaction);
@@ -933,7 +932,7 @@ 
 							$fS['profileName'] = $accArray[$this->mail_bo->profileID];
 							$fS['shortDisplayName'] = $i;
 							$moveactions[$moveaction] = $fS;
-							$counter ++;
+							$counter++;
 						}
 						else
 						{
@@ -943,9 +942,9 @@ 
 					}
 				}
 			}
-			elseif ($this->mail_bo->profileID!=$pid && isset($lastFoldersUsedForMoveCont[$pid]) && !empty($lastFoldersUsedForMoveCont[$pid]))
+			elseif ($this->mail_bo->profileID != $pid && isset($lastFoldersUsedForMoveCont[$pid]) && !empty($lastFoldersUsedForMoveCont[$pid]))
 			{
-				$counter =1;
+				$counter = 1;
 				foreach ($lastFoldersUsedForMoveCont[$pid] as $i => $lastFolderUsedForMoveCont)
 				{
 					//error_log(__METHOD__.__LINE__."$i => $lastFolderUsedForMoveCont");
@@ -958,19 +957,19 @@ 
 						$fS['profileName'] = $accArray[$pid];
 						$fS['shortDisplayName'] = $i;
 						$moveactions[$moveaction] = $fS;
-						$counter ++;
+						$counter++;
 					}
 				}
 			}
 		}
-		Api\Cache::setCache(Api\Cache::INSTANCE,'email','lastFolderUsedForMove'.trim($GLOBALS['egw_info']['user']['account_id']),$lastFoldersUsedForMoveCont, $expiration=60*60*1);
+		Api\Cache::setCache(Api\Cache::INSTANCE, 'email', 'lastFolderUsedForMove'.trim($GLOBALS['egw_info']['user']['account_id']), $lastFoldersUsedForMoveCont, $expiration = 60 * 60 * 1);
 		$group = 0;
-		$actions =  array(
+		$actions = array(
 			'open' => array(
 				'caption' => lang('Open'),
 				'icon' => 'view',
 				'group' => ++$group,
-				'onExecute' => Api\Header\UserAgent::mobile()?'javaScript:app.mail.mobileView':'javaScript:app.mail.mail_open',
+				'onExecute' => Api\Header\UserAgent::mobile() ? 'javaScript:app.mail.mobileView' : 'javaScript:app.mail.mail_open',
 				'allowOnMultiple' => false,
 				'default' => true,
 				'mobileViewTemplate' => 'view?'.filemtime(Api\Etemplate\Widget\Template::rel2path('/mail/templates/mobile/view.xet'))
@@ -1023,20 +1022,20 @@ 
 				'allowOnMultiple' => false,
 			)
 		);
-		$macounter=0;
+		$macounter = 0;
 		if (!empty($moveactions))
 		{
 			//error_log(__METHOD__.__LINE__.array2string($moveactions));
-			$children=array();
-			$pID=0;
+			$children = array();
+			$pID = 0;
 			foreach ($moveactions as $moveaction => $lastFolderUsedForMove)
 			{
-				$group = ($pID != $lastFolderUsedForMove['profileID'] && $macounter>0? $group+1 : $group);
+				$group = ($pID != $lastFolderUsedForMove['profileID'] && $macounter > 0 ? $group + 1 : $group);
 				//error_log(__METHOD__.__LINE__."#$pID != ".$lastFolderUsedForMove['profileID']."#".$macounter.'#'.$groupCounter.'#');
 				$children = array_merge($children,
 					array(
 						$moveaction => array(
-							'caption' => (!empty($lastFolderUsedForMove['profileName'])?$lastFolderUsedForMove['profileName']:'('.$lastFolderUsedForMove['profileID'].')').': '.(isset($lastFolderUsedForMove['shortDisplayName'])?$lastFolderUsedForMove['shortDisplayName']:''),
+							'caption' => (!empty($lastFolderUsedForMove['profileName']) ? $lastFolderUsedForMove['profileName'] : '('.$lastFolderUsedForMove['profileID'].')').': '.(isset($lastFolderUsedForMove['shortDisplayName']) ? $lastFolderUsedForMove['shortDisplayName'] : ''),
 							'icon' => 'move',
 							'group' => $group,
 							'onExecute' => 'javaScript:app.mail.mail_move2folder',
@@ -1047,7 +1046,7 @@ 
 				$pID = $lastFolderUsedForMove['profileID'];
 				$macounter++;
 			}
-			$actions['moveto'] =	array(
+			$actions['moveto'] = array(
 				'caption' => lang('Move selected to'),
 				'icon' => 'move',
 				'group' => $group,
@@ -1090,7 +1089,7 @@ 
 				'icon' => 'tracker/navbar',
 				'onExecute' => 'javaScript:app.mail.mail_integrate',
 				'popup' => Link::get_registry('tracker', 'add_popup'),
-				'mail_import' => Api\Hooks::single(array('location' => 'mail_import'),'tracker'),
+				'mail_import' => Api\Hooks::single(array('location' => 'mail_import'), 'tracker'),
 				'allowOnMultiple' => false,
 			),
 			'calendar' => array(
@@ -1309,25 +1308,25 @@ 
 	 * @param array &$rows
 	 * @param array &$readonlys
 	 */
-	public static function get_rows(&$query,&$rows,&$readonlys)
+	public static function get_rows(&$query, &$rows, &$readonlys)
 	{
-		unset($readonlys);	// not used, but required by function signature
+		unset($readonlys); // not used, but required by function signature
 
 		// handle possible profile change in get_rows
 		if (!empty($query['selectedFolder']))
 		{
-			list($_profileID,$folderName) = explode(self::$delimiter, $query['selectedFolder'], 2);
+			list($_profileID, $folderName) = explode(self::$delimiter, $query['selectedFolder'], 2);
 			if (is_numeric(($_profileID)) && $_profileID != $GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'])
 			{
 				try {
-					$mail_ui = new mail_ui(false);	// do NOT run constructor, as we change profile anyway
+					$mail_ui = new mail_ui(false); // do NOT run constructor, as we change profile anyway
 					$mail_ui->changeProfile($_profileID);
 					$query['actions'] = $mail_ui->get_actions();
 				}
-				catch(Exception $e)
+				catch (Exception $e)
 				{
 					unset($e);
-					$rows=array();
+					$rows = array();
 					return 0;
 				}
 				if (empty($folderName)) $query['selectedFolder'] = $_profileID.self::$delimiter.'INBOX';
@@ -1337,12 +1336,12 @@ 
 		{
 			try
 			{
-				$mail_ui = new mail_ui(true);	// run constructor for current profile
+				$mail_ui = new mail_ui(true); // run constructor for current profile
 			}
-			catch(Exception $e)
+			catch (Exception $e)
 			{
 				unset($e);
-				$rows=array();
+				$rows = array();
 				return 0;
 			}
 			if (empty($query['selectedFolder'])) $query['selectedFolder'] = $mail_ui->mail_bo->profileID.self::$delimiter.'INBOX';
@@ -1353,68 +1352,68 @@ 
 		//$query['search'] is the phrase in the searchbox
 
 		$mail_ui->mail_bo->restoreSessionData();
-		if (isset($query['selectedFolder'])) $mail_ui->mail_bo->sessionData['mailbox']=$query['selectedFolder'];
+		if (isset($query['selectedFolder'])) $mail_ui->mail_bo->sessionData['mailbox'] = $query['selectedFolder'];
 		$mail_ui->mail_bo->saveSessionData();
 
 		$sRToFetch = null;
-		list($_profileID,$_folderName) = explode(self::$delimiter,$query['selectedFolder'],2);
-		if (strpos($_folderName,self::$delimiter)!==false)
+		list($_profileID, $_folderName) = explode(self::$delimiter, $query['selectedFolder'], 2);
+		if (strpos($_folderName, self::$delimiter) !== false)
 		{
-			list($app,$_profileID,$_folderName) = explode(self::$delimiter,$_folderName,3);
+			list($app, $_profileID, $_folderName) = explode(self::$delimiter, $_folderName, 3);
 			unset($app);
 		}
 		//save selected Folder to sessionData (mailbox)->currentFolder
-		if (isset($query['selectedFolder'])) $mail_ui->mail_bo->sessionData['mailbox']=$_folderName;
-		$toSchema = false;//decides to select list schema with column to selected (if false fromaddress is default)
+		if (isset($query['selectedFolder'])) $mail_ui->mail_bo->sessionData['mailbox'] = $_folderName;
+		$toSchema = false; //decides to select list schema with column to selected (if false fromaddress is default)
 		if ($mail_ui->mail_bo->folderExists($_folderName))
 		{
-			$toSchema = $mail_ui->mail_bo->isDraftFolder($_folderName,false)||$mail_ui->mail_bo->isSentFolder($_folderName,false)||$mail_ui->mail_bo->isTemplateFolder($_folderName,false);
+			$toSchema = $mail_ui->mail_bo->isDraftFolder($_folderName, false) || $mail_ui->mail_bo->isSentFolder($_folderName, false) || $mail_ui->mail_bo->isTemplateFolder($_folderName, false);
 		}
 		else
 		{
 			// take the extra time on failure
-			if (!$mail_ui->mail_bo->folderExists($_folderName,true))
+			if (!$mail_ui->mail_bo->folderExists($_folderName, true))
 			{
 				//error_log(__METHOD__.__LINE__.' Test on Folder:'.$_folderName.' failed; Using INBOX instead');
-				$query['selectedFolder']=$mail_ui->mail_bo->sessionData['mailbox']=$_folderName='INBOX';
+				$query['selectedFolder'] = $mail_ui->mail_bo->sessionData['mailbox'] = $_folderName = 'INBOX';
 			}
 		}
 		$mail_ui->mail_bo->saveSessionData();
 		$rowsFetched['messages'] = null;
-		$offset = $query['start']+1; // we always start with 1
+		$offset = $query['start'] + 1; // we always start with 1
 		$maxMessages = $query['num_rows'];
 		//error_log(__METHOD__.__LINE__.array2string($query));
-		$sort = ($query['order']=='address'?($toSchema?'toaddress':'fromaddress'):$query['order']);
-		if (!empty($query['search'])||($query['cat_id']=='bydate' && (!empty($query['startdate'])||!empty($query['enddate']))))
+		$sort = ($query['order'] == 'address' ? ($toSchema ? 'toaddress' : 'fromaddress') : $query['order']);
+		if (!empty($query['search']) || ($query['cat_id'] == 'bydate' && (!empty($query['startdate']) || !empty($query['enddate']))))
 		{
 			if (is_null(Mail::$supportsORinQuery) || !isset(Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID]))
 			{
-				Mail::$supportsORinQuery = Api\Cache::getCache(Api\Cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*10);
+				Mail::$supportsORinQuery = Api\Cache::getCache(Api\Cache::INSTANCE, 'email', 'supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60 * 60 * 10);
 				if (!isset(Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID]))
 				{
-					Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID]=true;
+					Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID] = true;
 				}
 			}
 			//error_log(__METHOD__.__LINE__.' Startdate:'.$query['startdate'].' Enddate'.$query['enddate']);
 			$cutoffdate = $cutoffdate2 = null;
-			if ($query['startdate']) $cutoffdate = Api\DateTime::to($query['startdate'],'ts');//SINCE, enddate
-			if ($query['enddate']) $cutoffdate2 = Api\DateTime::to($query['enddate'],'ts');//BEFORE, startdate
+			if ($query['startdate']) $cutoffdate = Api\DateTime::to($query['startdate'], 'ts'); //SINCE, enddate
+			if ($query['enddate']) $cutoffdate2 = Api\DateTime::to($query['enddate'], 'ts'); //BEFORE, startdate
 			//error_log(__METHOD__.__LINE__.' Startdate:'.$cutoffdate2.' Enddate'.$cutoffdate);
 			$filter = array(
-				'filterName' => (Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID]?lang('quicksearch'):lang('subject')),
-				'type' => ($query['cat_id']?$query['cat_id']:(Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID]?'quick':'subject')),
+				'filterName' => (Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID] ? lang('quicksearch') : lang('subject')),
+				'type' => ($query['cat_id'] ? $query['cat_id'] : (Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID] ? 'quick' : 'subject')),
 				'string' => $query['search'],
 				'status' => 'any',
 				//'range'=>"BETWEEN",'since'=> date("d-M-Y", $cutoffdate),'before'=> date("d-M-Y", $cutoffdate2)
 			);
-			if ($query['enddate']||$query['startdate']) {
+			if ($query['enddate'] || $query['startdate']) {
 				$filter['range'] = "BETWEEN";
 				if ($cutoffdate) {
-					$filter[(empty($cutoffdate2)?'date':'since')] =  date("d-M-Y", $cutoffdate);
+					$filter[(empty($cutoffdate2) ? 'date' : 'since')] = date("d-M-Y", $cutoffdate);
 					if (empty($cutoffdate2)) $filter['range'] = "SINCE";
 				}
 				if ($cutoffdate2) {
-					$filter[(empty($cutoffdate)?'date':'before')] =  date("d-M-Y", $cutoffdate2);
+					$filter[(empty($cutoffdate) ? 'date' : 'before')] = date("d-M-Y", $cutoffdate2);
 					if (empty($cutoffdate)) $filter['range'] = "BEFORE";
 				}
 			}
@@ -1427,17 +1426,17 @@ 
 		{
 			$filter['status'] = $query['filter'];
 		}
-		$reverse = ($query['sort']=='ASC'?false:true);
+		$reverse = ($query['sort'] == 'ASC' ? false : true);
 		$prefchanged = false;
-		if (!isset($GLOBALS['egw_info']['user']['preferences']['mail']['ActiveSearchType']) || ($query['cat_id'] !=$GLOBALS['egw_info']['user']['preferences']['mail']['ActiveSearchType']))
+		if (!isset($GLOBALS['egw_info']['user']['preferences']['mail']['ActiveSearchType']) || ($query['cat_id'] != $GLOBALS['egw_info']['user']['preferences']['mail']['ActiveSearchType']))
 		{
 			//error_log(__METHOD__.__LINE__.' Changing userPref ActivesearchType:'.$query['cat_id']);
-			$GLOBALS['egw']->preferences->add('mail','ActiveSearchType',$query['cat_id'],'user');
+			$GLOBALS['egw']->preferences->add('mail', 'ActiveSearchType', $query['cat_id'], 'user');
 			$prefchanged = true;
 		}
-		if (!isset($GLOBALS['egw_info']['user']['preferences']['mail']['ShowDetails']) || ($query['filter2'] !=$GLOBALS['egw_info']['user']['preferences']['mail']['ShowDetails']))
+		if (!isset($GLOBALS['egw_info']['user']['preferences']['mail']['ShowDetails']) || ($query['filter2'] != $GLOBALS['egw_info']['user']['preferences']['mail']['ShowDetails']))
 		{
-			$GLOBALS['egw']->preferences->add('mail','ShowDetails',$query['filter2'],'user');
+			$GLOBALS['egw']->preferences->add('mail', 'ShowDetails', $query['filter2'], 'user');
 			$prefchanged = true;
 		}
 		if ($prefchanged)
@@ -1468,13 +1467,13 @@ 
 				$rowsFetched['messages'] = $_sR['count'];
 				$ids = $_sR['match']->ids;
 				// if $sR is false, something failed fundamentally
-				if($reverse === true) $ids = ($ids===false?array():array_reverse((array)$ids));
-				$sR = array_slice((array)$ids,($offset==0?0:$offset-1),$maxMessages); // we need only $maxMessages of uids
-				$sRToFetch = $sR;//array_slice($sR,0,50); // we fetch only the headers of a subset of the fetched uids
+				if ($reverse === true) $ids = ($ids === false ? array() : array_reverse((array)$ids));
+				$sR = array_slice((array)$ids, ($offset == 0 ? 0 : $offset - 1), $maxMessages); // we need only $maxMessages of uids
+				$sRToFetch = $sR; //array_slice($sR,0,50); // we fetch only the headers of a subset of the fetched uids
 				//error_log(__METHOD__.__LINE__.' Rows fetched (UID only):'.count($sR).' Data:'.array2string($sR));
 				$maxMessages = 75;
 				$sortResultwH['header'] = array();
-				if (count($sRToFetch)>0)
+				if (count($sRToFetch) > 0)
 				{
 					//error_log(__METHOD__.__LINE__.' Headers to fetch with UIDs:'.count($sRToFetch).' Data:'.array2string($sRToFetch));
 					$sortResult = array();
@@ -1488,7 +1487,7 @@ 
 						$filter,
 						$sRToFetch,
 						true, //cacheResult
-						($query['filter2']?true:false) // fetchPreview
+						($query['filter2'] ? true : false) // fetchPreview
 					);
 				}
 			}
@@ -1505,30 +1504,30 @@ 
 					$filter,
 					null, // this uids only
 					true, // cacheResult
-					($query['filter2']?true:false) // fetchPreview
+					($query['filter2'] ? true : false) // fetchPreview
 				);
 				$rowsFetched['messages'] = $sortResultwH['info']['total'];
 			}
 		}
 		catch (Exception $e)
 		{
-			$sortResultwH=array();
-			$sR=array();
+			$sortResultwH = array();
+			$sR = array();
 			self::callWizard($e->getMessage(), false, 'error');
 		}
 		$response = Api\Json\Response::get();
 		// unlock immediately after fetching the rows
-		if (stripos($_GET['menuaction'],'ajax_get_rows')!==false)
+		if (stripos($_GET['menuaction'], 'ajax_get_rows') !== false)
 		{
 			//error_log(__METHOD__.__LINE__.' unlock tree ->'.$_GET['menuaction']);
 			$response->call('app.mail.unlock_tree');
 		}
 
-		if (is_array($sR) && count($sR)>0)
+		if (is_array($sR) && count($sR) > 0)
 		{
 			foreach ((array)$sR as $key => $v)
 			{
-				if (array_key_exists($key,(array)$sortResultwH['header'])==true)
+				if (array_key_exists($key, (array)$sortResultwH['header']) == true)
 				{
 					$sortResult['header'][] = $sortResultwH['header'][$key];
 				}
@@ -1546,12 +1545,12 @@ 
 		if (empty($rowsFetched['messages'])) $rowsFetched['messages'] = $rowsFetched['rowsFetched'];
 
 		//error_log(__METHOD__.__LINE__.' Rows fetched:'.$rowsFetched.' Data:'.array2string($sortResult));
-		$cols = array('row_id','uid','status','attachments','subject','address','toaddress','fromaddress','ccaddress','additionaltoaddress','date','size','modified','bodypreview');
-		if ($GLOBALS['egw_info']['user']['preferences']['common']['select_mode']=='EGW_SELECTMODE_TOGGLE') unset($cols[0]);
-		$rows = $mail_ui->header2gridelements($sortResult['header'],$cols, $_folderName, $folderType=$toSchema);
+		$cols = array('row_id', 'uid', 'status', 'attachments', 'subject', 'address', 'toaddress', 'fromaddress', 'ccaddress', 'additionaltoaddress', 'date', 'size', 'modified', 'bodypreview');
+		if ($GLOBALS['egw_info']['user']['preferences']['common']['select_mode'] == 'EGW_SELECTMODE_TOGGLE') unset($cols[0]);
+		$rows = $mail_ui->header2gridelements($sortResult['header'], $cols, $_folderName, $folderType = $toSchema);
 		//error_log(__METHOD__.__LINE__.array2string($rows));
 
-		if (Mail::$debugTimes) Mail::logRunTimes($starttime,null,'Folder:'.$_folderName.' Start:'.$query['start'].' NumRows:'.$query['num_rows'],__METHOD__.__LINE__);
+		if (Mail::$debugTimes) Mail::logRunTimes($starttime, null, 'Folder:'.$_folderName.' Start:'.$query['start'].' NumRows:'.$query['num_rows'], __METHOD__.__LINE__);
 		return $rowsFetched['messages'];
 	}
 
@@ -1563,7 +1562,7 @@ 
 	 * @param boolean $_prependApp to indicate that the app 'mail' is to be used for creating the rowID
 	 * @return string - a colon separated string in the form [app:]accountID:profileID:folder:message_uid
 	 */
-	function createRowID($_folderName, $message_uid, $_prependApp=false)
+	function createRowID($_folderName, $message_uid, $_prependApp = false)
 	{
 		return self::generateRowID($this->mail_bo->profileID, $_folderName, $message_uid, $_prependApp);
 	}
@@ -1577,9 +1576,9 @@ 
 	 * @param boolean $_prependApp to indicate that the app 'mail' is to be used for creating the rowID
 	 * @return string - a colon separated string in the form [app:]accountID:profileID:folder:message_uid
 	 */
-	static function generateRowID($_profileID, $_folderName, $message_uid, $_prependApp=false)
+	static function generateRowID($_profileID, $_folderName, $message_uid, $_prependApp = false)
 	{
-		return ($_prependApp?'mail'.self::$delimiter:'').trim($GLOBALS['egw_info']['user']['account_id']).self::$delimiter.$_profileID.self::$delimiter.base64_encode($_folderName).self::$delimiter.$message_uid;
+		return ($_prependApp ? 'mail'.self::$delimiter : '').trim($GLOBALS['egw_info']['user']['account_id']).self::$delimiter.$_profileID.self::$delimiter.base64_encode($_folderName).self::$delimiter.$message_uid;
 	}
 
 	/**
@@ -1590,13 +1589,13 @@ 
 	 */
 	static function splitRowID($_rowID)
 	{
-		$res = explode(self::$delimiter,$_rowID);
+		$res = explode(self::$delimiter, $_rowID);
 		// as a rowID is perceeded by app::, should be mail!
 		//error_log(__METHOD__.__LINE__.array2string($res).' [0] isInt:'.is_int($res[0]).' [0] isNumeric:'.is_numeric($res[0]).' [0] isString:'.is_string($res[0]).' Count:'.count($res));
-		if (count($res)==4 && is_numeric($res[0]) )
+		if (count($res) == 4 && is_numeric($res[0]))
 		{
 			// we have an own created rowID; prepend app=mail
-			array_unshift($res,'mail');
+			array_unshift($res, 'mail');
 		}
 		return array('app'=>$res[0], 'accountID'=>$res[1], 'profileID'=>$res[2], 'folder'=>base64_decode($res[3]), 'msgUID'=>$res[4]);
 	}
@@ -1610,56 +1609,56 @@ 
 	{
 		$actions = $this->get_actions();
 		$arrActions = array('composeasnew', 'reply', 'reply_all', 'forward', 'flagged', 'delete', 'print',
-			'infolog', 'tracker', 'calendar', 'save', 'view', 'read', 'label1',	'label2', 'label3',	'label4', 'label5');
-		foreach( $arrActions as &$act)
+			'infolog', 'tracker', 'calendar', 'save', 'view', 'read', 'label1', 'label2', 'label3', 'label4', 'label5');
+		foreach ($arrActions as &$act)
 		{
 			//error_log(__METHOD__.__LINE__.' '.$act.'->'.array2string($actions[$act]));
 			switch ($act)
 			{
 				case 'forward':
-					$actionsenabled[$act]=$actions[$act];
+					$actionsenabled[$act] = $actions[$act];
 					break;
 				case 'save':
-					$actionsenabled[$act]=$actions[$act];
+					$actionsenabled[$act] = $actions[$act];
 
 					break;
 				case 'view':
-					$actionsenabled[$act]=$actions[$act];
+					$actionsenabled[$act] = $actions[$act];
 					break;
 				case 'flagged':
-					$actionsenabled[$act]= $actions['mark']['children'][$act];
+					$actionsenabled[$act] = $actions['mark']['children'][$act];
 					break;
 				case 'read':
-					$actionsenabled[$act]= $actions['mark']['children'][$act];
+					$actionsenabled[$act] = $actions['mark']['children'][$act];
 					break;
 				case 'label1':
 					$actions['mark']['children']['setLabel']['children'][$act]['caption'] = lang('important');
-					$actionsenabled[$act]= $actions['mark']['children']['setLabel']['children'][$act];
+					$actionsenabled[$act] = $actions['mark']['children']['setLabel']['children'][$act];
 					break;
 				case 'label2':
 					$actions['mark']['children']['setLabel']['children'][$act]['caption'] = lang('job');
-					$actionsenabled[$act]= $actions['mark']['children']['setLabel']['children'][$act];
+					$actionsenabled[$act] = $actions['mark']['children']['setLabel']['children'][$act];
 					break;
 				case 'label3':
 					$actions['mark']['children']['setLabel']['children'][$act]['caption'] = lang('personal');
-					$actionsenabled[$act]= $actions['mark']['children']['setLabel']['children'][$act];
+					$actionsenabled[$act] = $actions['mark']['children']['setLabel']['children'][$act];
 					break;
 				case 'label4':
 					$actions['mark']['children']['setLabel']['children'][$act]['caption'] = lang('to do');
-					$actionsenabled[$act]= $actions['mark']['children']['setLabel']['children'][$act];
+					$actionsenabled[$act] = $actions['mark']['children']['setLabel']['children'][$act];
 					break;
 				case 'label5':
 					$actions['mark']['children']['setLabel']['children'][$act]['caption'] = lang('later');
-					$actionsenabled[$act]= $actions['mark']['children']['setLabel']['children'][$act];
+					$actionsenabled[$act] = $actions['mark']['children']['setLabel']['children'][$act];
 					break;
 				default:
-					if (isset($actions[$act])) $actionsenabled[$act]=$actions[$act];
+					if (isset($actions[$act])) $actionsenabled[$act] = $actions[$act];
 			}
 		}
 		unset($actionsenabled['drag_mail']);
 		//error_log(array2string($actionsenabled['view']));
-		unset($actionsenabled['view']['children']['openastext']);//not supported in preview
-		unset($actionsenabled['view']['children']['openashtml']);//not supported in preview
+		unset($actionsenabled['view']['children']['openastext']); //not supported in preview
+		unset($actionsenabled['view']['children']['openashtml']); //not supported in preview
 
 		return $actionsenabled;
 	}
@@ -1673,45 +1672,45 @@ 
 	 * @param array $_folderType used to determine if we need to populate from/to
 	 * @return array populated result array
 	 */
-	public function header2gridelements($_headers, $cols, $_folderName, $_folderType=0)
+	public function header2gridelements($_headers, $cols, $_folderName, $_folderType = 0)
 	{
 		if (Mail::$debugTimes) $starttime = microtime(true);
 		$rv = array();
-		$i=0;
-		foreach((array)$_headers as $header)
+		$i = 0;
+		foreach ((array)$_headers as $header)
 		{
 			$i++;
 			$data = array();
 			//error_log(__METHOD__.array2string($header));
 			$message_uid = $header['uid'];
 			$data['uid'] = $message_uid;
-			$data['row_id']=$this->createRowID($_folderName,$message_uid);
+			$data['row_id'] = $this->createRowID($_folderName, $message_uid);
 
 			$flags = "";
-			if(!empty($header['recent'])) $flags .= "R";
-			if(!empty($header['flagged'])) $flags .= "F";
-			if(!empty($header['answered'])) $flags .= "A";
-			if(!empty($header['forwarded'])) $flags .= "W";
-			if(!empty($header['deleted'])) $flags .= "D";
-			if(!empty($header['seen'])) $flags .= "S";
-			if(!empty($header['label1'])) $flags .= "1";
-			if(!empty($header['label2'])) $flags .= "2";
-			if(!empty($header['label3'])) $flags .= "3";
-			if(!empty($header['label4'])) $flags .= "4";
-			if(!empty($header['label5'])) $flags .= "5";
+			if (!empty($header['recent'])) $flags .= "R";
+			if (!empty($header['flagged'])) $flags .= "F";
+			if (!empty($header['answered'])) $flags .= "A";
+			if (!empty($header['forwarded'])) $flags .= "W";
+			if (!empty($header['deleted'])) $flags .= "D";
+			if (!empty($header['seen'])) $flags .= "S";
+			if (!empty($header['label1'])) $flags .= "1";
+			if (!empty($header['label2'])) $flags .= "2";
+			if (!empty($header['label3'])) $flags .= "3";
+			if (!empty($header['label4'])) $flags .= "4";
+			if (!empty($header['label5'])) $flags .= "5";
 
 			$data["status"] = "<span class=\"status_img\"></span>";
 			//error_log(__METHOD__.array2string($header).' Flags:'.$flags);
 
 			// the css for this row
-			$is_recent=false;
+			$is_recent = false;
 			$css_styles = array("mail");
 			if ($header['deleted']) {
 				$css_styles[] = 'deleted';
 			}
 			if ($header['recent'] && !($header['deleted'] || $header['seen'] || $header['answered'] || $header['forwarded'])) {
 				$css_styles[] = 'recent';
-				$is_recent=true;
+				$is_recent = true;
 			}
 			if ($header['priority'] < 3) {
 				$css_styles[] = 'prio_high';
@@ -1749,19 +1748,19 @@ 
 			if (in_array("subject", $cols))
 			{
 				// filter out undisplayable characters
-				$search = array('[\016]','[\017]',
-					'[\020]','[\021]','[\022]','[\023]','[\024]','[\025]','[\026]','[\027]',
-					'[\030]','[\031]','[\032]','[\033]','[\034]','[\035]','[\036]','[\037]');
+				$search = array('[\016]', '[\017]',
+					'[\020]', '[\021]', '[\022]', '[\023]', '[\024]', '[\025]', '[\026]', '[\027]',
+					'[\030]', '[\031]', '[\032]', '[\033]', '[\034]', '[\035]', '[\036]', '[\037]');
 				$replace = '';
 
-				$header['subject'] = preg_replace($search,$replace,$header['subject']);
+				$header['subject'] = preg_replace($search, $replace, $header['subject']);
 				// curly brackets get messed up by the template!
 
 				if (!empty($header['subject'])) {
 					// make the subject shorter if it is to long
 					$subject = $header['subject'];
 				} else {
-					$subject = '('. lang('no subject') .')';
+					$subject = '('.lang('no subject').')';
 				}
 
 				$data["subject"] = $subject; // the mailsubject
@@ -1771,53 +1770,53 @@ 
 			//error_log(__METHOD__.__LINE__.array2string($header));
 			if (in_array("attachments", $cols))
 			{
-				if($header['mimetype'] == 'multipart/mixed' ||
+				if ($header['mimetype'] == 'multipart/mixed' ||
 					$header['mimetype'] == 'multipart/signed' ||
 					$header['mimetype'] == 'multipart/related' ||
 					$header['mimetype'] == 'multipart/report' ||
 					$header['mimetype'] == 'text/calendar' ||
 					$header['mimetype'] == 'text/html' ||
-					substr($header['mimetype'],0,11) == 'application' ||
-					substr($header['mimetype'],0,5) == 'audio' ||
-					substr($header['mimetype'],0,5) == 'video' ||
+					substr($header['mimetype'], 0, 11) == 'application' ||
+					substr($header['mimetype'], 0, 5) == 'audio' ||
+					substr($header['mimetype'], 0, 5) == 'video' ||
 					$header['mimetype'] == 'multipart/alternative')
 				{
-					$image = Api\Html::image('mail','attach');
+					$image = Api\Html::image('mail', 'attach');
 					$imageHTMLBlock = '';
-					$datarowid = $this->createRowID($_folderName,$message_uid,true);
+					$datarowid = $this->createRowID($_folderName, $message_uid, true);
 					$attachments = $header['attachments'];
-					if (count($attachments)<1)
+					if (count($attachments) < 1)
 					{
 						$image = '&nbsp;';
 					}
-					if (count($attachments)==1)
+					if (count($attachments) == 1)
 					{
-						$imageHTMLBlock = self::createAttachmentBlock($attachments, $datarowid, $header['uid'],$_folderName);
-						$image = Api\Html::image('mail','attach',$attachments[0]['name'].(!empty($attachments[0]['mimeType'])?' ('.$attachments[0]['mimeType'].')':''));
+						$imageHTMLBlock = self::createAttachmentBlock($attachments, $datarowid, $header['uid'], $_folderName);
+						$image = Api\Html::image('mail', 'attach', $attachments[0]['name'].(!empty($attachments[0]['mimeType']) ? ' ('.$attachments[0]['mimeType'].')' : ''));
 					}
-					if (count($attachments)>1)
+					if (count($attachments) > 1)
 					{
-						$imageHTMLBlock = self::createAttachmentBlock($attachments, $datarowid, $header['uid'],$_folderName);
-						$image = Api\Html::image('mail','attach',lang('%1 attachments',count($attachments)));
+						$imageHTMLBlock = self::createAttachmentBlock($attachments, $datarowid, $header['uid'], $_folderName);
+						$image = Api\Html::image('mail', 'attach', lang('%1 attachments', count($attachments)));
 					}
 
 					$attachmentFlag = $image;
 				} else {
-					$attachmentFlag ='&nbsp;';
+					$attachmentFlag = '&nbsp;';
 				}
 				// show priority flag
 				if ($header['priority'] < 3) {
-					 $image = Api\Html::image('mail','prio_high');
+					 $image = Api\Html::image('mail', 'prio_high');
 				} elseif ($header['priority'] > 3) {
-					$image = Api\Html::image('mail','prio_low');
+					$image = Api\Html::image('mail', 'prio_low');
 				} else {
 					$image = '';
 				}
 				// show a flag for flagged messages
-				$imageflagged ='';
+				$imageflagged = '';
 				if ($header['flagged'])
 				{
-					$imageflagged = Api\Html::image('mail','unread_flagged_small');
+					$imageflagged = Api\Html::image('mail', 'unread_flagged_small');
 				}
 				$data["attachments"] = $image.$attachmentFlag.$imageflagged; // icon for attachments available
 			}
@@ -1826,7 +1825,7 @@ 
 			if (in_array("toaddress", $cols))
 			{
 				// sent or drafts or template folder means foldertype > 0, use to address instead of from
-				$data["toaddress"] = $header['to_address'];//Mail::htmlentities($header['to_address'],$this->charset);
+				$data["toaddress"] = $header['to_address']; //Mail::htmlentities($header['to_address'],$this->charset);
 			}
 
 			if (in_array("additionaltoaddress", $cols))
@@ -1859,29 +1858,29 @@ 
 			$data['flags'] = Array();
 			if ($header['seen']) $data["flags"]['read'] = 'read';
 			foreach ($css_styles as &$flag) {
-				if ($flag!='mail')
+				if ($flag != 'mail')
 				{
-					if ($flag=='labelone') {$data["flags"]['label1'] = 'label1';}
-					elseif ($flag=='labeltwo') {$data["flags"]['label2'] = 'label2';}
-					elseif ($flag=='labelthree') {$data["flags"]['label3'] = 'label3';}
-					elseif ($flag=='labelfour') {$data["flags"]['label4'] = 'label4';}
-					elseif ($flag=='labelfive') {$data["flags"]['label5'] = 'label5';}
-					elseif ($flag=='unseen') {unset($data["flags"]['read']);}
+					if ($flag == 'labelone') {$data["flags"]['label1'] = 'label1'; }
+					elseif ($flag == 'labeltwo') {$data["flags"]['label2'] = 'label2'; }
+					elseif ($flag == 'labelthree') {$data["flags"]['label3'] = 'label3'; }
+					elseif ($flag == 'labelfour') {$data["flags"]['label4'] = 'label4'; }
+					elseif ($flag == 'labelfive') {$data["flags"]['label5'] = 'label5'; }
+					elseif ($flag == 'unseen') {unset($data["flags"]['read']); }
 					else $data["flags"][$flag] = $flag;
 				}
 			}
 			if ($header['disposition-notification-to']) $data['dispositionnotificationto'] = $header['disposition-notification-to'];
-			if (($header['mdnsent']||$header['mdnnotsent']|$header['seen'])&&isset($data['dispositionnotificationto'])) unset($data['dispositionnotificationto']);
+			if (($header['mdnsent'] || $header['mdnnotsent']|$header['seen']) && isset($data['dispositionnotificationto'])) unset($data['dispositionnotificationto']);
 			$data['attachmentsBlock'] = $imageHTMLBlock;
-			$data['address'] = ($_folderType?$data["toaddress"]:$data["fromaddress"]);
-			if (in_array("bodypreview", $cols)&&$header['bodypreview'])
+			$data['address'] = ($_folderType ? $data["toaddress"] : $data["fromaddress"]);
+			if (in_array("bodypreview", $cols) && $header['bodypreview'])
 			{
 				$data["bodypreview"] = $header['bodypreview'];
 			}
 			$rv[] = $data;
 			//error_log(__METHOD__.__LINE__.array2string($data));
 		}
-		if (Mail::$debugTimes) Mail::logRunTimes($starttime,null,'Folder:'.$_folderName,__METHOD__.__LINE__);
+		if (Mail::$debugTimes) Mail::logRunTimes($starttime, null, 'Folder:'.$_folderName, __METHOD__.__LINE__);
 
 		// ToDo: call this ONLY if labels change
 		Etemplate\Widget::setElementAttribute('toolbar', 'actions', $this->get_toolbar_actions());
@@ -1896,8 +1895,8 @@ 
 	 */
 	function displayHeader()
 	{
-		if(isset($_GET['id'])) $rowID	= $_GET['id'];
-		if(isset($_GET['part'])) $partID = $_GET['part'];
+		if (isset($_GET['id'])) $rowID = $_GET['id'];
+		if (isset($_GET['part'])) $partID = $_GET['part'];
 
 		$hA = self::splitRowID($rowID);
 		$uid = $hA['msgUID'];
@@ -1911,17 +1910,17 @@ 
 		}
 
 		$this->mail_bo->reopen($mailbox);
-		$headers_in	= $this->mail_bo->getMessageRawHeader($uid, $partID);
+		$headers_in = $this->mail_bo->getMessageRawHeader($uid, $partID);
 
 		// add line breaks to $rawheaders
-		$newRawHeaders = explode("\n",$headers_in);
+		$newRawHeaders = explode("\n", $headers_in);
 		reset($newRawHeaders);
 
 		// reset $rawheaders
-		$rawheaders 	= "";
+		$rawheaders = "";
 		// create it new, with good line breaks
 		reset($newRawHeaders);
-		while(list($key,$value) = @each($newRawHeaders)) {
+		while (list($key, $value) = @each($newRawHeaders)) {
 			$rawheaders .= wordwrap($value, 90, "\n     ");
 		}
 
@@ -1933,7 +1932,7 @@ 
 		}
 
 		header('Content-type: text/html; charset=iso-8859-1');
-		print '<pre>'. htmlspecialchars($rawheaders, ENT_NOQUOTES, 'iso-8859-1') .'</pre>';
+		print '<pre>'.htmlspecialchars($rawheaders, ENT_NOQUOTES, 'iso-8859-1').'</pre>';
 
 	}
 
@@ -1946,10 +1945,10 @@ 
 	{
 		if (is_null($_requesteddata)) $_requesteddata = $_GET;
 
-		$preventRedirect=false;
-		if(isset($_requesteddata['id'])) $rowID	= $_requesteddata['id'];
-		if(isset($_requesteddata['part'])) $partID = $_requesteddata['part']!='null'?$_requesteddata['part']:null;
-		if(isset($_requesteddata['mode'])) $preventRedirect   = (($_requesteddata['mode']=='display' || $_requesteddata['mode'] == 'print')?true:false);
+		$preventRedirect = false;
+		if (isset($_requesteddata['id'])) $rowID = $_requesteddata['id'];
+		if (isset($_requesteddata['part'])) $partID = $_requesteddata['part'] != 'null' ? $_requesteddata['part'] : null;
+		if (isset($_requesteddata['mode'])) $preventRedirect = (($_requesteddata['mode'] == 'display' || $_requesteddata['mode'] == 'print') ? true : false);
 
 		$hA = self::splitRowID($rowID);
 		$uid = $hA['msgUID'];
@@ -1973,79 +1972,79 @@ 
 		}
 		if (!$preventRedirect && ($this->mail_bo->isDraftFolder($mailbox) || $this->mail_bo->isTemplateFolder($mailbox)))
 		{
-			Egw::redirect_link('/index.php',array('menuaction'=>'mail.mail_compose.compose','id'=>$rowID,'from'=>'composefromdraft'));
+			Egw::redirect_link('/index.php', array('menuaction'=>'mail.mail_compose.compose', 'id'=>$rowID, 'from'=>'composefromdraft'));
 		}
 		$this->mail_bo->reopen($mailbox);
 		// retrieve the flags of the message, before touching it.
 		try
 		{
-			$headers	= $this->mail_bo->getMessageHeader($uid, $partID,true,true,$mailbox);
+			$headers = $this->mail_bo->getMessageHeader($uid, $partID, true, true, $mailbox);
 		}
 		catch (Api\Exception $e)
 		{
 			$error_msg[] = lang("ERROR: Message could not be displayed.");
-			$error_msg[] = lang("In Mailbox: %1, with ID: %2, and PartID: %3",$mailbox,$uid,$partID);
+			$error_msg[] = lang("In Mailbox: %1, with ID: %2, and PartID: %3", $mailbox, $uid, $partID);
 			Framework::message($e->getMessage(), 'error');
 		}
 		if (!empty($uid)) $this->mail_bo->getFlags($uid);
-		$envelope	= $this->mail_bo->getMessageEnvelope($uid, $partID,true,$mailbox);
+		$envelope = $this->mail_bo->getMessageEnvelope($uid, $partID, true, $mailbox);
 		//error_log(__METHOD__.__LINE__.array2string($envelope));
-		$this->mail_bo->getMessageRawHeader($uid, $partID,$mailbox);
+		$this->mail_bo->getMessageRawHeader($uid, $partID, $mailbox);
 		$fetchEmbeddedImages = false;
 		// if we are in HTML so its likely that we should show the embedded images; as a result
 		// we do NOT want to see those, that are embedded in the list of attachments
-		if ($htmlOptions !='always_display') $fetchEmbeddedImages = true;
-		$attachments	= $this->mail_bo->getMessageAttachments($uid, $partID, null, $fetchEmbeddedImages,true,true,$mailbox);
+		if ($htmlOptions != 'always_display') $fetchEmbeddedImages = true;
+		$attachments = $this->mail_bo->getMessageAttachments($uid, $partID, null, $fetchEmbeddedImages, true, true, $mailbox);
 		//error_log(__METHOD__.__LINE__.array2string($attachments));
 		$attachmentHTMLBlock = self::createAttachmentBlock($attachments, $rowID, $uid, $mailbox);
 
-		$nonDisplayAbleCharacters = array('[\016]','[\017]',
-				'[\020]','[\021]','[\022]','[\023]','[\024]','[\025]','[\026]','[\027]',
-				'[\030]','[\031]','[\032]','[\033]','[\034]','[\035]','[\036]','[\037]');
+		$nonDisplayAbleCharacters = array('[\016]', '[\017]',
+				'[\020]', '[\021]', '[\022]', '[\023]', '[\024]', '[\025]', '[\026]', '[\027]',
+				'[\030]', '[\031]', '[\032]', '[\033]', '[\034]', '[\035]', '[\036]', '[\037]');
 
 		//error_log(__METHOD__.__LINE__.$mailBody);
 		$this->mail_bo->closeConnection();
 		//$GLOBALS['egw_info']['flags']['currentapp'] = 'mail';//should not be needed
 		$etpl = new Etemplate('mail.display');
-		$subject = $this->mail_bo->decode_subject(preg_replace($nonDisplayAbleCharacters,'',$envelope['SUBJECT']),false);
+		$subject = $this->mail_bo->decode_subject(preg_replace($nonDisplayAbleCharacters, '', $envelope['SUBJECT']), false);
 
 		// Set up data for taglist widget(s)
-		if ($envelope['FROM']==$envelope['SENDER']) unset($envelope['SENDER']);
+		if ($envelope['FROM'] == $envelope['SENDER']) unset($envelope['SENDER']);
 		$sel_options = array();
-		foreach(array('SENDER','FROM','TO','CC','BCC') as $field)
+		foreach (array('SENDER', 'FROM', 'TO', 'CC', 'BCC') as $field)
 		{
 			if (!isset($envelope[$field])) continue;
-			foreach($envelope[$field] as $field_data)
+			foreach ($envelope[$field] as $field_data)
 			{
 				//error_log(__METHOD__.__LINE__.array2string($field_data));
 				$content[$field][] = $field_data;
 				$sel_options[$field][] = array(
 					// taglist requires these - not optional
 					'id' => $field_data,
-					'label' => str_replace('"',"'",$field_data),
+					'label' => str_replace('"', "'", $field_data),
 				);
 			}
 		}
 		$actionsenabled = $this->getDisplayToolbarActions();
 		$content['displayToolbaractions'] = json_encode($actionsenabled);
 		if (empty($subject)) $subject = lang('no subject');
-		$content['msg'] = (is_array($error_msg)?implode("<br>",$error_msg):$error_msg);
+		$content['msg'] = (is_array($error_msg) ? implode("<br>", $error_msg) : $error_msg);
 		// Send mail ID so we can use it for actions
 		$content['mail_id'] = $rowID;
 		if (!is_array($headers) || !isset($headers['DATE']))
 		{
-			$headers['DATE'] = (is_array($envelope)&&$envelope['DATE']?$envelope['DATE']:'');
+			$headers['DATE'] = (is_array($envelope) && $envelope['DATE'] ? $envelope['DATE'] : '');
 		}
-		$content['mail_displaydate'] = Mail::_strtotime($headers['DATE'],'ts',true);
+		$content['mail_displaydate'] = Mail::_strtotime($headers['DATE'], 'ts', true);
 		$content['mail_displaysubject'] = $subject;
-		$linkData = array('menuaction'=>"mail.mail_ui.loadEmailBody","_messageID"=>$rowID);
-		if (!empty($partID)) $linkData['_partID']=$partID;
-		if ($htmlOptions != $this->mail_bo->htmlOptions) $linkData['_htmloptions']=$htmlOptions;
-		$content['mailDisplayBodySrc'] = Egw::link('/index.php',$linkData);
+		$linkData = array('menuaction'=>"mail.mail_ui.loadEmailBody", "_messageID"=>$rowID);
+		if (!empty($partID)) $linkData['_partID'] = $partID;
+		if ($htmlOptions != $this->mail_bo->htmlOptions) $linkData['_htmloptions'] = $htmlOptions;
+		$content['mailDisplayBodySrc'] = Egw::link('/index.php', $linkData);
 		$content['mail_displayattachments'] = $attachmentHTMLBlock;
-		$content['mail_id']=$rowID;
-		$content['mailDisplayContainerClass']=(count($attachments)?"mailDisplayContainer mailDisplayContainerFixedHeight":"mailDisplayContainer mailDisplayContainerFullHeight");
-		$content['mailDisplayAttachmentsClass']=(count($attachments)?"mailDisplayAttachments":"mail_DisplayNone");
+		$content['mail_id'] = $rowID;
+		$content['mailDisplayContainerClass'] = (count($attachments) ? "mailDisplayContainer mailDisplayContainerFixedHeight" : "mailDisplayContainer mailDisplayContainerFullHeight");
+		$content['mailDisplayAttachmentsClass'] = (count($attachments) ? "mailDisplayAttachments" : "mail_DisplayNone");
 
 		// DRAG attachments actions
 		$etpl->setElementAttribute('mail_displayattachments', 'actions', array(
@@ -2062,22 +2061,22 @@ 
 			$this->changeProfile($rememberServerID);
 		}
 
-		$etpl->exec('mail.mail_ui.displayMessage',$content,$sel_options,$readonlys,$preserv,2);
+		$etpl->exec('mail.mail_ui.displayMessage', $content, $sel_options, $readonlys, $preserv, 2);
 	}
 
 	/**
 	 * Build actions for display toolbar
 	 */
-	function getDisplayToolbarActions ()
+	function getDisplayToolbarActions()
 	{
 		$actions = $this->get_toolbar_actions();
-		$actions['mark']['children']['flagged']=array(
+		$actions['mark']['children']['flagged'] = array(
 			'group' => $actions['mark']['children']['flagged']['group'],
 			'caption' => 'Flagged',
 			'icon' => 'unread_flagged_small',
 			'onExecute' => 'javaScript:app.mail.mail_flag',
 		);
-		$actions['mark']['children']['unflagged']=array(
+		$actions['mark']['children']['unflagged'] = array(
 			'group' => $actions['mark']['children']['flagged']['group'],
 			'caption' => 'Unflagged',
 			'icon' => 'read_flagged_small',
@@ -2089,9 +2088,9 @@ 
 		$compose = $actions['composeasnew'];
 		unset($actions['composeasnew']);
 
-		$actions2 = array_reverse($actions,true);
-		$actions2['composeasnew']= $compose;
-		return array_reverse($actions2,true);
+		$actions2 = array_reverse($actions, true);
+		$actions2['composeasnew'] = $compose;
+		return array_reverse($actions2, true);
 	}
 
 	/**
@@ -2104,22 +2103,22 @@ 
 	 * @param boolean $_returnFullHTML flag wether to return HTML or data array
 	 * @return array|string data array or html or empty string
 	 */
-	static function createAttachmentBlock($attachments, $rowID, $uid, $mailbox,$_returnFullHTML=false)
+	static function createAttachmentBlock($attachments, $rowID, $uid, $mailbox, $_returnFullHTML = false)
 	{
-		$attachmentHTMLBlock='';
+		$attachmentHTMLBlock = '';
 		$attachmentHTML = array();
 		if (is_array($attachments) && count($attachments) > 0) {
-			$url_img_vfs = Api\Html::image('filemanager','navbar', lang('Filemanager'), ' height="16"');
-			$url_img_vfs_save_all = Api\Html::image('mail','save_all', lang('Save all'));
+			$url_img_vfs = Api\Html::image('filemanager', 'navbar', lang('Filemanager'), ' height="16"');
+			$url_img_vfs_save_all = Api\Html::image('mail', 'save_all', lang('Save all'));
 
 			foreach ($attachments as $key => $value)
 			{
-				$attachmentHTML[$key]['filename']= ($value['name'] ? ( $value['filename'] ? $value['filename'] : $value['name'] ) : lang('(no subject)'));
-				$attachmentHTML[$key]['filename'] = Api\Translation::convert_jsonsafe($attachmentHTML[$key]['filename'],'utf-8');
+				$attachmentHTML[$key]['filename'] = ($value['name'] ? ($value['filename'] ? $value['filename'] : $value['name']) : lang('(no subject)'));
+				$attachmentHTML[$key]['filename'] = Api\Translation::convert_jsonsafe($attachmentHTML[$key]['filename'], 'utf-8');
 				//error_log(array2string($value));
 				//error_log(strtoupper($value['mimeType']) .'<->'. Api\MimeMagic::filename2mime($attachmentHTML[$key]['filename']));
-				if (strtoupper($value['mimeType']=='APPLICATION/OCTET-STREAM')) $value['mimeType'] = Api\MimeMagic::filename2mime($attachmentHTML[$key]['filename']);
-				$attachmentHTML[$key]['type']=$value['mimeType'];
+				if (strtoupper($value['mimeType'] == 'APPLICATION/OCTET-STREAM')) $value['mimeType'] = Api\MimeMagic::filename2mime($attachmentHTML[$key]['filename']);
+				$attachmentHTML[$key]['type'] = $value['mimeType'];
 				$attachmentHTML[$key]['mimetype'] = Api\MimeMagic::mime2label($value['mimeType']);
 				$hA = self::splitRowID($rowID);
 				$uid = $hA['msgUID'];
@@ -2129,28 +2128,27 @@ 
 				$attachmentHTML[$key]['mime_data'] = Link::set_data($value['mimeType'], 'EGroupware\\Api\\Mail::getAttachmentAccount', array(
 					$acc_id, $mailbox, $uid, $value['partID'], $value['is_winmail'], true
 				));
-				$attachmentHTML[$key]['size']=Vfs::hsize($value['size']);
-				$attachmentHTML[$key]['attachment_number']=$key;
-				$attachmentHTML[$key]['partID']=$value['partID'];
+				$attachmentHTML[$key]['size'] = Vfs::hsize($value['size']);
+				$attachmentHTML[$key]['attachment_number'] = $key;
+				$attachmentHTML[$key]['partID'] = $value['partID'];
 				$attachmentHTML[$key]['mail_id'] = $rowID;
-				$attachmentHTML[$key]['winmailFlag']=$value['is_winmail'];
+				$attachmentHTML[$key]['winmailFlag'] = $value['is_winmail'];
 				$attachmentHTML[$key]['classSaveAllPossiblyDisabled'] = "mail_DisplayNone";
 				// reset mode array as it should be considered differently for
 				// each attachment
 				$mode = array();
-				switch(strtoupper($value['mimeType']))
+				switch (strtoupper($value['mimeType']))
 				{
 					case 'MESSAGE/RFC822':
-						$linkData = array
-						(
+						$linkData = array(
 							'menuaction'	=> 'mail.mail_ui.displayMessage',
 							'mode'		=> 'display', //message/rfc822 attachments should be opened in display mode
 							'id'		=> $rowID,
 							'part'		=> $value['partID'],
 							'is_winmail'    => $value['is_winmail']
 						);
-						$windowName = 'displayMessage_'. $rowID.'_'.$value['partID'];
-						$linkView = "egw_openWindowCentered('".Egw::link('/index.php',$linkData)."','$windowName',700,egw_getWindowOuterHeight());";
+						$windowName = 'displayMessage_'.$rowID.'_'.$value['partID'];
+						$linkView = "egw_openWindowCentered('".Egw::link('/index.php', $linkData)."','$windowName',700,egw_getWindowOuterHeight());";
 						break;
 					case 'IMAGE/JPEG':
 					case 'IMAGE/PNG':
@@ -2166,7 +2164,7 @@ 
 					case 'TEXT/HTML':
 					case 'TEXT/DIRECTORY':
 						$sfxMimeType = $value['mimeType'];
-						$buff = explode('.',$value['name']);
+						$buff = explode('.', $value['name']);
 						$suffix = '';
 						if (is_array($buff)) $suffix = array_pop($buff); // take the last extension to check with ext2mime
 						if (!empty($suffix)) $sfxMimeType = Api\MimeMagic::ext2mime($suffix);
@@ -2179,49 +2177,47 @@ 
 					case 'TEXT/VCARD':
 					case 'TEXT/CALENDAR':
 					case 'TEXT/X-VCALENDAR':
-						$linkData = array_merge(array
-						(
+						$linkData = array_merge(array(
 							'menuaction'	=> 'mail.mail_ui.getAttachment',
 							'id'		=> $rowID,
 							'part'		=> $value['partID'],
 							'is_winmail'    => $value['is_winmail'],
 							'mailbox'   => base64_encode($mailbox),
-						) , $mode);
-						$windowName = 'displayAttachment_'. $uid;
+						), $mode);
+						$windowName = 'displayAttachment_'.$uid;
 						$reg = '800x600';
 						// handle calendar/vcard
-						if (strtoupper($value['mimeType'])=='TEXT/CALENDAR')
+						if (strtoupper($value['mimeType']) == 'TEXT/CALENDAR')
 						{
-							$windowName = 'displayEvent_'. $rowID;
-							$reg2 = Link::get_registry('calendar','view_popup');
-							$attachmentHTML[$key]['popup']=(!empty($reg2) ? $reg2 : $reg);
+							$windowName = 'displayEvent_'.$rowID;
+							$reg2 = Link::get_registry('calendar', 'view_popup');
+							$attachmentHTML[$key]['popup'] = (!empty($reg2) ? $reg2 : $reg);
 						}
-						if (strtoupper($value['mimeType'])=='TEXT/X-VCARD' || strtoupper($value['mimeType'])=='TEXT/VCARD')
+						if (strtoupper($value['mimeType']) == 'TEXT/X-VCARD' || strtoupper($value['mimeType']) == 'TEXT/VCARD')
 						{
-							$windowName = 'displayContact_'. $rowID;
-							$reg2 = Link::get_registry('addressbook','add_popup');
-							$attachmentHTML[$key]['popup']=(!empty($reg2) ? $reg2 : $reg);
+							$windowName = 'displayContact_'.$rowID;
+							$reg2 = Link::get_registry('addressbook', 'add_popup');
+							$attachmentHTML[$key]['popup'] = (!empty($reg2) ? $reg2 : $reg);
 						}
 						// apply to action
-						list($width,$height) = explode('x',(!empty($reg2) ? $reg2 : $reg));
-						$linkView = "egw_openWindowCentered('".Egw::link('/index.php',$linkData)."','$windowName',$width,$height);";
+						list($width, $height) = explode('x', (!empty($reg2) ? $reg2 : $reg));
+						$linkView = "egw_openWindowCentered('".Egw::link('/index.php', $linkData)."','$windowName',$width,$height);";
 						break;
 					default:
-						$linkData = array
-						(
+						$linkData = array(
 							'menuaction'	=> 'mail.mail_ui.getAttachment',
 							'id'		=> $rowID,
 							'part'		=> $value['partID'],
 							'is_winmail'    => $value['is_winmail'],
 							'mailbox'   => base64_encode($mailbox),
 						);
-						$linkView = "window.location.href = '".Egw::link('/index.php',$linkData)."';";
+						$linkView = "window.location.href = '".Egw::link('/index.php', $linkData)."';";
 						break;
 				}
 				// we either use mime_data for server-side supported mime-types or mime_url for client-side or download
 				if (empty($attachmentHTML[$key]['mime_data']))
 				{
-					$attachmentHTML[$key]['mime_url'] = Egw::link('/index.php',$linkData);
+					$attachmentHTML[$key]['mime_url'] = Egw::link('/index.php', $linkData);
 					unset($attachmentHTML[$key]['mime_data']);
 				}
 				$attachmentHTML[$key]['windowName'] = $windowName;
@@ -2231,8 +2227,7 @@ 
 					($value['name'] ? $value['name'] : lang('(no subject)')).
 					'</b></a>';
 
-				$linkData = array
-				(
+				$linkData = array(
 					'menuaction'	=> 'mail.mail_ui.getAttachment',
 					'mode'		=> 'save',
 					'id'		=> $rowID,
@@ -2240,11 +2235,11 @@ 
 					'is_winmail'    => $value['is_winmail'],
 					'mailbox'   => base64_encode($mailbox),
 				);
-				$attachmentHTML[$key]['link_save'] ="<a href='".Egw::link('/index.php',$linkData)."' title='".$attachmentHTML[$key]['filename']."'>".Api\Html::image('mail','fileexport')."</a>";
+				$attachmentHTML[$key]['link_save'] = "<a href='".Egw::link('/index.php', $linkData)."' title='".$attachmentHTML[$key]['filename']."'>".Api\Html::image('mail', 'fileexport')."</a>";
 
 				if ($GLOBALS['egw_info']['user']['apps']['filemanager'])
 				{
-					$link_vfs_save = Egw::link('/index.php',array(
+					$link_vfs_save = Egw::link('/index.php', array(
 						'menuaction' => 'filemanager.filemanager_select.select',
 						'mode' => 'saveas',
 						'name' => $value['name'],
@@ -2263,19 +2258,19 @@ 
 							//$rowID
 							$ids["id[$ikey]"] = $rowID.'::'.$value['partID'].'::'.$value['is_winmail'].'::'.$value['name'];
 						}
-						$link_vfs_save = Egw::link('/index.php',array(
+						$link_vfs_save = Egw::link('/index.php', array(
 							'menuaction' => 'filemanager.filemanager_select.select',
 							'mode' => 'select-dir',
 							'method' => 'mail.mail_ui.vfsSaveAttachment',
 							'label' => lang('Save all'),
-						)+$ids);
+						) + $ids);
 						$vfs_save .= "<a href='#' onclick=\"egw_openWindowCentered('$link_vfs_save','vfs_save_attachment','640','530',window.outerWidth/2,window.outerHeight/2); return false;\">$url_img_vfs_save_all</a>";
 					}
 					$attachmentHTML[$key]['link_save'] .= $vfs_save;
 					//error_log(__METHOD__.__LINE__.$attachmentHTML[$key]['link_save']);
 				}
 			}
-			$attachmentHTMLBlock="<table width='100%'>";
+			$attachmentHTMLBlock = "<table width='100%'>";
 			foreach ((array)$attachmentHTML as $row)
 			{
 				$attachmentHTMLBlock .= "<tr><td><div class='useEllipsis'>".$row['link_view'].'</div></td>';
@@ -2293,7 +2288,7 @@ 
 				unset($attachmentHTML[$ikey]['link_save']);
 			}
 		}
-		return ($_returnFullHTML?$attachmentHTMLBlock:$attachmentHTML);
+		return ($_returnFullHTML ? $attachmentHTMLBlock : $attachmentHTML);
 	}
 
 	/**
@@ -2304,7 +2299,7 @@ 
 	 */
 	function gatherVacation($cachedVacations = array())
 	{
-		$isVacationEnabled = $this->mail_bo->icServer->acc_sieve_enabled && ($this->mail_bo->icServer->acc_sieve_host||$this->mail_bo->icServer->acc_imap_host);
+		$isVacationEnabled = $this->mail_bo->icServer->acc_sieve_enabled && ($this->mail_bo->icServer->acc_sieve_host || $this->mail_bo->icServer->acc_imap_host);
 		//error_log(__METHOD__.__LINE__.' Server:'.self::$icServerID.' Sieve Enabled:'.array2string($vacation));
 
 		if ($isVacationEnabled)
@@ -2317,7 +2312,7 @@ 
 
 				$cachedVacations = array($sieveServer->acc_id => $vacation) + (array)$cachedVacations;
 				// Set vacation to the instance cache for particular account with expiration of one day
-				Api\Cache::setCache(Api\Cache::INSTANCE, 'email', 'vacationNotice'.$GLOBALS['egw_info']['user']['account_lid'], $cachedVacations, 60*60*24);
+				Api\Cache::setCache(Api\Cache::INSTANCE, 'email', 'vacationNotice'.$GLOBALS['egw_info']['user']['account_lid'], $cachedVacations, 60 * 60 * 24);
 			}
 			catch (PEAR_Exception $ex)
 			{
@@ -2338,36 +2333,36 @@ 
 	function quotaDisplay($_usage, $_limit)
 	{
 
-		if($_limit == 0) {
-			$quotaPercent=100;
+		if ($_limit == 0) {
+			$quotaPercent = 100;
 		} else {
-			$quotaPercent=round(($_usage*100)/$_limit);
+			$quotaPercent = round(($_usage * 100) / $_limit);
 		}
 
-		$quotaLimit=Mail::show_readable_size($_limit*1024);
-		$quotaUsage=Mail::show_readable_size($_usage*1024);
+		$quotaLimit = Mail::show_readable_size($_limit * 1024);
+		$quotaUsage = Mail::show_readable_size($_usage * 1024);
 
 
-		if($quotaPercent > 90 && $_limit>0) {
-			$quotaBG='mail-index_QuotaRed';
-		} elseif($quotaPercent > 80 && $_limit>0) {
-			$quotaBG='mail-index_QuotaYellow';
+		if ($quotaPercent > 90 && $_limit > 0) {
+			$quotaBG = 'mail-index_QuotaRed';
+		} elseif ($quotaPercent > 80 && $_limit > 0) {
+			$quotaBG = 'mail-index_QuotaYellow';
 		} else {
-			$quotaBG='mail-index_QuotaGreen';
+			$quotaBG = 'mail-index_QuotaGreen';
 		}
 
-		if($_limit > 0) {
-			$quotaText = $quotaUsage .'/'.$quotaLimit;
+		if ($_limit > 0) {
+			$quotaText = $quotaUsage.'/'.$quotaLimit;
 		} else {
 			$quotaText = $quotaUsage;
 		}
 
-		if($quotaPercent > 50) {
+		if ($quotaPercent > 50) {
 		} else {
 		}
 		$quota['class'] = $quotaBG;
-		$quota['text'] = lang('Quota: %1',$quotaText);
-		$quota['percent'] = (string)round(($_usage*100)/$_limit);
+		$quota['text'] = lang('Quota: %1', $quotaText);
+		$quota['percent'] = (string)round(($_usage * 100) / $_limit);
 		return $quota;
 	}
 
@@ -2381,12 +2376,12 @@ 
 		$uid	= $_GET['uid'];
 		$cid	= base64_decode($_GET['cid']);
 		$partID = urldecode($_GET['partID']);
-		if (!empty($_GET['mailbox'])) $mailbox  = base64_decode($_GET['mailbox']);
+		if (!empty($_GET['mailbox'])) $mailbox = base64_decode($_GET['mailbox']);
 
 		//error_log(__METHOD__.__LINE__.":$uid, $cid, $partID");
 		$this->mail_bo->reopen($mailbox);
 
-		$attachment = $this->mail_bo->getAttachmentByCID($uid, $cid, $partID, true);	// true get contents as stream
+		$attachment = $this->mail_bo->getAttachmentByCID($uid, $cid, $partID, true); // true get contents as stream
 
 		$this->mail_bo->closeConnection();
 
@@ -2394,8 +2389,8 @@ 
 
 		if ($attachment)
 		{
-			header("Content-Type: ". $attachment->getType());
-			header('Content-Disposition: inline; filename="'. $attachment->getDispositionParameter('filename') .'"');
+			header("Content-Type: ".$attachment->getType());
+			header('Content-Disposition: inline; filename="'.$attachment->getDispositionParameter('filename').'"');
 			//header("Expires: 0");
 			// the next headers are for IE and SSL
 			//header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
@@ -2413,7 +2408,7 @@ 
 
 	function getAttachment()
 	{
-		if(isset($_GET['id'])) $rowID	= $_GET['id'];
+		if (isset($_GET['id'])) $rowID = $_GET['id'];
 
 		$hA = self::splitRowID($rowID);
 		$uid = $hA['msgUID'];
@@ -2425,11 +2420,11 @@ 
 			//error_log(__METHOD__.__LINE__.' change Profile to ->'.$icServerID);
 			$this->changeProfile($icServerID);
 		}
-		$part		= $_GET['part'];
+		$part = $_GET['part'];
 		$is_winmail = $_GET['is_winmail'] ? $_GET['is_winmail'] : 0;
 
 		$this->mail_bo->reopen($mailbox);
-		$attachment = $this->mail_bo->getAttachment($uid,$part,$is_winmail,false);
+		$attachment = $this->mail_bo->getAttachment($uid, $part, $is_winmail, false);
 		$this->mail_bo->closeConnection();
 		if ($rememberServerID != $this->mail_bo->profileID)
 		{
@@ -2444,7 +2439,7 @@ 
 			if (strtoupper($attachment['type']) == 'TEXT/DIRECTORY' || empty($attachment['type']))
 			{
 				$sfxMimeType = $attachment['type'];
-				$buff = explode('.',$attachment['filename']);
+				$buff = explode('.', $attachment['filename']);
 				$suffix = '';
 				if (is_array($buff)) $suffix = array_pop($buff); // take the last extension to check with ext2mime
 				if (!empty($suffix)) $sfxMimeType = Api\MimeMagic::ext2mime($suffix);
@@ -2456,10 +2451,10 @@ 
 			{
 				//error_log(__METHOD__."about to call calendar_ical");
 				$calendar_ical = new calendar_ical();
-				$eventid = $calendar_ical->search($attachment['attachment'],-1);
+				$eventid = $calendar_ical->search($attachment['attachment'], -1);
 				//error_log(__METHOD__.array2string($eventid));
 				if (!$eventid) $eventid = -1;
-				$event = $calendar_ical->importVCal($attachment['attachment'],(is_array($eventid)?$eventid[0]:$eventid),null,true,0,'',null,$attachment['charset']);
+				$event = $calendar_ical->importVCal($attachment['attachment'], (is_array($eventid) ? $eventid[0] : $eventid), null, true, 0, '', null, $attachment['charset']);
 				//error_log(__METHOD__.$event);
 				if ((int)$event > 0)
 				{
@@ -2467,7 +2462,7 @@ 
 						'menuaction'      => 'calendar.calendar_uiforms.edit',
 						'cal_id'      => $event,
 					);
-					Egw::redirect_link('../index.php',$vars);
+					Egw::redirect_link('../index.php', $vars);
 				}
 				//Import failed, download content anyway
 			}
@@ -2482,13 +2477,13 @@ 
 				{
 					$vcard['uid'] = trim($vcard['uid']);
 					//error_log(__METHOD__.__LINE__.print_r($vcard,true));
-					$contact = $addressbook_vcal->find_contact($vcard,false);
+					$contact = $addressbook_vcal->find_contact($vcard, false);
 				}
 				if (!$contact) $contact = null;
 				// if there are not enough fields in the vcard (or the parser was unable to correctly parse the vcard (as of VERSION:3.0 created by MSO))
-				if ($contact || count($vcard)>2)
+				if ($contact || count($vcard) > 2)
 				{
-					$contact = $addressbook_vcal->addVCard($attachment['attachment'],(is_array($contact)?array_shift($contact):$contact),true,$attachment['charset']);
+					$contact = $addressbook_vcal->addVCard($attachment['attachment'], (is_array($contact) ? array_shift($contact) : $contact), true, $attachment['charset']);
 				}
 				if ((int)$contact > 0)
 				{
@@ -2496,14 +2491,14 @@ 
 						'menuaction'	=> 'addressbook.addressbook_ui.edit',
 						'contact_id'	=> $contact,
 					);
-					Egw::redirect_link('../index.php',$vars);
+					Egw::redirect_link('../index.php', $vars);
 				}
 				//Import failed, download content anyway
 			}
 		}
 		//error_log(__METHOD__.__LINE__.'->'.array2string($attachment));
-		$filename = ($attachment['name']?$attachment['name']:($attachment['filename']?$attachment['filename']:$mailbox.'_uid'.$uid.'_part'.$part));
-		Api\Header\Content::safe($attachment['attachment'], $filename, $attachment['type'], $size=0, True, $_GET['mode'] == "save");
+		$filename = ($attachment['name'] ? $attachment['name'] : ($attachment['filename'] ? $attachment['filename'] : $mailbox.'_uid'.$uid.'_part'.$part));
+		Api\Header\Content::safe($attachment['attachment'], $filename, $attachment['type'], $size = 0, True, $_GET['mode'] == "save");
 		echo $attachment['attachment'];
 
 		exit();
@@ -2518,9 +2513,9 @@ 
 	function saveMessage()
 	{
 		$display = false;
-		if(isset($_GET['id'])) $rowID	= $_GET['id'];
-		if(isset($_GET['part'])) $partID = $_GET['part'];
-		if (isset($_GET['location'])&& ($_GET['location']=='display'||$_GET['location']=='filemanager')) $display	= $_GET['location'];
+		if (isset($_GET['id'])) $rowID = $_GET['id'];
+		if (isset($_GET['part'])) $partID = $_GET['part'];
+		if (isset($_GET['location']) && ($_GET['location'] == 'display' || $_GET['location'] == 'filemanager')) $display = $_GET['location'];
 
 		$hA = self::splitRowID($rowID);
 		$uid = $hA['msgUID'];
@@ -2548,14 +2543,14 @@ 
 		if (!$display)
 		{
 			$headers = Horde_Mime_Headers::parseHeaders($message);
-			$subject = str_replace('$$','__',Mail::decode_header($headers['SUBJECT']));
-			Api\Header\Content::safe($message, $subject.".eml", $mime='message/rfc822', $size=0, true, true);
+			$subject = str_replace('$$', '__', Mail::decode_header($headers['SUBJECT']));
+			Api\Header\Content::safe($message, $subject.".eml", $mime = 'message/rfc822', $size = 0, true, true);
 			echo $message;
 		}
 		else
 		{
-			Api\Header\Content::safe($message, $subject.".eml", $mime='text/html', $size=0, true, false);
-			print '<pre>'. htmlspecialchars($message, ENT_NOQUOTES|ENT_SUBSTITUTE, 'utf-8') .'</pre>';
+			Api\Header\Content::safe($message, $subject.".eml", $mime = 'text/html', $size = 0, true, false);
+			print '<pre>'.htmlspecialchars($message, ENT_NOQUOTES|ENT_SUBSTITUTE, 'utf-8').'</pre>';
 		}
 	}
 
@@ -2567,18 +2562,18 @@ 
 	 * @param boolean $close Return javascript to close the window
 	 * @return string|boolean javascript eg. to close the selector window if $close is true, or success/fail if $close is false
 	 */
-	function vfsSaveMessage($ids,$path, $close = true)
+	function vfsSaveMessage($ids, $path, $close = true)
 	{
 		//error_log(__METHOD__.' IDs:'.array2string($ids).' SaveToPath:'.$path);
 
 		if (is_array($ids) && !Vfs::is_writable($path) || !is_array($ids) && !Vfs::is_writable(dirname($path)))
 		{
-			return 'alert("'.addslashes(lang('%1 is NOT writable by you!',$path)).'"); Egw(window).close();';
+			return 'alert("'.addslashes(lang('%1 is NOT writable by you!', $path)).'"); Egw(window).close();';
 		}
 		Api\Translation::add_app('mail');
 
 		$rememberServerID = $this->mail_bo->profileID;
-		foreach((array)$ids as $id)
+		foreach ((array)$ids as $id)
 		{
 			$hA = self::splitRowID($id);
 			$uid = $hA['msgUID'];
@@ -2589,20 +2584,20 @@ 
 				//error_log(__METHOD__.__LINE__.' change Profile to ->'.$icServerID);
 				$this->changeProfile($icServerID);
 			}
-			$message = $this->mail_bo->getMessageRawBody($uid, $partID='', $mailbox);
-			$err=null;
-			if(Vfs::is_dir($path))
+			$message = $this->mail_bo->getMessageRawBody($uid, $partID = '', $mailbox);
+			$err = null;
+			if (Vfs::is_dir($path))
 			{
-				$headers = $this->mail_bo->getMessageHeader($uid,$partID,true,false,$mailbox);
-				$file = $path . '/'.preg_replace('/[\f\n\t\v\\:*#?<>\|]/',"_",$headers['SUBJECT']).'.eml';
+				$headers = $this->mail_bo->getMessageHeader($uid, $partID, true, false, $mailbox);
+				$file = $path.'/'.preg_replace('/[\f\n\t\v\\:*#?<>\|]/', "_", $headers['SUBJECT']).'.eml';
 			}
 			else
 			{
 				$file = $path;
 			}
-			if (!($fp = Vfs::fopen($file,'wb')) || !fwrite($fp,$message))
+			if (!($fp = Vfs::fopen($file, 'wb')) || !fwrite($fp, $message))
 			{
-				$err .= lang('Error saving %1!',$file);
+				$err .= lang('Error saving %1!', $file);
 				$succeeded = false;
 			}
 			else
@@ -2612,10 +2607,10 @@ 
 			if ($fp) fclose($fp);
 			if ($succeeded)
 			{
-				unset($headers['SUBJECT']);//already in filename
+				unset($headers['SUBJECT']); //already in filename
 				$infoSection = Mail::createHeaderInfoSection($headers, 'SUPPRESS', false);
-				$props = array(array('name' => 'comment','val' => $infoSection));
-				Vfs::proppatch($file,$props);
+				$props = array(array('name' => 'comment', 'val' => $infoSection));
+				Vfs::proppatch($file, $props);
 			}
 		}
 		if ($rememberServerID != $this->mail_bo->profileID)
@@ -2624,9 +2619,9 @@ 
 			$this->changeProfile($rememberServerID);
 		}
 
-		if($close)
+		if ($close)
 		{
-			Framework::window_close(($err?$err:null));
+			Framework::window_close(($err ? $err : null));
 		}
 		else
 		{
@@ -2641,15 +2636,15 @@ 
 	 * @param string $path path in vfs (no Vfs::PREFIX!), only directory for multiple id's ($ids is an array)
 	 * @return string javascript eg. to close the selector window
 	 */
-	function vfsSaveAttachment($ids,$path)
+	function vfsSaveAttachment($ids, $path)
 	{
 		//error_log(__METHOD__.__LINE__.'("'.array2string($ids).'","'.$path."\")');");
 
 		if (is_array($ids) && !Vfs::is_writable($path) || !is_array($ids) && !Vfs::is_writable(dirname($path)))
 		{
-			return 'alert("'.addslashes(lang('%1 is NOT writable by you!',$path)).'"); Egw(window).close();';
+			return 'alert("'.addslashes(lang('%1 is NOT writable by you!', $path)).'"); Egw(window).close();';
 		}
-		$err=null;
+		$err = null;
 		$dupe_count = array();
 		$rememberServerID = $this->mail_bo->profileID;
 
@@ -2659,12 +2654,12 @@ 
 		 *
 		 * @return array an array of parameters
 		 */
-		$getParams = function ($id) {
-			list($app,$user,$serverID,$mailbox,$uid,$part,$is_winmail,$name) = explode('::',$id,8);
-			$lId = implode('::',array($app,$user,$serverID,$mailbox,$uid));
+		$getParams = function($id) {
+			list($app, $user, $serverID, $mailbox, $uid, $part, $is_winmail, $name) = explode('::', $id, 8);
+			$lId = implode('::', array($app, $user, $serverID, $mailbox, $uid));
 			$hA = mail_ui::splitRowID($lId);
 			return array(
-				'is_winmail' => $is_winmail == "null" || !$is_winmail?false:$is_winmail,
+				'is_winmail' => $is_winmail == "null" || !$is_winmail ? false : $is_winmail,
 				'user' => $user,
 				'name' => $name,
 				'part' => $part,
@@ -2676,8 +2671,8 @@ 
 
 		//Examine the first attachment to see if attachment
 		//is winmail.dat embedded attachments.
-		$isMultipleDownload=is_array($ids);
-		$p = $getParams((is_array($ids)?$ids[0]:$ids));
+		$isMultipleDownload = is_array($ids);
+		$p = $getParams((is_array($ids) ? $ids[0] : $ids));
 		if ($p['is_winmail'])
 		{
 			if ($p['icServer'] && $p['icServer'] != $this->mail_bo->profileID)
@@ -2688,14 +2683,14 @@ 
 			// Retrive all embedded attachments at once
 			// avoids to fetch heavy winmail.dat content
 			// for each file.
-			$attachments = $this->mail_bo->getTnefAttachments($p['uid'],$p['part']);
+			$attachments = $this->mail_bo->getTnefAttachments($p['uid'], $p['part']);
 		}
 
-		foreach((array)$ids as $id)
+		foreach ((array)$ids as $id)
 		{
 			$params = $getParams($id);
 			// when downloading a single file, name is not set
-			if (!$params['name']&&isset($_GET['name'])&&!$isMultipleDownload) $params['name'] = $_GET['name'];
+			if (!$params['name'] && isset($_GET['name']) && !$isMultipleDownload) $params['name'] = $_GET['name'];
 			if ($params['icServer'] && $params['icServer'] != $this->mail_bo->profileID)
 			{
 				//error_log(__METHOD__.__LINE__.' change Profile to ->'.$icServerID);
@@ -2713,25 +2708,25 @@ 
 			}
 			else
 			{
-				$attachment = $this->mail_bo->getAttachment($params['uid'],$params['part'],$params['is_winmail'],false);
+				$attachment = $this->mail_bo->getAttachment($params['uid'], $params['part'], $params['is_winmail'], false);
 			}
 
 			$file = $params['name'];
 			// when $isMultipleDownload the path holds no filename
-			while(Vfs::file_exists($path.($file && $isMultipleDownload ? '/'.$file : '')))
+			while (Vfs::file_exists($path.($file && $isMultipleDownload ? '/'.$file : '')))
 			{
 				$dupe_count[$params['name']]++;
-				$file = pathinfo($params['name'], PATHINFO_FILENAME) .
-					' ('.($dupe_count[$params['name']] + 1).')' . '.' .
+				$file = pathinfo($params['name'], PATHINFO_FILENAME).
+					' ('.($dupe_count[$params['name']] + 1).')'.'.'.
 					pathinfo($params['name'], PATHINFO_EXTENSION);
 			}
 			$params['name'] = $file;
 			//error_log(__METHOD__.__LINE__.array2string($attachment));
 			// when $isMultipleDownload the path holds no filename
-			if (!($fp = Vfs::fopen($file=$path.($params['name'] && $isMultipleDownload ? '/'.$params['name'] : ''),'wb')) ||
-				!fwrite($fp,$attachment['attachment']))
+			if (!($fp = Vfs::fopen($file = $path.($params['name'] && $isMultipleDownload ? '/'.$params['name'] : ''), 'wb')) ||
+				!fwrite($fp, $attachment['attachment']))
 			{
-				$err .= lang('Error saving %1!',$file);
+				$err .= lang('Error saving %1!', $file);
 			}
 			if ($fp)
 			{
@@ -2744,21 +2739,21 @@ 
 			//error_log(__METHOD__.__LINE__.' change Profile back to where we came from ->'.$rememberServerID);
 			$this->changeProfile($rememberServerID);
 		}
-		Framework::window_close(($err?$err:null));
+		Framework::window_close(($err ? $err : null));
 	}
 
 	/**
 	 * Zip all attachments and send to user
 	 * @param string $message_id = null
 	 */
-	function download_zip($message_id=null)
+	function download_zip($message_id = null)
 	{
 		//error_log(__METHOD__.__LINE__.array2string($_GET));
 		// First, get all attachment IDs
-		if(isset($_GET['id'])) $message_id	= $_GET['id'];
+		if (isset($_GET['id'])) $message_id = $_GET['id'];
 		//error_log(__METHOD__.__LINE__.$message_id);
 		$rememberServerID = $this->mail_bo->profileID;
-		if(!is_numeric($message_id))
+		if (!is_numeric($message_id))
 		{
 			$hA = self::splitRowID($message_id);
 			$message_id = $hA['msgUID'];
@@ -2776,30 +2771,30 @@ 
 		}
 		// always fetch all, even inline (images)
 		$fetchEmbeddedImages = true;
-		$attachments = $this->mail_bo->getMessageAttachments($message_id,null, null, $fetchEmbeddedImages, true,true,$mailbox);
+		$attachments = $this->mail_bo->getMessageAttachments($message_id, null, null, $fetchEmbeddedImages, true, true, $mailbox);
 		// put them in VFS so they can be zipped
-		$header = $this->mail_bo->getMessageHeader($message_id,'',true,false,$mailbox);
+		$header = $this->mail_bo->getMessageHeader($message_id, '', true, false, $mailbox);
 		//get_home_dir may fetch the users startfolder if set; if not writeable, action will fail. TODO: use temp_dir
 		$homedir = '/home/'.$GLOBALS['egw_info']['user']['account_lid'];
-		$temp_path = $homedir/*Vfs::get_home_dir()*/ . "/.mail_$message_id";
-		if(Vfs::is_dir($temp_path)) Vfs::remove ($temp_path);
+		$temp_path = $homedir/*Vfs::get_home_dir()*/."/.mail_$message_id";
+		if (Vfs::is_dir($temp_path)) Vfs::remove($temp_path);
 
 		// Add subject to path, so it gets used as the file name
-		$path = $temp_path . '/' . ($header['SUBJECT'] ? Vfs::encodePathComponent($header['SUBJECT']) : lang('mail')) .'/';
-		if(!Vfs::mkdir($path, 0700, true))
+		$path = $temp_path.'/'.($header['SUBJECT'] ? Vfs::encodePathComponent($header['SUBJECT']) : lang('mail')).'/';
+		if (!Vfs::mkdir($path, 0700, true))
 		{
-			Framework::message("Unable to open temp directory $path",'error');
+			Framework::message("Unable to open temp directory $path", 'error');
 			return;
 		}
 
 		$file_list = array();
 		$dupe_count = array();
 		$this->mail_bo->reopen($mailbox);
-		if ($attachments[0]['is_winmail'] && $attachments[0]['is_winmail']!='null')
+		if ($attachments[0]['is_winmail'] && $attachments[0]['is_winmail'] != 'null')
 		{
-			$tnefAttachments = $this->mail_bo->getTnefAttachments($message_id, $attachments[0]['partID'],true);
+			$tnefAttachments = $this->mail_bo->getTnefAttachments($message_id, $attachments[0]['partID'], true);
 		}
-		foreach($attachments as $file)
+		foreach ($attachments as $file)
 		{
 			if ($file['is_winmail'])
 			{
@@ -2812,22 +2807,22 @@ 
 			}
 			else
 			{
-				$attachment = $this->mail_bo->getAttachment($message_id,$file['partID'],$file['is_winmail'],false,true);
+				$attachment = $this->mail_bo->getAttachment($message_id, $file['partID'], $file['is_winmail'], false, true);
 			}
-			$success=true;
+			$success = true;
 			if (empty($file['filename'])) $file['filename'] = $file['name'];
-			if(in_array($path.$file['filename'], $file_list))
+			if (in_array($path.$file['filename'], $file_list))
 			{
 				$dupe_count[$path.$file['filename']]++;
-				$file['filename'] = pathinfo($file['filename'], PATHINFO_FILENAME) .
-					' ('.($dupe_count[$path.$file['filename']] + 1).')' . '.' .
+				$file['filename'] = pathinfo($file['filename'], PATHINFO_FILENAME).
+					' ('.($dupe_count[$path.$file['filename']] + 1).')'.'.'.
 					pathinfo($file['filename'], PATHINFO_EXTENSION);
 			}
-			if (!($fp = Vfs::fopen($path.$file['filename'],'wb')) ||
+			if (!($fp = Vfs::fopen($path.$file['filename'], 'wb')) ||
 				!(!fseek($attachment['attachment'], 0, SEEK_SET) && stream_copy_to_stream($attachment['attachment'], $fp)))
 			{
-				$success=false;
-				Framework::message("Unable to zip {$file['filename']}",'error');
+				$success = false;
+				Framework::message("Unable to zip {$file['filename']}", 'error');
 			}
 			if ($success) $file_list[] = $path.$file['filename'];
 			if ($fp) fclose($fp);
@@ -2848,7 +2843,7 @@ 
 		exit();
 	}
 
-	function get_load_email_data($uid, $partID, $mailbox,$htmlOptions=null)
+	function get_load_email_data($uid, $partID, $mailbox, $htmlOptions = null)
 	{
 		// seems to be needed, as if we open a mail from notification popup that is
 		// located in a different folder, we experience: could not parse message
@@ -2861,7 +2856,7 @@ 
 		// fetching structure now, to supply it to getMessageBody and getMessageAttachment, so it does not get fetched twice
 		$structure = $this->mail_bo->getStructure($uid, $partID, $mailbox, false);
 		$calendar_part = null;
-		$bodyParts	= $this->mail_bo->getMessageBody($uid, ($htmlOptions?$htmlOptions:''), $partID, $structure, false, $mailbox, $calendar_part);
+		$bodyParts	= $this->mail_bo->getMessageBody($uid, ($htmlOptions ? $htmlOptions : ''), $partID, $structure, false, $mailbox, $calendar_part);
 
 		// for meeting requests (multipart alternative with text/calendar part) let calendar render it
 		if ($calendar_part && isset($GLOBALS['egw_info']['user']['apps']['calendar']))
@@ -2876,26 +2871,26 @@ 
 			$this->mail_bo->htmlOptions = $bufferHtmlOptions;
 			Api\Translation::add_app('calendar');
 			return ExecMethod('calendar.calendar_uiforms.meeting',
-				array('event'=>null,'msg'=>'','useSession'=>true)
+				array('event'=>null, 'msg'=>'', 'useSession'=>true)
 			);
 		}
 		// Compose the content of the frame
 		$frameHtml =
 			$this->get_email_header($this->mail_bo->getStyles($bodyParts)).
-			$this->showBody($this->getdisplayableBody($bodyParts,true,false), false);
+			$this->showBody($this->getdisplayableBody($bodyParts, true, false), false);
 		//IE10 eats away linebreaks preceeded by a whitespace in PRE sections
-		$frameHtml = str_replace(" \r\n","\r\n",$frameHtml);
+		$frameHtml = str_replace(" \r\n", "\r\n", $frameHtml);
 		$this->mail_bo->htmlOptions = $bufferHtmlOptions;
 
 		return $frameHtml;
 	}
 
-	static function get_email_header($additionalStyle='')
+	static function get_email_header($additionalStyle = '')
 	{
 		// egw_info[flags][css] already include <style> tags
 		$GLOBALS['egw_info']['flags']['css'] = preg_replace('|</?style[^>]*>|i', '', $additionalStyle);
-		$GLOBALS['egw_info']['flags']['nofooter']=true;
-		$GLOBALS['egw_info']['flags']['nonavbar']=true;
+		$GLOBALS['egw_info']['flags']['nofooter'] = true;
+		$GLOBALS['egw_info']['flags']['nonavbar'] = true;
 		// do NOT include any default CSS
 		Framework::includeCSS('mail', 'preview', true, true);
 
@@ -2906,35 +2901,35 @@ 
 		return $GLOBALS['egw']->framework->header();
 	}
 
-	function showBody(&$body, $print=true,$fullPageTags=true)
+	function showBody(&$body, $print = true, $fullPageTags = true)
 	{
 		$BeginBody = '<div class="mailDisplayBody">
 <table width="100%" style="table-layout:fixed"><tr><td class="td_display">';
 
 		$EndBody = '</td></tr></table></div>';
 		if ($fullPageTags) $EndBody .= "</body></html>";
-		if ($print)	{
-			print $BeginBody. $body .$EndBody;
+		if ($print) {
+			print $BeginBody.$body.$EndBody;
 		} else {
-			return $BeginBody. $body .$EndBody;
+			return $BeginBody.$body.$EndBody;
 		}
 	}
 
-	function &getdisplayableBody($_bodyParts,$modifyURI=true,$useTidy = true)
+	function &getdisplayableBody($_bodyParts, $modifyURI = true, $useTidy = true)
 	{
-		$bodyParts	= $_bodyParts;
+		$bodyParts = $_bodyParts;
 
-		$nonDisplayAbleCharacters = array('[\016]','[\017]',
-				'[\020]','[\021]','[\022]','[\023]','[\024]','[\025]','[\026]','[\027]',
-				'[\030]','[\031]','[\032]','[\033]','[\034]','[\035]','[\036]','[\037]');
+		$nonDisplayAbleCharacters = array('[\016]', '[\017]',
+				'[\020]', '[\021]', '[\022]', '[\023]', '[\024]', '[\025]', '[\026]', '[\027]',
+				'[\030]', '[\031]', '[\032]', '[\033]', '[\034]', '[\035]', '[\036]', '[\037]');
 
 		$body = '';
 
 		//error_log(__METHOD__.array2string($bodyParts)); //exit;
 		if (empty($bodyParts)) return "";
-		foreach((array)$bodyParts as $singleBodyPart) {
+		foreach ((array)$bodyParts as $singleBodyPart) {
 			if (!isset($singleBodyPart['body'])) {
-				$singleBodyPart['body'] = $this->getdisplayableBody($singleBodyPart,$modifyURI,$useTidy);
+				$singleBodyPart['body'] = $this->getdisplayableBody($singleBodyPart, $modifyURI, $useTidy);
 				$body .= $singleBodyPart['body'];
 				continue;
 			}
@@ -2944,7 +2939,7 @@ 
 				$body .= '';
 				continue;
 			}
-			if(!empty($body)) {
+			if (!empty($body)) {
 				$body .= '<hr style="border:dotted 1px silver;">';
 			}
 			//error_log($singleBodyPart['body']);
@@ -2969,28 +2964,28 @@ 
 				'(R)',
 			);
 
-			if(($singleBodyPart['mimeType'] == 'text/html' || $singleBodyPart['mimeType'] == 'text/plain') &&
+			if (($singleBodyPart['mimeType'] == 'text/html' || $singleBodyPart['mimeType'] == 'text/plain') &&
 				strtoupper($singleBodyPart['charSet']) != 'UTF-8')
 			{
-				$singleBodyPart['body'] = preg_replace($sar,$rar,$singleBodyPart['body']);
+				$singleBodyPart['body'] = preg_replace($sar, $rar, $singleBodyPart['body']);
 			}
 			//error_log(__METHOD__.__LINE__.'reports:'.$singleBodyPart['charSet']);
-			if ($singleBodyPart['charSet']=='us-ascii')
+			if ($singleBodyPart['charSet'] == 'us-ascii')
 			{
-				$orgCharSet=$singleBodyPart['charSet'];
+				$orgCharSet = $singleBodyPart['charSet'];
 				$singleBodyPart['charSet'] = Api\Translation::detect_encoding($singleBodyPart['body']);
 				error_log(__METHOD__.__LINE__.'reports:'.$orgCharSet.' but seems to be:'.$singleBodyPart['charSet']);
 			}
-			$singleBodyPart['body'] = Api\Translation::convert_jsonsafe($singleBodyPart['body'],$singleBodyPart['charSet']);
+			$singleBodyPart['body'] = Api\Translation::convert_jsonsafe($singleBodyPart['body'], $singleBodyPart['charSet']);
 			//error_log(__METHOD__.__LINE__.array2string($singleBodyPart));
-			if($singleBodyPart['mimeType'] == 'text/plain')
+			if ($singleBodyPart['mimeType'] == 'text/plain')
 			{
-				$newBody	= @htmlentities($singleBodyPart['body'],ENT_QUOTES, strtoupper(Mail::$displayCharset));
+				$newBody = @htmlentities($singleBodyPart['body'], ENT_QUOTES, strtoupper(Mail::$displayCharset));
 				//error_log(__METHOD__.__LINE__.'..'.$newBody);
 				// if empty and charset is utf8 try sanitizing the string in question
-				if (empty($newBody) && strtolower($singleBodyPart['charSet'])=='utf-8') $newBody = @htmlentities(iconv('utf-8', 'utf-8', $singleBodyPart['body']),ENT_QUOTES, strtoupper(Mail::$displayCharset));
+				if (empty($newBody) && strtolower($singleBodyPart['charSet']) == 'utf-8') $newBody = @htmlentities(iconv('utf-8', 'utf-8', $singleBodyPart['body']), ENT_QUOTES, strtoupper(Mail::$displayCharset));
 				// if the conversion to htmlentities fails somehow, try without specifying the charset, which defaults to iso-
-				if (empty($newBody)) $newBody    = htmlentities($singleBodyPart['body'],ENT_QUOTES);
+				if (empty($newBody)) $newBody = htmlentities($singleBodyPart['body'], ENT_QUOTES);
 
 				// search http[s] links and make them as links available again
 				// to understand what's going on here, have a look at
@@ -3018,20 +3013,20 @@ 
 				// since we do not display the message as HTML anymore we may want to insert good linebreaking (for visibility).
 				//error_log(__METHOD__.__LINE__.'..'.$newBody);
 				// dont break lines that start with > (&gt; as the text was processed with htmlentities before)
-				$newBody	= "<pre>".Mail::wordwrap($newBody,90,"\n",'&gt;')."</pre>";
+				$newBody = "<pre>".Mail::wordwrap($newBody, 90, "\n", '&gt;')."</pre>";
 			}
 			else
 			{
-				$alreadyHtmlLawed=false;
-				$newBody	= $singleBodyPart['body'];
+				$alreadyHtmlLawed = false;
+				$newBody = $singleBodyPart['body'];
 				//TODO:$newBody	= $this->highlightQuotes($newBody);
 				#error_log(print_r($newBody,true));
 				if ($useTidy && extension_loaded('tidy'))
 				{
 					$tidy = new tidy();
-					$cleaned = $tidy->repairString($newBody, Mail::$tidy_config,'utf8');
+					$cleaned = $tidy->repairString($newBody, Mail::$tidy_config, 'utf8');
 					// Found errors. Strip it all so there's some output
-					if($tidy->getStatus() == 2)
+					if ($tidy->getStatus() == 2)
 					{
 						error_log(__METHOD__.' ('.__LINE__.') '.' ->'.$tidy->errorBuffer);
 					}
@@ -3042,7 +3037,7 @@ 
 					if (!$preserveHTML)	// ToDo KL: $preserveHTML is NOT initialised, so always if is dead code
 					{
 						// filter only the 'body', as we only want that part, if we throw away the Api\Html
-						preg_match('`(<htm.+?<body[^>]*>)(.+?)(</body>.*?</html>)`ims', $newBody, $matches=array());
+						preg_match('`(<htm.+?<body[^>]*>)(.+?)(</body>.*?</html>)`ims', $newBody, $matches = array());
 						if ($matches[2])
 						{
 							$hasOther = true;
@@ -3053,7 +3048,7 @@ 
 				else
 				{
 					// htmLawed filter only the 'body'
-					preg_match('`(<htm.+?<body[^>]*>)(.+?)(</body>.*?</html>)`ims', $newBody, $matches=array());
+					preg_match('`(<htm.+?<body[^>]*>)(.+?)(</body>.*?</html>)`ims', $newBody, $matches = array());
 					if ($matches[2])
 					{
 						$hasOther = true;
@@ -3062,10 +3057,10 @@ 
 					$htmLawed = new Api\Html\HtmLawed();
 					// the next line should not be needed, but produces better results on HTML 2 Text conversion,
 					// as we switched off HTMLaweds tidy functionality
-					$newBody = str_replace(array('&amp;amp;','<DIV><BR></DIV>',"<DIV>&nbsp;</DIV>",'<div>&nbsp;</div>'),array('&amp;','<BR>','<BR>','<BR>'),$newBody);
-					$newBody = $htmLawed->run($newBody,Mail::$htmLawed_config);
-					if ($hasOther && $preserveHTML) $newBody = $matches[1]. $newBody. $matches[3];
-					$alreadyHtmlLawed=true;
+					$newBody = str_replace(array('&amp;amp;', '<DIV><BR></DIV>', "<DIV>&nbsp;</DIV>", '<div>&nbsp;</div>'), array('&amp;', '<BR>', '<BR>', '<BR>'), $newBody);
+					$newBody = $htmLawed->run($newBody, Mail::$htmLawed_config);
+					if ($hasOther && $preserveHTML) $newBody = $matches[1].$newBody.$matches[3];
+					$alreadyHtmlLawed = true;
 				}
 				// do the cleanup, set for the use of purifier
 				//$newBodyBuff = $newBody;
@@ -3087,8 +3082,8 @@ 
 				}
 */
 				// removes stuff between http and ?http
-				$Protocol = '(http:\/\/|(ftp:\/\/|https:\/\/))';    // only http:// gets removed, other protocolls are shown
-				$newBody = preg_replace('~'.$Protocol.'[^>]*\?'.$Protocol.'~sim','$1',$newBody); // removes stuff between http:// and ?http://
+				$Protocol = '(http:\/\/|(ftp:\/\/|https:\/\/))'; // only http:// gets removed, other protocolls are shown
+				$newBody = preg_replace('~'.$Protocol.'[^>]*\?'.$Protocol.'~sim', '$1', $newBody); // removes stuff between http:// and ?http://
 				// TRANSFORM MAILTO LINKS TO EMAILADDRESS ONLY, WILL BE SUBSTITUTED BY parseEmail TO CLICKABLE LINK
 				$newBody = preg_replace('/(?<!"|href=|href\s=\s|href=\s|href\s=)'.'mailto:([a-z0-9._-]+)@([a-z0-9_-]+)\.([a-z0-9._-]+)/i',
 					"\\1@\\2.\\3",
@@ -3101,7 +3096,7 @@ 
 				// create links for inline images
 				if ($modifyURI)
 				{
-					$newBody = self::resolve_inline_images ($newBody, $this->mailbox, $this->uid, $this->partID);
+					$newBody = self::resolve_inline_images($newBody, $this->mailbox, $this->uid, $this->partID);
 				}
 				// email addresses / mailto links get now activated on client-side
 			}
@@ -3113,7 +3108,7 @@ 
 		$body = preg_replace("/(\\\\\\\\)([\w,\\\\,-]+)/i",
 			"<a href=\"file:$1$2\" target=\"_blank\"><font color=\"blue\">$1$2</font></a>", $body);
 
-		$body = preg_replace($nonDisplayAbleCharacters,'',$body);
+		$body = preg_replace($nonDisplayAbleCharacters, '', $body);
 
 		return $body;
 	}
@@ -3128,7 +3123,7 @@ 
 	 * @param string $_messageType = 'html', message type is either html or plain
 	 * @return string message body including all CID images replaced
 	 */
-	public static function resolve_inline_images ($_body,$_mailbox, $_uid, $_partID, $_messageType = 'html')
+	public static function resolve_inline_images($_body, $_mailbox, $_uid, $_partID, $_messageType = 'html')
 	{
 		if ($_messageType === 'plain')
 		{
@@ -3136,7 +3131,7 @@ 
 		}
 		else
 		{
-			foreach(array('src','url','background') as $type)
+			foreach (array('src', 'url', 'background') as $type)
 			{
 				$_body = self::resolve_inline_image_byType($_body, $_mailbox, $_uid, $_partID, $type);
 			}
@@ -3155,7 +3150,7 @@ 
 	 *	- types: {plain|src|url|background}
 	 * @return string returns body content including all CID replacements
 	 */
-	public static function resolve_inline_image_byType ($_body,$_mailbox, $_uid, $_partID, $_type ='src')
+	public static function resolve_inline_image_byType($_body, $_mailbox, $_uid, $_partID, $_type = 'src')
 	{
 		/**
 		 * Callback for preg_replace_callback function
@@ -3167,7 +3162,7 @@ 
 		 * @param string $_type
 		 * @return string|boolean returns the replace
 		*/
-		$replace_callback = function ($matches) use ($_mailbox,$_uid, $_partID,  $_type)
+		$replace_callback = function($matches) use ($_mailbox, $_uid, $_partID, $_type)
 		{
 			if (!$_type)	return false;
 			$CID = '';
@@ -3189,11 +3184,11 @@ 
 					break;
 			}
 
-			static $cache = array();	// some caching, if mails containing the same image multiple times
+			static $cache = array(); // some caching, if mails containing the same image multiple times
 
 			if (is_array($matches) && $CID)
 			{
-				$linkData = array (
+				$linkData = array(
 					'menuaction'    => 'mail.mail_ui.displayImage',
 					'uid'		=> $_uid,
 					'mailbox'	=> base64_encode($_mailbox),
@@ -3206,7 +3201,7 @@ 
 				{
 					if (!isset($cache[$imageURL]))
 					{
-						if ($_type !="background")
+						if ($_type != "background")
 						{
 							$bo = Mail::getInstance(false, mail_ui::$icServerID);
 							$attachment = $bo->getAttachmentByCID($_uid, $CID, $_partID);
@@ -3247,16 +3242,16 @@ 
 		};
 
 		// return new body content base on chosen type
-		switch($_type)
+		switch ($_type)
 		{
 			case"plain":
-				return preg_replace_callback("/\[cid:(.*)\]/iU",$replace_callback,$_body);
+				return preg_replace_callback("/\[cid:(.*)\]/iU", $replace_callback, $_body);
 			case "src":
-				return preg_replace_callback("/src=(\"|\')cid:(.*)(\"|\')/iU",$replace_callback,$_body);
+				return preg_replace_callback("/src=(\"|\')cid:(.*)(\"|\')/iU", $replace_callback, $_body);
 			case "url":
-				return preg_replace_callback("/url\(cid:(.*)\);/iU",$replace_callback,$_body);
+				return preg_replace_callback("/url\(cid:(.*)\);/iU", $replace_callback, $_body);
 			case "background":
-				return preg_replace_callback("/background=(\"|\')cid:(.*)(\"|\')/iU",$replace_callback,$_body);
+				return preg_replace_callback("/background=(\"|\')cid:(.*)(\"|\')/iU", $replace_callback, $_body);
 		}
 	}
 
@@ -3264,7 +3259,7 @@ 
 	 * importMessage
 	 * @param array $content = null an array of content
 	 */
-	function importMessage($content=null)
+	function importMessage($content = null)
 	{
 		//error_log(__METHOD__.__LINE__.$this->mail_bo->getDraftFolder());
 
@@ -3286,7 +3281,7 @@ 
 			}
 			$destination = $content['FOLDER'][0];
 
-			if (stripos($destination,self::$delimiter)!==false) list($icServerID,$destination) = explode(self::$delimiter,$destination,2);
+			if (stripos($destination, self::$delimiter) !== false) list($icServerID, $destination) = explode(self::$delimiter, $destination, 2);
 			if ($icServerID && $icServerID != $this->mail_bo->profileID)
 			{
 				//error_log(__METHOD__.__LINE__.' change Profile to ->'.$icServerID);
@@ -3297,32 +3292,31 @@ 
 			$importFailed = false;
 			try
 			{
-				$messageUid = $this->importMessageToFolder($file,$destination,$importID);
-			    $linkData = array
-			    (
+				$messageUid = $this->importMessageToFolder($file, $destination, $importID);
+			    $linkData = array(
 					'id' => $this->createRowID($destination, $messageUid, true),
 			    );
 			}
 			catch (Api\Exception\WrongUserinput $e)
 			{
-					$importFailed=true;
-					$content['msg']		= $e->getMessage();
+					$importFailed = true;
+					$content['msg'] = $e->getMessage();
 			}
 			if (!$importFailed)
 			{
 				list($width, $height) = explode('x', Link::get_registry('mail', 'add_popup'));
 				if ($width > 0 && $height > 0) Api\Json\Response::get()->call('resizeTo', $width, $height);
-				ExecMethod2('mail.mail_ui.displayMessage',$linkData);
+				ExecMethod2('mail.mail_ui.displayMessage', $linkData);
 				return;
 			}
 		}
 		if (!is_array($content)) $content = array();
-		if (empty($content['FOLDER'])) $content['FOLDER']=(array)$this->mail_bo->getDraftFolder();
-		if (!empty($content['FOLDER'])) $sel_options['FOLDER']=mail_compose::ajax_searchFolder(0,true);
+		if (empty($content['FOLDER'])) $content['FOLDER'] = (array)$this->mail_bo->getDraftFolder();
+		if (!empty($content['FOLDER'])) $sel_options['FOLDER'] = mail_compose::ajax_searchFolder(0, true);
 
 		$etpl = new Etemplate('mail.importMessage');
-		$etpl->setElementAttribute('uploadForImport','onFinish','app.mail.uploadForImport');
-		$etpl->exec('mail.mail_ui.importMessage',$content,$sel_options,array(),array(),2);
+		$etpl->setElementAttribute('uploadForImport', 'onFinish', 'app.mail.uploadForImport');
+		$etpl->exec('mail.mail_ui.importMessage', $content, $sel_options, array(), array(), 2);
 	}
 
 	/**
@@ -3334,7 +3328,7 @@ 
 	 * @param string $importID ID for the imported message, used by attachments to identify them unambiguously
 	 * @return mixed $messageUID or exception
 	 */
-	function importMessageToFolder($_formData,&$_folder,$importID='')
+	function importMessageToFolder($_formData, &$_folder, $importID = '')
 	{
 		$importfailed = false;
 		//error_log(__METHOD__.__LINE__.array2string($_formData));
@@ -3342,7 +3336,7 @@ 
 		// check if formdata meets basic restrictions (in tmp dir, or vfs, mimetype, etc.)
 		try
 		{
-			$tmpFileName = Mail::checkFileBasics($_formData,$importID);
+			$tmpFileName = Mail::checkFileBasics($_formData, $importID);
 		}
 		catch (Api\Exception\WrongUserinput $e)
 		{
@@ -3366,29 +3360,29 @@ 
 			if (empty($_folder))
 			{
 				$importfailed = true;
-				$alert_msg .= lang("Import of message %1 failed. Destination Folder not set.",$_formData['name']);
+				$alert_msg .= lang("Import of message %1 failed. Destination Folder not set.", $_formData['name']);
 			}
 			$delimiter = $this->mail_bo->getHierarchyDelimiter();
-			if($_folder=='INBOX'.$delimiter) $_folder='INBOX';
+			if ($_folder == 'INBOX'.$delimiter) $_folder = 'INBOX';
 			if ($importfailed === false)
 			{
-				if ($this->mail_bo->folderExists($_folder,true)) {
+				if ($this->mail_bo->folderExists($_folder, true)) {
 					try
 					{
 						$messageUid = $this->mail_bo->appendMessage($_folder,
 							$mailObject->getRaw(),
-							null,'\\Seen');
+							null, '\\Seen');
 					}
 					catch (Api\Exception\WrongUserinput $e)
 					{
 						$importfailed = true;
-						$alert_msg .= lang("Import of message %1 failed. Could not save message to folder %2 due to: %3",$_formData['name'],$_folder,$e->getMessage());
+						$alert_msg .= lang("Import of message %1 failed. Could not save message to folder %2 due to: %3", $_formData['name'], $_folder, $e->getMessage());
 					}
 				}
 				else
 				{
 					$importfailed = true;
-					$alert_msg .= lang("Import of message %1 failed. Destination Folder %2 does not exist.",$_formData['name'],$_folder);
+					$alert_msg .= lang("Import of message %1 failed. Destination Folder %2 does not exist.", $_formData['name'], $_folder);
 				}
 			}
 		}
@@ -3414,9 +3408,9 @@ 
 	 *								 $formData['size']	= 2136;
 	 * @return void
 	 */
-	function importMessageFromVFS2DraftAndEdit($formData='')
+	function importMessageFromVFS2DraftAndEdit($formData = '')
 	{
-		$this->importMessageFromVFS2DraftAndDisplay($formData,'edit');
+		$this->importMessageFromVFS2DraftAndDisplay($formData, 'edit');
 	}
 
 	/**
@@ -3431,7 +3425,7 @@ 
 	 * @param string $mode mode to open ImportedMessage display and edit are supported
 	 * @return void
 	 */
-	function importMessageFromVFS2DraftAndDisplay($formData='',$mode='display')
+	function importMessageFromVFS2DraftAndDisplay($formData = '', $mode = 'display')
 	{
 		if (empty($formData)) if (isset($_REQUEST['formData'])) $formData = $_REQUEST['formData'];
 		//error_log(__METHOD__.__LINE__.':'.array2string($formData).' Mode:'.$mode.'->'.function_backtrace());
@@ -3444,43 +3438,42 @@ 
 			$formData['file'] = 'egw-data://'.$formData['data'];
 		}
 		// name should be set to meet the requirements of checkFileBasics
-		if (parse_url($formData['file'],PHP_URL_SCHEME) == 'vfs' && empty($formData['name']))
+		if (parse_url($formData['file'], PHP_URL_SCHEME) == 'vfs' && empty($formData['name']))
 		{
-			$buff = explode('/',$formData['file']);
+			$buff = explode('/', $formData['file']);
 			if (is_array($buff)) $formData['name'] = array_pop($buff); // take the last part as name
 		}
 		// type should be set to meet the requirements of checkFileBasics
-		if (parse_url($formData['file'],PHP_URL_SCHEME) == 'vfs' && empty($formData['type']))
+		if (parse_url($formData['file'], PHP_URL_SCHEME) == 'vfs' && empty($formData['type']))
 		{
-			$buff = explode('.',$formData['file']);
+			$buff = explode('.', $formData['file']);
 			$suffix = '';
 			if (is_array($buff)) $suffix = array_pop($buff); // take the last extension to check with ext2mime
 			if (!empty($suffix)) $formData['type'] = Api\MimeMagic::ext2mime($suffix);
 		}
 		// size should be set to meet the requirements of checkFileBasics
-		if (parse_url($formData['file'],PHP_URL_SCHEME) == 'vfs' && !isset($formData['size']))
+		if (parse_url($formData['file'], PHP_URL_SCHEME) == 'vfs' && !isset($formData['size']))
 		{
 			$formData['size'] = strlen($formData['file']); // set some size, to meet requirements of checkFileBasics
 		}
 		try
 		{
-			$messageUid = $this->importMessageToFolder($formData,$draftFolder,$importID);
-			$linkData = array
-			(
-		        'menuaction'    => ($mode=='display'?'mail.mail_ui.displayMessage':'mail.mail_compose.composeFromDraft'),
-				'id'		=> $this->createRowID($draftFolder,$messageUid,true),
+			$messageUid = $this->importMessageToFolder($formData, $draftFolder, $importID);
+			$linkData = array(
+		        'menuaction'    => ($mode == 'display' ? 'mail.mail_ui.displayMessage' : 'mail.mail_compose.composeFromDraft'),
+				'id'		=> $this->createRowID($draftFolder, $messageUid, true),
 				'deleteDraftOnClose' => 1,
 			);
-			if ($mode!='display')
+			if ($mode != 'display')
 			{
 				unset($linkData['deleteDraftOnClose']);
-				$linkData['method']	='importMessageToMergeAndSend';
+				$linkData['method'] = 'importMessageToMergeAndSend';
 			}
 			else
 			{
-				$linkData['mode']=$mode;
+				$linkData['mode'] = $mode;
 			}
-			Egw::redirect_link('/index.php',$linkData);
+			Egw::redirect_link('/index.php', $linkData);
 		}
 		catch (Api\Exception\WrongUserinput $e)
 		{
@@ -3495,13 +3488,13 @@ 
 	 *
 	 * @return xajax response
 	 */
-	function loadEmailBody($_messageID=null,$_partID=null,$_htmloptions=null)
+	function loadEmailBody($_messageID = null, $_partID = null, $_htmloptions = null)
 	{
 		//error_log(__METHOD__.__LINE__.array2string($_GET));
 		if (!$_messageID && !empty($_GET['_messageID'])) $_messageID = $_GET['_messageID'];
 		if (!$_partID && !empty($_GET['_partID'])) $_partID = $_GET['_partID'];
 		if (!$_htmloptions && !empty($_GET['_htmloptions'])) $_htmloptions = $_GET['_htmloptions'];
-		if(Mail::$debug) error_log(__METHOD__."->".print_r($_messageID,true).",$_partID,$_htmloptions");
+		if (Mail::$debug) error_log(__METHOD__."->".print_r($_messageID, true).",$_partID,$_htmloptions");
 		if (empty($_messageID)) return "";
 		$uidA = self::splitRowID($_messageID);
 		$folder = $uidA['folder']; // all messages in one set are supposed to be within the same folder
@@ -3515,7 +3508,7 @@ 
 			$this->changeProfile($icServerID);
 		}
 
-		$bodyResponse = $this->get_load_email_data($messageID,$_partID,$folder,$_htmloptions);
+		$bodyResponse = $this->get_load_email_data($messageID, $_partID, $folder, $_htmloptions);
 		Api\Session::cache_control(true);
 		//error_log(array2string($bodyResponse));
 		echo $bodyResponse;
@@ -3538,7 +3531,7 @@ 
 			$oA = array();
 			foreach ($_folder as $_folderName)
 			{
-				list($profileID,$folderName) = explode(self::$delimiter,$_folderName,2);
+				list($profileID, $folderName) = explode(self::$delimiter, $_folderName, 2);
 				if (is_numeric($profileID))
 				{
 					if ($profileID != $this->mail_bo->profileID) continue; // only current connection
@@ -3546,19 +3539,19 @@ 
 					{
 						try
 						{
-							$fS = $this->mail_bo->getFolderStatus($folderName,false,false,false);
+							$fS = $this->mail_bo->getFolderStatus($folderName, false, false, false);
 						}
 						catch (Exception $e)
 						{
 							continue;
 						}
-						if (in_array($fS['shortDisplayName'],Mail::$autoFolders)) $fS['shortDisplayName']=lang($fS['shortDisplayName']);
+						if (in_array($fS['shortDisplayName'], Mail::$autoFolders)) $fS['shortDisplayName'] = lang($fS['shortDisplayName']);
 						//error_log(__METHOD__.__LINE__.array2string($fS));
 						if ($fS['unseen'])
 						{
 							$oA[$_folderName] = $fS['shortDisplayName'].' ('.$fS['unseen'].')';
 						}
-						if ($fS['unseen']==0 && $fS['shortDisplayName'])
+						if ($fS['unseen'] == 0 && $fS['shortDisplayName'])
 						{
 							$oA[$_folderName] = $fS['shortDisplayName'];
 						}
@@ -3569,7 +3562,7 @@ 
 			if ($oA)
 			{
 				$response = Api\Json\Response::get();
-				$response->call('app.mail.mail_setFolderStatus',$oA);
+				$response->call('app.mail.mail_setFolderStatus', $oA);
 			}
 		}
 	}
@@ -3583,14 +3576,14 @@ 
 	function ajax_addFolder($_parentFolderName, $_newName)
 	{
 		//error_log(__METHOD__.__LINE__.' ParentFolderName:'.array2string($_parentFolderName).' NewName/Folder:'.array2string($_newName));
-		$errorMessage='';
+		$errorMessage = '';
 		if ($_parentFolderName)
 		{
 			$created = false;
 			$decodedFolderName = $this->mail_bo->decodeEntityFolderName($_parentFolderName);
 			//the conversion is handeled by horde, frontend interaction is all utf-8
 			$_newName = $this->mail_bo->decodeEntityFolderName($_newName);
-			list($profileID,$parentFolderName) = explode(self::$delimiter,$decodedFolderName,2);
+			list($profileID, $parentFolderName) = explode(self::$delimiter, $decodedFolderName, 2);
 			if (is_numeric($profileID))
 			{
 				if ($profileID != $this->mail_bo->profileID) return; // only current connection
@@ -3630,10 +3623,10 @@ 
 
 				if (empty($del)) $del = $this->mail_bo->getHierarchyDelimiter(false);
 				*/
-				$nA = explode($del,$_newName);
+				$nA = explode($del, $_newName);
 
 				//error_log(__METHOD__.__LINE__."$folderName, $parentFolder, $_newName");
-				if (!!empty($parentFolderName)) $oldFolderInfo = $this->mail_bo->getFolderStatus($parentFolderName,false);
+				if (!!empty($parentFolderName)) $oldFolderInfo = $this->mail_bo->getFolderStatus($parentFolderName, false);
 				//error_log(__METHOD__.__LINE__.array2string($oldFolderInfo));
 
 				$this->mail_bo->reopen('INBOX');
@@ -3641,11 +3634,11 @@ 
 				// if newName has delimiter ($del) in it, we need to create the subtree
 				if (!empty($nA))
 				{
-					$c=0;
-					foreach($nA as $sTName)
+					$c = 0;
+					foreach ($nA as $sTName)
 					{
-						$error=null;
-						if(($parentFolderName = $this->mail_bo->createFolder($parentFolderName, $sTName, $error)))
+						$error = null;
+						if (($parentFolderName = $this->mail_bo->createFolder($parentFolderName, $sTName, $error)))
 						{
 							$c++;
 						}
@@ -3654,16 +3647,16 @@ 
 							$errorMessage .= $error;
 						}
 					}
-					if ($c==count($nA)) $created=true;
+					if ($c == count($nA)) $created = true;
 				}
 				if (!empty($parentName)) $this->mail_bo->reopen($parentName);
 			}
 			//error_log(__METHOD__.__LINE__.array2string($oA));
-			if ($created===true)
+			if ($created === true)
 			{
 				$this->mail_bo->resetFolderObjectCache($profileID);
 				$response = Api\Json\Response::get();
-				if ( $oldFolderInfo['shortDisplayName'])
+				if ($oldFolderInfo['shortDisplayName'])
 				{
 					$nodeInfo = array($_parentFolderName=>$oldFolderInfo['shortDisplayName']);
 				}
@@ -3671,14 +3664,14 @@ 
 				{
 					$nodeInfo = array($profileID=>lang('INBOX'));
 				}
-				$response->call('app.mail.mail_reloadNode',$nodeInfo);
+				$response->call('app.mail.mail_reloadNode', $nodeInfo);
 			}
 			else
 			{
 				if ($errorMessage)
 				{
 					$response = Api\Json\Response::get();
-					$response->call('egw.message',$errorMessage);
+					$response->call('egw.message', $errorMessage);
 				}
 			}
 		}
@@ -3700,22 +3693,22 @@ 
 			$_newName = $this->mail_bo->decodeEntityFolderName($_newName);
 			$del = $this->mail_bo->getHierarchyDelimiter(false);
 			$oA = array();
-			list($profileID,$folderName) = explode(self::$delimiter,$decodedFolderName,2);
+			list($profileID, $folderName) = explode(self::$delimiter, $decodedFolderName, 2);
 			$hasChildren = false;
 			if (is_numeric($profileID))
 			{
 				if ($profileID != $this->mail_bo->profileID) return; // only current connection
-				$pA = explode($del,$folderName);
+				$pA = explode($del, $folderName);
 				array_pop($pA);
-				$parentFolder = implode($del,$pA);
-				if (strtoupper($folderName)!= 'INBOX')
+				$parentFolder = implode($del, $pA);
+				if (strtoupper($folderName) != 'INBOX')
 				{
 					//error_log(__METHOD__.__LINE__."$folderName, $parentFolder, $_newName");
-					$oldFolderInfo = $this->mail_bo->getFolderStatus($folderName,false);
+					$oldFolderInfo = $this->mail_bo->getFolderStatus($folderName, false);
 					//error_log(__METHOD__.__LINE__.array2string($oldFolderInfo));
-					if (!empty($oldFolderInfo['attributes']) && stripos(array2string($oldFolderInfo['attributes']),'\hasnochildren')=== false)
+					if (!empty($oldFolderInfo['attributes']) && stripos(array2string($oldFolderInfo['attributes']), '\hasnochildren') === false)
 					{
-						$hasChildren=true; // translates to: hasChildren -> dynamicLoading
+						$hasChildren = true; // translates to: hasChildren -> dynamicLoading
 						$delimiter = $this->mail_bo->getHierarchyDelimiter();
 						$nameSpace = $this->mail_bo->_getNameSpaces();
 						$prefix = $this->mail_bo->getFolderPrefixFromNamespace($nameSpace, $folderName);
@@ -3732,7 +3725,7 @@ 
 							else
 							{
 								$rv = $this->mail_bo->icServer->subscribeMailbox($folder, false);
-								$fragments[$profileID.self::$delimiter.$folder] = substr($folder,strlen($folderName));
+								$fragments[$profileID.self::$delimiter.$folder] = substr($folder, strlen($folderName));
 							}
 						}
 						//error_log(__METHOD__.__LINE__.' Fetched Subfolders->'.array2string($fragments));
@@ -3742,7 +3735,7 @@ 
 					$success = false;
 					try
 					{
-						if(($newFolderName = $this->mail_bo->renameFolder($folderName, $parentFolder, $_newName)))
+						if (($newFolderName = $this->mail_bo->renameFolder($folderName, $parentFolder, $_newName)))
 						{
 							$this->mail_bo->resetFolderObjectCache($profileID);
 							//enforce the subscription to the newly named server, as it seems to fail for names with umlauts
@@ -3753,11 +3746,11 @@ 
 					}
 					catch (Exception $e)
 					{
-						$newFolderName=$folderName;
+						$newFolderName = $folderName;
 						$msg = $e->getMessage();
 					}
 					$this->mail_bo->reopen($newFolderName);
-					$fS = $this->mail_bo->getFolderStatus($newFolderName,false);
+					$fS = $this->mail_bo->getFolderStatus($newFolderName, false);
 					//error_log(__METHOD__.__LINE__.array2string($fS));
 					if ($hasChildren)
 					{
@@ -3788,12 +3781,12 @@ 
 					{
 						$oA[$_folderName]['desc'] = $fS['shortDisplayName'];
 					}
-					foreach($fragments as $oldFolderName => $fragment)
+					foreach ($fragments as $oldFolderName => $fragment)
 					{
 						//error_log(__METHOD__.__LINE__.':'.$oldFolderName.'->'.$profileID.self::$delimiter.$newFolderName.$fragment);
 						$oA[$oldFolderName]['id'] = $profileID.self::$delimiter.$newFolderName.$fragment;
 						$oA[$oldFolderName]['olddesc'] = '#skip-user-interaction-message#';
-						$fS = $this->mail_bo->getFolderStatus($newFolderName.$fragment,false);
+						$fS = $this->mail_bo->getFolderStatus($newFolderName.$fragment, false);
 						if ($fS['unseen'])
 						{
 							$oA[$oldFolderName]['desc'] = $fS['shortDisplayName'].' ('.$fS['unseen'].')';
@@ -3806,20 +3799,20 @@ 
 					}
 				}
 			}
-			if ($folderName==$this->mail_bo->sessionData['mailbox'])
+			if ($folderName == $this->mail_bo->sessionData['mailbox'])
 			{
-				$this->mail_bo->sessionData['mailbox']=$newFolderName;
+				$this->mail_bo->sessionData['mailbox'] = $newFolderName;
 				$this->mail_bo->saveSessionData();
 			}
 			//error_log(__METHOD__.__LINE__.array2string($oA));
 			$response = Api\Json\Response::get();
 			if ($oA && $success)
 			{
-				$response->call('app.mail.mail_setLeaf',$oA);
+				$response->call('app.mail.mail_setLeaf', $oA);
 			}
 			else
 			{
-				$response->call('egw.refresh',lang('failed to rename %1 ! Reason: %2',$oldFolderName,$msg),'mail');
+				$response->call('egw.refresh', lang('failed to rename %1 ! Reason: %2', $oldFolderName, $msg), 'mail');
 			}
 		}
 	}
@@ -3831,7 +3824,7 @@ 
 	 * @param boolean $_subscribedOnly = true
 	 * @return void
 	 */
-	function ajax_reloadNode($_folderName,$_subscribedOnly=true)
+	function ajax_reloadNode($_folderName, $_subscribedOnly = true)
 	{
 		Api\Translation::add_app('mail');
 		$oldPrefForSubscribedOnly = !$this->mail_bo->mailPreferences['showAllFoldersInFolderPane'];
@@ -3842,20 +3835,20 @@ 
 
 		$decodedFolderName = $this->mail_bo->decodeEntityFolderName($_folderName);
 		$this->mail_bo->getHierarchyDelimiter(false);
-		list($profileID,$folderName) = explode(self::$delimiter,$decodedFolderName,2);
+		list($profileID, $folderName) = explode(self::$delimiter, $decodedFolderName, 2);
 		// if pref and required mode dont match -> reset the folderObject cache to ensure
 		// that we get what we request
 		if ($_subscribedOnly != $oldPrefForSubscribedOnly) $this->mail_bo->resetFolderObjectCache($profileID);
 		if ($profileID != $this->mail_bo->profileID) return; // only current connection
 		if (!empty($folderName))
 		{
-			$parentFolder=(!empty($folderName)?$folderName:'INBOX');
-			$folderInfo = $this->mail_bo->getFolderStatus($parentFolder,false,false,false);
+			$parentFolder = (!empty($folderName) ? $folderName : 'INBOX');
+			$folderInfo = $this->mail_bo->getFolderStatus($parentFolder, false, false, false);
 			if ($folderInfo['unseen'])
 			{
 				$folderInfo['shortDisplayName'] = $folderInfo['shortDisplayName'].' ('.$folderInfo['unseen'].')';
 			}
-			if ($folderInfo['unseen']==0 && $folderInfo['shortDisplayName'])
+			if ($folderInfo['unseen'] == 0 && $folderInfo['shortDisplayName'])
 			{
 				$folderInfo['shortDisplayName'] = $folderInfo['shortDisplayName'];
 			}
@@ -3871,11 +3864,11 @@ 
 		}
 		// Send full info back in the response
 		$response = Api\Json\Response::get();
-		foreach($refreshData as $folder => &$name)
+		foreach ($refreshData as $folder => &$name)
 		{
-			$name = $this->mail_tree->getTree($folder,$profileID,1,false, $_subscribedOnly,true);
+			$name = $this->mail_tree->getTree($folder, $profileID, 1, false, $_subscribedOnly, true);
 		}
-		$response->call('app.mail.mail_reloadNode',$refreshData);
+		$response->call('app.mail.mail_reloadNode', $refreshData);
 
 	}
 
@@ -3891,7 +3884,7 @@ 
 	 * @param type $_rowid row id from nm
 	 *
 	 */
-	function ajax_resolveWinmail ($_rowid)
+	function ajax_resolveWinmail($_rowid)
 	{
 		$response = Api\Json\Response::get();
 
@@ -3899,7 +3892,7 @@ 
 		$uid = $idParts['msgUID'];
 		$mbox = $idParts['folder'];
 
-		$attachments = $this->mail_bo->getMessageAttachments($uid, null, null, false,true,true,$mbox);
+		$attachments = $this->mail_bo->getMessageAttachments($uid, null, null, false, true, true, $mbox);
 		if (is_array($attachments))
 		{
 			$attachments = $this->createAttachmentBlock($attachments, $_rowid, $uid, $mbox, false);
@@ -3927,30 +3920,30 @@ 
 			$decodedFolderName = $this->mail_bo->decodeEntityFolderName($_folderName);
 			$_newLocation2 = $this->mail_bo->decodeEntityFolderName($_target);
 			$del = $this->mail_bo->getHierarchyDelimiter(false);
-			list($profileID,$folderName) = explode(self::$delimiter,$decodedFolderName,2);
-			list($newProfileID,$_newLocation) = explode(self::$delimiter,$_newLocation2,2);
+			list($profileID, $folderName) = explode(self::$delimiter, $decodedFolderName, 2);
+			list($newProfileID, $_newLocation) = explode(self::$delimiter, $_newLocation2, 2);
 			$hasChildren = false;
 			if (is_numeric($profileID))
 			{
 				if ($profileID != $this->mail_bo->profileID || $profileID != $newProfileID) return; // only current connection
-				$pA = explode($del,$folderName);
+				$pA = explode($del, $folderName);
 				$namePart = array_pop($pA);
 				$_newName = $namePart;
-				$oldParentFolder = implode($del,$pA);
+				$oldParentFolder = implode($del, $pA);
 				$parentFolder = $_newLocation;
 
-				if (strtoupper($folderName)!= 'INBOX' &&
+				if (strtoupper($folderName) != 'INBOX' &&
 					(($oldParentFolder === $parentFolder) || //$oldParentFolder == $parentFolder means move on same level
 					(($oldParentFolder != $parentFolder &&
-					strlen($parentFolder)>0 && strlen($folderName)>0 &&
-					strpos($parentFolder,$folderName)===false)))) // indicates that we move the older up the tree within its own branch
+					strlen($parentFolder) > 0 && strlen($folderName) > 0 &&
+					strpos($parentFolder, $folderName) === false)))) // indicates that we move the older up the tree within its own branch
 				{
 					//error_log(__METHOD__.__LINE__."$folderName, $parentFolder, $_newName");
-					$oldFolderInfo = $this->mail_bo->getFolderStatus($folderName,false,false,false);
+					$oldFolderInfo = $this->mail_bo->getFolderStatus($folderName, false, false, false);
 					//error_log(__METHOD__.__LINE__.array2string($oldFolderInfo));
-					if (!empty($oldFolderInfo['attributes']) && stripos(array2string($oldFolderInfo['attributes']),'\hasnochildren')=== false)
+					if (!empty($oldFolderInfo['attributes']) && stripos(array2string($oldFolderInfo['attributes']), '\hasnochildren') === false)
 					{
-						$hasChildren=true; // translates to: hasChildren -> dynamicLoading
+						$hasChildren = true; // translates to: hasChildren -> dynamicLoading
 						$delimiter = $this->mail_bo->getHierarchyDelimiter();
 						$nameSpace = $this->mail_bo->_getNameSpaces();
 						$prefix = $this->mail_bo->getFolderPrefixFromNamespace($nameSpace, $folderName);
@@ -3975,7 +3968,7 @@ 
 					$success = false;
 					try
 					{
-						if(($newFolderName = $this->mail_bo->renameFolder($folderName, $parentFolder, $_newName)))
+						if (($newFolderName = $this->mail_bo->renameFolder($folderName, $parentFolder, $_newName)))
 						{
 							$this->mail_bo->resetFolderObjectCache($profileID);
 							//enforce the subscription to the newly named server, as it seems to fail for names with umlauts
@@ -3987,11 +3980,11 @@ 
 					}
 					catch (Exception $e)
 					{
-						$newFolderName=$folderName;
+						$newFolderName = $folderName;
 						$msg = $e->getMessage();
 					}
 					$this->mail_bo->reopen($parentFolder);
-					$this->mail_bo->getFolderStatus($parentFolder,false,false,false);
+					$this->mail_bo->getFolderStatus($parentFolder, false, false, false);
 					//error_log(__METHOD__.__LINE__.array2string($fS));
 					if ($hasChildren)
 					{
@@ -4012,9 +4005,9 @@ 
 					}
 				}
 			}
-			if ($folderName==$this->mail_bo->sessionData['mailbox'])
+			if ($folderName == $this->mail_bo->sessionData['mailbox'])
 			{
-				$this->mail_bo->sessionData['mailbox']=$newFolderName;
+				$this->mail_bo->sessionData['mailbox'] = $newFolderName;
 				$this->mail_bo->saveSessionData();
 			}
 			//error_log(__METHOD__.__LINE__.array2string($oA));
@@ -4023,26 +4016,26 @@ 
 			{
 				Api\Translation::add_app('mail');
 
-				$oldFolderInfo = $this->mail_bo->getFolderStatus($oldParentFolder,false,false,false);
-				$folderInfo = $this->mail_bo->getFolderStatus($parentFolder,false,false,false);
+				$oldFolderInfo = $this->mail_bo->getFolderStatus($oldParentFolder, false, false, false);
+				$folderInfo = $this->mail_bo->getFolderStatus($parentFolder, false, false, false);
 				$refreshData = array(
 					$profileID.self::$delimiter.$oldParentFolder=>$oldFolderInfo['shortDisplayName'],
 					$profileID.self::$delimiter.$parentFolder=>$folderInfo['shortDisplayName']);
 				// if we move the folder within the same parent-branch of the tree, there is no need no refresh the upper part
-				if (strlen($parentFolder)>strlen($oldParentFolder) && strpos($parentFolder,$oldParentFolder)!==false) unset($refreshData[$profileID.self::$delimiter.$parentFolder]);
-				if (count($refreshData)>1 && strlen($oldParentFolder)>strlen($parentFolder) && strpos($oldParentFolder,$parentFolder)!==false) unset($refreshData[$profileID.self::$delimiter.$oldParentFolder]);
+				if (strlen($parentFolder) > strlen($oldParentFolder) && strpos($parentFolder, $oldParentFolder) !== false) unset($refreshData[$profileID.self::$delimiter.$parentFolder]);
+				if (count($refreshData) > 1 && strlen($oldParentFolder) > strlen($parentFolder) && strpos($oldParentFolder, $parentFolder) !== false) unset($refreshData[$profileID.self::$delimiter.$oldParentFolder]);
 
 				// Send full info back in the response
-				foreach($refreshData as $folder => &$name)
+				foreach ($refreshData as $folder => &$name)
 				{
-					$name = $this->mail_tree->getTree($folder,$profileID,1,false,!$this->mail_bo->mailPreferences['showAllFoldersInFolderPane'],true);
+					$name = $this->mail_tree->getTree($folder, $profileID, 1, false, !$this->mail_bo->mailPreferences['showAllFoldersInFolderPane'], true);
 				}
-				$response->call('app.mail.mail_reloadNode',$refreshData);
+				$response->call('app.mail.mail_reloadNode', $refreshData);
 
 			}
 			else
 			{
-				$response->call('egw.refresh',lang('failed to move %1 ! Reason: %2',$folderName,$msg),'mail');
+				$response->call('egw.refresh', lang('failed to move %1 ! Reason: %2', $folderName, $msg), 'mail');
 			}
 		}
 	}
@@ -4062,23 +4055,23 @@ 
 			$decodedFolderName = $this->mail_bo->decodeEntityFolderName($_folderName);
 			$del = $this->mail_bo->getHierarchyDelimiter(false);
 			$oA = array();
-			list($profileID,$folderName) = explode(self::$delimiter,$decodedFolderName,2);
+			list($profileID, $folderName) = explode(self::$delimiter, $decodedFolderName, 2);
 			$hasChildren = false;
 			if (is_numeric($profileID))
 			{
 				if ($profileID != $this->mail_bo->profileID) return; // only current connection
-				$pA = explode($del,$folderName);
+				$pA = explode($del, $folderName);
 				array_pop($pA);
-				if (strtoupper($folderName)!= 'INBOX')
+				if (strtoupper($folderName) != 'INBOX')
 				{
 					//error_log(__METHOD__.__LINE__."$folderName,  implode($del,$pA), $_newName");
 					$oA = array();
 					$subFolders = array();
-					$oldFolderInfo = $this->mail_bo->getFolderStatus($folderName,false,false,false);
+					$oldFolderInfo = $this->mail_bo->getFolderStatus($folderName, false, false, false);
 					//error_log(__METHOD__.__LINE__.array2string($oldFolderInfo));
-					if (!empty($oldFolderInfo['attributes']) && stripos(array2string($oldFolderInfo['attributes']),'\hasnochildren')=== false)
+					if (!empty($oldFolderInfo['attributes']) && stripos(array2string($oldFolderInfo['attributes']), '\hasnochildren') === false)
 					{
-						$hasChildren=true; // translates to: hasChildren -> dynamicLoading
+						$hasChildren = true; // translates to: hasChildren -> dynamicLoading
 						$ftD = array();
 						$delimiter = $this->mail_bo->getHierarchyDelimiter();
 						$nameSpace = $this->mail_bo->_getNameSpaces();
@@ -4088,24 +4081,24 @@ 
 						//error_log(__METHOD__.__LINE__.'->'."$folderName, $delimiter, $prefix");
 						foreach ($subFolders as $k => $f)
 						{
-							$ftD[substr_count($f,$delimiter)][]=$f;
+							$ftD[substr_count($f, $delimiter)][] = $f;
 						}
-						krsort($ftD,SORT_NUMERIC);//sort per level
+						krsort($ftD, SORT_NUMERIC); //sort per level
 						//we iterate per level of depth of the subtree, deepest nesting is to be deleted first, and then up the tree
-						foreach($ftD as $k => $lc)//collection per level
+						foreach ($ftD as $k => $lc)//collection per level
 						{
-							foreach($lc as $f)//folders contained in that level
+							foreach ($lc as $f)//folders contained in that level
 							{
 								try
 								{
 									//error_log(__METHOD__.__LINE__.array2string($f).'<->'.$folderName);
 									$this->mail_bo->deleteFolder($f);
 									$success = true;
-									if ($f==$folderName) $oA[$_folderName] = $oldFolderInfo['shortDisplayName'];
+									if ($f == $folderName) $oA[$_folderName] = $oldFolderInfo['shortDisplayName'];
 								}
 								catch (Exception $e)
 								{
-									$msg .= ($msg?' ':'').lang("Failed to delete %1. Server responded:",$f).$e->getMessage();
+									$msg .= ($msg ? ' ' : '').lang("Failed to delete %1. Server responded:", $f).$e->getMessage();
 									$success = false;
 								}
 							}
@@ -4136,11 +4129,11 @@ 
 			if ($success)
 			{
 				//error_log(__METHOD__.__LINE__.array2string($oA));
-				$response->call('app.mail.mail_removeLeaf',$oA);
+				$response->call('app.mail.mail_removeLeaf', $oA);
 			}
 			else
 			{
-				$response->call('egw.refresh',lang('failed to delete %1 ! Reason: %2',$oldFolderInfo['shortDisplayName'],$msg),'mail');
+				$response->call('egw.refresh', lang('failed to delete %1 ! Reason: %2', $oldFolderInfo['shortDisplayName'], $msg), 'mail');
 			}
 		}
 	}
@@ -4154,7 +4147,7 @@ 
 	 * @param bool $getFolders The client needs the folders for the profile
 	 * @return nothing
 	 */
-	public static function ajax_changeProfile($icServerID, $getFolders = true, $exec_id=null)
+	public static function ajax_changeProfile($icServerID, $getFolders = true, $exec_id = null)
 	{
 		$response = Api\Json\Response::get();
 
@@ -4162,7 +4155,7 @@ 
 
 		if ($icServerID && $icServerID != $previous_id)
 		{
-			$mail_ui = new mail_ui(false);	// do NOT run constructor, as we call changeProfile anyway
+			$mail_ui = new mail_ui(false); // do NOT run constructor, as we call changeProfile anyway
 			try
 			{
 				$mail_ui->changeProfile($icServerID);
@@ -4178,23 +4171,23 @@ 
 				}
 			}
 			catch (Exception $e) {
-				self::callWizard($e->getMessage(),true, 'error');
+				self::callWizard($e->getMessage(), true, 'error');
 			}
 		}
 		else
 		{
-			$mail_ui = new mail_ui(true);	// run constructor
+			$mail_ui = new mail_ui(true); // run constructor
 		}
 
 		// Send full info back in the response
-		if($getFolders)
+		if ($getFolders)
 		{
 			Api\Translation::add_app('mail');
 
 			$refreshData = array(
-				$icServerID => $mail_ui->mail_tree->getTree(null,$icServerID,1,false,!$mail_ui->mail_bo->mailPreferences['showAllFoldersInFolderPane'],!$mail_ui->mail_bo->mailPreferences['showAllFoldersInFolderPane'])
+				$icServerID => $mail_ui->mail_tree->getTree(null, $icServerID, 1, false, !$mail_ui->mail_bo->mailPreferences['showAllFoldersInFolderPane'], !$mail_ui->mail_bo->mailPreferences['showAllFoldersInFolderPane'])
 			);
-			$response->call('app.mail.mail_reloadNode',$refreshData);
+			$response->call('app.mail.mail_reloadNode', $refreshData);
 		}
 	}
 
@@ -4205,7 +4198,7 @@ 
 	 *						if other than active profile; nothing is done!
 	 * @return nothing
 	 */
-	public static function ajax_refreshVacationNotice($icServerID=null)
+	public static function ajax_refreshVacationNotice($icServerID = null)
 	{
 		//Get vacation from cache if it's available
 		$cachedVacations = Api\Cache::getCache(Api\Cache::INSTANCE, 'email', 'vacationNotice'.$GLOBALS['egw_info']['user']['account_lid']);
@@ -4223,28 +4216,28 @@ 
 
 				$vacation = $mail->gatherVacation($cachedVacations);
 			} catch (Exception $e) {
-				$vacation=false;
+				$vacation = false;
 				error_log(__METHOD__.__LINE__." ".$e->getMessage());
 				unset($e);
 			}
 		}
 
-		if($vacation) {
-			if (is_array($vacation) && ($vacation['status'] == 'on' || $vacation['status']=='by_date'))
+		if ($vacation) {
+			if (is_array($vacation) && ($vacation['status'] == 'on' || $vacation['status'] == 'by_date'))
 			{
 				$dtfrmt = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'];
 				$refreshData['vacationnotice'] = lang('Vacation notice is active');
-				$refreshData['vacationrange'] = ($vacation['status']=='by_date'? Api\DateTime::server2user($vacation['start_date'],$dtfrmt,true).($vacation['end_date']>$vacation['start_date']?'->'.Api\DateTime::server2user($vacation['end_date']+ 24*3600-1,$dtfrmt,true):''):'');
-				if ($vacation['status'] == 'by_date' && $vacation['end_date']+ 24*3600 < time())$refreshData = '';
+				$refreshData['vacationrange'] = ($vacation['status'] == 'by_date' ? Api\DateTime::server2user($vacation['start_date'], $dtfrmt, true).($vacation['end_date'] > $vacation['start_date'] ? '->'.Api\DateTime::server2user($vacation['end_date'] + 24 * 3600 - 1, $dtfrmt, true) : '') : '');
+				if ($vacation['status'] == 'by_date' && $vacation['end_date'] + 24 * 3600 < time())$refreshData = '';
 			}
 		}
-		if ($vacation==false)
+		if ($vacation == false)
 		{
-			$refreshData['vacationnotice'] =  '';
-			$refreshData['vacationrange'] =  '';
+			$refreshData['vacationnotice'] = '';
+			$refreshData['vacationrange'] = '';
 		}
 		$response = Api\Json\Response::get();
-		$response->call('app.mail.mail_refreshVacationNotice',$refreshData);
+		$response->call('app.mail.mail_refreshVacationNotice', $refreshData);
 	}
 
 	/**
@@ -4254,43 +4247,43 @@ 
 	 *						if other than active profile; nothing is done!
 	 * @return nothing
 	 */
-	function ajax_refreshFilters($icServerID=null)
+	function ajax_refreshFilters($icServerID = null)
 	{
 		//error_log(__METHOD__.__LINE__.array2string($icServerId));
 		if (empty($icServerID)) $icServerID = $this->mail_bo->profileID;
 		if (is_null(Mail::$supportsORinQuery) || !isset(Mail::$supportsORinQuery[$this->mail_bo->profileID]))
 		{
-			Mail::$supportsORinQuery = Api\Cache::getCache(Api\Cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*10);
-			if (!isset(Mail::$supportsORinQuery[$this->mail_bo->profileID])) Mail::$supportsORinQuery[$this->mail_bo->profileID]=true;
+			Mail::$supportsORinQuery = Api\Cache::getCache(Api\Cache::INSTANCE, 'email', 'supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60 * 60 * 10);
+			if (!isset(Mail::$supportsORinQuery[$this->mail_bo->profileID])) Mail::$supportsORinQuery[$this->mail_bo->profileID] = true;
 		}
 		if (!Mail::$supportsORinQuery[$this->mail_bo->profileID])
 		{
 			unset($this->searchTypes['quick']);
 			unset($this->searchTypes['quickwithcc']);
 		}
-		if ( $this->mail_bo->icServer->hasCapability('SUPPORTS_KEYWORDS'))
+		if ($this->mail_bo->icServer->hasCapability('SUPPORTS_KEYWORDS'))
 		{
-			$this->statusTypes = array_merge($this->statusTypes,array(
-				'keyword1'	=> 'important',//lang('important'),
-				'keyword2'	=> 'job',	//lang('job'),
-				'keyword3'	=> 'personal',//lang('personal'),
-				'keyword4'	=> 'to do',	//lang('to do'),
-				'keyword5'	=> 'later',	//lang('later'),
+			$this->statusTypes = array_merge($this->statusTypes, array(
+				'keyword1'	=> 'important', //lang('important'),
+				'keyword2'	=> 'job', //lang('job'),
+				'keyword3'	=> 'personal', //lang('personal'),
+				'keyword4'	=> 'to do', //lang('to do'),
+				'keyword5'	=> 'later', //lang('later'),
 			));
 		}
 		else
 		{
-			$keywords = array('keyword1','keyword2','keyword3','keyword4','keyword5');
-			foreach($keywords as &$k)
+			$keywords = array('keyword1', 'keyword2', 'keyword3', 'keyword4', 'keyword5');
+			foreach ($keywords as &$k)
 			{
-				if (array_key_exists($k,$this->statusTypes)) unset($this->statusTypes[$k]);
+				if (array_key_exists($k, $this->statusTypes)) unset($this->statusTypes[$k]);
 			}
 		}
 
 		$response = Api\Json\Response::get();
-		$response->call('app.mail.mail_refreshCatIdOptions',$this->searchTypes);
-		$response->call('app.mail.mail_refreshFilterOptions',$this->statusTypes);
-		$response->call('app.mail.mail_refreshFilter2Options',array(''=>lang('No Sneak Preview in list'),1=>lang('Sneak Preview in list')));
+		$response->call('app.mail.mail_refreshCatIdOptions', $this->searchTypes);
+		$response->call('app.mail.mail_refreshFilterOptions', $this->statusTypes);
+		$response->call('app.mail.mail_refreshFilter2Options', array(''=>lang('No Sneak Preview in list'), 1=>lang('Sneak Preview in list')));
 
 	}
 
@@ -4299,7 +4292,7 @@ 
 	 *
 	 * @return nothing
 	 */
-	function ajax_refreshQuotaDisplay($icServerID=null)
+	function ajax_refreshQuotaDisplay($icServerID = null)
 	{
 		//error_log(__METHOD__.__LINE__.array2string($icServerID));
 		Api\Translation::add_app('mail');
@@ -4319,10 +4312,10 @@ 
 			unset($e);
 		}
 
-		if($quota !== false && $quota['limit'] != 'NOT SET') {
+		if ($quota !== false && $quota['limit'] != 'NOT SET') {
 			$quotainfo = $this->quotaDisplay($quota['usage'], $quota['limit']);
 			$content['quota'] = $sel_options[self::$nm_index]['quota'] = $quotainfo['text'];
-			$content['quotainpercent'] = $sel_options[self::$nm_index]['quotainpercent'] =  (string)$quotainfo['percent'];
+			$content['quotainpercent'] = $sel_options[self::$nm_index]['quotainpercent'] = (string)$quotainfo['percent'];
 			$content['quotaclass'] = $sel_options[self::$nm_index]['quotaclass'] = $quotainfo['class'];
 			$content['quotanotsupported'] = $sel_options[self::$nm_index]['quotanotsupported'] = "";
 		} else {
@@ -4342,7 +4335,7 @@ 
 			}
 		}
 		$response = Api\Json\Response::get();
-		$response->call('app.mail.mail_setQuotaDisplay',array('data'=>$content));
+		$response->call('app.mail.mail_setQuotaDisplay', array('data'=>$content));
 	}
 
 	/**
@@ -4364,34 +4357,34 @@ 
 			$this->changeProfile($icServerID);
 		}
 		$junkFolder = $this->mail_bo->getJunkFolder();
-		if(!empty($junkFolder)) {
+		if (!empty($junkFolder)) {
 			if ($selectedFolder == $icServerID.self::$delimiter.$junkFolder)
 			{
 				// Lock the tree if the active folder is junk folder
 				$response->call('app.mail.lock_tree');
 			}
-			$this->mail_bo->deleteMessages('all',$junkFolder,'remove_immediately');
+			$this->mail_bo->deleteMessages('all', $junkFolder, 'remove_immediately');
 
 			$heirarchyDelimeter = $this->mail_bo->getHierarchyDelimiter(true);
-			$fShortName =  array_pop(explode($heirarchyDelimeter, $junkFolder));
+			$fShortName = array_pop(explode($heirarchyDelimeter, $junkFolder));
 			$fStatus = array(
 				$icServerID.self::$delimiter.$junkFolder => lang($fShortName)
 			);
 			//Call to reset folder status counter, after junkFolder triggered not from Junk folder
 			//-as we don't have junk folder specific information available on client-side we need to deal with it on server
-			$response->call('app.mail.mail_setFolderStatus',$fStatus);
+			$response->call('app.mail.mail_setFolderStatus', $fStatus);
 		}
 		if ($rememberServerID != $this->mail_bo->profileID)
 		{
-			$oldFolderInfo = $this->mail_bo->getFolderStatus($junkFolder,false,false,false);
-			$response->call('egw.message',lang('empty junk'));
-			$response->call('app.mail.mail_reloadNode',array($icServerID.self::$delimiter.$junkFolder=>$oldFolderInfo['shortDisplayName']));
+			$oldFolderInfo = $this->mail_bo->getFolderStatus($junkFolder, false, false, false);
+			$response->call('egw.message', lang('empty junk'));
+			$response->call('app.mail.mail_reloadNode', array($icServerID.self::$delimiter.$junkFolder=>$oldFolderInfo['shortDisplayName']));
 			//error_log(__METHOD__.__LINE__.' change Profile to ->'.$rememberServerID);
 			$this->changeProfile($rememberServerID);
 		}
 		else if ($selectedFolder == $icServerID.self::$delimiter.$junkFolder)
 		{
-			$response->call('egw.refresh',lang('empty junk'),'mail');
+			$response->call('egw.refresh', lang('empty junk'), 'mail');
 		}
 	}
 
@@ -4414,7 +4407,7 @@ 
 			$this->changeProfile($icServerID);
 		}
 		$trashFolder = $this->mail_bo->getTrashFolder();
-		if(!empty($trashFolder)) {
+		if (!empty($trashFolder)) {
 			if ($selectedFolder == $icServerID.self::$delimiter.$trashFolder)
 			{
 				// Lock the tree if the active folder is Trash folder
@@ -4423,25 +4416,25 @@ 
 			$this->mail_bo->compressFolder($trashFolder);
 
 			$heirarchyDelimeter = $this->mail_bo->getHierarchyDelimiter(true);
-			$fShortName =  array_pop(explode($heirarchyDelimeter, $trashFolder));
+			$fShortName = array_pop(explode($heirarchyDelimeter, $trashFolder));
 			$fStatus = array(
 				$icServerID.self::$delimiter.$trashFolder => lang($fShortName)
 			);
 			//Call to reset folder status counter, after emptyTrash triggered not from Trash folder
 			//-as we don't have trash folder specific information available on client-side we need to deal with it on server
-			$response->call('app.mail.mail_setFolderStatus',$fStatus);
+			$response->call('app.mail.mail_setFolderStatus', $fStatus);
 		}
 		if ($rememberServerID != $this->mail_bo->profileID)
 		{
-			$oldFolderInfo = $this->mail_bo->getFolderStatus($trashFolder,false,false,false);
-			$response->call('egw.message',lang('empty trash'));
-			$response->call('app.mail.mail_reloadNode',array($icServerID.self::$delimiter.$trashFolder=>$oldFolderInfo['shortDisplayName']));
+			$oldFolderInfo = $this->mail_bo->getFolderStatus($trashFolder, false, false, false);
+			$response->call('egw.message', lang('empty trash'));
+			$response->call('app.mail.mail_reloadNode', array($icServerID.self::$delimiter.$trashFolder=>$oldFolderInfo['shortDisplayName']));
 			//error_log(__METHOD__.__LINE__.' change Profile to ->'.$rememberServerID);
 			$this->changeProfile($rememberServerID);
 		}
 		else if ($selectedFolder == $icServerID.self::$delimiter.$trashFolder)
 		{
-			$response->call('egw.refresh',lang('empty trash'),'mail');
+			$response->call('egw.refresh', lang('empty trash'), 'mail');
 		}
 	}
 
@@ -4458,7 +4451,7 @@ 
 
 		$this->mail_bo->restoreSessionData();
 		$decodedFolderName = $this->mail_bo->decodeEntityFolderName($_folderName);
-		list($icServerID,$folderName) = explode(self::$delimiter,$decodedFolderName,2);
+		list($icServerID, $folderName) = explode(self::$delimiter, $decodedFolderName, 2);
 
 		if (empty($folderName)) $folderName = $this->mail_bo->sessionData['mailbox'];
 		if ($this->mail_bo->folderExists($folderName))
@@ -4469,7 +4462,7 @@ 
 				//error_log(__METHOD__.__LINE__.' change Profile to ->'.$icServerID);
 				$this->changeProfile($icServerID);
 			}
-			if(!empty($_folderName)) {
+			if (!empty($_folderName)) {
 				$this->mail_bo->compressFolder($folderName);
 			}
 			if ($rememberServerID != $this->mail_bo->profileID)
@@ -4478,7 +4471,7 @@ 
 				$this->changeProfile($rememberServerID);
 			}
 			$response = Api\Json\Response::get();
-			$response->call('egw.refresh',lang('compress folder').': '.$folderName,'mail');
+			$response->call('egw.refresh', lang('compress folder').': '.$folderName, 'mail');
 		}
 	}
 
@@ -4491,10 +4484,10 @@ 
 	 */
 	function ajax_sendMDN($_messageList)
 	{
-		if(Mail::$debug) error_log(__METHOD__."->".array2string($_messageList));
+		if (Mail::$debug) error_log(__METHOD__."->".array2string($_messageList));
 		$uidA = self::splitRowID($_messageList['msg'][0]);
 		$folder = $uidA['folder']; // all messages in one set are supposed to be within the same folder
-		$this->mail_bo->sendMDN($uidA['msgUID'],$folder);
+		$this->mail_bo->sendMDN($uidA['msgUID'], $folder);
 	}
 
 	/**
@@ -4506,14 +4499,14 @@ 
 	 *
 	 * @return xajax response
 	 */
-	function ajax_flagMessages($_flag, $_messageList, $_sendJsonResponse=true)
+	function ajax_flagMessages($_flag, $_messageList, $_sendJsonResponse = true)
 	{
-		if(Mail::$debug) error_log(__METHOD__."->".$_flag.':'.array2string($_messageList));
+		if (Mail::$debug) error_log(__METHOD__."->".$_flag.':'.array2string($_messageList));
 		Api\Translation::add_app('mail');
-		$alreadyFlagged=false;
-		$flag2check='';
+		$alreadyFlagged = false;
+		$flag2check = '';
 		$filter2toggle = $query = array();
-		if ($_messageList=='all' || !empty($_messageList['msg']))
+		if ($_messageList == 'all' || !empty($_messageList['msg']))
 		{
 			if (isset($_messageList['all']) && $_messageList['all'])
 			{
@@ -4523,34 +4516,34 @@ 
 				if (isset($_messageList['activeFilters']) && $_messageList['activeFilters'])
 				{
 					$query = $_messageList['activeFilters'];
-					if (!empty($query['search']) || !empty($query['filter'])||($query['cat_id']=='bydate' && (!empty($query['startdate'])||!empty($query['enddate']))))
+					if (!empty($query['search']) || !empty($query['filter']) || ($query['cat_id'] == 'bydate' && (!empty($query['startdate']) || !empty($query['enddate']))))
 					{
 						//([filterName] => Schnellsuche[type] => quick[string] => ebay[status] => any
 						if (is_null(Mail::$supportsORinQuery) || !isset(Mail::$supportsORinQuery[$this->mail_bo->profileID]))
 						{
-							Mail::$supportsORinQuery = Api\Cache::getCache(Api\Cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*10);
-							if (!isset(Mail::$supportsORinQuery[$this->mail_bo->profileID])) Mail::$supportsORinQuery[$this->mail_bo->profileID]=true;
+							Mail::$supportsORinQuery = Api\Cache::getCache(Api\Cache::INSTANCE, 'email', 'supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60 * 60 * 10);
+							if (!isset(Mail::$supportsORinQuery[$this->mail_bo->profileID])) Mail::$supportsORinQuery[$this->mail_bo->profileID] = true;
 						}
 						//error_log(__METHOD__.__LINE__.' Startdate:'.$query['startdate'].' Enddate'.$query['enddate']);
 						$cutoffdate = $cutoffdate2 = null;
-						if ($query['startdate']) $cutoffdate = Api\DateTime::to($query['startdate'],'ts');//SINCE, enddate
-						if ($query['enddate']) $cutoffdate2 = Api\DateTime::to($query['enddate'],'ts');//BEFORE, startdate
+						if ($query['startdate']) $cutoffdate = Api\DateTime::to($query['startdate'], 'ts'); //SINCE, enddate
+						if ($query['enddate']) $cutoffdate2 = Api\DateTime::to($query['enddate'], 'ts'); //BEFORE, startdate
 						//error_log(__METHOD__.__LINE__.' Startdate:'.$cutoffdate2.' Enddate'.$cutoffdate);
 						$filter = array(
-							'filterName' => (Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID]?lang('quicksearch'):lang('subject')),
-							'type' => ($query['cat_id']?$query['cat_id']:(Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID]?'quick':'subject')),
+							'filterName' => (Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID] ? lang('quicksearch') : lang('subject')),
+							'type' => ($query['cat_id'] ? $query['cat_id'] : (Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID] ? 'quick' : 'subject')),
 							'string' => $query['search'],
-							'status' => 'any',//this is a status change. status will be manipulated later on
+							'status' => 'any', //this is a status change. status will be manipulated later on
 							//'range'=>"BETWEEN",'since'=> date("d-M-Y", $cutoffdate),'before'=> date("d-M-Y", $cutoffdate2)
 						);
-						if ($query['enddate']||$query['startdate']) {
+						if ($query['enddate'] || $query['startdate']) {
 							$filter['range'] = "BETWEEN";
 							if ($cutoffdate) {
-								$filter[(empty($cutoffdate2)?'date':'since')] =  date("d-M-Y", $cutoffdate);
+								$filter[(empty($cutoffdate2) ? 'date' : 'since')] = date("d-M-Y", $cutoffdate);
 								if (empty($cutoffdate2)) $filter['range'] = "SINCE";
 							}
 							if ($cutoffdate2) {
-								$filter[(empty($cutoffdate)?'date':'before')] =  date("d-M-Y", $cutoffdate2);
+								$filter[(empty($cutoffdate) ? 'date' : 'before')] = date("d-M-Y", $cutoffdate2);
 								if (empty($cutoffdate)) $filter['range'] = "BEFORE";
 							}
 						}
@@ -4563,12 +4556,12 @@ 
 					// flags read,flagged,label1,label2,label3,label4,label5 can be toggled: handle this when all mails in a folder
 					// should be affected serverside. here.
 					$messageList = $messageListForToggle = array();
-					$flag2check = ($_flag=='read'?'seen':$_flag);
-					if (in_array($_flag,array('read','flagged','label1','label2','label3','label4','label5')) &&
-						!($flag2check==$query['filter'] || stripos($query['filter'],$flag2check)!==false))
+					$flag2check = ($_flag == 'read' ? 'seen' : $_flag);
+					if (in_array($_flag, array('read', 'flagged', 'label1', 'label2', 'label3', 'label4', 'label5')) &&
+						!($flag2check == $query['filter'] || stripos($query['filter'], $flag2check) !== false))
 					{
 						$filter2toggle['status'] = array('un'.$_flag);
-						if ($query['filter'] && $query['filter']!='any')
+						if ($query['filter'] && $query['filter'] != 'any')
 						{
 							$filter2toggle['status'][] = $query['filter'];
 						}
@@ -4576,7 +4569,7 @@ 
 						$reverse = 1;
 						$_sRt = $this->mail_bo->getSortedList(
 							$folder,
-							$sort=0,
+							$sort = 0,
 							$reverse,
 							$filter2toggle,
 							$rByUid,
@@ -4584,52 +4577,52 @@ 
 						);
 						$messageListForToggle = $_sRt['match']->ids;
 						$filter['status'] = array($_flag);
-						if ($query['filter'] && $query['filter'] !='any')
+						if ($query['filter'] && $query['filter'] != 'any')
 						{
 							$filter['status'][] = $query['filter'];
 						}
-						$rByUid=true;
+						$rByUid = true;
 						$reverse = 1;
 						$_sR = $this->mail_bo->getSortedList(
 							$folder,
-							$sort=0,
+							$sort = 0,
 							$reverse,
 							$filter,
 							$rByUid,
 							false
 						);
 						$messageList = $_sR['match']->ids;
-						if (count($messageListForToggle)>0)
+						if (count($messageListForToggle) > 0)
 						{
 							$flag2set = (strtolower($_flag));
-							if(Mail::$debug) error_log(__METHOD__.__LINE__." toggle un$_flag -> $flag2set ".array2string($filter2toggle).array2string($messageListForToggle));
-							$this->mail_bo->flagMessages($flag2set, $messageListForToggle,$folder);
+							if (Mail::$debug) error_log(__METHOD__.__LINE__." toggle un$_flag -> $flag2set ".array2string($filter2toggle).array2string($messageListForToggle));
+							$this->mail_bo->flagMessages($flag2set, $messageListForToggle, $folder);
 						}
-						if (count($messageList)>0)
+						if (count($messageList) > 0)
 						{
 							$flag2set = 'un'.$_flag;
-							if(Mail::$debug) error_log(__METHOD__.__LINE__." $_flag -> $flag2set ".array2string($filter).array2string($messageList));
-							$this->mail_bo->flagMessages($flag2set, $messageList,$folder);
+							if (Mail::$debug) error_log(__METHOD__.__LINE__." $_flag -> $flag2set ".array2string($filter).array2string($messageList));
+							$this->mail_bo->flagMessages($flag2set, $messageList, $folder);
 						}
-						$alreadyFlagged=true;
+						$alreadyFlagged = true;
 					}
 					elseif (!empty($filter) &&
-						(!in_array($_flag,array('read','flagged','label1','label2','label3','label4','label5')) ||
-						(in_array($_flag,array('read','flagged','label1','label2','label3','label4','label5')) &&
-						($flag2check==$query['filter'] || stripos($query['filter'],$flag2check)!==false))))
+						(!in_array($_flag, array('read', 'flagged', 'label1', 'label2', 'label3', 'label4', 'label5')) ||
+						(in_array($_flag, array('read', 'flagged', 'label1', 'label2', 'label3', 'label4', 'label5')) &&
+						($flag2check == $query['filter'] || stripos($query['filter'], $flag2check) !== false))))
 					{
-						if ($query['filter'] && $query['filter'] !='any')
+						if ($query['filter'] && $query['filter'] != 'any')
 						{
 							$filter['status'] = $query['filter'];
 							// since we toggle and we toggle by the filtered flag we must must change _flag
-							$_flag = ($query['filter']=='unseen' && $_flag=='read' ? 'read' : ($query['filter']=='seen'&& $_flag=='read'?'unread':($_flag==$query['filter']?'un'.$_flag:$_flag)));
+							$_flag = ($query['filter'] == 'unseen' && $_flag == 'read' ? 'read' : ($query['filter'] == 'seen' && $_flag == 'read' ? 'unread' : ($_flag == $query['filter'] ? 'un'.$_flag : $_flag)));
 						}
-						if(Mail::$debug) error_log(__METHOD__.__LINE__." flag all with $_flag on filter used:".array2string($filter));
+						if (Mail::$debug) error_log(__METHOD__.__LINE__." flag all with $_flag on filter used:".array2string($filter));
 						$rByUid = true;
 						$reverse = 1;
 						$_sR = $this->mail_bo->getSortedList(
 							$folder,
-							$sort=0,
+							$sort = 0,
 							$reverse,
 							$filter,
 							$rByUid,
@@ -4641,8 +4634,8 @@ 
 					}
 					else
 					{
-						if(Mail::$debug) error_log(__METHOD__.__LINE__." $_flag all ".array2string($filter));
-						$alreadyFlagged=true;
+						if (Mail::$debug) error_log(__METHOD__.__LINE__." $_flag all ".array2string($filter));
+						$alreadyFlagged = true;
 						$uidA = self::splitRowID($_messageList['msg'][0]);
 						$folder = $uidA['folder']; // all messages in one set are supposed to be within the same folder
 						$this->mail_bo->flagMessages($_flag, 'all', $folder);
@@ -4656,41 +4649,41 @@ 
 			}
 			if (!$alreadyFlagged)
 			{
-				foreach($_messageList['msg'] as $rowID)
+				foreach ($_messageList['msg'] as $rowID)
 				{
 					$hA = self::splitRowID($rowID);
 					$messageList[] = $hA['msgUID'];
 				}
-				if(Mail::$debug) error_log(__METHOD__.__LINE__." $_flag in $folder:".array2string(((isset($_messageList['all']) && $_messageList['all']) ? 'all':$messageList)));
-				$this->mail_bo->flagMessages($_flag, ((isset($_messageList['all']) && $_messageList['all']) ? 'all':$messageList),$folder);
+				if (Mail::$debug) error_log(__METHOD__.__LINE__." $_flag in $folder:".array2string(((isset($_messageList['all']) && $_messageList['all']) ? 'all' : $messageList)));
+				$this->mail_bo->flagMessages($_flag, ((isset($_messageList['all']) && $_messageList['all']) ? 'all' : $messageList), $folder);
 			}
 		}
 		else
 		{
-			if(Mail::$debug) error_log(__METHOD__."-> No messages selected.");
+			if (Mail::$debug) error_log(__METHOD__."-> No messages selected.");
 		}
 
 		if ($_sendJsonResponse)
 		{
-			$flag=array(
-				'label1'	=> 'important',//lang('important'),
-				'label2'	=> 'job',	//lang('job'),
-				'label3'	=> 'personal',//lang('personal'),
-				'label4'	=> 'to do',	//lang('to do'),
-				'label5'	=> 'later',	//lang('later'),
+			$flag = array(
+				'label1'	=> 'important', //lang('important'),
+				'label2'	=> 'job', //lang('job'),
+				'label3'	=> 'personal', //lang('personal'),
+				'label4'	=> 'to do', //lang('to do'),
+				'label5'	=> 'later', //lang('later'),
 			);
 			$response = Api\Json\Response::get();
 			if (isset($_messageList['msg']) && $_messageList['popup'])
 			{
-				$response->call('egw.refresh',lang('flagged %1 messages as %2 in %3',$_messageList['msg'],lang(($flag[$_flag]?$flag[$_flag]:$_flag)),$folder),'mail', $_messageList['msg'], 'update');
+				$response->call('egw.refresh', lang('flagged %1 messages as %2 in %3', $_messageList['msg'], lang(($flag[$_flag] ? $flag[$_flag] : $_flag)), $folder), 'mail', $_messageList['msg'], 'update');
 			}
-			else if ((isset($_messageList['all']) && $_messageList['all']) || ($query['filter'] && ($flag2check==$query['filter'] || stripos($query['filter'],$flag2check)!==false)))
+			else if ((isset($_messageList['all']) && $_messageList['all']) || ($query['filter'] && ($flag2check == $query['filter'] || stripos($query['filter'], $flag2check) !== false)))
 			{
-				$response->call('egw.refresh',lang('flagged %1 messages as %2 in %3',(isset($_messageList['all']) && $_messageList['all']?lang('all'):count($_messageList['msg'])),lang(($flag[$_flag]?$flag[$_flag]:$_flag)),$folder),'mail');
+				$response->call('egw.refresh', lang('flagged %1 messages as %2 in %3', (isset($_messageList['all']) && $_messageList['all'] ? lang('all') : count($_messageList['msg'])), lang(($flag[$_flag] ? $flag[$_flag] : $_flag)), $folder), 'mail');
 			}
 			else
 			{
-				$response->call('egw.message',lang('flagged %1 messages as %2 in %3',(isset($_messageList['all']) && $_messageList['all']?lang('all'):count($_messageList['msg'])),lang(($flag[$_flag]?$flag[$_flag]:$_flag)),$folder));
+				$response->call('egw.message', lang('flagged %1 messages as %2 in %3', (isset($_messageList['all']) && $_messageList['all'] ? lang('all') : count($_messageList['msg'])), lang(($flag[$_flag] ? $flag[$_flag] : $_flag)), $folder));
 			}
 		}
 	}
@@ -4702,12 +4695,12 @@ 
 	 * @param string _forceDeleteMethod - method of deletion to be enforced
 	 * @return xajax response
 	 */
-	function ajax_deleteMessages($_messageList,$_forceDeleteMethod=null)
+	function ajax_deleteMessages($_messageList, $_forceDeleteMethod = null)
 	{
-		if(Mail::$debug) error_log(__METHOD__."->".print_r($_messageList,true).' Method:'.$_forceDeleteMethod);
+		if (Mail::$debug) error_log(__METHOD__."->".print_r($_messageList, true).' Method:'.$_forceDeleteMethod);
 		$error = null;
-		$filtered =  false;
-		if ($_messageList=='all' || !empty($_messageList['msg']))
+		$filtered = false;
+		if ($_messageList == 'all' || !empty($_messageList['msg']))
 		{
 			if (isset($_messageList['all']) && $_messageList['all'])
 			{
@@ -4717,34 +4710,34 @@ 
 				if (isset($_messageList['activeFilters']) && $_messageList['activeFilters'])
 				{
 					$query = $_messageList['activeFilters'];
-					if (!empty($query['search']) || !empty($query['filter'])||($query['cat_id']=='bydate' && (!empty($query['startdate'])||!empty($query['enddate']))))
+					if (!empty($query['search']) || !empty($query['filter']) || ($query['cat_id'] == 'bydate' && (!empty($query['startdate']) || !empty($query['enddate']))))
 					{
 						//([filterName] => Schnellsuche[type] => quick[string] => ebay[status] => any
 						if (is_null(Mail::$supportsORinQuery) || !isset(Mail::$supportsORinQuery[$this->mail_bo->profileID]))
 						{
-							Mail::$supportsORinQuery = Api\Cache::getCache(Api\Cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*10);
-							if (!isset(Mail::$supportsORinQuery[$this->mail_bo->profileID])) Mail::$supportsORinQuery[$this->mail_bo->profileID]=true;
+							Mail::$supportsORinQuery = Api\Cache::getCache(Api\Cache::INSTANCE, 'email', 'supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60 * 60 * 10);
+							if (!isset(Mail::$supportsORinQuery[$this->mail_bo->profileID])) Mail::$supportsORinQuery[$this->mail_bo->profileID] = true;
 						}
-						$filtered =  true;
+						$filtered = true;
 						$cutoffdate = $cutoffdate2 = null;
-						if ($query['startdate']) $cutoffdate = Api\DateTime::to($query['startdate'],'ts');//SINCE, enddate
-						if ($query['enddate']) $cutoffdate2 = Api\DateTime::to($query['enddate'],'ts');//BEFORE, startdate
+						if ($query['startdate']) $cutoffdate = Api\DateTime::to($query['startdate'], 'ts'); //SINCE, enddate
+						if ($query['enddate']) $cutoffdate2 = Api\DateTime::to($query['enddate'], 'ts'); //BEFORE, startdate
 						//error_log(__METHOD__.__LINE__.' Startdate:'.$cutoffdate2.' Enddate'.$cutoffdate);
 						$filter = array(
-							'filterName' => (Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID]?lang('quicksearch'):lang('subject')),
-							'type' => ($query['cat_id']?$query['cat_id']:(Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID]?'quick':'subject')),
+							'filterName' => (Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID] ? lang('quicksearch') : lang('subject')),
+							'type' => ($query['cat_id'] ? $query['cat_id'] : (Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID] ? 'quick' : 'subject')),
 							'string' => $query['search'],
-							'status' => (!empty($query['filter'])?$query['filter']:'any'),
+							'status' => (!empty($query['filter']) ? $query['filter'] : 'any'),
 							//'range'=>"BETWEEN",'since'=> date("d-M-Y", $cutoffdate),'before'=> date("d-M-Y", $cutoffdate2)
 						);
-						if ($query['enddate']||$query['startdate']) {
+						if ($query['enddate'] || $query['startdate']) {
 							$filter['range'] = "BETWEEN";
 							if ($cutoffdate) {
-								$filter[(empty($cutoffdate2)?'date':'since')] =  date("d-M-Y", $cutoffdate);
+								$filter[(empty($cutoffdate2) ? 'date' : 'since')] = date("d-M-Y", $cutoffdate);
 								if (empty($cutoffdate2)) $filter['range'] = "SINCE";
 							}
 							if ($cutoffdate2) {
-								$filter[(empty($cutoffdate)?'date':'before')] =  date("d-M-Y", $cutoffdate2);
+								$filter[(empty($cutoffdate) ? 'date' : 'before')] = date("d-M-Y", $cutoffdate2);
 								if (empty($cutoffdate)) $filter['range'] = "BEFORE";
 							}
 						}
@@ -4758,7 +4751,7 @@ 
 					$rByUid = true;
 					$_sR = $this->mail_bo->getSortedList(
 						$folder,
-						$sort=0,
+						$sort = 0,
 						$reverse,
 						$filter,
 						$rByUid,
@@ -4768,23 +4761,23 @@ 
 				}
 				else
 				{
-					$messageList='all';
+					$messageList = 'all';
 				}
 				try
 				{
 					//error_log(__METHOD__.__LINE__."->".print_r($messageList,true).' folder:'.$folder.' Method:'.$_forceDeleteMethod);
-					$this->mail_bo->deleteMessages(($messageList=='all' ? 'all':$messageList),$folder,(empty($_forceDeleteMethod)?'no':$_forceDeleteMethod));
+					$this->mail_bo->deleteMessages(($messageList == 'all' ? 'all' : $messageList), $folder, (empty($_forceDeleteMethod) ? 'no' : $_forceDeleteMethod));
 				}
 				catch (Api\Exception $e)
 				{
-					$error = str_replace('"',"'",$e->getMessage());
+					$error = str_replace('"', "'", $e->getMessage());
 				}
 			}
 			else
 			{
 				$uidA = self::splitRowID($_messageList['msg'][0]);
 				$folder = $uidA['folder']; // all messages in one set are supposed to be within the same folder
-				foreach($_messageList['msg'] as $rowID)
+				foreach ($_messageList['msg'] as $rowID)
 				{
 					$hA = self::splitRowID($rowID);
 					$messageList[] = $hA['msgUID'];
@@ -4792,27 +4785,27 @@ 
 				try
 				{
 					//error_log(__METHOD__.__LINE__."->".print_r($messageList,true).' folder:'.$folder.' Method:'.$_forceDeleteMethod);
-					$this->mail_bo->deleteMessages($messageList,$folder,(empty($_forceDeleteMethod)?'no':$_forceDeleteMethod));
+					$this->mail_bo->deleteMessages($messageList, $folder, (empty($_forceDeleteMethod) ? 'no' : $_forceDeleteMethod));
 				}
 				catch (Api\Exception $e)
 				{
-					$error = str_replace('"',"'",$e->getMessage());
+					$error = str_replace('"', "'", $e->getMessage());
 				}
 			}
 			$response = Api\Json\Response::get();
 			if (empty($error))
 			{
-				$response->call('app.mail.mail_deleteMessagesShowResult',array('egw_message'=>lang('deleted %1 messages in %2',($messageList=='all'||$_messageList['all']?($filtered?lang('all filtered'):lang('all')):count($_messageList['msg'])),$folder),'msg'=>$_messageList['msg']));
+				$response->call('app.mail.mail_deleteMessagesShowResult', array('egw_message'=>lang('deleted %1 messages in %2', ($messageList == 'all' || $_messageList['all'] ? ($filtered ? lang('all filtered') : lang('all')) : count($_messageList['msg'])), $folder), 'msg'=>$_messageList['msg']));
 			}
 			else
 			{
-				$error = str_replace('\n',"\n",lang('mailserver reported:\n%1 \ndo you want to proceed by deleting the selected messages immediately (click ok)?\nif not, please try to empty your trashfolder before continuing. (click cancel)',$error));
-				$response->call('app.mail.mail_retryForcedDelete',array('response'=>$error,'messageList'=>$_messageList));
+				$error = str_replace('\n', "\n", lang('mailserver reported:\n%1 \ndo you want to proceed by deleting the selected messages immediately (click ok)?\nif not, please try to empty your trashfolder before continuing. (click cancel)', $error));
+				$response->call('app.mail.mail_retryForcedDelete', array('response'=>$error, 'messageList'=>$_messageList));
 			}
 		}
 		else
 		{
-			if(Mail::$debug) error_log(__METHOD__."-> No messages selected.");
+			if (Mail::$debug) error_log(__METHOD__."-> No messages selected.");
 		}
 	}
 
@@ -4826,48 +4819,48 @@ 
 	 *
 	 * @return xajax response
 	 */
-	function ajax_copyMessages($_folderName, $_messageList, $_copyOrMove='copy', $_move2ArchiveMarker='_')
+	function ajax_copyMessages($_folderName, $_messageList, $_copyOrMove = 'copy', $_move2ArchiveMarker = '_')
 	{
-		if(Mail::$debug) error_log(__METHOD__."->".$_folderName.':'.print_r($_messageList,true).' Method:'.$_copyOrMove.' ArchiveMarker:'.$_move2ArchiveMarker);
+		if (Mail::$debug) error_log(__METHOD__."->".$_folderName.':'.print_r($_messageList, true).' Method:'.$_copyOrMove.' ArchiveMarker:'.$_move2ArchiveMarker);
 		Api\Translation::add_app('mail');
 		$folderName = $this->mail_bo->decodeEntityFolderName($_folderName);
 		// only copy or move are supported as method
-		if (!($_copyOrMove=='copy' || $_copyOrMove=='move')) $_copyOrMove='copy';
-		list($targetProfileID,$targetFolder) = explode(self::$delimiter,$folderName,2);
+		if (!($_copyOrMove == 'copy' || $_copyOrMove == 'move')) $_copyOrMove = 'copy';
+		list($targetProfileID, $targetFolder) = explode(self::$delimiter, $folderName, 2);
 		// check if move2archive was called with the correct archiveFolder
 		$archiveFolder = $this->mail_bo->getArchiveFolder();
-		if ($_move2ArchiveMarker=='2' && $targetFolder != $archiveFolder)
+		if ($_move2ArchiveMarker == '2' && $targetFolder != $archiveFolder)
 		{
 			error_log(__METHOD__.__LINE__."#Move to Archive called with:"."$targetProfileID,$targetFolder");
 			$targetProfileID = $this->mail_bo->profileID;
 			$targetFolder = $archiveFolder;
 			error_log(__METHOD__.__LINE__."#Fixed ArchiveFolder:"."$targetProfileID,$targetFolder");
 		}
-		$lastFoldersUsedForMoveCont = Api\Cache::getCache(Api\Cache::INSTANCE,'email','lastFolderUsedForMove'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),$expiration=60*60*1);
+		$lastFoldersUsedForMoveCont = Api\Cache::getCache(Api\Cache::INSTANCE, 'email', 'lastFolderUsedForMove'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), $expiration = 60 * 60 * 1);
 		$changeFolderActions = false;
 		//error_log(__METHOD__.__LINE__."#"."$targetProfileID,$targetFolder");
 		//error_log(__METHOD__.__LINE__.array2string($lastFoldersUsedForMoveCont));
 		if (!isset($lastFoldersUsedForMoveCont[$targetProfileID][$targetFolder]))
 		{
 			//error_log(__METHOD__.__LINE__.array2string($lastFoldersUsedForMoveCont[$targetProfileID][$targetFolder]));
-			if ($lastFoldersUsedForMoveCont[$targetProfileID] && count($lastFoldersUsedForMoveCont[$targetProfileID])>3)
+			if ($lastFoldersUsedForMoveCont[$targetProfileID] && count($lastFoldersUsedForMoveCont[$targetProfileID]) > 3)
 			{
 				$keys = array_keys($lastFoldersUsedForMoveCont[$targetProfileID]);
-				foreach( $keys as &$f)
+				foreach ($keys as &$f)
 				{
-					if (count($lastFoldersUsedForMoveCont[$targetProfileID])>9) unset($lastFoldersUsedForMoveCont[$targetProfileID][$f]);
+					if (count($lastFoldersUsedForMoveCont[$targetProfileID]) > 9) unset($lastFoldersUsedForMoveCont[$targetProfileID][$f]);
 					else break;
 				}
 				//error_log(__METHOD__.__LINE__.array2string($lastFoldersUsedForMoveCont[$targetProfileID]));
 			}
 			//error_log(__METHOD__.__LINE__."#"."$targetProfileID,$targetFolder = $_folderName");
-			$lastFoldersUsedForMoveCont[$targetProfileID][$targetFolder]=$folderName;
+			$lastFoldersUsedForMoveCont[$targetProfileID][$targetFolder] = $folderName;
 			$changeFolderActions = true;
 		}
 		$filtered = false;
-		if ($_messageList=='all' || !empty($_messageList['msg']))
+		if ($_messageList == 'all' || !empty($_messageList['msg']))
 		{
-			$error=false;
+			$error = false;
 			if (isset($_messageList['all']) && $_messageList['all'])
 			{
 				// we have both messageIds AND allFlag folder information
@@ -4877,34 +4870,34 @@ 
 				if (isset($_messageList['activeFilters']) && $_messageList['activeFilters'])
 				{
 					$query = $_messageList['activeFilters'];
-					if (!empty($query['search']) || !empty($query['filter'])||($query['cat_id']=='bydate' && (!empty($query['startdate'])||!empty($query['enddate']))))
+					if (!empty($query['search']) || !empty($query['filter']) || ($query['cat_id'] == 'bydate' && (!empty($query['startdate']) || !empty($query['enddate']))))
 					{
 						//([filterName] => Schnellsuche[type] => quick[string] => ebay[status] => any
 						if (is_null(Mail::$supportsORinQuery) || !isset(Mail::$supportsORinQuery[$this->mail_bo->profileID]))
 						{
-							Mail::$supportsORinQuery = Api\Cache::getCache(Api\Cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*10);
-							if (!isset(Mail::$supportsORinQuery[$this->mail_bo->profileID])) Mail::$supportsORinQuery[$this->mail_bo->profileID]=true;
+							Mail::$supportsORinQuery = Api\Cache::getCache(Api\Cache::INSTANCE, 'email', 'supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60 * 60 * 10);
+							if (!isset(Mail::$supportsORinQuery[$this->mail_bo->profileID])) Mail::$supportsORinQuery[$this->mail_bo->profileID] = true;
 						}
 						$filtered = true;
 						$cutoffdate = $cutoffdate2 = null;
-						if ($query['startdate']) $cutoffdate = Api\DateTime::to($query['startdate'],'ts');//SINCE, enddate
-						if ($query['enddate']) $cutoffdate2 = Api\DateTime::to($query['enddate'],'ts');//BEFORE, startdate
+						if ($query['startdate']) $cutoffdate = Api\DateTime::to($query['startdate'], 'ts'); //SINCE, enddate
+						if ($query['enddate']) $cutoffdate2 = Api\DateTime::to($query['enddate'], 'ts'); //BEFORE, startdate
 						//error_log(__METHOD__.__LINE__.' Startdate:'.$cutoffdate2.' Enddate'.$cutoffdate);
 						$filter = array(
-							'filterName' => (Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID]?lang('quicksearch'):lang('subject')),
-							'type' => ($query['cat_id']?$query['cat_id']:(Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID]?'quick':'subject')),
+							'filterName' => (Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID] ? lang('quicksearch') : lang('subject')),
+							'type' => ($query['cat_id'] ? $query['cat_id'] : (Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID] ? 'quick' : 'subject')),
 							'string' => $query['search'],
-							'status' => (!empty($query['filter'])?$query['filter']:'any'),
+							'status' => (!empty($query['filter']) ? $query['filter'] : 'any'),
 							//'range'=>"BETWEEN",'since'=> date("d-M-Y", $cutoffdate),'before'=> date("d-M-Y", $cutoffdate2)
 						);
-						if ($query['enddate']||$query['startdate']) {
+						if ($query['enddate'] || $query['startdate']) {
 							$filter['range'] = "BETWEEN";
 							if ($cutoffdate) {
-								$filter[(empty($cutoffdate2)?'date':'since')] =  date("d-M-Y", $cutoffdate);
+								$filter[(empty($cutoffdate2) ? 'date' : 'since')] = date("d-M-Y", $cutoffdate);
 								if (empty($cutoffdate2)) $filter['range'] = "SINCE";
 							}
 							if ($cutoffdate2) {
-								$filter[(empty($cutoffdate)?'date':'before')] =  date("d-M-Y", $cutoffdate2);
+								$filter[(empty($cutoffdate) ? 'date' : 'before')] = date("d-M-Y", $cutoffdate2);
 								if (empty($cutoffdate)) $filter['range'] = "BEFORE";
 							}
 						}
@@ -4917,70 +4910,70 @@ 
 					$rByUid = true;
 					$_sR = $this->mail_bo->getSortedList(
 						$folder,
-						$sort=0,
+						$sort = 0,
 						$reverse,
 						$filter,
-						$rByUid=true,
+						$rByUid = true,
 						false
 					);
 					$messageList = $_sR['match']->ids;
-					foreach($messageList as $uID)
+					foreach ($messageList as $uID)
 					{
 						//error_log(__METHOD__.__LINE__.$uID);
-						if ($_copyOrMove=='move')
+						if ($_copyOrMove == 'move')
 						{
-							$messageListForRefresh[] = self::generateRowID($sourceProfileID, $folderName, $uID, $_prependApp=false);
+							$messageListForRefresh[] = self::generateRowID($sourceProfileID, $folderName, $uID, $_prependApp = false);
 						}
 					}
 				}
 				else
 				{
-					$messageList='all';
+					$messageList = 'all';
 				}
 				try
 				{
 					//error_log(__METHOD__.__LINE__."->".print_r($messageList,true).' folder:'.$folder.' Method:'.$_forceDeleteMethod.' '.$targetProfileID.'/'.$sourceProfileID);
-					$this->mail_bo->moveMessages($targetFolder,$messageList,($_copyOrMove=='copy'?false:true),$folder,false,$sourceProfileID,($targetProfileID!=$sourceProfileID?$targetProfileID:null));
+					$this->mail_bo->moveMessages($targetFolder, $messageList, ($_copyOrMove == 'copy' ? false : true), $folder, false, $sourceProfileID, ($targetProfileID != $sourceProfileID ? $targetProfileID : null));
 				}
 				catch (Api\Exception $e)
 				{
-					$error = str_replace('"',"'",$e->getMessage());
+					$error = str_replace('"', "'", $e->getMessage());
 				}
 			}
 			else
 			{
 				$messageList = array();
-				while(count($_messageList['msg']) > 0)
+				while (count($_messageList['msg']) > 0)
 				{
 					$uidA = self::splitRowID($_messageList['msg'][0]);
 					$folder = $uidA['folder']; // all messages in one set are supposed to be within the same folder
 					$sourceProfileID = $uidA['profileID'];
 					$moveList = array();
-					foreach($_messageList['msg'] as $rowID)
+					foreach ($_messageList['msg'] as $rowID)
 					{
 						$hA = self::splitRowID($rowID);
 
 						// If folder changes, stop and move what we've got
-						if($hA['folder'] != $folder) break;
+						if ($hA['folder'] != $folder) break;
 
 						array_shift($_messageList['msg']);
 						$messageList[] = $hA['msgUID'];
 						$moveList[] = $hA['msgUID'];
-						if ($_copyOrMove=='move')
+						if ($_copyOrMove == 'move')
 						{
-							$helpvar = explode(self::$delimiter,$rowID);
+							$helpvar = explode(self::$delimiter, $rowID);
 							array_shift($helpvar);
-							$messageListForRefresh[]= implode(self::$delimiter,$helpvar);
+							$messageListForRefresh[] = implode(self::$delimiter, $helpvar);
 						}
 					}
 					try
 					{
 						//error_log(__METHOD__.__LINE__."->".print_r($moveList,true).' folder:'.$folder.' Method:'.$_forceDeleteMethod.' '.$targetProfileID.'/'.$sourceProfileID);
-						$this->mail_bo->moveMessages($targetFolder,$moveList,($_copyOrMove=='copy'?false:true),$folder,false,$sourceProfileID,($targetProfileID!=$sourceProfileID?$targetProfileID:null));
+						$this->mail_bo->moveMessages($targetFolder, $moveList, ($_copyOrMove == 'copy' ? false : true), $folder, false, $sourceProfileID, ($targetProfileID != $sourceProfileID ? $targetProfileID : null));
 					}
 					catch (Api\Exception $e)
 					{
-						$error = str_replace('"',"'",$e->getMessage());
+						$error = str_replace('"', "'", $e->getMessage());
 					}
 				}
 			}
@@ -4993,30 +4986,30 @@ 
 					unset($lastFoldersUsedForMoveCont[$targetProfileID][$targetFolder]);
 					$changeFolderActions = true;
 				}
-				$response->call('egw.message',$error,"error");
+				$response->call('egw.message', $error, "error");
 			}
 			else
 			{
-				if ($_copyOrMove=='copy')
+				if ($_copyOrMove == 'copy')
 				{
-					$response->call('egw.message',lang('copied %1 message(s) from %2 to %3',($messageList=='all'||$_messageList['all']?($filtered?lang('all filtered'):lang('all')):count($messageList)),$folder,$targetFolder));
+					$response->call('egw.message', lang('copied %1 message(s) from %2 to %3', ($messageList == 'all' || $_messageList['all'] ? ($filtered ? lang('all filtered') : lang('all')) : count($messageList)), $folder, $targetFolder));
 				}
 				else
 				{
-					$response->call('egw.refresh',lang('moved %1 message(s) from %2 to %3',($messageList=='all'||$_messageList['all']?($filtered?lang('all filtered'):lang('all')):count($messageList)),$folder,$targetFolder),'mail',$messageListForRefresh,'delete');
+					$response->call('egw.refresh', lang('moved %1 message(s) from %2 to %3', ($messageList == 'all' || $_messageList['all'] ? ($filtered ? lang('all filtered') : lang('all')) : count($messageList)), $folder, $targetFolder), 'mail', $messageListForRefresh, 'delete');
 				}
 			}
 			if ($changeFolderActions == true)
 			{
 				//error_log(__METHOD__.__LINE__.array2string($lastFoldersUsedForMoveCont));
-				Api\Cache::setCache(Api\Cache::INSTANCE,'email','lastFolderUsedForMove'.trim($GLOBALS['egw_info']['user']['account_id']),$lastFoldersUsedForMoveCont, $expiration=60*60*1);
+				Api\Cache::setCache(Api\Cache::INSTANCE, 'email', 'lastFolderUsedForMove'.trim($GLOBALS['egw_info']['user']['account_id']), $lastFoldersUsedForMoveCont, $expiration = 60 * 60 * 1);
 				$actionsnew = Etemplate\Widget\Nextmatch::egw_actions(self::get_actions());
-				$response->call('app.mail.mail_rebuildActionsOnList',$actionsnew);
+				$response->call('app.mail.mail_rebuildActionsOnList', $actionsnew);
 			}
 		}
 		else
 		{
-			if(Mail::$debug) error_log(__METHOD__."-> No messages selected.");
+			if (Mail::$debug) error_log(__METHOD__."-> No messages selected.");
 		}
 	}
 
@@ -5026,11 +5019,11 @@ 
 	 *
 	 * @param type $_id
 	 */
-	function ajax_folderMgmtTree_autoloading ($_id = null)
+	function ajax_folderMgmtTree_autoloading($_id = null)
 	{
 		$mail_ui = new mail_ui();
-		$id = $_id? $_id : $_GET['id'];
-		Etemplate\Widget\Tree::send_quote_json($mail_ui->mail_tree->getTree($id,'',1,true,false,false,false));
+		$id = $_id ? $_id : $_GET['id'];
+		Etemplate\Widget\Tree::send_quote_json($mail_ui->mail_tree->getTree($id, '', 1, true, false, false, false));
 	}
 
 	/**
@@ -5038,15 +5031,15 @@ 
 	 *
 	 * @param array $content content of dialog
 	 */
-	function folderManagement (array $content = null)
+	function folderManagement(array $content = null)
 	{
 		$dtmpl = new Etemplate('mail.folder_management');
-		$profileID = $_GET['acc_id']? $_GET['acc_id']: $content['acc_id'];
-		$sel_options['tree'] = $this->mail_tree->getTree(null,$profileID, 1, true, false, false);
+		$profileID = $_GET['acc_id'] ? $_GET['acc_id'] : $content['acc_id'];
+		$sel_options['tree'] = $this->mail_tree->getTree(null, $profileID, 1, true, false, false);
 
 		if (!is_array($content))
 		{
-			$content = array ('acc_id' => $profileID);
+			$content = array('acc_id' => $profileID);
 		}
 
 		$readonlys = array();
@@ -5054,7 +5047,7 @@ 
 		$preserv = array(
 			'acc_id' => $content['acc_id'] // preserve acc id to be used in client-side
 		);
-		$dtmpl->exec('mail.mail_ui.folderManagement', $content,$sel_options,$readonlys,$preserv,2);
+		$dtmpl->exec('mail.mail_ui.folderManagement', $content, $sel_options, $readonlys, $preserv, 2);
 	}
 
 	/**
@@ -5064,11 +5057,11 @@ 
 	 *
 	 * @param type $_folderName
 	 */
-	function ajax_folderMgmt_delete ($_folderName)
+	function ajax_folderMgmt_delete($_folderName)
 	{
 		if ($_folderName)
 		{
-			$success = $this->ajax_deleteFolder($_folderName,true);
+			$success = $this->ajax_deleteFolder($_folderName, true);
 			$response = Api\Json\Response::get();
 			list(,$folderName) = explode(self::$delimiter, $_folderName);
 			if ($success)
@@ -5077,7 +5070,7 @@ 
 			}
 			else
 			{
-				$res = lang("Failed to delete %1",$folderName);
+				$res = lang("Failed to delete %1", $folderName);
 			}
 			$response->data($res);
 		}

notifications/inc/class.notifications.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -434,7 +434,7 @@
 	 * Sets backends that should be skipped even if the user
 	 * defined them in its chain
 	 *
-	 * @param array $_skip_backends array with names of the backends to be skipped
+	 * @param string[] $_skip_backends array with names of the backends to be skipped
 	 * e.g. array('popup', 'winpopup')
 	 */
 	public function set_skip_backends(array $_skip_backends) {

Indentation +8 added lines, -8 removed lines

@@ -660,14 +660,14 @@
 	 }
 
 	 /**
-	 * returns notification chains based on admin prefs
-	 * @abstract the available chains can be retrieved in two different output formats:
-	 * routing: array with common and enabled chains, chain-name as key and the chain-array as value (used for message-routing)
-	 * human: array with common, enabled and disabled chains, chain-name as key and a human-readable description as value (used for config)
-	 *
-	 * @param string $_output one of: 'routing' or 'human', defaults to 'routing'
-	 * @return array containing notification chains, output like given in $_output
-	 */
+	  * returns notification chains based on admin prefs
+	  * @abstract the available chains can be retrieved in two different output formats:
+	  * routing: array with common and enabled chains, chain-name as key and the chain-array as value (used for message-routing)
+	  * human: array with common, enabled and disabled chains, chain-name as key and a human-readable description as value (used for config)
+	  *
+	  * @param string $_output one of: 'routing' or 'human', defaults to 'routing'
+	  * @return array containing notification chains, output like given in $_output
+	  */
 	public function get_available_chains($_output = 'routing') {
 		// determine enabled backends from Api\Config
 		$enabled_backends = array();

Spacing +78 added lines, -78 removed lines

@@ -179,7 +179,7 @@ 
 	 *
 	 */
 	public function __construct() {
-		$this->config = (object) Api\Config::read(self::_appname);
+		$this->config = (object)Api\Config::read(self::_appname);
 	}
 
 	/**
@@ -188,7 +188,7 @@ 
 	 * @param boolean $reset =false true: reset all errors
 	 * @return array
 	 */
-	public static function errors($reset=false)
+	public static function errors($reset = false)
 	{
 		$ret = self::$errors;
 		if ($reset) self::$errors = array();
@@ -203,19 +203,19 @@ 
 	 * it's an int with the account id or the e-mail address of a non-eGW user
 	 */
 	public function set_sender($_sender) {
-		if(is_object($_sender)) {
+		if (is_object($_sender)) {
 			$this->sender = $_sender;
 			return true;
 		} else {
 			// no object atm, we have to handle this and make a pseudo-object
-			if(is_numeric($_sender)) {
-				$this->sender = (object) $GLOBALS['egw']->accounts->read($_sender);
+			if (is_numeric($_sender)) {
+				$this->sender = (object)$GLOBALS['egw']->accounts->read($_sender);
 				return true;
 			}
-			if(is_string($_sender) && strpos($_sender,'@')) {
-				$this->sender = (object) array (
-									'account_email' => $this->get_addresspart($_sender,'email'),
-									'account_fullname' => $this->get_addresspart($_sender,'fullname'),
+			if (is_string($_sender) && strpos($_sender, '@')) {
+				$this->sender = (object)array(
+									'account_email' => $this->get_addresspart($_sender, 'email'),
+									'account_fullname' => $this->get_addresspart($_sender, 'fullname'),
 									);
 				return true;
 			}
@@ -245,19 +245,19 @@ 
 	 * it's an int with the account id or the e-mail address of a non-eGW user
 	 */
 	public function add_receiver($_receiver) {
-		if(is_object($_receiver)) {
+		if (is_object($_receiver)) {
 			$this->receivers[] = $_receiver;
 			return true;
 		} else {
 			// no object atm, we have to handle this and make a pseudo-object
-			if(is_numeric($_receiver)) {
-				$this->receivers[] = (object) $GLOBALS['egw']->accounts->read($_receiver);
+			if (is_numeric($_receiver)) {
+				$this->receivers[] = (object)$GLOBALS['egw']->accounts->read($_receiver);
 				return true;
 			}
-			if(is_string($_receiver) && strpos($_receiver,'@')) {
-				$this->receivers[] = (object) array (
-									'account_email' => $this->get_addresspart($_receiver,'email'),
-									'account_fullname' => $this->get_addresspart($_receiver,'fullname'),
+			if (is_string($_receiver) && strpos($_receiver, '@')) {
+				$this->receivers[] = (object)array(
+									'account_email' => $this->get_addresspart($_receiver, 'email'),
+									'account_fullname' => $this->get_addresspart($_receiver, 'fullname'),
 									);
 				return true;
 			}
@@ -296,7 +296,7 @@ 
 	 * @param string $_message
 	 */
 	public function set_message($_message) {
-		if(strlen($_message) == strlen(strip_tags($_message))) {
+		if (strlen($_message) == strlen(strip_tags($_message))) {
 			$this->message_plain = $_message;
 		} else {
 			$this->message_html = $_message;
@@ -314,7 +314,7 @@ 
 	 */
 	public function set_popupmessage($_message) {
 		//popup requires html
-		if(strlen($_message) == strlen(strip_tags($_message))) $_message = self::plain2html($_message);
+		if (strlen($_message) == strlen(strip_tags($_message))) $_message = self::plain2html($_message);
 		$this->message_popup = $_message;
 		return true;
 	}
@@ -326,9 +326,9 @@ 
 	 */
 	public function set_links(array $_links) {
 		$this->links = array(); // clear array if set
-		foreach($_links as $link) {
-			if(is_array($link)) {
-				$this->add_link($link['text'], $link['view'], $link['popup'], $link['app'],$link['id']);
+		foreach ($_links as $link) {
+			if (is_array($link)) {
+				$this->add_link($link['text'], $link['view'], $link['popup'], $link['app'], $link['id']);
 			}
 		}
 		return true;
@@ -341,8 +341,8 @@ 
 	 */
 	public function set_popuplinks(array $_links) {
 		$this->popup_links = array(); // clear array if set
-		foreach($_links as $link) {
-			if(is_array($link)) {
+		foreach ($_links as $link) {
+			if (is_array($link)) {
 				$this->add_popuplink($link['text'], $link['view'], $link['popup']);
 			}
 		}
@@ -359,7 +359,7 @@ 
 	 * @param string $_id Application ID, to use link registry (popup & view ignored)
 	 */
 	public function add_link($_text, $_view, $_popup = false, $_app = false, $_id = false) {
-		if(!$_view || !$_text) { return false; }
+		if (!$_view || !$_text) { return false; }
 		$this->links[] = (object)array(
 			'text'	=> $_text,
 			'view'	=> $_view,
@@ -378,8 +378,8 @@ 
 	 * @param string $_popup if link can be viewed in a popup something like '300x200' otherwise false
 	 */
 	public function add_popuplink($_text, $_view, $_popup = false) {
-		if(!$_view || !$_text) { return false; }
-		$this->popup_links[] = (object)array(	'text'	=> $_text,
+		if (!$_view || !$_text) { return false; }
+		$this->popup_links[] = (object)array('text'	=> $_text,
 										'view'	=> $_view,
 										'popup'	=> $_popup,
 										);
@@ -393,8 +393,8 @@ 
 	 */
 	public function set_attachments(array $_attachments) {
 		$this->attachments = array(); // clear array if set
-		foreach($_attachments as $attachment) {
-			if(is_array($attachment)) {
+		foreach ($_attachments as $attachment) {
+			if (is_array($attachment)) {
 				$this->add_attachment(
 					$attachment['string'],
 					$attachment['filename'],
@@ -418,8 +418,8 @@ 
 	 * @param string $_type File extension (MIME) type.
 	 * @param string $_path optional path to attachment, if !$_string
 	 */
-	public function add_attachment($_string, $_filename, $_encoding = "base64", $_type = "application/octet-stream", $_path=null) {
-		if(!$_string && (!$_path || !file_exists($_path)) || !$_filename) return false;
+	public function add_attachment($_string, $_filename, $_encoding = "base64", $_type = "application/octet-stream", $_path = null) {
+		if (!$_string && (!$_path || !file_exists($_path)) || !$_filename) return false;
 		$this->attachments[] = (object)array(
 			'string' => $_string,
 			'filename' => $_filename,
@@ -451,7 +451,7 @@ 
 		if (!is_array($this->receivers) || count($this->receivers) == 0) {
 			throw new Exception('Error: cannot send notifications. No receivers supplied');
 		}
-		if(!$messages = $this->create_messages($this->message_plain, $this->message_html, $this->message_popup)) {
+		if (!$messages = $this->create_messages($this->message_plain, $this->message_html, $this->message_popup)) {
 			throw new Exception('Error: cannot send notifications. No valid messages supplied');
 		}
 
@@ -463,7 +463,7 @@ 
 			$backend_errors = array();
 			try {
 				// system or non-system user
-				if($receiver->account_id && is_numeric($receiver->account_id)) {
+				if ($receiver->account_id && is_numeric($receiver->account_id)) {
 					// system user, collect data and check for Status and expire state, skip notification if expired or not active
 					$userData = $GLOBALS['egw']->accounts->read($receiver->account_id);
 					//error_log(__METHOD__.__LINE__." fetched data for User:".array2string($userData['account_lid']).'#'.$userData['account_type'].'#'.$userData['account_status'].'#'.$GLOBALS['egw']->accounts->is_expired($userData).'#');
@@ -476,17 +476,17 @@ 
 					}
 					$receiver->handle = $receiver->account_lid;
 					// check if the receiver has rights to run the notifcation app
-					$ids = $GLOBALS['egw']->accounts->memberships($receiver->account_id,true);
+					$ids = $GLOBALS['egw']->accounts->memberships($receiver->account_id, true);
 					$ids[] = $receiver->account_id;
-					if ($GLOBALS['egw']->acl->get_specific_rights_for_account($ids,'run','notifications')) {
+					if ($GLOBALS['egw']->acl->get_specific_rights_for_account($ids, 'run', 'notifications')) {
 						// read the users notification chain
 						$prefs = new Api\Preferences($receiver->account_id);
 						$preferences_all = $prefs->read();
 						$preferences = (object)$preferences_all[self::_appname];
-						if($preferences->notification_chain) {
+						if ($preferences->notification_chain) {
 							// fallback: admin disabled user-chosen chain
-							if(!$notification_chain = $available_chains[$preferences->notification_chain]) {
-								$prepend_message .= lang(	'This eGroupWare notification has been sent to you by mail because your'
+							if (!$notification_chain = $available_chains[$preferences->notification_chain]) {
+								$prepend_message .= lang('This eGroupWare notification has been sent to you by mail because your'
 															.' chosen notification-chain has been disabled by the administrator.'
 															.' Please choose another notification-chain in your preferences!');
 								$notification_chain = $available_chains[self::_fallback];
@@ -503,28 +503,28 @@ 
 					$notification_chain = $available_chains[self::_fallback]; // fallback: non-system user
 				}
 
-				if($notification_chain == 'disable') {
+				if ($notification_chain == 'disable') {
 					continue; //user disabled notifications
 				}
 
-				foreach($notification_chain as $backend => $action) {
+				foreach ($notification_chain as $backend => $action) {
 					$notification_backend = null;
 					try {
 						// check if backend should be skipped
-						if( in_array($backend, $this->skip_backends) ) {
+						if (in_array($backend, $this->skip_backends)) {
 							// log as error just for the case too much skipping prevents user from being notified
 							$backend_errors[] = $backend.' will be skipped (as defined by calling application)';
 							continue;
 						}
 
 						$notification_backend = self::_appname.'_'.$backend;
-						if(!file_exists(EGW_INCLUDE_ROOT.'/'. self::_appname.'/inc/class.'. $notification_backend. '.inc.php')) {
-							throw new Exception('file for '.$notification_backend. ' does not exist');
+						if (!file_exists(EGW_INCLUDE_ROOT.'/'.self::_appname.'/inc/class.'.$notification_backend.'.inc.php')) {
+							throw new Exception('file for '.$notification_backend.' does not exist');
 						}
-						$obj = new $notification_backend( $this->sender, $receiver, $this->config, $preferences );
-						if ( !($obj instanceof notifications_iface) ) {
-							unset ( $obj );
-					 		throw new Exception($notification_backend. ' is no implementation of notifications_iface');
+						$obj = new $notification_backend($this->sender, $receiver, $this->config, $preferences);
+						if (!($obj instanceof notifications_iface)) {
+							unset ($obj);
+					 		throw new Exception($notification_backend.' is no implementation of notifications_iface');
 						}
 						$lsubject = $this->subject;
 						$llinks = $this->links;
@@ -538,17 +538,17 @@ 
 					catch (Exception $exception) {
 						$backend_errors[] = $notification_backend.' failed: '.$exception->getMessage();
 						// try next backend
-						if($action == 'fail' || $action == 'continue') {
+						if ($action == 'fail' || $action == 'continue') {
 							continue;
 						}
 						break; // stop running through chain
 					}
 					// backend sucseeded
 					$user_notified = true;
-					if($action == 'stop' || $action == 'fail') { break; } // stop running through chain
+					if ($action == 'stop' || $action == 'fail') { break; } // stop running through chain
 				}
 				// check if the user has been notified at all
-				if(!$user_notified) {
+				if (!$user_notified) {
 					/*error_log('Error: notification of receiver '.$receiver->handle.' failed for the following reasons:');
 					foreach($backend_errors as $id=>$backend_error) {
 						error_log($backend_error);
@@ -575,22 +575,22 @@ 
 	 * @return plain and html message in one array, $messages['plain'] and $messages['html'] and, if exists $messages['popup']
 	 */
 	private function create_messages($_message_plain = '', $_message_html = '', $_message_popup = '') {
-		if(empty($_message_plain) && empty($_message_html) && empty($_message_popup)) { return false; } // no message set
+		if (empty($_message_plain) && empty($_message_html) && empty($_message_popup)) { return false; } // no message set
 		$messages = array();
 
 		// create the messages
-		if(!empty($_message_plain)) {
+		if (!empty($_message_plain)) {
 			$messages['plain'] = $_message_plain;
 		} else {
 			$messages['plain'] = Api\Mail\Html::convertHTMLToText($_message_html, false, true);
 		}
 
-		if(!empty($_message_html)) {
+		if (!empty($_message_html)) {
 			$messages['html'] = $_message_html;
 		} else {
 			$messages['html'] = self::plain2html($_message_plain);
 		}
-		if (!empty($_message_popup)) $messages['popup']=$_message_popup;
+		if (!empty($_message_popup)) $messages['popup'] = $_message_popup;
 		return $messages;
 	}
 
@@ -613,9 +613,9 @@ 
 	 * @return plain and html message in one array including the prepended message, $messages['plain'] and $messages['html']
 	 */
 	 private function prepend_message(array $_messages, $_prepend = null) {
-		if(strlen($_prepend) > 0) {
-			foreach($_messages as $key => $value) {
-				switch($key) {
+		if (strlen($_prepend) > 0) {
+			foreach ($_messages as $key => $value) {
+				switch ($key) {
 					case 'plain':
 						$_messages[$key] = $_prepend."\n\n".$value;
 						break;
@@ -639,17 +639,17 @@ 
 	 * @param string $_part
 	 * @return string chosen part of the address
 	 */
-	private function get_addresspart($_address, $_part='email')
+	private function get_addresspart($_address, $_part = 'email')
 	{
 		$parts = null;
-	 	if(strpos($_address,'<') && preg_match('/^(.*)\S?\<(.*)\>/',$_address, $parts)) { // _address contains a fullname part
-	 		$fullname = trim(trim($parts[1]),'\"');
+	 	if (strpos($_address, '<') && preg_match('/^(.*)\S?\<(.*)\>/', $_address, $parts)) { // _address contains a fullname part
+	 		$fullname = trim(trim($parts[1]), '\"');
 	 		$email = $parts[2];
 	 	} else {
 	 		$fullname = false;
 	 		$email = $_address;
 	 	}
-	 	switch($_part) {
+	 	switch ($_part) {
 	 		case 'fullname':
 	 			return $fullname;
 	 		case 'email':
@@ -671,8 +671,8 @@ 
 	public function get_available_chains($_output = 'routing') {
 		// determine enabled backends from Api\Config
 		$enabled_backends = array();
-		foreach($this->backends as $backend) {
-			switch($backend) {
+		foreach ($this->backends as $backend) {
+			switch ($backend) {
 				case 'email':
 				case 'popup':
 				case 'jpopup':
@@ -687,15 +687,15 @@ 
 
 		$enabled_chains = array();
 		$disabled_chains = array();
-		foreach($this->notification_chains as $key => $chain) {
+		foreach ($this->notification_chains as $key => $chain) {
 			$allow_chain = true;
-			if(is_array($chain)) {
-				foreach(array_keys($chain) as $name) {
-					if(!$enabled_backends[$name]) {
+			if (is_array($chain)) {
+				foreach (array_keys($chain) as $name) {
+					if (!$enabled_backends[$name]) {
 						$allow_chain = false; // disable whole chain if one backend is disabled
 					}
 				}
-				if($allow_chain) {
+				if ($allow_chain) {
 					$enabled_chains[$key] = $chain;
 				} else {
 					$disabled_chains[$key] = $chain;
@@ -710,15 +710,15 @@ 
 		// create the 'all' chain from the enabled backends
 		$chain_all = array();
 		$backend_count = 1;
-		foreach($enabled_backends as $backend => $enabled) {
-			if($enabled) {
+		foreach ($enabled_backends as $backend => $enabled) {
+			if ($enabled) {
 				$chain_all[$backend] = count($enabled_backends) == $backend_count ? 'stop' : 'continue';
 			}
 			$backend_count++;
 		}
 		$common_chains['all'] = $chain_all;
 
-		switch($_output) {
+		switch ($_output) {
 			case 'human':
 				$chain_groups = array(
 					lang('Common chains')	=> 'common_chains',
@@ -727,10 +727,10 @@ 
 					);
 				$suffix = '_human';
 				// create descriptions for each chain key in each group
-				foreach($chain_groups as $name => $arr_name) {
+				foreach ($chain_groups as $name => $arr_name) {
 					${$arr_name.$suffix} = array();
-					foreach(array_keys(${$arr_name}) as $key) {
-						if($arr_name == 'disabled_chains') {
+					foreach (array_keys(${$arr_name}) as $key) {
+						if ($arr_name == 'disabled_chains') {
 							${$arr_name.$suffix}[$key] = '('.lang('Disabled').') '.lang($this->chains_descriptions[$key]);
 						} else {
 							${$arr_name.$suffix}[$key] = lang($this->chains_descriptions[$key]);
@@ -739,8 +739,8 @@ 
 				}
 				// summarize all groups with minimum one chain to the final array
 				$chains_final = array();
-				foreach($chain_groups as $name => $arr_name) {
-					if(is_array(${$arr_name.$suffix}) && count(${$arr_name.$suffix}) > 0) {
+				foreach ($chain_groups as $name => $arr_name) {
+					if (is_array(${$arr_name.$suffix}) && count(${$arr_name.$suffix}) > 0) {
 						$chains_final[$name] = ${$arr_name.$suffix};
 					}
 				}
@@ -760,10 +760,10 @@ 
 	 * @param settings array with keys account_id and new_owner (new_owner is optional)
 	 */
 	public function deleteaccount($settings) {
-		foreach($this->backends as $backend) {
-			$backend_hook = array(self::_appname.'_'.$backend,'deleteaccount');
+		foreach ($this->backends as $backend) {
+			$backend_hook = array(self::_appname.'_'.$backend, 'deleteaccount');
 			if (is_callable($backend_hook)) {
-				call_user_func($backend_hook,$settings);
+				call_user_func($backend_hook, $settings);
 			}
 		}
 	}

Braces +222 added lines, -96 removed lines

@@ -24,7 +24,8 @@ 
  * called from this class. The backend's job is to deliver ONE message to ONE recipient.
  *
  */
-final class notifications {
+final class notifications
+{
 
 	/**
 	 * Appname
@@ -178,7 +179,8 @@ 
 	 * constructor of notifications
 	 *
 	 */
-	public function __construct() {
+	public function __construct()
+	{
 		$this->config = (object) Api\Config::read(self::_appname);
 	}
 
@@ -191,7 +193,10 @@ 
 	public static function errors($reset=false)
 	{
 		$ret = self::$errors;
-		if ($reset) self::$errors = array();
+		if ($reset)
+		{
+			self::$errors = array();
+		}
 		return $ret;
 	}
 
@@ -202,17 +207,23 @@ 
 	 * as long as the accounts class isn't a nice object,
 	 * it's an int with the account id or the e-mail address of a non-eGW user
 	 */
-	public function set_sender($_sender) {
-		if(is_object($_sender)) {
+	public function set_sender($_sender)
+	{
+		if(is_object($_sender))
+		{
 			$this->sender = $_sender;
 			return true;
-		} else {
+		}
+		else
+		{
 			// no object atm, we have to handle this and make a pseudo-object
-			if(is_numeric($_sender)) {
+			if(is_numeric($_sender))
+			{
 				$this->sender = (object) $GLOBALS['egw']->accounts->read($_sender);
 				return true;
 			}
-			if(is_string($_sender) && strpos($_sender,'@')) {
+			if(is_string($_sender) && strpos($_sender,'@'))
+			{
 				$this->sender = (object) array (
 									'account_email' => $this->get_addresspart($_sender,'email'),
 									'account_fullname' => $this->get_addresspart($_sender,'fullname'),
@@ -230,9 +241,11 @@ 
 	 * as long as the accounts class isn't a nice object,
 	 * it's an array with the int of the account id or the e-mail address of a non-eGW user
 	 */
-	public function set_receivers(array $_receivers) {
+	public function set_receivers(array $_receivers)
+	{
 		$this->receivers = array();
-		foreach ($_receivers as $receiver) {
+		foreach ($_receivers as $receiver)
+		{
 			$this->add_receiver($receiver);
 		}
 	}
@@ -244,17 +257,23 @@ 
 	 * as long as the accounts class isn't a nice object,
 	 * it's an int with the account id or the e-mail address of a non-eGW user
 	 */
-	public function add_receiver($_receiver) {
-		if(is_object($_receiver)) {
+	public function add_receiver($_receiver)
+	{
+		if(is_object($_receiver))
+		{
 			$this->receivers[] = $_receiver;
 			return true;
-		} else {
+		}
+		else
+		{
 			// no object atm, we have to handle this and make a pseudo-object
-			if(is_numeric($_receiver)) {
+			if(is_numeric($_receiver))
+			{
 				$this->receivers[] = (object) $GLOBALS['egw']->accounts->read($_receiver);
 				return true;
 			}
-			if(is_string($_receiver) && strpos($_receiver,'@')) {
+			if(is_string($_receiver) && strpos($_receiver,'@'))
+			{
 				$this->receivers[] = (object) array (
 									'account_email' => $this->get_addresspart($_receiver,'email'),
 									'account_fullname' => $this->get_addresspart($_receiver,'fullname'),
@@ -270,7 +289,8 @@ 
 	 *
 	 * @param string $_subject
 	 */
-	public function set_subject($_subject) {
+	public function set_subject($_subject)
+	{
 		$this->subject = $_subject;
 		return true;
 	}
@@ -280,7 +300,8 @@ 
 	 *
 	 * @param string $_subject
 	 */
-	public function set_popupsubject($_subject) {
+	public function set_popupsubject($_subject)
+	{
 		$this->popupsubject = $_subject;
 		return true;
 	}
@@ -295,10 +316,14 @@ 
 	 *
 	 * @param string $_message
 	 */
-	public function set_message($_message) {
-		if(strlen($_message) == strlen(strip_tags($_message))) {
+	public function set_message($_message)
+	{
+		if(strlen($_message) == strlen(strip_tags($_message)))
+		{
 			$this->message_plain = $_message;
-		} else {
+		}
+		else
+		{
 			$this->message_html = $_message;
 		}
 		return true;
@@ -312,9 +337,13 @@ 
 	 *
 	 * @param string $_message
 	 */
-	public function set_popupmessage($_message) {
+	public function set_popupmessage($_message)
+	{
 		//popup requires html
-		if(strlen($_message) == strlen(strip_tags($_message))) $_message = self::plain2html($_message);
+		if(strlen($_message) == strlen(strip_tags($_message)))
+		{
+			$_message = self::plain2html($_message);
+		}
 		$this->message_popup = $_message;
 		return true;
 	}
@@ -324,10 +353,13 @@ 
 	 *
 	 * @param array $_links link array (like defined in $this->add_link)
 	 */
-	public function set_links(array $_links) {
+	public function set_links(array $_links)
+	{
 		$this->links = array(); // clear array if set
-		foreach($_links as $link) {
-			if(is_array($link)) {
+		foreach($_links as $link)
+		{
+			if(is_array($link))
+			{
 				$this->add_link($link['text'], $link['view'], $link['popup'], $link['app'],$link['id']);
 			}
 		}
@@ -339,10 +371,13 @@ 
 	 *
 	 * @param array $_links link array (like defined in $this->add_link)
 	 */
-	public function set_popuplinks(array $_links) {
+	public function set_popuplinks(array $_links)
+	{
 		$this->popup_links = array(); // clear array if set
-		foreach($_links as $link) {
-			if(is_array($link)) {
+		foreach($_links as $link)
+		{
+			if(is_array($link))
+			{
 				$this->add_popuplink($link['text'], $link['view'], $link['popup']);
 			}
 		}
@@ -358,8 +393,11 @@ 
 	 * @param string $_app Application name, to use link registry (popup & view ignored)
 	 * @param string $_id Application ID, to use link registry (popup & view ignored)
 	 */
-	public function add_link($_text, $_view, $_popup = false, $_app = false, $_id = false) {
-		if(!$_view || !$_text) { return false; }
+	public function add_link($_text, $_view, $_popup = false, $_app = false, $_id = false)
+	{
+		if(!$_view || !$_text)
+		{
+return false; }
 		$this->links[] = (object)array(
 			'text'	=> $_text,
 			'view'	=> $_view,
@@ -377,8 +415,11 @@ 
 	 * @param array $_view all params needed to view the link (name => value pairs)
 	 * @param string $_popup if link can be viewed in a popup something like '300x200' otherwise false
 	 */
-	public function add_popuplink($_text, $_view, $_popup = false) {
-		if(!$_view || !$_text) { return false; }
+	public function add_popuplink($_text, $_view, $_popup = false)
+	{
+		if(!$_view || !$_text)
+		{
+return false; }
 		$this->popup_links[] = (object)array(	'text'	=> $_text,
 										'view'	=> $_view,
 										'popup'	=> $_popup,
@@ -391,10 +432,13 @@ 
 	 *
 	 * @param array $_attachments attachment array (like defined in $this->add_attachment)
 	 */
-	public function set_attachments(array $_attachments) {
+	public function set_attachments(array $_attachments)
+	{
 		$this->attachments = array(); // clear array if set
-		foreach($_attachments as $attachment) {
-			if(is_array($attachment)) {
+		foreach($_attachments as $attachment)
+		{
+			if(is_array($attachment))
+			{
 				$this->add_attachment(
 					$attachment['string'],
 					$attachment['filename'],
@@ -418,8 +462,12 @@ 
 	 * @param string $_type File extension (MIME) type.
 	 * @param string $_path optional path to attachment, if !$_string
 	 */
-	public function add_attachment($_string, $_filename, $_encoding = "base64", $_type = "application/octet-stream", $_path=null) {
-		if(!$_string && (!$_path || !file_exists($_path)) || !$_filename) return false;
+	public function add_attachment($_string, $_filename, $_encoding = "base64", $_type = "application/octet-stream", $_path=null)
+	{
+		if(!$_string && (!$_path || !file_exists($_path)) || !$_filename)
+		{
+			return false;
+		}
 		$this->attachments[] = (object)array(
 			'string' => $_string,
 			'filename' => $_filename,
@@ -437,33 +485,40 @@ 
 	 * @param array $_skip_backends array with names of the backends to be skipped
 	 * e.g. array('popup', 'winpopup')
 	 */
-	public function set_skip_backends(array $_skip_backends) {
+	public function set_skip_backends(array $_skip_backends)
+	{
 		$this->skip_backends = $_skip_backends;
 	}
 
 	/**
 	 * sends notifications
 	 */
-	public function send() {
-		if (!is_object($this->sender)) {
+	public function send()
+	{
+		if (!is_object($this->sender))
+		{
 			throw new Exception('Error: cannot send notifications. No sender supplied');
 		}
-		if (!is_array($this->receivers) || count($this->receivers) == 0) {
+		if (!is_array($this->receivers) || count($this->receivers) == 0)
+		{
 			throw new Exception('Error: cannot send notifications. No receivers supplied');
 		}
-		if(!$messages = $this->create_messages($this->message_plain, $this->message_html, $this->message_popup)) {
+		if(!$messages = $this->create_messages($this->message_plain, $this->message_html, $this->message_popup))
+		{
 			throw new Exception('Error: cannot send notifications. No valid messages supplied');
 		}
 
 		$available_chains = $this->get_available_chains('routing');
 
-		foreach ($this->receivers as $receiver) {
+		foreach ($this->receivers as $receiver)
+		{
 			$user_notified = false;
 			$prepend_message = '';
 			$backend_errors = array();
 			try {
 				// system or non-system user
-				if($receiver->account_id && is_numeric($receiver->account_id)) {
+				if($receiver->account_id && is_numeric($receiver->account_id))
+				{
 					// system user, collect data and check for Status and expire state, skip notification if expired or not active
 					$userData = $GLOBALS['egw']->accounts->read($receiver->account_id);
 					//error_log(__METHOD__.__LINE__." fetched data for User:".array2string($userData['account_lid']).'#'.$userData['account_type'].'#'.$userData['account_status'].'#'.$GLOBALS['egw']->accounts->is_expired($userData).'#');
@@ -478,51 +533,65 @@ 
 					// check if the receiver has rights to run the notifcation app
 					$ids = $GLOBALS['egw']->accounts->memberships($receiver->account_id,true);
 					$ids[] = $receiver->account_id;
-					if ($GLOBALS['egw']->acl->get_specific_rights_for_account($ids,'run','notifications')) {
+					if ($GLOBALS['egw']->acl->get_specific_rights_for_account($ids,'run','notifications'))
+					{
 						// read the users notification chain
 						$prefs = new Api\Preferences($receiver->account_id);
 						$preferences_all = $prefs->read();
 						$preferences = (object)$preferences_all[self::_appname];
-						if($preferences->notification_chain) {
+						if($preferences->notification_chain)
+						{
 							// fallback: admin disabled user-chosen chain
-							if(!$notification_chain = $available_chains[$preferences->notification_chain]) {
+							if(!$notification_chain = $available_chains[$preferences->notification_chain])
+							{
 								$prepend_message .= lang(	'This eGroupWare notification has been sent to you by mail because your'
 															.' chosen notification-chain has been disabled by the administrator.'
 															.' Please choose another notification-chain in your preferences!');
 								$notification_chain = $available_chains[self::_fallback];
 							}
-						} else {
+						}
+						else
+						{
 							$notification_chain = $available_chains[self::user_fallback]; // fallback: no prefs
 						}
-					} else {
+					}
+					else
+					{
 						$notification_chain = $available_chains[self::_fallback]; // fallback: no rights to app
 					}
-				} else {
+				}
+				else
+				{
 					// non-system user
 					$receiver->handle = $receiver->account_email;
 					$notification_chain = $available_chains[self::_fallback]; // fallback: non-system user
 				}
 
-				if($notification_chain == 'disable') {
+				if($notification_chain == 'disable')
+				{
 					continue; //user disabled notifications
 				}
 
-				foreach($notification_chain as $backend => $action) {
+				foreach($notification_chain as $backend => $action)
+				{
 					$notification_backend = null;
 					try {
 						// check if backend should be skipped
-						if( in_array($backend, $this->skip_backends) ) {
+						if( in_array($backend, $this->skip_backends) )
+						{
 							// log as error just for the case too much skipping prevents user from being notified
 							$backend_errors[] = $backend.' will be skipped (as defined by calling application)';
 							continue;
 						}
 
 						$notification_backend = self::_appname.'_'.$backend;
-						if(!file_exists(EGW_INCLUDE_ROOT.'/'. self::_appname.'/inc/class.'. $notification_backend. '.inc.php')) {
+						if(!file_exists(EGW_INCLUDE_ROOT.'/'. self::_appname.'/inc/class.'. $notification_backend. '.inc.php'))
+						{
 							throw new Exception('file for '.$notification_backend. ' does not exist');
 						}
 						$obj = new $notification_backend( $this->sender, $receiver, $this->config, $preferences );
-						if ( !($obj instanceof notifications_iface) ) {
+						if ( !($obj instanceof notifications_iface) )
+						{
 							unset ( $obj );
 					 		throw new Exception($notification_backend. ' is no implementation of notifications_iface');
 						}
@@ -530,31 +599,44 @@ 
 						$llinks = $this->links;
 						if ($backend == 'popup')
 						{
-							if (!empty($this->popupsubject)) $lsubject = $this->popupsubject;
-							if ($this->popup_links) $llinks = $this->popup_links;
+							if (!empty($this->popupsubject))
+							{
+								$lsubject = $this->popupsubject;
+							}
+							if ($this->popup_links)
+							{
+								$llinks = $this->popup_links;
+							}
 						}
 						$obj->send($this->prepend_message($messages, $prepend_message), $lsubject, $llinks, $this->attachments);
 					}
 					catch (Exception $exception) {
 						$backend_errors[] = $notification_backend.' failed: '.$exception->getMessage();
 						// try next backend
-						if($action == 'fail' || $action == 'continue') {
+						if($action == 'fail' || $action == 'continue')
+						{
 							continue;
 						}
 						break; // stop running through chain
 					}
 					// backend sucseeded
 					$user_notified = true;
-					if($action == 'stop' || $action == 'fail') { break; } // stop running through chain
+					if($action == 'stop' || $action == 'fail')
+					{
+break; } // stop running through chain
 				}
 				// check if the user has been notified at all
-				if(!$user_notified) {
+				if(!$user_notified)
+				{
 					/*error_log('Error: notification of receiver '.$receiver->handle.' failed for the following reasons:');
 					foreach($backend_errors as $id=>$backend_error) {
 						error_log($backend_error);
 					}*/
 					$error = implode(', ', $backend_errors);
-					if (stripos($error, (string)$receiver->handle) !== false) $error = $receiver->handle.': '.$error;
+					if (stripos($error, (string)$receiver->handle) !== false)
+					{
+						$error = $receiver->handle.': '.$error;
+					}
 					self::$errors[] = $error;
 				}
 			}
@@ -574,23 +656,35 @@ 
 	 * @param string $_message_popup
 	 * @return plain and html message in one array, $messages['plain'] and $messages['html'] and, if exists $messages['popup']
 	 */
-	private function create_messages($_message_plain = '', $_message_html = '', $_message_popup = '') {
-		if(empty($_message_plain) && empty($_message_html) && empty($_message_popup)) { return false; } // no message set
+	private function create_messages($_message_plain = '', $_message_html = '', $_message_popup = '')
+	{
+		if(empty($_message_plain) && empty($_message_html) && empty($_message_popup))
+		{
+return false; } // no message set
 		$messages = array();
 
 		// create the messages
-		if(!empty($_message_plain)) {
+		if(!empty($_message_plain))
+		{
 			$messages['plain'] = $_message_plain;
-		} else {
+		}
+		else
+		{
 			$messages['plain'] = Api\Mail\Html::convertHTMLToText($_message_html, false, true);
 		}
 
-		if(!empty($_message_html)) {
+		if(!empty($_message_html))
+		{
 			$messages['html'] = $_message_html;
-		} else {
+		}
+		else
+		{
 			$messages['html'] = self::plain2html($_message_plain);
 		}
-		if (!empty($_message_popup)) $messages['popup']=$_message_popup;
+		if (!empty($_message_popup))
+		{
+			$messages['popup']=$_message_popup;
+		}
 		return $messages;
 	}
 
@@ -612,10 +706,14 @@ 
 	 * @param string $_prepend just a plain message to prepend, no html!
 	 * @return plain and html message in one array including the prepended message, $messages['plain'] and $messages['html']
 	 */
-	 private function prepend_message(array $_messages, $_prepend = null) {
-		if(strlen($_prepend) > 0) {
-			foreach($_messages as $key => $value) {
-				switch($key) {
+	 private function prepend_message(array $_messages, $_prepend = null)
+	 {
+		if(strlen($_prepend) > 0)
+		{
+			foreach($_messages as $key => $value)
+			{
+				switch($key)
+				{
 					case 'plain':
 						$_messages[$key] = $_prepend."\n\n".$value;
 						break;
@@ -642,14 +740,19 @@ 
 	private function get_addresspart($_address, $_part='email')
 	{
 		$parts = null;
-	 	if(strpos($_address,'<') && preg_match('/^(.*)\S?\<(.*)\>/',$_address, $parts)) { // _address contains a fullname part
+	 	if(strpos($_address,'<') && preg_match('/^(.*)\S?\<(.*)\>/',$_address, $parts))
+	 	{
+// _address contains a fullname part
 	 		$fullname = trim(trim($parts[1]),'\"');
 	 		$email = $parts[2];
-	 	} else {
+	 	}
+	 	else
+	 	{
 	 		$fullname = false;
 	 		$email = $_address;
 	 	}
-	 	switch($_part) {
+	 	switch($_part)
+	 	{
 	 		case 'fullname':
 	 			return $fullname;
 	 		case 'email':
@@ -668,11 +771,14 @@ 
 	 * @param string $_output one of: 'routing' or 'human', defaults to 'routing'
 	 * @return array containing notification chains, output like given in $_output
 	 */
-	public function get_available_chains($_output = 'routing') {
+	public function get_available_chains($_output = 'routing')
+	{
 		// determine enabled backends from Api\Config
 		$enabled_backends = array();
-		foreach($this->backends as $backend) {
-			switch($backend) {
+		foreach($this->backends as $backend)
+		{
+			switch($backend)
+			{
 				case 'email':
 				case 'popup':
 				case 'jpopup':
@@ -687,17 +793,24 @@ 
 
 		$enabled_chains = array();
 		$disabled_chains = array();
-		foreach($this->notification_chains as $key => $chain) {
+		foreach($this->notification_chains as $key => $chain)
+		{
 			$allow_chain = true;
-			if(is_array($chain)) {
-				foreach(array_keys($chain) as $name) {
-					if(!$enabled_backends[$name]) {
+			if(is_array($chain))
+			{
+				foreach(array_keys($chain) as $name)
+				{
+					if(!$enabled_backends[$name])
+					{
 						$allow_chain = false; // disable whole chain if one backend is disabled
 					}
 				}
-				if($allow_chain) {
+				if($allow_chain)
+				{
 					$enabled_chains[$key] = $chain;
-				} else {
+				}
+				else
+				{
 					$disabled_chains[$key] = $chain;
 				}
 			}
@@ -710,15 +823,18 @@ 
 		// create the 'all' chain from the enabled backends
 		$chain_all = array();
 		$backend_count = 1;
-		foreach($enabled_backends as $backend => $enabled) {
-			if($enabled) {
+		foreach($enabled_backends as $backend => $enabled)
+		{
+			if($enabled)
+			{
 				$chain_all[$backend] = count($enabled_backends) == $backend_count ? 'stop' : 'continue';
 			}
 			$backend_count++;
 		}
 		$common_chains['all'] = $chain_all;
 
-		switch($_output) {
+		switch($_output)
+		{
 			case 'human':
 				$chain_groups = array(
 					lang('Common chains')	=> 'common_chains',
@@ -727,20 +843,27 @@ 
 					);
 				$suffix = '_human';
 				// create descriptions for each chain key in each group
-				foreach($chain_groups as $name => $arr_name) {
+				foreach($chain_groups as $name => $arr_name)
+				{
 					${$arr_name.$suffix} = array();
-					foreach(array_keys(${$arr_name}) as $key) {
-						if($arr_name == 'disabled_chains') {
+					foreach(array_keys(${$arr_name}) as $key)
+					{
+						if($arr_name == 'disabled_chains')
+						{
 							${$arr_name.$suffix}[$key] = '('.lang('Disabled').') '.lang($this->chains_descriptions[$key]);
-						} else {
+						}
+						else
+						{
 							${$arr_name.$suffix}[$key] = lang($this->chains_descriptions[$key]);
 						}
 					}
 				}
 				// summarize all groups with minimum one chain to the final array
 				$chains_final = array();
-				foreach($chain_groups as $name => $arr_name) {
-					if(is_array(${$arr_name.$suffix}) && count(${$arr_name.$suffix}) > 0) {
+				foreach($chain_groups as $name => $arr_name)
+				{
+					if(is_array(${$arr_name.$suffix}) && count(${$arr_name.$suffix}) > 0)
+					{
 						$chains_final[$name] = ${$arr_name.$suffix};
 					}
 				}
@@ -759,10 +882,13 @@ 
 	 *
 	 * @param settings array with keys account_id and new_owner (new_owner is optional)
 	 */
-	public function deleteaccount($settings) {
-		foreach($this->backends as $backend) {
+	public function deleteaccount($settings)
+	{
+		foreach($this->backends as $backend)
+		{
 			$backend_hook = array(self::_appname.'_'.$backend,'deleteaccount');
-			if (is_callable($backend_hook)) {
+			if (is_callable($backend_hook))
+			{
 				call_user_func($backend_hook,$settings);
 			}
 		}

notifications/inc/class.notifications_email.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -131,7 +131,7 @@
 	 * @param array $_links
 	 * @param boolean $_render_html
 	 * @param boolean $_render_external
-	 * @return plain or html rendered link(s) as complete string
+	 * @return false|string or html rendered link(s) as complete string
 	 */
 	private function render_links($_links = false, $_render_html = false, $_render_external = true) {
 		if(!is_array($_links) || count($_links) == 0) { return false; }

Spacing +14 added lines, -14 removed lines

@@ -66,13 +66,13 @@ 
 	 * @param object $_preferences
 	 */
 	public function __construct($_sender, $_recipient, $_config = null, $_preferences = null) {
-		if(!is_object($_sender)) { throw new Exception("no sender given."); }
-		if(!is_object($_recipient)) { throw new Exception("no recipient given."); }
+		if (!is_object($_sender)) { throw new Exception("no sender given."); }
+		if (!is_object($_recipient)) { throw new Exception("no recipient given."); }
 		$this->sender = $_sender;
 		$this->recipient = $_recipient;
 		$this->config = $_config;
 		$this->preferences = $_preferences;
-		if(is_object($this->mail))
+		if (is_object($this->mail))
 		{
 			unset($this->mail);
 		}
@@ -104,18 +104,18 @@ 
 		$this->mail->setFrom($this->sender->account_email, $this->sender->account_fullname);
 
 		$this->mail->addHeader('Subject', trim($_subject)); // trim the subject to avoid strange wrong encoding problem
-		$this->mail->setHtmlBody($body_html, null, false);	// no automatic alternativ
+		$this->mail->setHtmlBody($body_html, null, false); // no automatic alternativ
 		$this->mail->setBody($body_plain);
 
-		if(is_array($_attachments) && count($_attachments) > 0)
+		if (is_array($_attachments) && count($_attachments) > 0)
 		{
-			foreach($_attachments as $attachment)
+			foreach ($_attachments as $attachment)
 			{
 				if ($attachment->string)
 				{
 					$this->mail->AddStringAttachment($attachment->string, $attachment->filename, $attachment->encoding, $attachment->type);
 				}
-				elseif($attachment->path)
+				elseif ($attachment->path)
 				{
 					$this->mail->AddAttachment($attachment->path, $attachment->filename, $attachment->encoding, $attachment->type);
 				}
@@ -134,20 +134,20 @@ 
 	 * @return plain or html rendered link(s) as complete string
 	 */
 	private function render_links($_links = false, $_render_html = false, $_render_external = true) {
-		if(!is_array($_links) || count($_links) == 0) { return false; }
+		if (!is_array($_links) || count($_links) == 0) { return false; }
 
 		// provide defaults if given arguments are null
 		// php distinguishes between missing and present(null) arguments
-		if(is_null($_render_html)) { $_render_html = false; }
-		if(is_null($_render_external)) { $_render_external = true; }
+		if (is_null($_render_html)) { $_render_html = false; }
+		if (is_null($_render_external)) { $_render_external = true; }
 		$newline = $_render_html ? "<br />" : "\n";
 		$hruler = $_render_html ? Api\Html::hr() : '';
 
 		$rendered_links = array();
-		foreach($_links as $link) {
-			if($_render_external || ! $link->popup) { $link->view['no_popup'] = 1; }
+		foreach ($_links as $link) {
+			if ($_render_external || !$link->popup) { $link->view['no_popup'] = 1; }
 			// do not expose sensitive data
-			$url = preg_replace('/(sessionid|kp3|domain)=[^&]+&?/','',Api\Html::link('/index.php', $link->view));
+			$url = preg_replace('/(sessionid|kp3|domain)=[^&]+&?/', '', Api\Html::link('/index.php', $link->view));
 			// complete missing protocol and domain part if needed
 			if ($url{0} == '/' && $_render_external) {
 				$url = ($_SERVER['HTTPS'] || $GLOBALS['egw_info']['server']['enforce_ssl'] ? 'https://' : 'http://').
@@ -157,7 +157,7 @@ 
 			$rendered_links[] = $_render_html ? $a_href : $url;
 		}
 
-		return $hruler.$newline.lang('Linked entries:').$newline.implode($newline,$rendered_links);
+		return $hruler.$newline.lang('Linked entries:').$newline.implode($newline, $rendered_links);
 	}
 
 }

Braces +28 added lines, -11 removed lines

@@ -15,7 +15,8 @@ 
 /**
  * User notification via email.
  */
-class notifications_email implements notifications_iface {
+class notifications_email implements notifications_iface
+{
 
 	/**
 	 * Appname
@@ -65,9 +66,14 @@ 
 	 * @param object $_config
 	 * @param object $_preferences
 	 */
-	public function __construct($_sender, $_recipient, $_config = null, $_preferences = null) {
-		if(!is_object($_sender)) { throw new Exception("no sender given."); }
-		if(!is_object($_recipient)) { throw new Exception("no recipient given."); }
+	public function __construct($_sender, $_recipient, $_config = null, $_preferences = null)
+	{
+		if(!is_object($_sender))
+		{
+throw new Exception("no sender given."); }
+		if(!is_object($_recipient))
+		{
+throw new Exception("no recipient given."); }
 		$this->sender = $_sender;
 		$this->recipient = $_recipient;
 		$this->config = $_config;
@@ -133,23 +139,34 @@ 
 	 * @param boolean $_render_external
 	 * @return plain or html rendered link(s) as complete string
 	 */
-	private function render_links($_links = false, $_render_html = false, $_render_external = true) {
-		if(!is_array($_links) || count($_links) == 0) { return false; }
+	private function render_links($_links = false, $_render_html = false, $_render_external = true)
+	{
+		if(!is_array($_links) || count($_links) == 0)
+		{
+return false; }
 
 		// provide defaults if given arguments are null
 		// php distinguishes between missing and present(null) arguments
-		if(is_null($_render_html)) { $_render_html = false; }
-		if(is_null($_render_external)) { $_render_external = true; }
+		if(is_null($_render_html))
+		{
+$_render_html = false; }
+		if(is_null($_render_external))
+		{
+$_render_external = true; }
 		$newline = $_render_html ? "<br />" : "\n";
 		$hruler = $_render_html ? Api\Html::hr() : '';
 
 		$rendered_links = array();
-		foreach($_links as $link) {
-			if($_render_external || ! $link->popup) { $link->view['no_popup'] = 1; }
+		foreach($_links as $link)
+		{
+			if($_render_external || ! $link->popup)
+			{
+$link->view['no_popup'] = 1; }
 			// do not expose sensitive data
 			$url = preg_replace('/(sessionid|kp3|domain)=[^&]+&?/','',Api\Html::link('/index.php', $link->view));
 			// complete missing protocol and domain part if needed
-			if ($url{0} == '/' && $_render_external) {
+			if ($url{0} == '/' && $_render_external)
+			{
 				$url = ($_SERVER['HTTPS'] || $GLOBALS['egw_info']['server']['enforce_ssl'] ? 'https://' : 'http://').
 					($GLOBALS['egw_info']['server']['hostname'] ? $GLOBALS['egw_info']['server']['hostname'] : $_SERVER['HTTP_HOST']).$url;
 			}

notifications/inc/class.notifications_jpopup.inc.php

Doc Comments -1 removed lines

@@ -152,7 +152,6 @@
 	* saves notification into database so that the client can fetch it from there
 	*
 	* @param string $_message
-	* @param array $_user_sessions
 	*/
 	private function save( $_message ) {
 		$result = $this->db->insert( self::_notification_table, array(

Indentation +50 added lines, -50 removed lines

@@ -15,63 +15,63 @@ 
 {
 
 	/**
-	* Appname
-	*/
+	 * Appname
+	 */
 	const _appname = 'notifications';
 
 	/**
-	* Notification table in SQL database
-	*/
+	 * Notification table in SQL database
+	 */
 	const _notification_table = 'egw_notificationpopup';
 
 	/**
-	* Notification type
-	*/
+	 * Notification type
+	 */
 	const _type = 'jpopup';
 
 	/**
-	* holds account object for user who sends the message
-	*
-	* @var object
-	*/
+	 * holds account object for user who sends the message
+	 *
+	 * @var object
+	 */
 	private $sender;
 
 	/**
-	* holds account object for user to notify
-	*
-	* @var object
-	*/
+	 * holds account object for user to notify
+	 *
+	 * @var object
+	 */
 	private $recipient;
 
 	/**
-	* holds config object (sitewide application config)
-	*
-	* @var object
-	*/
+	 * holds config object (sitewide application config)
+	 *
+	 * @var object
+	 */
 	private $config;
 
 	/**
-	* holds preferences object of user to notify
-	*
-	* @var object
-	*/
+	 * holds preferences object of user to notify
+	 *
+	 * @var object
+	 */
 	private $preferences;
 
 	/**
-	* holds db object of SQL database
-	*
-	* @var Api\Db
-	*/
+	 * holds db object of SQL database
+	 *
+	 * @var Api\Db
+	 */
 	private $db;
 
 	/**
-	* constructor of notifications_egwpopup
-	*
-	* @param object $_sender
-	* @param object $_recipient
-	* @param object $_config
-	* @param object $_preferences
-	*/
+	 * constructor of notifications_egwpopup
+	 *
+	 * @param object $_sender
+	 * @param object $_recipient
+	 * @param object $_config
+	 * @param object $_preferences
+	 */
 	public function __construct($_sender, $_recipient, $_config = null, $_preferences = null)
 	{
 		if( !is_object($_sender) ) { throw new Exception("no sender given."); }
@@ -85,13 +85,13 @@ 
 	}
 
 	/**
-	* sends notification if user is online
-	*
-	* @param array $_messages
-	* @param string $_subject
-	* @param array $_links
-	* @param array $_attachments
-	*/
+	 * sends notification if user is online
+	 *
+	 * @param array $_messages
+	 * @param string $_subject
+	 * @param array $_links
+	 * @param array $_attachments
+	 */
 	public function send(array $_messages, $_subject=false, $_links=false, $_attachments=false)
 	{
 		unset($_attachments);	// not used
@@ -133,11 +133,11 @@ 
 	}
 
 	/**
-	* renders additional infos from sender and subject
-	*
-	* @param string $_subject
-	* @return string html rendered info as complete string
-	*/
+	 * renders additional infos from sender and subject
+	 *
+	 * @param string $_subject
+	 * @return string html rendered info as complete string
+	 */
 	private function render_infos($_subject = false) {
 		$infos = array();
 		$newline = "<br />";
@@ -149,11 +149,11 @@ 
 	}
 
 	/**
-	* saves notification into database so that the client can fetch it from there
-	*
-	* @param string $_message
-	* @param array $_user_sessions
-	*/
+	 * saves notification into database so that the client can fetch it from there
+	 *
+	 * @param string $_message
+	 * @param array $_user_sessions
+	 */
 	private function save( $_message ) {
 		$result = $this->db->insert( self::_notification_table, array(
 			'account_id'     => $this->recipient->account_id,

Spacing +21 added lines, -21 removed lines

@@ -74,14 +74,14 @@ 
 	*/
 	public function __construct($_sender, $_recipient, $_config = null, $_preferences = null)
 	{
-		if( !is_object($_sender) ) { throw new Exception("no sender given."); }
-		if( !is_object($_recipient) ) { throw new Exception("no recipient given."); }
+		if (!is_object($_sender)) { throw new Exception("no sender given."); }
+		if (!is_object($_recipient)) { throw new Exception("no recipient given."); }
 
 		$this->sender		= $_sender;
-		$this->recipient	= $_recipient;
+		$this->recipient = $_recipient;
 		$this->config		= $_config;
-		$this->preferences	= $_preferences;
-		$this->db			= $GLOBALS['egw']->db;
+		$this->preferences = $_preferences;
+		$this->db = $GLOBALS['egw']->db;
 	}
 
 	/**
@@ -92,19 +92,19 @@ 
 	* @param array $_links
 	* @param array $_attachments
 	*/
-	public function send(array $_messages, $_subject=false, $_links=false, $_attachments=false)
+	public function send(array $_messages, $_subject = false, $_links = false, $_attachments = false)
 	{
-		unset($_attachments);	// not used
+		unset($_attachments); // not used
 
 		$jmessage = array();
 
 		// app-message
-		if( ($_links != null) && (count($_links) > 0) )
+		if (($_links != null) && (count($_links) > 0))
 		{
-			$tlink		= $_links[0];
-			$appname	= "";
+			$tlink = $_links[0];
+			$appname = "";
 
-			if( key_exists('menuaction', $tlink->view) )
+			if (key_exists('menuaction', $tlink->view))
 			{
 				$tmp = explode(".", $tlink->view['menuaction']);
 				$appname = $tmp[0];
@@ -112,9 +112,9 @@ 
 
 			$link = array();
 
-			foreach( $tlink->view as $pkey => $pvalue )
+			foreach ($tlink->view as $pkey => $pvalue)
 			{
-				$link[] = $pkey . '=' . $pvalue;
+				$link[] = $pkey.'='.$pvalue;
 			}
 
 			// TODO more links?
@@ -125,11 +125,11 @@ 
 			.Api\Html::hr()
 			.$_messages['html'];
 
-		$jmessage['msghtml']	= $message;
-		$jmessage['app']		= $appname;
+		$jmessage['msghtml'] = $message;
+		$jmessage['app'] = $appname;
 
 
-		$this->save( serialize($jmessage) );
+		$this->save(serialize($jmessage));
 	}
 
 	/**
@@ -144,8 +144,8 @@ 
 
 		$sender = $this->sender->account_fullname ? $this->sender->account_fullname : $this->sender_account_email;
 		$infos[] = lang('Message from').': '.$sender;
-		if(!empty($_subject)) { $infos[] = Api\Html::bold($_subject); }
-		return implode($newline,$infos);
+		if (!empty($_subject)) { $infos[] = Api\Html::bold($_subject); }
+		return implode($newline, $infos);
 	}
 
 	/**
@@ -154,12 +154,12 @@ 
 	* @param string $_message
 	* @param array $_user_sessions
 	*/
-	private function save( $_message ) {
-		$result = $this->db->insert( self::_notification_table, array(
+	private function save($_message) {
+		$result = $this->db->insert(self::_notification_table, array(
 			'account_id'     => $this->recipient->account_id,
 			'notify_message' => $_message,
 			'notify_type'	 => self::_type
-			), false,__LINE__,__FILE__,self::_appname);
+			), false, __LINE__, __FILE__, self::_appname);
 		if ($result === false) throw new Exception("Can't save notification into SQL table");
 	}
 }

Braces +17 added lines, -6 removed lines

@@ -74,8 +74,12 @@ 
 	*/
 	public function __construct($_sender, $_recipient, $_config = null, $_preferences = null)
 	{
-		if( !is_object($_sender) ) { throw new Exception("no sender given."); }
-		if( !is_object($_recipient) ) { throw new Exception("no recipient given."); }
+		if( !is_object($_sender) )
+		{
+throw new Exception("no sender given."); }
+		if( !is_object($_recipient) )
+		{
+throw new Exception("no recipient given."); }
 
 		$this->sender		= $_sender;
 		$this->recipient	= $_recipient;
@@ -138,13 +142,16 @@ 
 	* @param string $_subject
 	* @return string html rendered info as complete string
 	*/
-	private function render_infos($_subject = false) {
+	private function render_infos($_subject = false)
+	{
 		$infos = array();
 		$newline = "<br />";
 
 		$sender = $this->sender->account_fullname ? $this->sender->account_fullname : $this->sender_account_email;
 		$infos[] = lang('Message from').': '.$sender;
-		if(!empty($_subject)) { $infos[] = Api\Html::bold($_subject); }
+		if(!empty($_subject))
+		{
+$infos[] = Api\Html::bold($_subject); }
 		return implode($newline,$infos);
 	}
 
@@ -154,12 +161,16 @@ 
 	* @param string $_message
 	* @param array $_user_sessions
 	*/
-	private function save( $_message ) {
+	private function save( $_message )
+	{
 		$result = $this->db->insert( self::_notification_table, array(
 			'account_id'     => $this->recipient->account_id,
 			'notify_message' => $_message,
 			'notify_type'	 => self::_type
 			), false,__LINE__,__FILE__,self::_appname);
-		if ($result === false) throw new Exception("Can't save notification into SQL table");
+		if ($result === false)
+		{
+			throw new Exception("Can't save notification into SQL table");
+		}
 	}
 }

notifications/inc/class.notifications_popup.inc.php

Doc Comments -1 removed lines

@@ -121,7 +121,6 @@
 	 * saves notification into database so that the client can fetch it from there
 	 *
 	 * @param string $_message
-	 * @param array $_user_sessions
 	 */
 	private function save( $_message ) {
 		$result = $this->db->insert( self::_notification_table, array(

Spacing +28 added lines, -28 removed lines

@@ -83,8 +83,8 @@ 
 	 */
 	public function __construct($_sender, $_recipient, $_config = null, $_preferences = null) {
 		//error_log(__METHOD__."(".array2string($_sender).', '.array2string($_recipient).', '.array2string($config).',...)');
-		if(!is_object($_sender)) { throw new Exception("no sender given."); }
-		if(!is_object($_recipient)) { throw new Exception("no recipient given."); }
+		if (!is_object($_sender)) { throw new Exception("no sender given."); }
+		if (!is_object($_recipient)) { throw new Exception("no recipient given."); }
 		$this->sender = $_sender;
 		$this->recipient = $_recipient;
 		$this->config = $_config;
@@ -102,19 +102,19 @@ 
 	 */
 	public function send(array $_messages, $_subject = false, $_links = false, $_attachments = false)
 	{
-		unset($_attachments);	// not used
+		unset($_attachments); // not used
 		// Check access log to see if user is still logged in
-		if ( !Api\Session::notifications_active($this->recipient->account_id) )
+		if (!Api\Session::notifications_active($this->recipient->account_id))
 		{
 			throw new Exception("User {$this->recipient->account_lid} isn't online. Can't send notification via popup");
 		}
 
-		$message = 	$this->render_infos($_subject)
+		$message = $this->render_infos($_subject)
 					.Api\Html::hr()
-					.(isset($_messages['popup'])&&!empty($_messages['popup'])?$_messages['popup']:$_messages['html'])
+					.(isset($_messages['popup']) && !empty($_messages['popup']) ? $_messages['popup'] : $_messages['html'])
 					.$this->render_links($_links);
 
-		$this->save( $message );
+		$this->save($message);
 	}
 
 	/**
@@ -123,12 +123,12 @@ 
 	 * @param string $_message
 	 * @param array $_user_sessions
 	 */
-	private function save( $_message ) {
-		$result = $this->db->insert( self::_notification_table, array(
+	private function save($_message) {
+		$result = $this->db->insert(self::_notification_table, array(
 			'account_id'     => $this->recipient->account_id,
 			'notify_message' => $_message,
 			'notify_type'	 => self::_type
-			), false,__LINE__,__FILE__,self::_appname);
+			), false, __LINE__, __FILE__, self::_appname);
 		if ($result === false) throw new Exception("Can't save notification into SQL table");
 	}
 
@@ -140,25 +140,25 @@ 
 	 * @return string html rendered link(s) as complete string with jspopup or a new window
 	 */
 	private function render_links($_links = false) {
-		if(!is_array($_links) || count($_links) == 0) { return false; }
+		if (!is_array($_links) || count($_links) == 0) { return false; }
 		$newline = "<br />";
 
 		$rendered_links = array();
-		foreach($_links as $link) {
-			if(!$link->popup) { $link->view['no_popup'] = 1; }
+		foreach ($_links as $link) {
+			if (!$link->popup) { $link->view['no_popup'] = 1; }
 
 			// do not expose sensitive data
-			$url = preg_replace('/(sessionid|kp3|domain)=[^&]+&?/','',
+			$url = preg_replace('/(sessionid|kp3|domain)=[^&]+&?/', '',
 				Api\Html::link('/index.php', $link->view));
 			// extract application-icon from menuaction
-			if($link->view['menuaction']) {
-				$menuaction_arr = explode('.',$link->view['menuaction']);
+			if ($link->view['menuaction']) {
+				$menuaction_arr = explode('.', $link->view['menuaction']);
 				$application = $menuaction_arr[0];
-				$image = $application ? Api\Html::image($application,'navbar',$link->text,'align="middle" style="width: 24px; margin-right: 0.5em;"') : '';
+				$image = $application ? Api\Html::image($application, 'navbar', $link->text, 'align="middle" style="width: 24px; margin-right: 0.5em;"') : '';
 			} else {
 				$image = '';
 			}
-			if($link->popup && !$GLOBALS['egw_info']['user']['preferences']['notifications']['external_mailclient'])
+			if ($link->popup && !$GLOBALS['egw_info']['user']['preferences']['notifications']['external_mailclient'])
 			{
 				$data = array(
 					"data-app = '{$link->app}'",
@@ -167,14 +167,14 @@ 
 					"data-popup = '{$link->popup}'"
 				);
 
-				$rendered_links[] = Api\Html::div($image.$link->text,implode(' ',$data),'link');
+				$rendered_links[] = Api\Html::div($image.$link->text, implode(' ', $data), 'link');
 			} else {
-				$rendered_links[] = Api\Html::div('<a href="'.$url.'" target="_blank">'.$image.$link->text.'</a>','','link');
+				$rendered_links[] = Api\Html::div('<a href="'.$url.'" target="_blank">'.$image.$link->text.'</a>', '', 'link');
 			}
 
 		}
-		if(count($rendered_links) > 0) {
-			return Api\Html::hr().Api\Html::bold(lang('Linked entries:')).$newline.implode($newline,$rendered_links);
+		if (count($rendered_links) > 0) {
+			return Api\Html::hr().Api\Html::bold(lang('Linked entries:')).$newline.implode($newline, $rendered_links);
 		}
 	}
 
@@ -187,9 +187,9 @@ 
 	 * @param int $height =400 height of the window
 	 * @return string javascript (using single quotes)
 	 */
-	private function jspopup($link,$target='_blank',$width=750,$height=410)
+	private function jspopup($link, $target = '_blank', $width = 750, $height = 410)
 	{
-		if($GLOBALS['egw_info']['user']['preferences']['notifications']['external_mailclient'])
+		if ($GLOBALS['egw_info']['user']['preferences']['notifications']['external_mailclient'])
 		{
 			return 'window.open('.($link == 'this.href' ? $link : "'".$link."'").','.
 				($target == 'this.target' ? $target : "'".$target."'").",$width,$height,'yes')";
@@ -213,8 +213,8 @@ 
 
 		$sender = $this->sender->account_fullname ? $this->sender->account_fullname : $this->sender_account_email;
 		$infos[] = lang('Message from').': '.$sender;
-		if(!empty($_subject)) { $infos[] = Api\Html::bold($_subject); }
-		return implode($newline,$infos);
+		if (!empty($_subject)) { $infos[] = Api\Html::bold($_subject); }
+		return implode($newline, $infos);
 	}
 
 	/**
@@ -223,8 +223,8 @@ 
 	 * @param settings array with keys account_id and new_owner (new_owner is optional)
 	 */
 	public static function deleteaccount($settings) {
-		$GLOBALS['egw']->db->delete( self::_notification_table, array(
+		$GLOBALS['egw']->db->delete(self::_notification_table, array(
 			'account_id'	=> $settings['account_id']
-		),__LINE__,__FILE__,self::_appname);
+		), __LINE__, __FILE__, self::_appname);
 	}
 }

Braces +43 added lines, -17 removed lines

@@ -21,7 +21,8 @@ 
  * out the table to look if there is a notificaton for this
  * client. The second stage is done in class.notifications_ajax.inc.php
  */
-class notifications_popup implements notifications_iface {
+class notifications_popup implements notifications_iface
+{
 
 	/**
 	 * Appname
@@ -81,10 +82,15 @@ 
 	 * @param object $_config
 	 * @param object $_preferences
 	 */
-	public function __construct($_sender, $_recipient, $_config = null, $_preferences = null) {
+	public function __construct($_sender, $_recipient, $_config = null, $_preferences = null)
+	{
 		//error_log(__METHOD__."(".array2string($_sender).', '.array2string($_recipient).', '.array2string($config).',...)');
-		if(!is_object($_sender)) { throw new Exception("no sender given."); }
-		if(!is_object($_recipient)) { throw new Exception("no recipient given."); }
+		if(!is_object($_sender))
+		{
+throw new Exception("no sender given."); }
+		if(!is_object($_recipient))
+		{
+throw new Exception("no recipient given."); }
 		$this->sender = $_sender;
 		$this->recipient = $_recipient;
 		$this->config = $_config;
@@ -123,13 +129,17 @@ 
 	 * @param string $_message
 	 * @param array $_user_sessions
 	 */
-	private function save( $_message ) {
+	private function save( $_message )
+	{
 		$result = $this->db->insert( self::_notification_table, array(
 			'account_id'     => $this->recipient->account_id,
 			'notify_message' => $_message,
 			'notify_type'	 => self::_type
 			), false,__LINE__,__FILE__,self::_appname);
-		if ($result === false) throw new Exception("Can't save notification into SQL table");
+		if ($result === false)
+		{
+			throw new Exception("Can't save notification into SQL table");
+		}
 	}
 
 	/**
@@ -139,23 +149,32 @@ 
 	 * @param array $_links
 	 * @return string html rendered link(s) as complete string with jspopup or a new window
 	 */
-	private function render_links($_links = false) {
-		if(!is_array($_links) || count($_links) == 0) { return false; }
+	private function render_links($_links = false)
+	{
+		if(!is_array($_links) || count($_links) == 0)
+		{
+return false; }
 		$newline = "<br />";
 
 		$rendered_links = array();
-		foreach($_links as $link) {
-			if(!$link->popup) { $link->view['no_popup'] = 1; }
+		foreach($_links as $link)
+		{
+			if(!$link->popup)
+			{
+$link->view['no_popup'] = 1; }
 
 			// do not expose sensitive data
 			$url = preg_replace('/(sessionid|kp3|domain)=[^&]+&?/','',
 				Api\Html::link('/index.php', $link->view));
 			// extract application-icon from menuaction
-			if($link->view['menuaction']) {
+			if($link->view['menuaction'])
+			{
 				$menuaction_arr = explode('.',$link->view['menuaction']);
 				$application = $menuaction_arr[0];
 				$image = $application ? Api\Html::image($application,'navbar',$link->text,'align="middle" style="width: 24px; margin-right: 0.5em;"') : '';
-			} else {
+			}
+			else
+			{
 				$image = '';
 			}
 			if($link->popup && !$GLOBALS['egw_info']['user']['preferences']['notifications']['external_mailclient'])
@@ -168,12 +187,15 @@ 
 				);
 
 				$rendered_links[] = Api\Html::div($image.$link->text,implode(' ',$data),'link');
-			} else {
+			}
+			else
+			{
 				$rendered_links[] = Api\Html::div('<a href="'.$url.'" target="_blank">'.$image.$link->text.'</a>','','link');
 			}
 
 		}
-		if(count($rendered_links) > 0) {
+		if(count($rendered_links) > 0)
+		{
 			return Api\Html::hr().Api\Html::bold(lang('Linked entries:')).$newline.implode($newline,$rendered_links);
 		}
 	}
@@ -207,13 +229,16 @@ 
 	 * @param string $_subject
 	 * @return string html rendered info as complete string
 	 */
-	private function render_infos($_subject = false) {
+	private function render_infos($_subject = false)
+	{
 		$infos = array();
 		$newline = "<br />";
 
 		$sender = $this->sender->account_fullname ? $this->sender->account_fullname : $this->sender_account_email;
 		$infos[] = lang('Message from').': '.$sender;
-		if(!empty($_subject)) { $infos[] = Api\Html::bold($_subject); }
+		if(!empty($_subject))
+		{
+$infos[] = Api\Html::bold($_subject); }
 		return implode($newline,$infos);
 	}
 
@@ -222,7 +247,8 @@ 
 	 *
 	 * @param settings array with keys account_id and new_owner (new_owner is optional)
 	 */
-	public static function deleteaccount($settings) {
+	public static function deleteaccount($settings)
+	{
 		$GLOBALS['egw']->db->delete( self::_notification_table, array(
 			'account_id'	=> $settings['account_id']
 		),__LINE__,__FILE__,self::_appname);

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -106,7 +106,7 @@
 		// Check access log to see if user is still logged in
 		if ( !Api\Session::notifications_active($this->recipient->account_id) )
 		{
-			throw new Exception("User {$this->recipient->account_lid} isn't online. Can't send notification via popup");
+			throw new Exception("user {$this->recipient->account_lid} isn't online. Can't send notification via popup");
 		}
 
 		$message = 	$this->render_infos($_subject)

notifications/inc/class.notifications_winpopup.inc.php

Doc Comments +2 added lines, -2 removed lines

@@ -155,7 +155,7 @@ 
 	 * checks for a valid IPv4-address without CIDR notation
 	 *
 	 * @param string $_ip
-	 * @return true or false
+	 * @return integer or false
 	 */
 	private function valid_ip($_ip) {
 		return eregi('^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$',$_ip);
@@ -165,7 +165,7 @@ 
 	 * renders additional info from subject
 	 *
 	 * @param string $_subject
-	 * @return plain rendered info as complete string
+	 * @return string|false rendered info as complete string
 	 */
 	private function render_infos($_subject = false) {
 		$newline = "\n";

Braces +43 added lines, -18 removed lines

@@ -15,7 +15,8 @@ 
 /**
  * User notification via winpopup.
  */
-class notifications_winpopup implements notifications_iface {
+class notifications_winpopup implements notifications_iface
+{
 
 	/**
 	 * Appname
@@ -80,10 +81,16 @@ 
 	 * @param object $_config
 	 * @param object $_preferences
 	 */
-	public function __construct($_sender, $_recipient, $_config = null, $_preferences = null) {
-		if(!is_object($_sender)) { throw new Exception("no sender given."); }
-		if(!is_object($_recipient)) { throw new Exception("no recipient given."); }
-		if(!$this->netbios_command) {
+	public function __construct($_sender, $_recipient, $_config = null, $_preferences = null)
+	{
+		if(!is_object($_sender))
+		{
+throw new Exception("no sender given."); }
+		if(!is_object($_recipient))
+		{
+throw new Exception("no recipient given."); }
+		if(!$this->netbios_command)
+		{
 			throw new Exception(	'Winpopup plugin not configured yet. Skipped sending notification message. '.
 									'Please check var "netbios_command" in winpopup backend '.
 									'('.EGW_INCLUDE_ROOT. SEP. self::_appname. SEP. 'inc'. SEP. 'class.notifications_winpopup.inc.php).');
@@ -107,14 +114,20 @@ 
 		unset($_links, $_attachments);	// not used
 
 		$user_sessions = array();
-		foreach (Api\Session::session_list(0, 'asc', 'session_dla', true) as $session) {
-			if ($session['session_lid'] == $this->recipient->account_lid. '@'. $GLOBALS['egw_info']['user']['domain']) {
-				if($this->valid_ip($session['session_ip'])) {
+		foreach (Api\Session::session_list(0, 'asc', 'session_dla', true) as $session)
+		{
+			if ($session['session_lid'] == $this->recipient->account_lid. '@'. $GLOBALS['egw_info']['user']['domain'])
+			{
+				if($this->valid_ip($session['session_ip']))
+				{
 					$user_sessions[] = $session['session_ip'];
 				}
 			}
 		}
-		if ( empty($user_sessions) ) throw new Exception("User #{$this->recipient->account_id} isn't online. Can't send notification via winpopup");
+		if ( empty($user_sessions) )
+		{
+			throw new Exception("User #{$this->recipient->account_id} isn't online. Can't send notification via winpopup");
+		}
 
 		$this->send_winpopup( $this->render_infos($_subject).$_messages['plain'], $user_sessions );
 		return true;
@@ -126,13 +139,20 @@ 
 	 * @param string $_message
 	 * @param array $_user_sessions
 	 */
-	private function send_winpopup( $_message, array $_user_sessions ) {
-		foreach($_user_sessions as $user_session) {
+	private function send_winpopup( $_message, array $_user_sessions )
+	{
+		foreach($_user_sessions as $user_session)
+		{
 			$ip_octets=explode(".",$user_session);
 			// format the ip_octets to 3 digits each
-			foreach($ip_octets as $id=>$ip_octet) {
-				if(strlen($ip_octet)==1) { $ip_octets[$id] = '00'.$ip_octet; }
-				if(strlen($ip_octet)==2) { $ip_octets[$id] = '0'.$ip_octet; }
+			foreach($ip_octets as $id=>$ip_octet)
+			{
+				if(strlen($ip_octet)==1)
+				{
+$ip_octets[$id] = '00'.$ip_octet; }
+				if(strlen($ip_octet)==2)
+				{
+$ip_octets[$id] = '0'.$ip_octet; }
 			}
 			$placeholders = array(	'/\[MESSAGE\]/' => escapeshellarg($_message), // prevent code injection
 									'/\[1\]/' => $ip_octets[0],
@@ -145,7 +165,8 @@ 
 			$command = preg_replace(array_keys($placeholders), $placeholders, $this->netbios_command);
 			$output = $returncode = null;
 			exec($command,$output,$returncode);
-			if($returncode != 0) {
+			if($returncode != 0)
+			{
 				throw new Exception("Failed sending notification message via winpopup. Error while executing the specified command.");
 			}
 		}
@@ -157,7 +178,8 @@ 
 	 * @param string $_ip
 	 * @return true or false
 	 */
-	private function valid_ip($_ip) {
+	private function valid_ip($_ip)
+	{
 		return eregi('^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$',$_ip);
 	}
 
@@ -167,9 +189,12 @@ 
 	 * @param string $_subject
 	 * @return plain rendered info as complete string
 	 */
-	private function render_infos($_subject = false) {
+	private function render_infos($_subject = false)
+	{
 		$newline = "\n";
-		if(!empty($_subject)) { return $_subject.$newline; }
+		if(!empty($_subject))
+		{
+return $_subject.$newline; }
 		return false;
 	}
 }
\ No newline at end of file

Spacing +21 added lines, -21 removed lines

@@ -81,12 +81,12 @@ 
 	 * @param object $_preferences
 	 */
 	public function __construct($_sender, $_recipient, $_config = null, $_preferences = null) {
-		if(!is_object($_sender)) { throw new Exception("no sender given."); }
-		if(!is_object($_recipient)) { throw new Exception("no recipient given."); }
-		if(!$this->netbios_command) {
-			throw new Exception(	'Winpopup plugin not configured yet. Skipped sending notification message. '.
+		if (!is_object($_sender)) { throw new Exception("no sender given."); }
+		if (!is_object($_recipient)) { throw new Exception("no recipient given."); }
+		if (!$this->netbios_command) {
+			throw new Exception('Winpopup plugin not configured yet. Skipped sending notification message. '.
 									'Please check var "netbios_command" in winpopup backend '.
-									'('.EGW_INCLUDE_ROOT. '/'. self::_appname. '/inc/class.notifications_winpopup.inc.php).');
+									'('.EGW_INCLUDE_ROOT.'/'.self::_appname.'/inc/class.notifications_winpopup.inc.php).');
 		}
 		$this->sender = $_sender;
 		$this->recipient = $_recipient;
@@ -104,19 +104,19 @@ 
 	 */
 	public function send(array $_messages, $_subject = false, $_links = false, $_attachments = false)
 	{
-		unset($_links, $_attachments);	// not used
+		unset($_links, $_attachments); // not used
 
 		$user_sessions = array();
 		foreach (Api\Session::session_list(0, 'asc', 'session_dla', true) as $session) {
-			if ($session['session_lid'] == $this->recipient->account_lid. '@'. $GLOBALS['egw_info']['user']['domain']) {
-				if($this->valid_ip($session['session_ip'])) {
+			if ($session['session_lid'] == $this->recipient->account_lid.'@'.$GLOBALS['egw_info']['user']['domain']) {
+				if ($this->valid_ip($session['session_ip'])) {
 					$user_sessions[] = $session['session_ip'];
 				}
 			}
 		}
-		if ( empty($user_sessions) ) throw new Exception("User #{$this->recipient->account_id} isn't online. Can't send notification via winpopup");
+		if (empty($user_sessions)) throw new Exception("User #{$this->recipient->account_id} isn't online. Can't send notification via winpopup");
 
-		$this->send_winpopup( $this->render_infos($_subject).$_messages['plain'], $user_sessions );
+		$this->send_winpopup($this->render_infos($_subject).$_messages['plain'], $user_sessions);
 		return true;
 	}
 
@@ -126,15 +126,15 @@ 
 	 * @param string $_message
 	 * @param array $_user_sessions
 	 */
-	private function send_winpopup( $_message, array $_user_sessions ) {
-		foreach($_user_sessions as $user_session) {
-			$ip_octets=explode(".",$user_session);
+	private function send_winpopup($_message, array $_user_sessions) {
+		foreach ($_user_sessions as $user_session) {
+			$ip_octets = explode(".", $user_session);
 			// format the ip_octets to 3 digits each
-			foreach($ip_octets as $id=>$ip_octet) {
-				if(strlen($ip_octet)==1) { $ip_octets[$id] = '00'.$ip_octet; }
-				if(strlen($ip_octet)==2) { $ip_octets[$id] = '0'.$ip_octet; }
+			foreach ($ip_octets as $id=>$ip_octet) {
+				if (strlen($ip_octet) == 1) { $ip_octets[$id] = '00'.$ip_octet; }
+				if (strlen($ip_octet) == 2) { $ip_octets[$id] = '0'.$ip_octet; }
 			}
-			$placeholders = array(	'/\[MESSAGE\]/' => escapeshellarg($_message), // prevent code injection
+			$placeholders = array('/\[MESSAGE\]/' => escapeshellarg($_message), // prevent code injection
 									'/\[1\]/' => $ip_octets[0],
 									'/\[2\]/' => $ip_octets[1],
 									'/\[3\]/' => $ip_octets[2],
@@ -144,8 +144,8 @@ 
 									);
 			$command = preg_replace(array_keys($placeholders), $placeholders, $this->netbios_command);
 			$output = $returncode = null;
-			exec($command,$output,$returncode);
-			if($returncode != 0) {
+			exec($command, $output, $returncode);
+			if ($returncode != 0) {
 				throw new Exception("Failed sending notification message via winpopup. Error while executing the specified command.");
 			}
 		}
@@ -158,7 +158,7 @@ 
 	 * @return true or false
 	 */
 	private function valid_ip($_ip) {
-		return eregi('^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$',$_ip);
+		return eregi('^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$', $_ip);
 	}
 
 	/**
@@ -169,7 +169,7 @@ 
 	 */
 	private function render_infos($_subject = false) {
 		$newline = "\n";
-		if(!empty($_subject)) { return $_subject.$newline; }
+		if (!empty($_subject)) { return $_subject.$newline; }
 		return false;
 	}
 }
\ No newline at end of file