EGroupware / egroupware

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')

Spacing +773 added lines, -780 removed lines

@@ -31,8 +31,7 @@ 
 	 *
 	 * @var array
 	 */
-	var $public_functions = array
-	(
+	var $public_functions = array(
 		'index' => True,
 		'displayHeader'	=> True,
 		'displayMessage'	=> True,
@@ -83,12 +82,12 @@ 
 	 * @var array
 	 */
 	var $searchTypes = array(
-		'quick'		=> 'quicksearch',	// lang('quicksearch')
-		'subject'	=> 'subject',		// lang('subject')
-		'body'		=> 'message body',	// lang('message body')
-		'from'		=> 'from',			// lang('from')
-		'to'		=> 'to',			// lang('to')
-		'cc'		=> 'cc',			// lang('cc')
+		'quick'		=> 'quicksearch', // lang('quicksearch')
+		'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')
 	);
 
@@ -98,12 +97,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')
 	);
 
 	/**
@@ -111,12 +110,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_bo::$debugTimes) $starttime = microtime (true);
+		if (mail_bo::$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']);
 
@@ -132,13 +131,13 @@ 
 		}
 
 		try {
-			$this->mail_bo = mail_bo::getInstance(true,self::$icServerID, true, false, true);
+			$this->mail_bo = mail_bo::getInstance(true, self::$icServerID, true, false, true);
 			if (mail_bo::$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']) && !egw_json_request::isJSONRequest())
+			if (!preg_match($needle, $_GET['menuaction']) && !egw_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
@@ -148,9 +147,9 @@ 
 		catch (Exception $e)
 		{
 			// redirect to mail wizard to handle it (redirect works for ajax too)
-			self::callWizard($e->getMessage(),true,'error');
+			self::callWizard($e->getMessage(), true, 'error');
 		}
-		if (mail_bo::$debugTimes) mail_bo::logRunTimes($starttime,null,'',__METHOD__.__LINE__);
+		if (mail_bo::$debugTimes) mail_bo::logRunTimes($starttime, null, '', __METHOD__.__LINE__);
 	}
 
 	/**
@@ -160,10 +159,10 @@ 
 	 * @param boolean $exit If true, will call common::egw_exit() after opening the wizardpopup
 	 * @param string $msg_type = 'success' message type
 	 */
-	static function callWizard($message, $exit=true, $msg_type='success')
+	static function callWizard($message, $exit = true, $msg_type = 'success')
 	{
 		//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(
@@ -177,11 +176,11 @@ 
 		{
 			$response = egw_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);
 			egw_framework::message($message, 'error');
 			if ($_GET['menuaction'] == 'mail.mail_ui.index')
 			{
-				$response->call('framework.setSidebox','mail',array(),'md5');
+				$response->call('framework.setSidebox', 'mail', array(), 'md5');
 			}
 			if ($exit)
 			{
@@ -190,8 +189,8 @@ 
 		}
 		else	// regular GET request eg. in idots template
 		{
-			egw_framework::popup(egw_framework::link('/index.php',$linkData));
-			$GLOBALS['egw']->framework->render($message,'',true);
+			egw_framework::popup(egw_framework::link('/index.php', $linkData));
+			$GLOBALS['egw']->framework->render($message, '', true);
 			if ($exit)
 			{
 				common::egw_exit();
@@ -207,9 +206,9 @@ 
 	 *
 	 * @throws egw_exception
 	 */
-	function changeProfile($_icServerID,$unsetCache=false)
+	function changeProfile($_icServerID, $unsetCache = false)
 	{
-		if (mail_bo::$debugTimes) $starttime = microtime (true);
+		if (mail_bo::$debugTimes) $starttime = microtime(true);
 		if (self::$icServerID != $_icServerID)
 		{
 			self::$icServerID = $_icServerID;
@@ -217,35 +216,35 @@ 
 		if (mail_bo::$debug) error_log(__METHOD__.__LINE__.'->'.self::$icServerID.'<->'.$_icServerID);
 
 		if ($unsetCache) emailadmin_imapbase::unsetCachedObjects(self::$icServerID);
-		$this->mail_bo = mail_bo::getInstance(false,self::$icServerID,true, false, true);
+		$this->mail_bo = mail_bo::getInstance(false, self::$icServerID, true, false, true);
 		if (mail_bo::$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->icServer) || $this->mail_bo->icServer->ImapServerId<>$_icServerID)
+		if (!isset($this->mail_bo->icServer) || $this->mail_bo->icServer->ImapServerId <> $_icServerID)
 		{
 			self::$icServerID = $_icServerID;
 			throw new egw_exception('Profile change failed!');
 		}
 
 		// save session varchar
-		$oldicServerID =& egw_cache::getSession('mail','activeProfileID');
+		$oldicServerID = & egw_cache::getSession('mail', 'activeProfileID');
 		if ($oldicServerID <> self::$icServerID) $this->mail_bo->openConnection(self::$icServerID);
 		$oldicServerID = self::$icServerID;
-		if (!emailadmin_imapbase::storeActiveProfileIDToPref($this->mail_bo->icServer, self::$icServerID, true ))
+		if (!emailadmin_imapbase::storeActiveProfileIDToPref($this->mail_bo->icServer, self::$icServerID, true))
 		{
 			throw new egw_exception(__METHOD__." failed to change Profile to $_icServerID");
 		}
 
-		if (mail_bo::$debugTimes) mail_bo::logRunTimes($starttime,null,'',__METHOD__.__LINE__);
+		if (mail_bo::$debugTimes) mail_bo::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));
+		$_id = $_id ? $_id : $_GET['id'];
+		etemplate_widget_tree::send_quote_json($mail_ui->mail_tree->getTree($_id, '', 1, false));
 	}
 
 	/**
@@ -254,11 +253,11 @@ 
 	 * @param array $content
 	 * @param type $msg
 	 */
-	function subscription(array $content=null ,$msg=null)
+	function subscription(array $content = null, $msg = null)
 	{
 		$stmpl = new etemplate_new('mail.subscribe');
 
-		if(is_array($content))
+		if (is_array($content))
 		{
 			$profileId = $content['profileId'];
 		}
@@ -268,14 +267,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) {
 			egw_framework::message($ex->getMessage());
 		}
@@ -286,7 +285,7 @@ 
 
 			foreach ($subscribed as $folder)
 			{
-				$folderName = $profileId . self::$delimiter . $folder['MAILBOX'];
+				$folderName = $profileId.self::$delimiter.$folder['MAILBOX'];
 				array_push($content['foldertree'], $folderName);
 			}
 		}
@@ -300,9 +299,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)
@@ -310,7 +309,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;
 						}
@@ -320,7 +319,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))
 						{
@@ -356,18 +355,18 @@ 
 						}
 					}
 					// update foldertree in main window
-					$parentFolder='INBOX';
+					$parentFolder = 'INBOX';
 					$refreshData = array(
 						$profileId => lang($parentFolder),
 					);
 					$response = egw_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);
 
 					egw_framework::refresh_opener($msg, 'mail', null, null, null, null, null, $msg_type);
 					if ($button == 'apply')
@@ -387,7 +386,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);
 	}
 
 	/**
@@ -396,11 +395,11 @@ 
 	 * @param array $content
 	 * @param string $msg
 	 */
-	function index(array $content=null,$msg=null)
+	function index(array $content = null, $msg = null)
 	{
-		try	{
+		try {
 				//error_log(__METHOD__.__LINE__.function_backtrace());
-				if (mail_bo::$debugTimes) $starttime = microtime (true);
+				if (mail_bo::$debugTimes) $starttime = microtime(true);
 				$this->mail_bo->restoreSessionData();
 				$sessionFolder = $this->mail_bo->sessionData['mailbox'];
 				if ($this->mail_bo->folderExists($sessionFolder))
@@ -415,20 +414,20 @@ 
 				if (!is_array($content))
 				{
 					$content = array(
-						self::$nm_index => egw_session::appsession('index','mail'),
+						self::$nm_index => egw_session::appsession('index', 'mail'),
 					);
 					if (!is_array($content[self::$nm_index]))
 					{
 						$content[self::$nm_index] = array(
-							'filter'         => 'any',	// filter is used to choose the mailbox
-							'no_filter2'     => false,	// I  disable the 2. filter (params are the same as for filter)
-							'no_cat'         => true,	// I  disable the cat-selectbox
+							'filter'         => 'any', // filter is used to choose the mailbox
+							'no_filter2'     => false, // I  disable the 2. filter (params are the same as for filter)
+							'no_cat'         => true, // I  disable the cat-selectbox
 							//'cat_is_select'	 => 'no_lang', // true or no_lang
-							'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'
+							'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'
 							//'default_cols'   => 'status,attachments,subject,'.($toSchema?'toaddress':'fromaddress').',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
 							//'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
 							//'csv_fields'     =>	false, // I  false=disable csv export, true or unset=enable it with auto-detected fieldnames,
@@ -441,8 +440,8 @@ 
 				}
 
 				$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)
 				{
@@ -454,11 +453,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 {
@@ -467,43 +466,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'? common::show_date($vacation['start_date'],$dtfrmt,true).($vacation['end_date']>$vacation['start_date']?'->'.common::show_date($vacation['end_date']+ 24*3600-1,$dtfrmt,true):''):'');
+						$content[self::$nm_index]['vacationrange'] = $sel_options[self::$nm_index]['vacationrange'] = ($vacation['status'] == 'by_date' ? common::show_date($vacation['start_date'], $dtfrmt, true).($vacation['end_date'] > $vacation['start_date'] ? '->'.common::show_date($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]);
 					}
 				}
 
@@ -514,17 +513,17 @@ 
 
 				if (is_null(emailadmin_imapbase::$supportsORinQuery) || !isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]))
 				{
-					emailadmin_imapbase::$supportsORinQuery = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*10);
-					if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID])) emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]=true;
+					emailadmin_imapbase::$supportsORinQuery = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60 * 60 * 10);
+					if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID])) emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID] = true;
 				}
 				if (!emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]) unset($this->searchTypes['quick']);
 				$sel_options['filter2'] = $this->searchTypes;
 				$sel_options['filter'] = $this->statusTypes;
 
-				$etpl = new etemplate_new(html::$ua_mobile?'mail.mobile_index':'mail.index');
+				$etpl = new etemplate_new(html::$ua_mobile ? 'mail.mobile_index' : 'mail.index');
 				// 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=2;
+				$group = 2;
 				// Set tree actions
 				$tree_actions = array(
 					'drop_move_mail' => array(
@@ -602,13 +601,13 @@ 
 					'sieve' => array(
 						'caption' => 'Mail filter',
 						'onExecute' => 'javaScript:app.mail.edit_sieve',
-						'group'	=> ++$group,	// new group for filter
+						'group'	=> ++$group, // new group for filter
 						'enabled'	=> 'javaScript:app.mail.sieve_enabled',
-						'icon' => 'etemplate/fav_filter',	// funnel
+						'icon' => 'etemplate/fav_filter', // funnel
 					),
 					'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',
 						'group'	=> $group,
 						'enabled'	=> 'javaScript:app.mail.sieve_enabled',
@@ -617,7 +616,7 @@ 
 						'caption' => 'Edit account ...',
 						'icon' => 'configure',
 						'onExecute' => 'javaScript:app.mail.edit_account',
-						'group'	=> ++$group,	// new groups for account & acl
+						'group'	=> ++$group, // new groups for account & acl
 					),
 					'edit_acl'	=> array(
 						'caption' => 'Edit folder ACL ...',
@@ -652,8 +651,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(
@@ -672,7 +671,7 @@ 
 						);
 						break;
 				}
-				++$group;	// put empty spam immediately in own group
+				++$group; // put empty spam immediately in own group
 				$junkFolder = $this->mail_bo->getJunkFolder();
 				//error_log(__METHOD__.__LINE__.$junkFolder);
 				if ($junkFolder && !empty($junkFolder))
@@ -709,23 +708,23 @@ 
 					// to existing folders, it should only affect add/rename/move/delete
 				}
 
-				$etpl->setElementAttribute(self::$nm_index.'[foldertree]','actions', $tree_actions);
+				$etpl->setElementAttribute(self::$nm_index.'[foldertree]', 'actions', $tree_actions);
 
 				// sending preview toolbar actions
 				if ($content['mailSplitter']) $etpl->setElementAttribute('mailPreview[toolbar]', 'actions', $this->get_toolbar_actions());
 
-				if (empty($content[self::$nm_index]['filter2']) || empty($content[self::$nm_index]['search'])) $content[self::$nm_index]['filter2']=(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?'quick':'subject');
+				if (empty($content[self::$nm_index]['filter2']) || empty($content[self::$nm_index]['search'])) $content[self::$nm_index]['filter2'] = (emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID] ? 'quick' : 'subject');
 				$readonlys = $preserv = array();
-				if (mail_bo::$debugTimes) mail_bo::logRunTimes($starttime,null,'',__METHOD__.__LINE__);
+				if (mail_bo::$debugTimes) mail_bo::logRunTimes($starttime, null, '', __METHOD__.__LINE__);
 		}
 		catch (Exception $e)
 		{
-			self::callWizard($e->getMessage(),true, 'error');
+			self::callWizard($e->getMessage(), true, 'error');
 		}
 		// Check preview pane is enabled, then show spliter
 		if ($this->mail_bo->mailPreferences['previewPane']) $etpl->setElementAttribute('mail.index.spliter', 'template', 'mail.index.nospliter');
 
-		return $etpl->exec('mail.mail_ui.index',$content,$sel_options,$readonlys,$preserv);
+		return $etpl->exec('mail.mail_ui.index', $content, $sel_options, $readonlys, $preserv);
 	}
 
 	/**
@@ -735,19 +734,19 @@ 
 	 * @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_bo object to related profileId
 		$this->changeProfile($_acc_id);
 
-		if($this->mail_bo->icServer->subscribeMailbox($_folderName, $_status))
+		if ($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']);
 		}
 		else
 		{
-			error_log(__METHOD__.__LINE__."()". lang('Folder %1 %2 failed!',$_folderName,$_status?'subscribed':'unsubscribed'));
+			error_log(__METHOD__.__LINE__."()".lang('Folder %1 %2 failed!', $_folderName, $_status ? 'subscribed' : 'unsubscribed'));
 		}
 	}
 
@@ -759,25 +758,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);
@@ -793,17 +792,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);
 			}
 		}
 	}
@@ -817,7 +816,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',
@@ -827,12 +826,12 @@ 
 		// todo: real hierarchical folder list
 		$lastFolderUsedForMove = null;
 		$moveactions = array();
-		$lastFoldersUsedForMoveCont = egw_cache::getCache(egw_cache::INSTANCE,'email','lastFolderUsedForMove'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),$expiration=60*60*1);
+		$lastFoldersUsedForMoveCont = egw_cache::getCache(egw_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(emailadmin_account::search($only_current_user=true, false) as $acc_id => $accountObj)
+			foreach (emailadmin_account::search($only_current_user = true, false) as $acc_id => $accountObj)
 			{
 				//error_log(__METHOD__.__LINE__.array2string($accountObj));
 				if (!$accountObj->is_imap())
@@ -840,22 +839,22 @@ 
 					// not to be used for IMAP Foldertree, as there is no Imap host
 					continue;
 				}
-				$identity_name = emailadmin_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 = emailadmin_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 ($lastFoldersUsedForMoveCont as $pid => $info)
 		{
-			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;
 
@@ -865,7 +864,7 @@ 
 							$fS['profileName'] = $accArray[$this->mail_bo->profileID];
 							$fS['shortDisplayName'] = $i;
 							$moveactions[$moveaction] = $fS;
-							$counter ++;
+							$counter++;
 						}
 						else
 						{
@@ -875,9 +874,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");
@@ -889,14 +888,14 @@ 
 						$fS['profileName'] = $accArray[$pid];
 						$fS['shortDisplayName'] = $i;
 						$moveactions[$moveaction] = $fS;
-						$counter ++;
+						$counter++;
 					}
 				}
 			}
 		}
-		egw_cache::setCache(egw_cache::INSTANCE,'email','lastFolderUsedForMove'.trim($GLOBALS['egw_info']['user']['account_id']),$lastFoldersUsedForMoveCont, $expiration=60*60*1);
+		egw_cache::setCache(egw_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',
@@ -952,20 +951,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',
@@ -976,7 +975,7 @@ 
 				$pID = $lastFolderUsedForMove['profileID'];
 				$macounter++;
 			}
-			$actions = array_merge($actions,array('moveto' =>
+			$actions = array_merge($actions, array('moveto' =>
 				array(
 					'caption' => lang('Move selected to'),
 					'icon' => 'move',
@@ -1007,7 +1006,7 @@ 
 					'icon' => 'tracker/navbar',
 					'onExecute' => 'javaScript:app.mail.mail_integrate',
 					'popup' => egw_link::get_registry('tracker', 'add_popup'),
-					'mail_import' => $GLOBALS['egw']->hooks->single(array('location' => 'mail_import'),'tracker'),
+					'mail_import' => $GLOBALS['egw']->hooks->single(array('location' => 'mail_import'), 'tracker'),
 					'allowOnMultiple' => false,
 				),
 				'calendar' => array(
@@ -1223,22 +1222,22 @@ 
 	 * @param array &$rows
 	 * @param array &$readonlys
 	 */
-	public static function get_rows(&$query,&$rows,&$readonlys)
+	public static function get_rows(&$query, &$rows, &$readonlys)
 	{
 		// 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)
 				{
-					$rows=array();
+					$rows = array();
 					return 0;
 				}
 				if (empty($folderName)) $query['selectedFolder'] = $_profileID.self::$delimiter.'INBOX';
@@ -1246,7 +1245,7 @@ 
 		}
 		if (!isset($mail_ui))
 		{
-			$mail_ui = new mail_ui(true);	// run constructor for current profile
+			$mail_ui = new mail_ui(true); // run constructor for current profile
 			if (empty($query['selectedFolder'])) $query['selectedFolder'] = $mail_ui->mail_bo->profileID.self::$delimiter.'INBOX';
 		}
 
@@ -1256,51 +1255,51 @@ 
 		//$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__.$query['order']);
-		$sort = ($query['order']=='address'?($toSchema?'toaddress':'fromaddress'):$query['order']);
+		$sort = ($query['order'] == 'address' ? ($toSchema ? 'toaddress' : 'fromaddress') : $query['order']);
 		if (!empty($query['search']))
 		{
 			if (is_null(emailadmin_imapbase::$supportsORinQuery) || !isset(emailadmin_imapbase::$supportsORinQuery[$mail_ui->mail_bo->profileID]))
 			{
-				emailadmin_imapbase::$supportsORinQuery = egw_cache::getCache(egw_cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*10);
+				emailadmin_imapbase::$supportsORinQuery = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60 * 60 * 10);
 				if (!isset(emailadmin_imapbase::$supportsORinQuery[$mail_ui->mail_bo->profileID]))
 				{
-					emailadmin_imapbase::$supportsORinQuery[$mail_ui->mail_bo->profileID]=true;
+					emailadmin_imapbase::$supportsORinQuery[$mail_ui->mail_bo->profileID] = true;
 				}
 			}
 			$filter = array(
-				'filterName' => (emailadmin_imapbase::$supportsORinQuery[$mail_ui->mail_bo->profileID]?lang('quicksearch'):lang('subject')),
-				'type' => ($query['filter2']?$query['filter2']:(emailadmin_imapbase::$supportsORinQuery[$mail_ui->mail_bo->profileID]?'quick':'subject')),
+				'filterName' => (emailadmin_imapbase::$supportsORinQuery[$mail_ui->mail_bo->profileID] ? lang('quicksearch') : lang('subject')),
+				'type' => ($query['filter2'] ? $query['filter2'] : (emailadmin_imapbase::$supportsORinQuery[$mail_ui->mail_bo->profileID] ? 'quick' : 'subject')),
 				'string' => $query['search'],
 				'status' => 'any');
 		}
@@ -1312,7 +1311,7 @@ 
 		{
 			$filter['status'] = $query['filter'];
 		}
-		$reverse = ($query['sort']=='ASC'?false:true);
+		$reverse = ($query['sort'] == 'ASC' ? false : true);
 		//error_log(__METHOD__.__LINE__.' maxMessages:'.$maxMessages.' Offset:'.$offset.' Filter:'.array2string($mail_ui->sessionData['messageFilter']));
 		try
 		{
@@ -1323,18 +1322,18 @@ 
 					$sort,
 					$reverse,
 					$filter,
-					$rByUid=true
+					$rByUid = true
 				);
 				$rowsFetched['messages'] = $_sR['count'];
 				$sR = $_sR['match']->ids;
 				// if $sR is false, something failed fundamentally
-				if($reverse === true) $sR = ($sR===false?array():array_reverse((array)$sR));
-				$sR = array_slice((array)$sR,($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) $sR = ($sR === false ? array() : array_reverse((array)$sR));
+				$sR = array_slice((array)$sR, ($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();
@@ -1372,23 +1371,23 @@ 
 		}
 		catch (Exception $e)
 		{
-			$sortResultwH=array();
-			$sR=array();
+			$sortResultwH = array();
+			$sR = array();
 			self::callWizard($e->getMessage(), false, 'error');
 		}
 		$response = egw_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];
 				}
@@ -1406,12 +1405,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_bo::$debugTimes) mail_bo::logRunTimes($starttime,null,'Folder:'.$_folderName.' Start:'.$query['start'].' NumRows:'.$query['num_rows'],__METHOD__.__LINE__);
+		if (mail_bo::$debugTimes) mail_bo::logRunTimes($starttime, null, 'Folder:'.$_folderName.' Start:'.$query['start'].' NumRows:'.$query['num_rows'], __METHOD__.__LINE__);
 		return $rowsFetched['messages'];
 	}
 
@@ -1423,7 +1422,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);
 	}
@@ -1437,9 +1436,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;
 	}
 
 	/**
@@ -1450,13 +1449,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]);
 	}
@@ -1470,56 +1469,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;
 	}
@@ -1533,45 +1532,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_bo::$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';
@@ -1609,19 +1608,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
@@ -1631,53 +1630,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 = html::image('mail','attach');
+					$image = 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 = html::image('mail','attach',$attachments[0]['name'].(!empty($attachments[0]['mimeType'])?' ('.$attachments[0]['mimeType'].')':''));
+						$imageHTMLBlock = self::createAttachmentBlock($attachments, $datarowid, $header['uid'], $_folderName);
+						$image = 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 = html::image('mail','attach',lang('%1 attachments',count($attachments)));
+						$imageHTMLBlock = self::createAttachmentBlock($attachments, $datarowid, $header['uid'], $_folderName);
+						$image = html::image('mail', 'attach', lang('%1 attachments', count($attachments)));
 					}
 
 					$attachmentFlag = $image;
 				} else {
-					$attachmentFlag ='&nbsp;';
+					$attachmentFlag = '&nbsp;';
 				}
 				// show priority flag
 				if ($header['priority'] < 3) {
-					 $image = html::image('mail','prio_high');
+					 $image = html::image('mail', 'prio_high');
 				} elseif ($header['priority'] > 3) {
-					$image = html::image('mail','prio_low');
+					$image = html::image('mail', 'prio_low');
 				} else {
 					$image = '';
 				}
 				// show a flag for flagged messages
-				$imageflagged ='';
+				$imageflagged = '';
 				if ($header['flagged'])
 				{
-					$imageflagged = html::image('mail','unread_flagged_small');
+					$imageflagged = html::image('mail', 'unread_flagged_small');
 				}
 				$data["attachments"] = $image.$attachmentFlag.$imageflagged; // icon for attachments available
 			}
@@ -1686,7 +1685,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_bo::htmlentities($header['to_address'],$this->charset);
+				$data["toaddress"] = $header['to_address']; //mail_bo::htmlentities($header['to_address'],$this->charset);
 			}
 
 			if (in_array("additionaltoaddress", $cols))
@@ -1719,29 +1718,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_bo::$debugTimes) mail_bo::logRunTimes($starttime,null,'Folder:'.$_folderName,__METHOD__.__LINE__);
+		if (mail_bo::$debugTimes) mail_bo::logRunTimes($starttime, null, 'Folder:'.$_folderName, __METHOD__.__LINE__);
 
 		// ToDo: call this ONLY if labels change
 		etemplate_widget::setElementAttribute('toolbar', 'actions', $this->get_toolbar_actions());
@@ -1756,8 +1755,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'];
@@ -1771,17 +1770,17 @@ 
 		}
 
 		$this->mail_bo->reopen($mailbox);
-		$rawheaders	= $this->mail_bo->getMessageRawHeader($uid, $partID);
+		$rawheaders = $this->mail_bo->getMessageRawHeader($uid, $partID);
 
 		// add line breaks to $rawheaders
-		$newRawHeaders = explode("\n",$rawheaders);
+		$newRawHeaders = explode("\n", $rawheaders);
 		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     ");
 		}
 
@@ -1793,7 +1792,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>';
 
 	}
 
@@ -1806,10 +1805,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'];
@@ -1833,78 +1832,78 @@ 
 		}
 		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 (egw_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);
 			egw_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);
 		//error_log(__METHOD__.__LINE__.array2string($attachmentHTMLBlock));
-		$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_new('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']);
-		foreach(array('SENDER','FROM','TO','CC','BCC') as $field)
+		if ($envelope['FROM'] == $envelope['SENDER']) unset($envelope['SENDER']);
+		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_bo::_strtotime($headers['DATE'],'ts',true);
+		$content['mail_displaydate'] = mail_bo::_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(
@@ -1921,22 +1920,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',
@@ -1946,9 +1945,9 @@ 
 		$actions['forward']['toolbarDefault'] = true;
 		$compose = $actions['composeasnew'];
 		unset($actions['composeasnew']);
-		$actions = array_reverse($actions,true);
-		$actions['composeasnew']= $compose;
-		$actions = array_reverse($actions,true);
+		$actions = array_reverse($actions, true);
+		$actions['composeasnew'] = $compose;
+		$actions = array_reverse($actions, true);
 		return $actions;
 	}
 	
@@ -1963,23 +1962,23 @@ 
 	 * @param boolean $_returnFullHTML flag wether to return HTML or data array
 	 * @return mixed 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 = html::image('filemanager','navbar', lang('Filemanager'), ' height="16"');
-			$url_img_vfs_save_all = html::image('mail','save_all', lang('Save all'));
+			$url_img_vfs = html::image('filemanager', 'navbar', lang('Filemanager'), ' height="16"');
+			$url_img_vfs_save_all = 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'] = 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'] = translation::convert_jsonsafe($attachmentHTML[$key]['filename'], 'utf-8');
 				//error_log(array2string($value));
 				//error_log(strtoupper($value['mimeType']) .'<->'. mime_magic::filename2mime($attachmentHTML[$key]['filename']));
-				if (strtoupper($value['mimeType']=='APPLICATION/OCTET-STREAM')) $value['mimeType'] = mime_magic::filename2mime($attachmentHTML[$key]['filename']);
-				$attachmentHTML[$key]['type']=$value['mimeType'];
-				$attachmentHTML[$key]['mimetype']=mime_magic::mime2label($value['mimeType']);
+				if (strtoupper($value['mimeType'] == 'APPLICATION/OCTET-STREAM')) $value['mimeType'] = mime_magic::filename2mime($attachmentHTML[$key]['filename']);
+				$attachmentHTML[$key]['type'] = $value['mimeType'];
+				$attachmentHTML[$key]['mimetype'] = mime_magic::mime2label($value['mimeType']);
 				$hA = self::splitRowID($rowID);
 				$uid = $hA['msgUID'];
 				$mailbox = $hA['folder'];
@@ -1988,26 +1987,25 @@ 
 				$attachmentHTML[$key]['mime_data'] = egw_link::set_data($value['mimeType'], 'emailadmin_imapbase::getAttachmentAccount', array(
 					$acc_id, $mailbox, $uid, $value['partID'], $value['is_winmail'], true
 				));
-				$attachmentHTML[$key]['size']=egw_vfs::hsize($value['size']);
-				$attachmentHTML[$key]['attachment_number']=$key;
-				$attachmentHTML[$key]['partID']=$value['partID'];
+				$attachmentHTML[$key]['size'] = egw_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";
 
-				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':
@@ -2018,7 +2016,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 = mime_magic::ext2mime($suffix);
@@ -2031,49 +2029,47 @@ 
 					case 'TEXT/VCARD':
 					case 'TEXT/CALENDAR':
 					case 'TEXT/X-VCALENDAR':
-						$linkData = array
-						(
+						$linkData = array(
 							'menuaction'	=> 'mail.mail_ui.getAttachment',
 							'id'		=> $rowID,
 							'part'		=> $value['partID'],
 							'is_winmail'    => $value['is_winmail'],
 							'mailbox'   => base64_encode($mailbox),
 						);
-						$windowName = 'displayAttachment_'. $uid;
+						$windowName = 'displayAttachment_'.$uid;
 						$reg = '800x600';
 						// handle calendar/vcard
-						if (strtoupper($value['mimeType'])=='TEXT/CALENDAR')
+						if (strtoupper($value['mimeType']) == 'TEXT/CALENDAR')
 						{
-							$windowName = 'displayEvent_'. $rowID;
-							$reg2 = egw_link::get_registry('calendar','view_popup');
-							$attachmentHTML[$key]['popup']=(!empty($reg2) ? $reg2 : $reg);
+							$windowName = 'displayEvent_'.$rowID;
+							$reg2 = egw_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 = egw_link::get_registry('addressbook','add_popup');
-							$attachmentHTML[$key]['popup']=(!empty($reg2) ? $reg2 : $reg);
+							$windowName = 'displayContact_'.$rowID;
+							$reg2 = egw_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;
@@ -2083,8 +2079,7 @@ 
 					($value['name'] ? $value['name'] : lang('(no subject)')).
 					'</b></a>';
 
-				$linkData = array
-				(
+				$linkData = array(
 					'menuaction'	=> 'mail.mail_ui.getAttachment',
 					'mode'		=> 'save',
 					'id'		=> $rowID,
@@ -2092,11 +2087,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']."'>".html::image('mail','fileexport')."</a>";
+				$attachmentHTML[$key]['link_save'] = "<a href='".egw::link('/index.php', $linkData)."' title='".$attachmentHTML[$key]['filename']."'>".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'],
@@ -2115,19 +2110,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>';
@@ -2146,7 +2141,7 @@ 
 				unset($attachmentHTML[$ikey]['link_save']);
 			}
 		}
-		return ($_returnFullHTML?$attachmentHTMLBlock:$attachmentHTML);
+		return ($_returnFullHTML ? $attachmentHTMLBlock : $attachmentHTML);
 	}
 
 	/**
@@ -2157,7 +2152,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)
@@ -2170,7 +2165,7 @@ 
 
 				$cachedVacations = array($sieveServer->acc_id => $vacation) + (array)$cachedVacations;
 				// Set vacation to the instance cache for particular account with expiration of one day
-				egw_cache::setCache(egw_cache::INSTANCE, 'email', 'vacationNotice'.$GLOBALS['egw_info']['user']['account_lid'], $cachedVacations, 60*60*24);
+				egw_cache::setCache(egw_cache::INSTANCE, 'email', 'vacationNotice'.$GLOBALS['egw_info']['user']['account_lid'], $cachedVacations, 60 * 60 * 24);
 			}
 			catch (PEAR_Exception $ex)
 			{
@@ -2191,36 +2186,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_bo::show_readable_size($_limit*1024);
-		$quotaUsage=mail_bo::show_readable_size($_usage*1024);
+		$quotaLimit = mail_bo::show_readable_size($_limit * 1024);
+		$quotaUsage = mail_bo::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;
 	}
 
@@ -2234,12 +2229,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();
 
@@ -2247,8 +2242,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");
@@ -2266,7 +2261,7 @@ 
 
 	function getAttachment()
 	{
-		if(isset($_GET['id'])) $rowID	= $_GET['id'];
+		if (isset($_GET['id'])) $rowID = $_GET['id'];
 
 		$hA = self::splitRowID($rowID);
 		$uid = $hA['msgUID'];
@@ -2278,11 +2273,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)
 		{
@@ -2297,7 +2292,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 = mime_magic::ext2mime($suffix);
@@ -2309,10 +2304,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)
 				{
@@ -2320,7 +2315,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
 			}
@@ -2335,13 +2330,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)
 				{
@@ -2349,14 +2344,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));
-		html::safe_content_header($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));
+		html::safe_content_header($attachment['attachment'], $filename, $attachment['type'], $size = 0, True, $_GET['mode'] == "save");
 		echo $attachment['attachment'];
 
 		common::egw_exit();
@@ -2371,9 +2366,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'];
@@ -2389,7 +2384,7 @@ 
 		$this->mail_bo->reopen($mailbox);
 
 		$message = $this->mail_bo->getMessageRawBody($uid, $partID, $mailbox);
-		$headers = $this->mail_bo->getMessageHeader($uid, $partID, true,false, $mailbox);
+		$headers = $this->mail_bo->getMessageHeader($uid, $partID, true, false, $mailbox);
 
 		$this->mail_bo->closeConnection();
 		if ($rememberServerID != $this->mail_bo->profileID)
@@ -2401,14 +2396,14 @@ 
 		$GLOBALS['egw']->session->commit_session();
 		if (!$display)
 		{
-			$subject = str_replace('$$','__',mail_bo::decode_header($headers['SUBJECT']));
-			html::safe_content_header($message, $subject.".eml", $mime='message/rfc822', $size=0, true, true);
+			$subject = str_replace('$$', '__', mail_bo::decode_header($headers['SUBJECT']));
+			html::safe_content_header($message, $subject.".eml", $mime = 'message/rfc822', $size = 0, true, true);
 			echo $message;
 		}
 		else
 		{
-			html::safe_content_header($message, $subject.".eml", $mime='text/html', $size=0, true, false);
-			print '<pre>'. htmlspecialchars($message, ENT_NOQUOTES|ENT_SUBSTITUTE, 'utf-8') .'</pre>';
+			html::safe_content_header($message, $subject.".eml", $mime = 'text/html', $size = 0, true, false);
+			print '<pre>'.htmlspecialchars($message, ENT_NOQUOTES|ENT_SUBSTITUTE, 'utf-8').'</pre>';
 		}
 	}
 
@@ -2420,18 +2415,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) && !egw_vfs::is_writable($path) || !is_array($ids) && !egw_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();';
 		}
 		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'];
@@ -2442,20 +2437,20 @@ 
 				//error_log(__METHOD__.__LINE__.' change Profile to ->'.$icServerID);
 				$this->changeProfile($icServerID);
 			}
-			$message = $this->mail_bo->getMessageRawBody($uid, $partID='', $mailbox);
-			$err=null;
-			if(egw_vfs::is_dir($path))
+			$message = $this->mail_bo->getMessageRawBody($uid, $partID = '', $mailbox);
+			$err = null;
+			if (egw_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 = egw_vfs::fopen($file,'wb')) || !fwrite($fp,$message))
+			if (!($fp = egw_vfs::fopen($file, 'wb')) || !fwrite($fp, $message))
 			{
-				$err .= lang('Error saving %1!',$file);
+				$err .= lang('Error saving %1!', $file);
 				$succeeded = false;
 			}
 			else
@@ -2465,10 +2460,10 @@ 
 			if ($fp) fclose($fp);
 			if ($succeeded)
 			{
-				unset($headers['SUBJECT']);//already in filename
+				unset($headers['SUBJECT']); //already in filename
 				$infoSection = mail_bo::createHeaderInfoSection($headers, 'SUPPRESS', false);
-				$props = array(array('name' => 'comment','val' => $infoSection));
-				egw_vfs::proppatch($file,$props);
+				$props = array(array('name' => 'comment', 'val' => $infoSection));
+				egw_vfs::proppatch($file, $props);
 			}
 		}
 		if ($rememberServerID != $this->mail_bo->profileID)
@@ -2477,9 +2472,9 @@ 
 			$this->changeProfile($rememberServerID);
 		}
 
-		if($close)
+		if ($close)
 		{
-			egw_framework::window_close(($err?$err:null));
+			egw_framework::window_close(($err ? $err : null));
 		}
 		else
 		{
@@ -2494,15 +2489,15 @@ 
 	 * @param string $path path in vfs (no egw_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) && !egw_vfs::is_writable($path) || !is_array($ids) && !egw_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;
 		
@@ -2512,12 +2507,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,
@@ -2529,8 +2524,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)
@@ -2541,14 +2536,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);
@@ -2566,25 +2561,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(egw_vfs::file_exists($path.($file && $isMultipleDownload ? '/'.$file : '')))
+			while (egw_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 = egw_vfs::fopen($file=$path.($params['name'] && $isMultipleDownload ? '/'.$params['name'] : ''),'wb')) ||
-				!fwrite($fp,$attachment['attachment']))
+			if (!($fp = egw_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)
 			{
@@ -2597,21 +2592,21 @@ 
 			//error_log(__METHOD__.__LINE__.' change Profile back to where we came from ->'.$rememberServerID);
 			$this->changeProfile($rememberServerID);
 		}
-		egw_framework::window_close(($err?$err:null));
+		egw_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'];
@@ -2629,29 +2624,29 @@ 
 		}
 		// 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/*egw_vfs::get_home_dir()*/ . "/.mail_$message_id";
-		if(egw_vfs::is_dir($temp_path)) egw_vfs::remove ($temp_path);
+		$temp_path = $homedir/*egw_vfs::get_home_dir()*/."/.mail_$message_id";
+		if (egw_vfs::is_dir($temp_path)) egw_vfs::remove($temp_path);
 
 		// Add subject to path, so it gets used as the file name
-		$path = $temp_path . '/' . ($header['SUBJECT'] ? egw_vfs::encodePathComponent($header['SUBJECT']) : lang('mail')) .'/';
-		if(!egw_vfs::mkdir($path, 0700, true))
+		$path = $temp_path.'/'.($header['SUBJECT'] ? egw_vfs::encodePathComponent($header['SUBJECT']) : lang('mail')).'/';
+		if (!egw_vfs::mkdir($path, 0700, true))
 		{
-			egw_framework::message("Unable to open temp directory $path",'error');
+			egw_framework::message("Unable to open temp directory $path", 'error');
 			return;
 		}
 
 		$file_list = 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'])
 			{
@@ -2664,15 +2659,15 @@ 
 			}
 			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 (!($fp = egw_vfs::fopen($path.$file['filename'],'wb')) ||
+			if (!($fp = egw_vfs::fopen($path.$file['filename'], 'wb')) ||
 				!(!fseek($attachment['attachment'], 0, SEEK_SET) && stream_copy_to_stream($attachment['attachment'], $fp)))
 			{
-				$success=false;
-				egw_framework::message("Unable to zip {$file['filename']}",'error');
+				$success = false;
+				egw_framework::message("Unable to zip {$file['filename']}", 'error');
 			}
 			if ($success) $file_list[] = $path.$file['filename'];
 			if ($fp) fclose($fp);
@@ -2693,7 +2688,7 @@ 
 		common::egw_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
@@ -2705,19 +2700,19 @@ 
 		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);
+		$bodyParts	= $this->mail_bo->getMessageBody($uid, ($htmlOptions ? $htmlOptions : ''), $partID, $structure, false, $mailbox);
 
 		//error_log(__METHOD__.__LINE__.array2string($bodyParts));
 		// attachments here are only fetched to determine if there is a meeting request
 		// and if. use the appropriate action. so we do not need embedded images
 		$fetchEmbeddedImages = false;
-		$attachments = (array)$this->mail_bo->getMessageAttachments($uid, $partID, $structure, $fetchEmbeddedImages, true,true,$mailbox);
+		$attachments = (array)$this->mail_bo->getMessageAttachments($uid, $partID, $structure, $fetchEmbeddedImages, true, true, $mailbox);
 		//error_log(__METHOD__.__LINE__.array2string($attachments));
 		foreach ($attachments as &$attach)
 		{
 			if (strtolower($attach['mimeType']) == 'text/calendar' &&
 				isset($GLOBALS['egw_info']['user']['apps']['calendar']) &&
-				($attachment = $this->mail_bo->getAttachment($uid, $attach['partID'],$attach['is_winmail'],(strtolower($attach['mimeType']) == 'text/calendar'?false:true))))
+				($attachment = $this->mail_bo->getAttachment($uid, $attach['partID'], $attach['is_winmail'], (strtolower($attach['mimeType']) == 'text/calendar' ? false : true))))
 			{
 				//error_log(__METHOD__.__LINE__.array2string($attachment));
 				egw_cache::setSession('calendar', 'ical', array(
@@ -2728,28 +2723,28 @@ 
 				));
 				$this->mail_bo->htmlOptions = $bufferHtmlOptions;
 				translation::add_app('calendar');
-				return ExecMethod( 'calendar.calendar_uiforms.meeting',
-					array('event'=>null,'msg'=>'','useSession'=>true)
+				return ExecMethod('calendar.calendar_uiforms.meeting',
+					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
 		egw_framework::includeCSS('mail', 'preview', true, true);
 
@@ -2760,35 +2755,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;
 			}
@@ -2798,7 +2793,7 @@ 
 				$body .= '';
 				continue;
 			}
-			if(!empty($body)) {
+			if (!empty($body)) {
 				$body .= '<hr style="border:dotted 1px silver;">';
 			}
 			//error_log($singleBodyPart['body']);
@@ -2823,22 +2818,22 @@ 
 				'(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']);
-			$singleBodyPart['body'] = translation::convert_jsonsafe($singleBodyPart['body'],$singleBodyPart['charSet']);
+			$singleBodyPart['body'] = 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_bo::$displayCharset));
+				$newBody = @htmlentities($singleBodyPart['body'], ENT_QUOTES, strtoupper(mail_bo::$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_bo::$displayCharset));
+				if (empty($newBody) && strtolower($singleBodyPart['charSet']) == 'utf-8') $newBody = @htmlentities(iconv('utf-8', 'utf-8', $singleBodyPart['body']), ENT_QUOTES, strtoupper(mail_bo::$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
@@ -2866,20 +2861,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_bo::wordwrap($newBody,90,"\n",'&gt;')."</pre>";
+				$newBody = "<pre>".mail_bo::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_bo::$tidy_config,'utf8');
+					$cleaned = $tidy->repairString($newBody, mail_bo::$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);
 					}
@@ -2890,7 +2885,7 @@ 
 					if (!$preserveHTML)
 					{
 						// filter only the 'body', as we only want that part, if we throw away the html
-						preg_match('`(<htm.+?<body[^>]*>)(.+?)(</body>.*?</html>)`ims', $newBody, $matches=array());
+						preg_match('`(<htm.+?<body[^>]*>)(.+?)(</body>.*?</html>)`ims', $newBody, $matches = array());
 						if ($matches[2])
 						{
 							$hasOther = true;
@@ -2901,7 +2896,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;
@@ -2910,10 +2905,10 @@ 
 					$htmLawed = new egw_htmLawed();
 					// the next line should not be needed, but produces better results on HTML 2 Text conversion,
 					// as we switched off HTMLaweds tidy functionality
-					$newBody = str_replace(array('&amp;amp;','<DIV><BR></DIV>',"<DIV>&nbsp;</DIV>",'<div>&nbsp;</div>'),array('&amp;','<BR>','<BR>','<BR>'),$newBody);
-					$newBody = $htmLawed->egw_htmLawed($newBody,mail_bo::$htmLawed_config);
-					if ($hasOther && $preserveHTML) $newBody = $matches[1]. $newBody. $matches[3];
-					$alreadyHtmlLawed=true;
+					$newBody = str_replace(array('&amp;amp;', '<DIV><BR></DIV>', "<DIV>&nbsp;</DIV>", '<div>&nbsp;</div>'), array('&amp;', '<BR>', '<BR>', '<BR>'), $newBody);
+					$newBody = $htmLawed->egw_htmLawed($newBody, mail_bo::$htmLawed_config);
+					if ($hasOther && $preserveHTML) $newBody = $matches[1].$newBody.$matches[3];
+					$alreadyHtmlLawed = true;
 				}
 				// do the cleanup, set for the use of purifier
 				//$newBodyBuff = $newBody;
@@ -2935,8 +2930,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",
@@ -2949,7 +2944,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
 			}
@@ -2961,7 +2956,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;
 	}
@@ -2976,7 +2971,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')
 		{
@@ -2984,7 +2979,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);
 			}
@@ -3003,7 +2998,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
@@ -3015,7 +3010,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 = '';
@@ -3037,11 +3032,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),
@@ -3054,7 +3049,7 @@ 
 				{
 					if (!isset($cache[$imageURL]))
 					{
-						if ($_type !="background")
+						if ($_type != "background")
 						{
 							$bo = emailadmin_imapbase::getInstance(false, mail_ui::$icServerID);
 							$attachment = $bo->getAttachmentByCID($_uid, $CID, $_partID);
@@ -3095,16 +3090,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);
 		}
 	}
 
@@ -3112,7 +3107,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());
 
@@ -3134,7 +3129,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);
@@ -3145,32 +3140,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 (egw_exception_wrong_userinput $e)
 			{
-					$importFailed=true;
-					$content['msg']		= $e->getMessage();
+					$importFailed = true;
+					$content['msg'] = $e->getMessage();
 			}
 			if (!$importFailed)
 			{
 				list($width, $height) = explode('x', egw_link::get_registry('mail', 'add_popup'));
 				if ($width > 0 && $height > 0) egw_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_new('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);
 	}
 
 	/**
@@ -3182,7 +3176,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));
@@ -3190,7 +3184,7 @@ 
 		// check if formdata meets basic restrictions (in tmp dir, or vfs, mimetype, etc.)
 		try
 		{
-			$tmpFileName = mail_bo::checkFileBasics($_formData,$importID);
+			$tmpFileName = mail_bo::checkFileBasics($_formData, $importID);
 		}
 		catch (egw_exception_wrong_userinput $e)
 		{
@@ -3214,29 +3208,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 (egw_exception_wrong_userinput $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);
 				}
 			}
 		}
@@ -3262,9 +3256,9 @@ 
 	 *								 $formData['size']	= 2136;
 	 * @return void
 	 */
-	function importMessageFromVFS2DraftAndEdit($formData='')
+	function importMessageFromVFS2DraftAndEdit($formData = '')
 	{
-		$this->importMessageFromVFS2DraftAndDisplay($formData,'edit');
+		$this->importMessageFromVFS2DraftAndDisplay($formData, 'edit');
 	}
 
 	/**
@@ -3279,7 +3273,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());
@@ -3292,43 +3286,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'] = mime_magic::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 (egw_exception_wrong_userinput $e)
 		{
@@ -3343,13 +3336,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_bo::$debug) error_log(__METHOD__."->".print_r($_messageID,true).",$_partID,$_htmloptions");
+		if (mail_bo::$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
@@ -3363,7 +3356,7 @@ 
 			$this->changeProfile($icServerID);
 		}
 
-		$bodyResponse = $this->get_load_email_data($messageID,$_partID,$folder,$_htmloptions);
+		$bodyResponse = $this->get_load_email_data($messageID, $_partID, $folder, $_htmloptions);
 		egw_session::cache_control(true);
 		//error_log(array2string($bodyResponse));
 		echo $bodyResponse;
@@ -3386,20 +3379,20 @@ 
 			$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
 					if ($folderName)
 					{
-						$fS = $this->mail_bo->getFolderStatus($folderName,false,false,false);
-						if (in_array($fS['shortDisplayName'],mail_bo::$autoFolders)) $fS['shortDisplayName']=lang($fS['shortDisplayName']);
+						$fS = $this->mail_bo->getFolderStatus($folderName, false, false, false);
+						if (in_array($fS['shortDisplayName'], mail_bo::$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'];
 						}
@@ -3410,7 +3403,7 @@ 
 			if ($oA)
 			{
 				$response = egw_json_response::get();
-				$response->call('app.mail.mail_setFolderStatus',$oA);
+				$response->call('app.mail.mail_setFolderStatus', $oA);
 			}
 		}
 	}
@@ -3424,14 +3417,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
@@ -3471,10 +3464,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');
@@ -3482,11 +3475,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++;
 						}
@@ -3495,16 +3488,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 = egw_json_response::get();
-				if ( $oldFolderInfo['shortDisplayName'])
+				if ($oldFolderInfo['shortDisplayName'])
 				{
 					$nodeInfo = array($_parentFolderName=>$oldFolderInfo['shortDisplayName']);
 				}
@@ -3512,14 +3505,14 @@ 
 				{
 					$nodeInfo = array($profileID=>lang('INBOX'));
 				}
-				$response->call('app.mail.mail_reloadNode',$nodeInfo);
+				$response->call('app.mail.mail_reloadNode', $nodeInfo);
 			}
 			else
 			{
 				if ($errorMessage)
 				{
 					$response = egw_json_response::get();
-					$response->call('egw.message',$errorMessage);
+					$response->call('egw.message', $errorMessage);
 				}
 			}
 		}
@@ -3541,22 +3534,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);
@@ -3573,7 +3566,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));
@@ -3583,7 +3576,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
@@ -3594,11 +3587,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)
 					{
@@ -3629,12 +3622,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'].')';
@@ -3647,20 +3640,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 = egw_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');
 			}
 		}
 	}
@@ -3672,7 +3665,7 @@ 
 	 * @param boolean $_subscribedOnly = true
 	 * @return void
 	 */
-	function ajax_reloadNode($_folderName,$_subscribedOnly=true)
+	function ajax_reloadNode($_folderName, $_subscribedOnly = true)
 	{
 		translation::add_app('mail');
 		$oldPrefForSubscribedOnly = !$this->mail_bo->mailPreferences['showAllFoldersInFolderPane'];
@@ -3683,20 +3676,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'];
 			}
@@ -3712,11 +3705,11 @@ 
 		}
 		// Send full info back in the response
 		$response = egw_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);
 
 	}
 	
@@ -3732,7 +3725,7 @@ 
 	 * @param type $_rowid row id from nm
 	 *
 	 */
-	function ajax_resolveWinmail ($_rowid)
+	function ajax_resolveWinmail($_rowid)
 	{
 		$response = egw_json_response::get();
 		
@@ -3740,7 +3733,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);
@@ -3768,30 +3761,30 @@ 
 			$decodedFolderName = $this->mail_bo->decodeEntityFolderName($_folderName);
 			$_newLocation = $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,$_newLocation,2);
+			list($profileID, $folderName) = explode(self::$delimiter, $decodedFolderName, 2);
+			list($newProfileID, $_newLocation) = explode(self::$delimiter, $_newLocation, 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);
@@ -3816,7 +3809,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
@@ -3828,11 +3821,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)
 					{
@@ -3853,9 +3846,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));
@@ -3864,26 +3857,26 @@ 
 			{
 				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');
 			}
 		}
 	}
@@ -3903,23 +3896,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();
@@ -3929,24 +3922,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 $i => $f)//folders contained in that level
+							foreach ($lc as $i => $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;
 								}
 							}
@@ -3977,11 +3970,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');
 			}
 		}
 	}
@@ -3995,7 +3988,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 = egw_json_response::get();
 
@@ -4003,7 +3996,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);
@@ -4019,23 +4012,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)
 		{
 			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);
 		}
 	}
 
@@ -4046,7 +4039,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 = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'vacationNotice'.$GLOBALS['egw_info']['user']['account_lid']);
@@ -4063,22 +4056,22 @@ 
 			$vacation = $mail->gatherVacation($cachedVacations);
 		}
 
-		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'? common::show_date($vacation['start_date'],$dtfrmt,true).($vacation['end_date']>$vacation['start_date']?'->'.common::show_date($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' ? common::show_date($vacation['start_date'], $dtfrmt, true).($vacation['end_date'] > $vacation['start_date'] ? '->'.common::show_date($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 = egw_json_response::get();
-		$response->call('app.mail.mail_refreshVacationNotice',$refreshData);
+		$response->call('app.mail.mail_refreshVacationNotice', $refreshData);
 	}
 
 	/**
@@ -4088,41 +4081,41 @@ 
 	 *						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(emailadmin_imapbase::$supportsORinQuery) || !isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]))
 		{
-			emailadmin_imapbase::$supportsORinQuery = egw_cache::getCache(egw_cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*10);
-			if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID])) emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]=true;
+			emailadmin_imapbase::$supportsORinQuery = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60 * 60 * 10);
+			if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID])) emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID] = true;
 		}
 		if (!emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID])
 		{
 			unset($this->searchTypes['quick']);
 		}
-		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 = egw_json_response::get();
-		$response->call('app.mail.mail_refreshFilter2Options',$this->searchTypes);
-		$response->call('app.mail.mail_refreshFilterOptions',$this->statusTypes);
+		$response->call('app.mail.mail_refreshFilter2Options', $this->searchTypes);
+		$response->call('app.mail.mail_refreshFilterOptions', $this->statusTypes);
 
 	}
 
@@ -4131,7 +4124,7 @@ 
 	 *
 	 * @return nothing
 	 */
-	function ajax_refreshQuotaDisplay($icServerID=null)
+	function ajax_refreshQuotaDisplay($icServerID = null)
 	{
 		//error_log(__METHOD__.__LINE__.array2string($icServerID));
 		translation::add_app('mail');
@@ -4150,10 +4143,10 @@ 
 			error_log(__METHOD__.__LINE__." ".$e->getMessage());
 		}
 
-		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 {
@@ -4167,7 +4160,7 @@ 
 			$this->changeProfile($rememberServerID);
 		}
 		$response = egw_json_response::get();
-		$response->call('app.mail.mail_setQuotaDisplay',array('data'=>$content));
+		$response->call('app.mail.mail_setQuotaDisplay', array('data'=>$content));
 	}
 
 	/**
@@ -4189,34 +4182,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');
 		}
 	}
 
@@ -4239,7 +4232,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
@@ -4248,25 +4241,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');
 		}
 	}
 
@@ -4283,7 +4276,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))
@@ -4294,7 +4287,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)
@@ -4303,7 +4296,7 @@ 
 				$this->changeProfile($rememberServerID);
 			}
 			$response = egw_json_response::get();
-			$response->call('egw.refresh',lang('compress folder').': '.$folderName,'mail');
+			$response->call('egw.refresh', lang('compress folder').': '.$folderName, 'mail');
 		}
 	}
 
@@ -4316,10 +4309,10 @@ 
 	 */
 	function ajax_sendMDN($_messageList)
 	{
-		if(mail_bo::$debug) error_log(__METHOD__."->".array2string($_messageList));
+		if (mail_bo::$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);
 	}
 
 	/**
@@ -4331,14 +4324,14 @@ 
 	 *
 	 * @return xajax response
 	 */
-	function ajax_flagMessages($_flag, $_messageList, $_sendJsonResponse=true)
+	function ajax_flagMessages($_flag, $_messageList, $_sendJsonResponse = true)
 	{
-		if(mail_bo::$debug) error_log(__METHOD__."->".$_flag.':'.array2string($_messageList));
+		if (mail_bo::$debug) error_log(__METHOD__."->".$_flag.':'.array2string($_messageList));
 		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'])
 			{
@@ -4353,10 +4346,10 @@ 
 						//([filterName] => Schnellsuche[type] => quick[string] => ebay[status] => any
 						if (is_null(emailadmin_imapbase::$supportsORinQuery) || !isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]))
 						{
-							emailadmin_imapbase::$supportsORinQuery = egw_cache::getCache(egw_cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*10);
-							if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID])) emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]=true;
+							emailadmin_imapbase::$supportsORinQuery = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60 * 60 * 10);
+							if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID])) emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID] = true;
 						}
-						$filter = $filter2toggle = array('filterName' => (emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?lang('quicksearch'):lang('subject')),'type' => ($query['filter2']?$query['filter2']:(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?'quick':'subject')),'string' => $query['search'],'status' => 'any');
+						$filter = $filter2toggle = array('filterName' => (emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID] ? lang('quicksearch') : lang('subject')), 'type' => ($query['filter2'] ? $query['filter2'] : (emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID] ? 'quick' : 'subject')), 'string' => $query['search'], 'status' => 'any');
 					}
 					else
 					{
@@ -4365,70 +4358,70 @@ 
 					// 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'];
 						}
 						$_sRt = $this->mail_bo->getSortedList(
 							$folder,
-							$sort=0,
-							$reverse=1,
+							$sort = 0,
+							$reverse = 1,
 							$filter2toggle,
-							$rByUid=true,
+							$rByUid = true,
 							false
 						);
 						$messageListForToggle = $_sRt['match']->ids;
 						$filter['status'] = array($_flag);
-						if ($query['filter'] && $query['filter'] !='any')
+						if ($query['filter'] && $query['filter'] != 'any')
 						{
 							$filter['status'][] = $query['filter'];
 						}
 						$_sR = $this->mail_bo->getSortedList(
 							$folder,
-							$sort=0,
-							$reverse=1,
+							$sort = 0,
+							$reverse = 1,
 							$filter,
-							$rByUid=true,
+							$rByUid = true,
 							false
 						);
 						$messageList = $_sR['match']->ids;
-						if (count($messageListForToggle)>0)
+						if (count($messageListForToggle) > 0)
 						{
 							$flag2set = (strtolower($_flag));
-							if(mail_bo::$debug) error_log(__METHOD__.__LINE__." toggle un$_flag -> $flag2set ".array2string($filter2toggle).array2string($messageListForToggle));
-							$this->mail_bo->flagMessages($flag2set, $messageListForToggle,$folder);
+							if (mail_bo::$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_bo::$debug) error_log(__METHOD__.__LINE__." $_flag -> $flag2set ".array2string($filter).array2string($messageList));
-							$this->mail_bo->flagMessages($flag2set, $messageList,$folder);
+							if (mail_bo::$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_bo::$debug) error_log(__METHOD__.__LINE__." flag all with $_flag on filter used:".array2string($filter));
+						if (mail_bo::$debug) error_log(__METHOD__.__LINE__." flag all with $_flag on filter used:".array2string($filter));
 						$_sR = $this->mail_bo->getSortedList(
 							$folder,
-							$sort=0,
-							$reverse=1,
+							$sort = 0,
+							$reverse = 1,
 							$filter,
-							$rByUid=true,
+							$rByUid = true,
 							false
 						);
 						$messageList = $_sR['match']->ids;
@@ -4437,8 +4430,8 @@ 
 					}
 					else
 					{
-						if(mail_bo::$debug) error_log(__METHOD__.__LINE__." $_flag all ".array2string($filter));
-						$alreadyFlagged=true;
+						if (mail_bo::$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);
@@ -4452,41 +4445,41 @@ 
 			}
 			if (!$alreadyFlagged)
 			{
-				foreach($_messageList['msg'] as $rowID)
+				foreach ($_messageList['msg'] as $rowID)
 				{
 					$hA = self::splitRowID($rowID);
 					$messageList[] = $hA['msgUID'];
 				}
-				if(mail_bo::$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_bo::$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_bo::$debug) error_log(__METHOD__."-> No messages selected.");
+			if (mail_bo::$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 = egw_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));
 			}
 		}
 	}
@@ -4498,12 +4491,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_bo::$debug) error_log(__METHOD__."->".print_r($_messageList,true).' Method:'.$_forceDeleteMethod);
+		if (mail_bo::$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'])
 			{
@@ -4518,11 +4511,11 @@ 
 						//([filterName] => Schnellsuche[type] => quick[string] => ebay[status] => any
 						if (is_null(emailadmin_imapbase::$supportsORinQuery) || !isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]))
 						{
-							emailadmin_imapbase::$supportsORinQuery = egw_cache::getCache(egw_cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*10);
-							if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID])) emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]=true;
+							emailadmin_imapbase::$supportsORinQuery = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60 * 60 * 10);
+							if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID])) emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID] = true;
 						}
-						$filtered =  true;
-						$filter = array('filterName' => (emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?lang('quicksearch'):lang('subject')),'type' => ($query['filter2']?$query['filter2']:(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?'quick':'subject')),'string' => $query['search'],'status' => (!empty($query['filter'])?$query['filter']:'any'));
+						$filtered = true;
+						$filter = array('filterName' => (emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID] ? lang('quicksearch') : lang('subject')), 'type' => ($query['filter2'] ? $query['filter2'] : (emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID] ? 'quick' : 'subject')), 'string' => $query['search'], 'status' => (!empty($query['filter']) ? $query['filter'] : 'any'));
 					}
 					else
 					{
@@ -4534,7 +4527,7 @@ 
 					$rByUid = true;
 					$_sR = $this->mail_bo->getSortedList(
 						$folder,
-						$sort=0,
+						$sort = 0,
 						$reverse,
 						$filter,
 						$rByUid,
@@ -4544,23 +4537,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 (egw_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'];
@@ -4568,27 +4561,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 (egw_exception $e)
 				{
-					$error = str_replace('"',"'",$e->getMessage());
+					$error = str_replace('"', "'", $e->getMessage());
 				}
 			}
 			$response = egw_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_bo::$debug) error_log(__METHOD__."-> No messages selected.");
+			if (mail_bo::$debug) error_log(__METHOD__."-> No messages selected.");
 		}
 	}
 
@@ -4601,35 +4594,35 @@ 
 	 *
 	 * @return xajax response
 	 */
-	function ajax_copyMessages($_folderName, $_messageList, $_copyOrMove='copy')
+	function ajax_copyMessages($_folderName, $_messageList, $_copyOrMove = 'copy')
 	{
-		if(mail_bo::$debug) error_log(__METHOD__."->".$_folderName.':'.print_r($_messageList,true).' Method:'.$_copyOrMove);
+		if (mail_bo::$debug) error_log(__METHOD__."->".$_folderName.':'.print_r($_messageList, true).' Method:'.$_copyOrMove);
 		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);
-		$lastFoldersUsedForMoveCont = egw_cache::getCache(egw_cache::INSTANCE,'email','lastFolderUsedForMove'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),$expiration=60*60*1);
+		if (!($_copyOrMove == 'copy' || $_copyOrMove == 'move')) $_copyOrMove = 'copy';
+		list($targetProfileID, $targetFolder) = explode(self::$delimiter, $_folderName, 2);
+		$lastFoldersUsedForMoveCont = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'lastFolderUsedForMove'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), $expiration = 60 * 60 * 1);
 		$changeFolderActions = false;
 		if (!isset($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]));
 			}
-			$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
@@ -4644,11 +4637,11 @@ 
 						//([filterName] => Schnellsuche[type] => quick[string] => ebay[status] => any
 						if (is_null(emailadmin_imapbase::$supportsORinQuery) || !isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]))
 						{
-							emailadmin_imapbase::$supportsORinQuery = egw_cache::getCache(egw_cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*10);
-							if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID])) emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]=true;
+							emailadmin_imapbase::$supportsORinQuery = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60 * 60 * 10);
+							if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID])) emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID] = true;
 						}
 						$filtered = true;
-						$filter = array('filterName' => (emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?lang('quicksearch'):lang('subject')),'type' => ($query['filter2']?$query['filter2']:(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?'quick':'subject')),'string' => $query['search'],'status' => (!empty($query['filter'])?$query['filter']:'any'));
+						$filter = array('filterName' => (emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID] ? lang('quicksearch') : lang('subject')), 'type' => ($query['filter2'] ? $query['filter2'] : (emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID] ? 'quick' : 'subject')), 'string' => $query['search'], 'status' => (!empty($query['filter']) ? $query['filter'] : 'any'));
 					}
 					else
 					{
@@ -4659,70 +4652,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 (egw_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 (egw_exception $e)
 					{
-						$error = str_replace('"',"'",$e->getMessage());
+						$error = str_replace('"', "'", $e->getMessage());
 					}
 				}
 			}
@@ -4735,30 +4728,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)
 			{
-				egw_cache::setCache(egw_cache::INSTANCE,'email','lastFolderUsedForMove'.trim($GLOBALS['egw_info']['user']['account_id']),$lastFoldersUsedForMoveCont, $expiration=60*60*1);
+				egw_cache::setCache(egw_cache::INSTANCE, 'email', 'lastFolderUsedForMove'.trim($GLOBALS['egw_info']['user']['account_id']), $lastFoldersUsedForMoveCont, $expiration = 60 * 60 * 1);
 				$actionsnew = self::get_actions();
 				$actionsnew = etemplate_widget_nextmatch::egw_actions($actionsnew);
-				$response->call('app.mail.mail_rebuildActionsOnList',$actionsnew);
+				$response->call('app.mail.mail_rebuildActionsOnList', $actionsnew);
 			}
 		}
 		else
 		{
-			if(mail_bo::$debug) error_log(__METHOD__."-> No messages selected.");
+			if (mail_bo::$debug) error_log(__METHOD__."-> No messages selected.");
 		}
 	}
 
@@ -4768,11 +4761,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));
 	}
 
 	/**
@@ -4780,15 +4773,15 @@ 
 	 *
 	 * @param array $content content of dialog
 	 */
-	function folderManagement (array $content = null)
+	function folderManagement(array $content = null)
 	{
 		$dtmpl = new etemplate_new('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();
@@ -4796,7 +4789,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);
 	}
 
 	/**
@@ -4806,11 +4799,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 = egw_json_response::get();
 			list(,$folderName) = explode(self::$delimiter, $_folderName);
 			if ($success)
@@ -4819,7 +4812,7 @@ 
 			}
 			else
 			{
-				$res = lang("Failed to delete %1",$folderName);
+				$res = lang("Failed to delete %1", $folderName);
 			}
 			$response->data($res);
 		}

Braces +806 added lines, -222 removed lines

@@ -114,9 +114,15 @@ 
 	function __construct($run_constructor=true)
 	{
 		$this->mail_tree = new mail_tree($this);
-		if (!$run_constructor) return;
+		if (!$run_constructor)
+		{
+			return;
+		}
 
-		if (mail_bo::$debugTimes) $starttime = microtime (true);
+		if (mail_bo::$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']);
 
@@ -127,13 +133,19 @@ 
 		if ($_GET["resetConnection"])
 		{
 			unset($_GET["resetConnection"]);
-			if (mail_bo::$debug) error_log(__METHOD__.__LINE__.' Connection Reset triggered: for Profile with ID:'.self::$icServerID);
+			if (mail_bo::$debug)
+			{
+				error_log(__METHOD__.__LINE__.' Connection Reset triggered: for Profile with ID:'.self::$icServerID);
+			}
 			emailadmin_imapbase::unsetCachedObjects(self::$icServerID);
 		}
 
 		try {
 			$this->mail_bo = mail_bo::getInstance(true,self::$icServerID, true, false, true);
-			if (mail_bo::$debug) error_log(__METHOD__.__LINE__.' Fetched IC Server:'.self::$icServerID.'/'.$this->mail_bo->profileID.':'.function_backtrace());
+			if (mail_bo::$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
@@ -150,7 +162,10 @@ 
 			// redirect to mail wizard to handle it (redirect works for ajax too)
 			self::callWizard($e->getMessage(),true,'error');
 		}
-		if (mail_bo::$debugTimes) mail_bo::logRunTimes($starttime,null,'',__METHOD__.__LINE__);
+		if (mail_bo::$debugTimes)
+		{
+			mail_bo::logRunTimes($starttime,null,'',__METHOD__.__LINE__);
+		}
 	}
 
 	/**
@@ -209,16 +224,28 @@ 
 	 */
 	function changeProfile($_icServerID,$unsetCache=false)
 	{
-		if (mail_bo::$debugTimes) $starttime = microtime (true);
+		if (mail_bo::$debugTimes)
+		{
+			$starttime = microtime (true);
+		}
 		if (self::$icServerID != $_icServerID)
 		{
 			self::$icServerID = $_icServerID;
 		}
-		if (mail_bo::$debug) error_log(__METHOD__.__LINE__.'->'.self::$icServerID.'<->'.$_icServerID);
+		if (mail_bo::$debug)
+		{
+			error_log(__METHOD__.__LINE__.'->'.self::$icServerID.'<->'.$_icServerID);
+		}
 
-		if ($unsetCache) emailadmin_imapbase::unsetCachedObjects(self::$icServerID);
+		if ($unsetCache)
+		{
+			emailadmin_imapbase::unsetCachedObjects(self::$icServerID);
+		}
 		$this->mail_bo = mail_bo::getInstance(false,self::$icServerID,true, false, true);
-		if (mail_bo::$debug) error_log(__METHOD__.__LINE__.' Fetched IC Server:'.self::$icServerID.'/'.$this->mail_bo->profileID.':'.function_backtrace());
+		if (mail_bo::$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->icServer) || $this->mail_bo->icServer->ImapServerId<>$_icServerID)
 		{
@@ -228,14 +255,20 @@ 
 
 		// save session varchar
 		$oldicServerID =& egw_cache::getSession('mail','activeProfileID');
-		if ($oldicServerID <> self::$icServerID) $this->mail_bo->openConnection(self::$icServerID);
+		if ($oldicServerID <> self::$icServerID)
+		{
+			$this->mail_bo->openConnection(self::$icServerID);
+		}
 		$oldicServerID = self::$icServerID;
 		if (!emailadmin_imapbase::storeActiveProfileIDToPref($this->mail_bo->icServer, self::$icServerID, true ))
 		{
 			throw new egw_exception(__METHOD__." failed to change Profile to $_icServerID");
 		}
 
-		if (mail_bo::$debugTimes) mail_bo::logRunTimes($starttime,null,'',__METHOD__.__LINE__);
+		if (mail_bo::$debugTimes)
+		{
+			mail_bo::logRunTimes($starttime,null,'',__METHOD__.__LINE__);
+		}
 	}
 
 	/**
@@ -276,7 +309,8 @@ 
 		// got subscribed or unsubscribed by the user
 		try {
 			$subscribed = $this->mail_bo->icServer->listSubscribedMailboxes('',0,true);
-		} catch (Exception $ex) {
+		}
+		catch (Exception $ex) {
 			egw_framework::message($ex->getMessage());
 		}
 
@@ -310,9 +344,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;
+							}
 						}
 
 					}
@@ -400,7 +443,10 @@ 
 	{
 		try	{
 				//error_log(__METHOD__.__LINE__.function_backtrace());
-				if (mail_bo::$debugTimes) $starttime = microtime (true);
+				if (mail_bo::$debugTimes)
+				{
+					$starttime = microtime (true);
+				}
 				$this->mail_bo->restoreSessionData();
 				$sessionFolder = $this->mail_bo->sessionData['mailbox'];
 				if ($this->mail_bo->folderExists($sessionFolder))
@@ -455,13 +501,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";
@@ -469,7 +518,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')*/;
@@ -503,21 +553,36 @@ 
 					$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(emailadmin_imapbase::$supportsORinQuery) || !isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]))
 				{
 					emailadmin_imapbase::$supportsORinQuery = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*10);
-					if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID])) emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]=true;
+					if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]))
+					{
+						emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]=true;
+					}
+				}
+				if (!emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID])
+				{
+					unset($this->searchTypes['quick']);
 				}
-				if (!emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]) unset($this->searchTypes['quick']);
 				$sel_options['filter2'] = $this->searchTypes;
 				$sel_options['filter'] = $this->statusTypes;
 
@@ -712,18 +777,30 @@ 
 				$etpl->setElementAttribute(self::$nm_index.'[foldertree]','actions', $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());
+				}
 
-				if (empty($content[self::$nm_index]['filter2']) || empty($content[self::$nm_index]['search'])) $content[self::$nm_index]['filter2']=(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?'quick':'subject');
+				if (empty($content[self::$nm_index]['filter2']) || empty($content[self::$nm_index]['search']))
+				{
+					$content[self::$nm_index]['filter2']=(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?'quick':'subject');
+				}
 				$readonlys = $preserv = array();
-				if (mail_bo::$debugTimes) mail_bo::logRunTimes($starttime,null,'',__METHOD__.__LINE__);
+				if (mail_bo::$debugTimes)
+				{
+					mail_bo::logRunTimes($starttime,null,'',__METHOD__.__LINE__);
+				}
 		}
 		catch (Exception $e)
 		{
 			self::callWizard($e->getMessage(),true, 'error');
 		}
 		// Check preview pane is enabled, then show spliter
-		if ($this->mail_bo->mailPreferences['previewPane']) $etpl->setElementAttribute('mail.index.spliter', 'template', 'mail.index.nospliter');
+		if ($this->mail_bo->mailPreferences['previewPane'])
+		{
+			$etpl->setElementAttribute('mail.index.spliter', 'template', 'mail.index.nospliter');
+		}
 
 		return $etpl->exec('mail.mail_ui.index',$content,$sel_options,$readonlys,$preserv);
 	}
@@ -762,12 +839,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
@@ -779,7 +862,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);
 	}
 
@@ -844,7 +930,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 ($lastFoldersUsedForMoveCont as $pid => $info)
 		{
 			if ($this->mail_bo->profileID==$pid && isset($lastFoldersUsedForMoveCont[$this->mail_bo->profileID]))
@@ -859,9 +948,12 @@ 
 					{
 						$moveaction .= $lastFolderUsedForMoveCont;
 
-						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;
@@ -881,9 +973,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_';
+					}
 						$fS = array();
 						$fS['profileID'] = $pid;
 						$fS['profileName'] = $accArray[$pid];
@@ -1241,22 +1336,34 @@ 
 					$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))
 		{
 			$mail_ui = new mail_ui(true);	// run constructor for current profile
-			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_bo::$debugTimes=true;
-		if (mail_bo::$debugTimes) $starttime = microtime(true);
+		if (mail_bo::$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;
@@ -1267,7 +1374,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))
 		{
@@ -1328,7 +1438,10 @@ 
 				$rowsFetched['messages'] = $_sR['count'];
 				$sR = $_sR['match']->ids;
 				// if $sR is false, something failed fundamentally
-				if($reverse === true) $sR = ($sR===false?array():array_reverse((array)$sR));
+				if($reverse === true)
+				{
+					$sR = ($sR===false?array():array_reverse((array)$sR));
+				}
 				$sR = array_slice((array)$sR,($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));
@@ -1394,7 +1507,10 @@ 
 				}
 				else
 				{
-					if (!empty($v)) $sortResult['header'][] = array('uid'=>$v);
+					if (!empty($v))
+					{
+						$sortResult['header'][] = array('uid'=>$v);
+					}
 				}
 			}
 		}
@@ -1403,15 +1519,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_bo::$debugTimes) mail_bo::logRunTimes($starttime,null,'Folder:'.$_folderName.' Start:'.$query['start'].' NumRows:'.$query['num_rows'],__METHOD__.__LINE__);
+		if (mail_bo::$debugTimes)
+		{
+			mail_bo::logRunTimes($starttime,null,'Folder:'.$_folderName.' Start:'.$query['start'].' NumRows:'.$query['num_rows'],__METHOD__.__LINE__);
+		}
 		return $rowsFetched['messages'];
 	}
 
@@ -1513,7 +1638,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']);
@@ -1535,7 +1663,10 @@ 
 	 */
 	public function header2gridelements($_headers, $cols, $_folderName, $_folderType=0)
 	{
-		if (mail_bo::$debugTimes) $starttime = microtime(true);
+		if (mail_bo::$debugTimes)
+		{
+			$starttime = microtime(true);
+		}
 		$rv = array();
 		$i=0;
 		foreach((array)$_headers as $header)
@@ -1548,17 +1679,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);
@@ -1566,41 +1730,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';
 			}
 
@@ -1617,10 +1793,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') .')';
 				}
 
@@ -1662,15 +1841,22 @@ 
 					}
 
 					$attachmentFlag = $image;
-				} else {
+				}
+				else
+				{
 					$attachmentFlag ='&nbsp;';
 				}
 				// show priority flag
-				if ($header['priority'] < 3) {
+				if ($header['priority'] < 3)
+				{
 					 $image = html::image('mail','prio_high');
-				} elseif ($header['priority'] > 3) {
+				}
+				elseif ($header['priority'] > 3)
+				{
 					$image = html::image('mail','prio_low');
-				} else {
+				}
+				else
+				{
 					$image = '';
 				}
 				// show a flag for flagged messages
@@ -1712,26 +1898,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'])
@@ -1741,7 +1954,10 @@ 
 			$rv[] = $data;
 			//error_log(__METHOD__.__LINE__.array2string($data));
 		}
-		if (mail_bo::$debugTimes) mail_bo::logRunTimes($starttime,null,'Folder:'.$_folderName,__METHOD__.__LINE__);
+		if (mail_bo::$debugTimes)
+		{
+			mail_bo::logRunTimes($starttime,null,'Folder:'.$_folderName,__METHOD__.__LINE__);
+		}
 
 		// ToDo: call this ONLY if labels change
 		etemplate_widget::setElementAttribute('toolbar', 'actions', $this->get_toolbar_actions());
@@ -1756,8 +1972,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'];
@@ -1781,7 +2003,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     ");
 		}
 
@@ -1804,12 +2027,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'];
@@ -1822,8 +2057,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')
@@ -1847,14 +2088,20 @@ 
 			$error_msg[] = lang("In Mailbox: %1, with ID: %2, and PartID: %3",$mailbox,$uid,$partID);
 			egw_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);
@@ -1870,10 +2117,16 @@ 
 		$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']);
+		}
 		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));
@@ -1887,7 +2140,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;
@@ -1898,8 +2154,14 @@ 
 		$content['mail_displaydate'] = mail_bo::_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;
@@ -1967,7 +2229,8 @@ 
 	{
 		$attachmentHTMLBlock='';
 		$attachmentHTML = array();
-		if (is_array($attachments) && count($attachments) > 0) {
+		if (is_array($attachments) && count($attachments) > 0)
+		{
 			$url_img_vfs = html::image('filemanager','navbar', lang('Filemanager'), ' height="16"');
 			$url_img_vfs_save_all = html::image('mail','save_all', lang('Save all'));
 
@@ -1977,7 +2240,10 @@ 
 				$attachmentHTML[$key]['filename'] = translation::convert_jsonsafe($attachmentHTML[$key]['filename'],'utf-8');
 				//error_log(array2string($value));
 				//error_log(strtoupper($value['mimeType']) .'<->'. mime_magic::filename2mime($attachmentHTML[$key]['filename']));
-				if (strtoupper($value['mimeType']=='APPLICATION/OCTET-STREAM')) $value['mimeType'] = mime_magic::filename2mime($attachmentHTML[$key]['filename']);
+				if (strtoupper($value['mimeType']=='APPLICATION/OCTET-STREAM'))
+				{
+					$value['mimeType'] = mime_magic::filename2mime($attachmentHTML[$key]['filename']);
+				}
 				$attachmentHTML[$key]['type']=$value['mimeType'];
 				$attachmentHTML[$key]['mimetype']=mime_magic::mime2label($value['mimeType']);
 				$hA = self::splitRowID($rowID);
@@ -2020,8 +2286,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 = mime_magic::ext2mime($suffix);
+						if (is_array($buff))
+						{
+							$suffix = array_pop($buff);
+						}
+						// take the last extension to check with ext2mime
+						if (!empty($suffix))
+						{
+							$sfxMimeType = mime_magic::ext2mime($suffix);
+						}
 						if (strtoupper($sfxMimeType) == 'TEXT/VCARD' || strtoupper($sfxMimeType) == 'TEXT/X-VCARD')
 						{
 							$attachments[$key]['mimeType'] = $sfxMimeType;
@@ -2191,9 +2464,12 @@ 
 	function quotaDisplay($_usage, $_limit)
 	{
 
-		if($_limit == 0) {
+		if($_limit == 0)
+		{
 			$quotaPercent=100;
-		} else {
+		}
+		else
+		{
 			$quotaPercent=round(($_usage*100)/$_limit);
 		}
 
@@ -2201,22 +2477,33 @@ 
 		$quotaUsage=mail_bo::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);
@@ -2234,7 +2521,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);
@@ -2266,7 +2556,10 @@ 
 
 	function getAttachment()
 	{
-		if(isset($_GET['id'])) $rowID	= $_GET['id'];
+		if(isset($_GET['id']))
+		{
+			$rowID	= $_GET['id'];
+		}
 
 		$hA = self::splitRowID($rowID);
 		$uid = $hA['msgUID'];
@@ -2299,10 +2592,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 = mime_magic::ext2mime($suffix);
+				if (is_array($buff))
+				{
+					$suffix = array_pop($buff);
+				}
+				// take the last extension to check with ext2mime
+				if (!empty($suffix))
+				{
+					$sfxMimeType = mime_magic::ext2mime($suffix);
+				}
 				$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')
@@ -2311,7 +2614,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)
@@ -2337,7 +2643,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)
 				{
@@ -2371,9 +2680,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'];
@@ -2462,7 +2780,10 @@ 
 			{
 				$succeeded = true;
 			}
-			if ($fp) fclose($fp);
+			if ($fp)
+			{
+				fclose($fp);
+			}
 			if ($succeeded)
 			{
 				unset($headers['SUBJECT']);//already in filename
@@ -2512,7 +2833,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);
@@ -2548,7 +2870,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);
@@ -2561,7 +2886,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
@@ -2608,7 +2936,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))
@@ -2635,7 +2966,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/*egw_vfs::get_home_dir()*/ . "/.mail_$message_id";
-		if(egw_vfs::is_dir($temp_path)) egw_vfs::remove ($temp_path);
+		if(egw_vfs::is_dir($temp_path))
+		{
+			egw_vfs::remove ($temp_path);
+		}
 
 		// Add subject to path, so it gets used as the file name
 		$path = $temp_path . '/' . ($header['SUBJECT'] ? egw_vfs::encodePathComponent($header['SUBJECT']) : lang('mail')) .'/';
@@ -2659,7 +2993,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
@@ -2667,15 +3004,24 @@ 
 				$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 (!($fp = egw_vfs::fopen($path.$file['filename'],'wb')) ||
 				!(!fseek($attachment['attachment'], 0, SEEK_SET) && stream_copy_to_stream($attachment['attachment'], $fp)))
 			{
 				$success=false;
 				egw_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)
@@ -2702,7 +3048,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);
@@ -2766,10 +3115,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;
 		}
 	}
@@ -2785,9 +3140,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;
@@ -2798,7 +3158,8 @@ 
 				$body .= '';
 				continue;
 			}
-			if(!empty($body)) {
+			if(!empty($body))
+			{
 				$body .= '<hr style="border:dotted 1px silver;">';
 			}
 			//error_log($singleBodyPart['body']);
@@ -2836,16 +3197,25 @@ 
 				$newBody	= @htmlentities($singleBodyPart['body'],ENT_QUOTES, strtoupper(mail_bo::$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_bo::$displayCharset));
+				if (empty($newBody) && strtolower($singleBodyPart['charSet'])=='utf-8')
+				{
+					$newBody = @htmlentities(iconv('utf-8', 'utf-8', $singleBodyPart['body']),ENT_QUOTES, strtoupper(mail_bo::$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 = html::activate_links($newBody);
+				if ($modifyURI)
+				{
+					$newBody = html::activate_links($newBody);
+				}
 				//error_log(__METHOD__.__LINE__.'..'.$newBody);
 				// redirect links for websites if you use no cookies
 				#if (!($GLOBALS['egw_info']['server']['usecookies']))
@@ -2912,7 +3282,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->egw_htmLawed($newBody,mail_bo::$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
@@ -3017,7 +3390,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)
@@ -3060,9 +3436,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
@@ -3134,7 +3513,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);
@@ -3159,14 +3541,26 @@ 
 			if (!$importFailed)
 			{
 				list($width, $height) = explode('x', egw_link::get_registry('mail', 'add_popup'));
-				if ($width > 0 && $height > 0) egw_json_response::get()->call('resizeTo', $width, $height);
+				if ($width > 0 && $height > 0)
+				{
+					egw_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_new('mail.importMessage');
 		$etpl->setElementAttribute('uploadForImport','onFinish','app.mail.uploadForImport');
@@ -3186,7 +3580,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
 		{
@@ -3217,10 +3614,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,
@@ -3281,7 +3682,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_bo::getRandomString();
@@ -3295,15 +3699,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'] = mime_magic::ext2mime($suffix);
+			if (is_array($buff))
+			{
+				$suffix = array_pop($buff);
+			}
+			// take the last extension to check with ext2mime
+			if (!empty($suffix))
+			{
+				$formData['type'] = mime_magic::ext2mime($suffix);
+			}
 		}
 		// size should be set to meet the requirements of checkFileBasics
 		if (parse_url($formData['file'],PHP_URL_SCHEME) == 'vfs' && !isset($formData['size']))
@@ -3346,17 +3761,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_bo::$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_bo::$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);
@@ -3389,11 +3822,18 @@ 
 				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)
 					{
 						$fS = $this->mail_bo->getFolderStatus($folderName,false,false,false);
-						if (in_array($fS['shortDisplayName'],mail_bo::$autoFolders)) $fS['shortDisplayName']=lang($fS['shortDisplayName']);
+						if (in_array($fS['shortDisplayName'],mail_bo::$autoFolders))
+						{
+							$fS['shortDisplayName']=lang($fS['shortDisplayName']);
+						}
 						//error_log(__METHOD__.__LINE__.array2string($fS));
 						if ($fS['unseen'])
 						{
@@ -3434,7 +3874,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();
@@ -3474,7 +3918,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');
@@ -3495,9 +3942,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)
@@ -3533,7 +3986,10 @@ 
 	 */
 	function ajax_renameFolder($_folderName, $_newName)
 	{
-		if (mail_bo::$debug) error_log(__METHOD__.__LINE__.' OldFolderName:'.array2string($_folderName).' NewName:'.array2string($_newName));
+		if (mail_bo::$debug)
+		{
+			error_log(__METHOD__.__LINE__.' OldFolderName:'.array2string($_folderName).' NewName:'.array2string($_newName));
+		}
 		if ($_folderName)
 		{
 			translation::add_app('mail');
@@ -3545,7 +4001,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);
@@ -3686,8 +4146,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');
@@ -3762,7 +4229,10 @@ 
 	 */
 	function ajax_MoveFolder($_folderName, $_target)
 	{
-		if (mail_bo::$debug) error_log(__METHOD__.__LINE__."Move Folder: $_folderName to Target: $_target");
+		if (mail_bo::$debug)
+		{
+			error_log(__METHOD__.__LINE__."Move Folder: $_folderName to Target: $_target");
+		}
 		if ($_folderName)
 		{
 			$decodedFolderName = $this->mail_bo->decodeEntityFolderName($_folderName);
@@ -3773,7 +4243,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;
@@ -3784,10 +4258,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)
 					{
@@ -3870,8 +4347,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)
@@ -3907,7 +4390,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')
@@ -3933,7 +4420,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 $i => $f)//folders contained in that level
 							{
@@ -3941,8 +4430,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)
 								{
@@ -3972,7 +4465,10 @@ 
 					$msg = lang("refused to delete folder INBOX");
 				}
 			}
-			if ($_return) return $success;
+			if ($_return)
+			{
+				return $success;
+			}
 			$response = egw_json_response::get();
 			if ($success)
 			{
@@ -4057,19 +4553,29 @@ 
 			// Create mail app object
 			$mail = new mail_ui();
 
-			if (empty($icServerID)) $icServerID = $mail->mail_bo->profileID;
-			if ($icServerID != $mail->mail_bo->profileID) return;
+			if (empty($icServerID))
+			{
+				$icServerID = $mail->mail_bo->profileID;
+			}
+			if ($icServerID != $mail->mail_bo->profileID)
+			{
+				return;
+			}
 
 			$vacation = $mail->gatherVacation($cachedVacations);
 		}
 
-		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'? common::show_date($vacation['start_date'],$dtfrmt,true).($vacation['end_date']>$vacation['start_date']?'->'.common::show_date($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)
@@ -4091,11 +4597,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(emailadmin_imapbase::$supportsORinQuery) || !isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]))
 		{
 			emailadmin_imapbase::$supportsORinQuery = egw_cache::getCache(egw_cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*10);
-			if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID])) emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]=true;
+			if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]))
+			{
+				emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]=true;
+			}
 		}
 		if (!emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID])
 		{
@@ -4116,7 +4628,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]);
+				}
 			}
 		}
 
@@ -4135,7 +4650,10 @@ 
 	{
 		//error_log(__METHOD__.__LINE__.array2string($icServerID));
 		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;
 		if ($icServerID && $icServerID != $this->mail_bo->profileID)
 		{
@@ -4145,18 +4663,22 @@ 
 		try
 		{
 			$quota = $this->mail_bo->getQuotaRoot();
-		} catch (Exception $e) {
+		}
+		catch (Exception $e) {
 			$quota['limit'] = 'NOT SET';
 			error_log(__METHOD__.__LINE__." ".$e->getMessage());
 		}
 
-		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";
@@ -4189,7 +4711,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
@@ -4239,7 +4762,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
@@ -4285,7 +4809,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;
@@ -4294,7 +4821,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)
@@ -4316,7 +4844,10 @@ 
 	 */
 	function ajax_sendMDN($_messageList)
 	{
-		if(mail_bo::$debug) error_log(__METHOD__."->".array2string($_messageList));
+		if(mail_bo::$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);
@@ -4333,7 +4864,10 @@ 
 	 */
 	function ajax_flagMessages($_flag, $_messageList, $_sendJsonResponse=true)
 	{
-		if(mail_bo::$debug) error_log(__METHOD__."->".$_flag.':'.array2string($_messageList));
+		if(mail_bo::$debug)
+		{
+			error_log(__METHOD__."->".$_flag.':'.array2string($_messageList));
+		}
 		translation::add_app('mail');
 		$alreadyFlagged=false;
 		$flag2check='';
@@ -4354,7 +4888,10 @@ 
 						if (is_null(emailadmin_imapbase::$supportsORinQuery) || !isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]))
 						{
 							emailadmin_imapbase::$supportsORinQuery = egw_cache::getCache(egw_cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*10);
-							if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID])) emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]=true;
+							if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]))
+							{
+								emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]=true;
+							}
 						}
 						$filter = $filter2toggle = array('filterName' => (emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?lang('quicksearch'):lang('subject')),'type' => ($query['filter2']?$query['filter2']:(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?'quick':'subject')),'string' => $query['search'],'status' => 'any');
 					}
@@ -4400,13 +4937,19 @@ 
 						if (count($messageListForToggle)>0)
 						{
 							$flag2set = (strtolower($_flag));
-							if(mail_bo::$debug) error_log(__METHOD__.__LINE__." toggle un$_flag -> $flag2set ".array2string($filter2toggle).array2string($messageListForToggle));
+							if(mail_bo::$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_bo::$debug) error_log(__METHOD__.__LINE__." $_flag -> $flag2set ".array2string($filter).array2string($messageList));
+							if(mail_bo::$debug)
+							{
+								error_log(__METHOD__.__LINE__." $_flag -> $flag2set ".array2string($filter).array2string($messageList));
+							}
 							$this->mail_bo->flagMessages($flag2set, $messageList,$folder);
 						}
 						$alreadyFlagged=true;
@@ -4422,7 +4965,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_bo::$debug) error_log(__METHOD__.__LINE__." flag all with $_flag on filter used:".array2string($filter));
+						if(mail_bo::$debug)
+						{
+							error_log(__METHOD__.__LINE__." flag all with $_flag on filter used:".array2string($filter));
+						}
 						$_sR = $this->mail_bo->getSortedList(
 							$folder,
 							$sort=0,
@@ -4437,7 +4983,10 @@ 
 					}
 					else
 					{
-						if(mail_bo::$debug) error_log(__METHOD__.__LINE__." $_flag all ".array2string($filter));
+						if(mail_bo::$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
@@ -4457,13 +5006,19 @@ 
 					$hA = self::splitRowID($rowID);
 					$messageList[] = $hA['msgUID'];
 				}
-				if(mail_bo::$debug) error_log(__METHOD__.__LINE__." $_flag in $folder:".array2string(((isset($_messageList['all']) && $_messageList['all']) ? 'all':$messageList)));
+				if(mail_bo::$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_bo::$debug) error_log(__METHOD__."-> No messages selected.");
+			if(mail_bo::$debug)
+			{
+				error_log(__METHOD__."-> No messages selected.");
+			}
 		}
 
 		if ($_sendJsonResponse)
@@ -4500,7 +5055,10 @@ 
 	 */
 	function ajax_deleteMessages($_messageList,$_forceDeleteMethod=null)
 	{
-		if(mail_bo::$debug) error_log(__METHOD__."->".print_r($_messageList,true).' Method:'.$_forceDeleteMethod);
+		if(mail_bo::$debug)
+		{
+			error_log(__METHOD__."->".print_r($_messageList,true).' Method:'.$_forceDeleteMethod);
+		}
 		$error = null;
 		$filtered =  false;
 		if ($_messageList=='all' || !empty($_messageList['msg']))
@@ -4519,7 +5077,10 @@ 
 						if (is_null(emailadmin_imapbase::$supportsORinQuery) || !isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]))
 						{
 							emailadmin_imapbase::$supportsORinQuery = egw_cache::getCache(egw_cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*10);
-							if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID])) emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]=true;
+							if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]))
+							{
+								emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]=true;
+							}
 						}
 						$filtered =  true;
 						$filter = array('filterName' => (emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?lang('quicksearch'):lang('subject')),'type' => ($query['filter2']?$query['filter2']:(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?'quick':'subject')),'string' => $query['search'],'status' => (!empty($query['filter'])?$query['filter']:'any'));
@@ -4588,7 +5149,10 @@ 
 		}
 		else
 		{
-			if(mail_bo::$debug) error_log(__METHOD__."-> No messages selected.");
+			if(mail_bo::$debug)
+			{
+				error_log(__METHOD__."-> No messages selected.");
+			}
 		}
 	}
 
@@ -4603,11 +5167,17 @@ 
 	 */
 	function ajax_copyMessages($_folderName, $_messageList, $_copyOrMove='copy')
 	{
-		if(mail_bo::$debug) error_log(__METHOD__."->".$_folderName.':'.print_r($_messageList,true).' Method:'.$_copyOrMove);
+		if(mail_bo::$debug)
+		{
+			error_log(__METHOD__."->".$_folderName.':'.print_r($_messageList,true).' Method:'.$_copyOrMove);
+		}
 		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);
 		$lastFoldersUsedForMoveCont = egw_cache::getCache(egw_cache::INSTANCE,'email','lastFolderUsedForMove'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),$expiration=60*60*1);
 		$changeFolderActions = false;
@@ -4618,8 +5188,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]));
 			}
@@ -4645,7 +5220,10 @@ 
 						if (is_null(emailadmin_imapbase::$supportsORinQuery) || !isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]))
 						{
 							emailadmin_imapbase::$supportsORinQuery = egw_cache::getCache(egw_cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*10);
-							if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID])) emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]=true;
+							if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]))
+							{
+								emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]=true;
+							}
 						}
 						$filtered = true;
 						$filter = array('filterName' => (emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?lang('quicksearch'):lang('subject')),'type' => ($query['filter2']?$query['filter2']:(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?'quick':'subject')),'string' => $query['search'],'status' => (!empty($query['filter'])?$query['filter']:'any'));
@@ -4703,7 +5281,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'];
@@ -4758,7 +5339,10 @@ 
 		}
 		else
 		{
-			if(mail_bo::$debug) error_log(__METHOD__."-> No messages selected.");
+			if(mail_bo::$debug)
+			{
+				error_log(__METHOD__."-> No messages selected.");
+			}
 		}
 	}
 

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; }

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;
 			}

Spacing +14 added lines, -14 removed lines

@@ -64,13 +64,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);
 		}
@@ -102,18 +102,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);
 				}
@@ -132,20 +132,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 ? 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)=[^&]+&?/','',html::link('/index.php', $link->view));
+			$url = preg_replace('/(sessionid|kp3|domain)=[^&]+&?/', '', 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://').
@@ -155,7 +155,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);
 	}
 
 }

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";

Spacing +20 added lines, -20 removed lines

@@ -79,12 +79,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. SEP. self::_appname. SEP. 'inc'. SEP. 'class.notifications_winpopup.inc.php).');
+									'('.EGW_INCLUDE_ROOT.SEP.self::_appname.SEP.'inc'.SEP.'class.notifications_winpopup.inc.php).');
 		}
 		$this->sender = $_sender;
 		$this->recipient = $_recipient;
@@ -103,15 +103,15 @@ 
 	public function send(array $_messages, $_subject = false, $_links = false, $_attachments = false) {
 		$user_sessions = array();
 		foreach (egw_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;
 	}
 
@@ -121,15 +121,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],
@@ -138,8 +138,8 @@ 
 									'/\[SENDER\]/' => $this->sender->account_fullname ? escapeshellarg($this->sender->account_fullname) : escapeshellarg($this->sender->account_email),
 									);
 			$command = preg_replace(array_keys($placeholders), $placeholders, $this->netbios_command);
-			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.");
 			}
 		}
@@ -152,7 +152,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);
 	}
 
 	/**
@@ -163,7 +163,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

Braces +45 added lines, -19 removed lines

@@ -13,7 +13,8 @@ 
 /**
  * User notification via winpopup.
  */
-class notifications_winpopup implements notifications_iface {
+class notifications_winpopup implements notifications_iface
+{
 
 	/**
 	 * Appname
@@ -78,10 +79,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).');
@@ -100,16 +107,23 @@ 
 	 * @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)
+	{
 		$user_sessions = array();
-		foreach (egw_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 (egw_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;
@@ -121,13 +135,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],
@@ -139,7 +160,8 @@ 
 									);
 			$command = preg_replace(array_keys($placeholders), $placeholders, $this->netbios_command);
 			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.");
 			}
 		}
@@ -151,7 +173,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);
 	}
 
@@ -161,9 +184,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

redirect.php

Doc Comments +4 added lines

@@ -24,6 +24,10 @@
 
 	if(!function_exists('html_entity_decode'))
 	{
+
+		/**
+		 * @param integer $quote_style
+		 */
 		function html_entity_decode($given_html, $quote_style = ENT_QUOTES)
 		{
 			$trans_table = array_flip(get_html_translation_table( HTML_SPECIALCHARS, $quote_style));

Spacing +9 added lines, -9 removed lines

@@ -22,11 +22,11 @@ 
 	  "<a href=\"$webserverURL/redirect.php?go=".htmlentities(urlencode('http://www.egroupware.org')).'">'
 	*/
 
-	if(!function_exists('html_entity_decode'))
+	if (!function_exists('html_entity_decode'))
 	{
 		function html_entity_decode($given_html, $quote_style = ENT_QUOTES)
 		{
-			$trans_table = array_flip(get_html_translation_table( HTML_SPECIALCHARS, $quote_style));
+			$trans_table = array_flip(get_html_translation_table(HTML_SPECIALCHARS, $quote_style));
 			$trans_table['&#39;'] = "'";
 			return(strtr($given_html, $trans_table));
 		}
@@ -45,17 +45,17 @@ 
 
 	/* Only allow redirects from inside this eGroupware installation. */
 	$valid_referer = array();
-	$path = preg_replace('/\/[^\/]*$/','',$_SERVER['PHP_SELF']) . '/';
+	$path = preg_replace('/\/[^\/]*$/', '', $_SERVER['PHP_SELF']).'/';
 	array_push($valid_referer, $path);
-	array_push($valid_referer, ($_SERVER['HTTPS'] ? 'https://' : 'http://') . $_SERVER['SERVER_ADDR'] . $path);
-	array_push($valid_referer, ($_SERVER['HTTPS'] ? 'https://' : 'http://') . $_SERVER['SERVER_NAME'] . $path);
+	array_push($valid_referer, ($_SERVER['HTTPS'] ? 'https://' : 'http://').$_SERVER['SERVER_ADDR'].$path);
+	array_push($valid_referer, ($_SERVER['HTTPS'] ? 'https://' : 'http://').$_SERVER['SERVER_NAME'].$path);
 
 	$referrer = trim($_SERVER['HTTP_REFERER']);
 	if ((!isset($_SERVER['HTTP_REFERER'])) || (empty($referrer)))
 	{
 		echo "Only usable from within eGroupware.\n";
 	}
-	else if($_GET['go'])
+	else if ($_GET['go'])
 	{
 		$allow = false;
 		foreach ($valid_referer as $urlRoot)
@@ -69,15 +69,15 @@ 
 		}
 		if ($allow)
 		{
-			$url= html_entity_decode(urldecode($_GET['go']));
+			$url = html_entity_decode(urldecode($_GET['go']));
 			unset($_GET['go']);
 			/* Only add "&" if there is something to append. */
 			if (!empty($_GET))
 			{
-				$url=$url."&".http_build_query($_GET);
+				$url = $url."&".http_build_query($_GET);
 			}
 
-			Header('Location: ' . html_entity_decode(urldecode($url)));
+			Header('Location: '.html_entity_decode(urldecode($url)));
 			exit;
 		}
 		else

resources/inc/class.resources_export_csv.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 	/**
 	 * Exports records as defined in $_definition
 	 *
-	 * @param egw_record $_definition
+	 * @param importexport_definition $_definition
 	 */
 	public function export( $_stream, importexport_definition $_definition) {
 		$options = $_definition->plugin_options;

Indentation +2 added lines, -2 removed lines

@@ -170,9 +170,9 @@
 	 * Get selectbox values
 	 */
 	protected function get_selects()
-        {
+		{
 		$this->selects = array();
-        }
+		}
 
 	/**
 	 * Customize automatically generated filter fields

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

@@ -247,7 +247,7 @@
 		$this->selects['info_status'] = $this->bo->get_status();
 	}
 
-	public function get_filter_fields(Array &$filters)
+	public function get_filter_fields(array &$filters)
 	{
 		foreach($filters as $field_name => &$settings)
 		{

Spacing +27 added lines, -27 removed lines

@@ -28,54 +28,54 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export($_stream, importexport_definition $_definition) {
 		$options = $_definition->plugin_options;
 
 		$selection = array();
 		if ($options['selection'] == 'search') {
 			// ui selection with checkbox 'selected'
 			$query = egw_cache::getSession('resources', 'get_rows');
-			$query['num_rows'] = -1;	// all
+			$query['num_rows'] = -1; // all
 			unset($query['store_state']);
-			$query['csv_export'] = true;	// so get_rows method _can_ produce different content or not store state in the session
-			$this->bo->get_rows($query,$selection,$readonlys);
+			$query['csv_export'] = true; // so get_rows method _can_ produce different content or not store state in the session
+			$this->bo->get_rows($query, $selection, $readonlys);
 		}
-		elseif ( $options['selection'] == 'all' || $options['selection'] == 'filter') {
+		elseif ($options['selection'] == 'all' || $options['selection'] == 'filter') {
 			$query = array(
 				'num_rows'	=> -1,
-				'filter2'	=> -3,  // Accessories & resources
-				'csv_export' => true,	// so get_rows method _can_ produce different content or not store state in the session
-			);	// all
+				'filter2'	=> -3, // Accessories & resources
+				'csv_export' => true, // so get_rows method _can_ produce different content or not store state in the session
+			); // all
 			
-			if($options['selection'] == 'filter')
+			if ($options['selection'] == 'filter')
 			{
 				$filter = $_definition->filter;
 				// Handle ranges
-				foreach($filter as $field => $value)
+				foreach ($filter as $field => $value)
 				{
-					if($field == 'cat_id')
+					if ($field == 'cat_id')
 					{
 						$query['filter'] = $value;
 						continue;
 					}
-					if($field == 'filter2')
+					if ($field == 'filter2')
 					{
 						$query['filter2'] = $value;
 						continue;
 					}
 					$query['col_filter'][$field] = $value;
-					if(!is_array($value) || (!$value['from'] && !$value['to'])) continue;
+					if (!is_array($value) || (!$value['from'] && !$value['to'])) continue;
 
 					// Ranges are inclusive, so should be provided that way (from 2 to 10 includes 2 and 10)
-					if($value['from']) $query['col_filter'][] = "$field >= " . (int)$value['from'];
-					if($value['to']) $query['col_filter'][] = "$field <= " . (int)$value['to'];
+					if ($value['from']) $query['col_filter'][] = "$field >= ".(int)$value['from'];
+					if ($value['to']) $query['col_filter'][] = "$field <= ".(int)$value['to'];
 					unset($query['col_filter'][$field]);
 				}
 			}
 			
-			$this->bo->get_rows($query,$selection,$readonlys);
+			$this->bo->get_rows($query, $selection, $readonlys);
 		} else {
-			$selection = explode(',',$options['selection']);
+			$selection = explode(',', $options['selection']);
 		}
 
 		$export_object = new importexport_export_csv($_stream, (array)$options);
@@ -83,28 +83,28 @@ 
 
 		// Check if we need to load the custom fields
 		$need_custom = false;
-		foreach(config::get_customfields('resources') as $field => $settings) {
-			if($options['mapping']['#'.$field]) {
+		foreach (config::get_customfields('resources') as $field => $settings) {
+			if ($options['mapping']['#'.$field]) {
 				$need_custom = true;
 				break;
 			}
 		}
 
 		foreach ($selection as $record) {
-			if(!is_array($record) || !$record['res_id']) continue;
+			if (!is_array($record) || !$record['res_id']) continue;
 
-			if($need_custom) {
+			if ($need_custom) {
 				$record = $this->bo->read($record['res_id']);
 			}
 			$resource = new resources_egw_record();
 			$resource->set_record($record);
 			$resource->long_description = strip_tags($resource->long_description);
-			if($options['convert']) {
+			if ($options['convert']) {
 				importexport_export_csv::convert($resource, resources_egw_record::$types, 'resources', $this->selects);
 			} else {
 				// Implode arrays, so they don't say 'Array'
-				foreach($resource->get_record_array() as $key => $value) {
-					if(is_array($value)) $resource->$key = implode(',', $value);
+				foreach ($resource->get_record_array() as $key => $value) {
+					if (is_array($value)) $resource->$key = implode(',', $value);
 				}
  			}
 
@@ -179,7 +179,7 @@ 
 		// In resources, not all categories are used
 		$filters['cat_id']['type'] = 'select';
 		$filters['cat_id']['name'] = 'filter';
-		$filters['cat_id']['values']= (array)$this->bo->acl->get_cats(EGW_ACL_READ);
+		$filters['cat_id']['values'] = (array)$this->bo->acl->get_cats(EGW_ACL_READ);
 
 		// Add in resources / accessories
 		$filters['filter2'] = array(
@@ -189,9 +189,9 @@ 
 			'rows' => 5,
 			'values' => resources_bo::$filter_options
 		);
-		foreach($filters as $field_name => &$settings)
+		foreach ($filters as $field_name => &$settings)
 		{
-			if($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
+			if ($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
 		}
 	}
 

Braces +63 added lines, -25 removed lines

@@ -14,7 +14,8 @@ 
 /**
  * export resources to CSV
  */
-class resources_export_csv implements importexport_iface_export_plugin {
+class resources_export_csv implements importexport_iface_export_plugin
+{
 
 	public function __construct()
 	{
@@ -28,11 +29,13 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export( $_stream, importexport_definition $_definition)
+	{
 		$options = $_definition->plugin_options;
 
 		$selection = array();
-		if ($options['selection'] == 'search') {
+		if ($options['selection'] == 'search')
+		{
 			// ui selection with checkbox 'selected'
 			$query = egw_cache::getSession('resources', 'get_rows');
 			$query['num_rows'] = -1;	// all
@@ -40,7 +43,8 @@ 
 			$query['csv_export'] = true;	// so get_rows method _can_ produce different content or not store state in the session
 			$this->bo->get_rows($query,$selection,$readonlys);
 		}
-		elseif ( $options['selection'] == 'all' || $options['selection'] == 'filter') {
+		elseif ( $options['selection'] == 'all' || $options['selection'] == 'filter')
+		{
 			$query = array(
 				'num_rows'	=> -1,
 				'filter2'	=> -3,  // Accessories & resources
@@ -64,17 +68,28 @@ 
 						continue;
 					}
 					$query['col_filter'][$field] = $value;
-					if(!is_array($value) || (!$value['from'] && !$value['to'])) continue;
+					if(!is_array($value) || (!$value['from'] && !$value['to']))
+					{
+						continue;
+					}
 
 					// Ranges are inclusive, so should be provided that way (from 2 to 10 includes 2 and 10)
-					if($value['from']) $query['col_filter'][] = "$field >= " . (int)$value['from'];
-					if($value['to']) $query['col_filter'][] = "$field <= " . (int)$value['to'];
+					if($value['from'])
+					{
+						$query['col_filter'][] = "$field >= " . (int)$value['from'];
+					}
+					if($value['to'])
+					{
+						$query['col_filter'][] = "$field <= " . (int)$value['to'];
+					}
 					unset($query['col_filter'][$field]);
 				}
 			}
 			
 			$this->bo->get_rows($query,$selection,$readonlys);
-		} else {
+		}
+		else
+		{
 			$selection = explode(',',$options['selection']);
 		}
 
@@ -83,28 +98,42 @@ 
 
 		// Check if we need to load the custom fields
 		$need_custom = false;
-		foreach(config::get_customfields('resources') as $field => $settings) {
-			if($options['mapping']['#'.$field]) {
+		foreach(config::get_customfields('resources') as $field => $settings)
+		{
+			if($options['mapping']['#'.$field])
+			{
 				$need_custom = true;
 				break;
 			}
 		}
 
-		foreach ($selection as $record) {
-			if(!is_array($record) || !$record['res_id']) continue;
+		foreach ($selection as $record)
+		{
+			if(!is_array($record) || !$record['res_id'])
+			{
+				continue;
+			}
 
-			if($need_custom) {
+			if($need_custom)
+			{
 				$record = $this->bo->read($record['res_id']);
 			}
 			$resource = new resources_egw_record();
 			$resource->set_record($record);
 			$resource->long_description = strip_tags($resource->long_description);
-			if($options['convert']) {
+			if($options['convert'])
+			{
 				importexport_export_csv::convert($resource, resources_egw_record::$types, 'resources', $this->selects);
-			} else {
+			}
+			else
+			{
 				// Implode arrays, so they don't say 'Array'
-				foreach($resource->get_record_array() as $key => $value) {
-					if(is_array($value)) $resource->$key = implode(',', $value);
+				foreach($resource->get_record_array() as $key => $value)
+				{
+					if(is_array($value))
+					{
+						$resource->$key = implode(',', $value);
+					}
 				}
  			}
 
@@ -119,7 +148,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Resources CSV export');
 	}
 
@@ -128,7 +158,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Exports a list of resources to a CSV File.");
 	}
 
@@ -137,11 +168,13 @@ 
 	 *
 	 * @return string suffix
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
-	public static function get_mimetype() {
+	public static function get_mimetype()
+	{
 		return 'text/csv';
 	}
 
@@ -150,14 +183,16 @@ 
 	 * this way the plugin has all opportunities for options tab
 	 *
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 	}
 
 	/**
 	 * returns selectors information
 	 *
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		return array(
 			'name'	=> 'importexport.export_csv_selectors',
 		);
@@ -167,7 +202,7 @@ 
 	 * Get selectbox values
 	 */
 	protected function get_selects()
-        {
+	{
 		$this->selects = array();
         }
 
@@ -191,7 +226,10 @@ 
 		);
 		foreach($filters as $field_name => &$settings)
 		{
-			if($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
+			if($this->selects[$field_name])
+			{
+				$settings['values'] = $this->selects[$field_name];
+			}
 		}
 	}
 

resources/inc/class.resources_import_csv.inc.php

Doc Comments +2 added lines, -4 removed lines

@@ -28,9 +28,7 @@ 
 
 	/**
 	 * imports entries according to given definition object.
-	 * @param resource $_stream
-	 * @param string $_charset
-	 * @param definition $_definition
+	 * @param importexport_definition $_definition
 	 */
 	public function init(importexport_definition $_definition ) {
 
@@ -52,7 +50,7 @@ 
 	*
 	* Updates the count of actions taken
 	*
-	* @return boolean success
+	* @return null|boolean success
 	*/
 	protected function import_record(importexport_iface_egw_record &$record, &$import_csv)
 	{

Indentation +17 added lines, -17 removed lines

@@ -45,15 +45,15 @@ 
 	}
 
 	/**
-	* Import a single record
-	*
-	* You don't need to worry about mappings or translations, they've been done already.
-	* You do need to handle the conditions and the actions taken.
-	*
-	* Updates the count of actions taken
-	*
-	* @return boolean success
-	*/
+	 * Import a single record
+	 *
+	 * You don't need to worry about mappings or translations, they've been done already.
+	 * You do need to handle the conditions and the actions taken.
+	 *
+	 * Updates the count of actions taken
+	 *
+	 * @return boolean success
+	 */
 	protected function import_record(importexport_iface_egw_record &$record, &$import_csv)
 	{
 		// Check for an un-matched accessory of, try again on just name
@@ -250,14 +250,14 @@ 
 	}
 
 	/**
-        * Returns warnings that were encountered during importing
-        * Maximum of one warning message per record, but you can append if you need to
-        *
-        * @return Array (
-        *       record_# => warning message
-        *       )
-        */
-        public function get_warnings() {
+	 * Returns warnings that were encountered during importing
+	 * Maximum of one warning message per record, but you can append if you need to
+	 *
+	 * @return Array (
+	 *       record_# => warning message
+	 *       )
+	 */
+		public function get_warnings() {
 		return $this->warnings;
 	}
 }

Braces +70 added lines, -29 removed lines

@@ -16,7 +16,8 @@ 
 /**
  * class to import resources from CSV
  */
-class resources_import_csv extends importexport_basic_import_csv  {
+class resources_import_csv extends importexport_basic_import_csv
+{
 
 
 	/**
@@ -32,7 +33,8 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function init(importexport_definition $_definition ) {
+	public function init(importexport_definition $_definition )
+	{
 
 		// fetch the resource bo
 		$this->bo = new resources_bo();
@@ -92,7 +94,8 @@ 
 		// Check for a new category, it needs permissions set
 		$category = $GLOBALS['egw']->categories->read($record->cat_id);
 
-		if($category['last_mod'] >= $this->start_time) {
+		if($category['last_mod'] >= $this->start_time)
+		{
 			// New category.  Give read & write permissions to the current user's default group
 			$this->acl_bo->set_rights($record['cat_id'],
 				array($GLOBALS['egw_info']['user']['account_primary_group']),
@@ -104,35 +107,53 @@ 
 			// Refresh ACL
 			//$GLOBALS['egw']->acl->read_repository();
 		}
-		if(!$record->accessory_of) $record->accessory_of = -1;
+		if(!$record->accessory_of)
+		{
+			$record->accessory_of = -1;
+		}
 		//error_log(__METHOD__.__LINE__.array2string($_definition->plugin_options['conditions']));
-		if ($this->definition->plugin_options['conditions']) {
+		if ($this->definition->plugin_options['conditions'])
+		{
 		
-			foreach ( $this->definition->plugin_options['conditions'] as $condition ) {
+			foreach ( $this->definition->plugin_options['conditions'] as $condition )
+			{
 				$results = array();
-				switch ( $condition['type'] ) {
+				switch ( $condition['type'] )
+				{
 					// exists
 					case 'exists' :
-						if($record->$condition['string']) {
+						if($record->$condition['string'])
+						{
 							$results = $this->bo->so->search(
 								array( $condition['string'] => $record->$condition['string']),
 								False
 							);
 						}
 
-						if ( is_array( $results ) && count( array_keys( $results )) >= 1) {
+						if ( is_array( $results ) && count( array_keys( $results )) >= 1)
+						{
 							// apply action to all contacts matching this exists condition
 							$action = $condition['true'];
-							foreach ( (array)$results as $resource ) {
+							foreach ( (array)$results as $resource )
+							{
 								$record->res_id = $resource['res_id'];
-								if ( $_definition->plugin_options['update_cats'] == 'add' ) {
-									if ( !is_array( $resource['cat_id'] ) ) $resource['cat_id'] = explode( ',', $resource['cat_id'] );
-									if ( !is_array( $record->cat_id ) ) $record->cat_id = explode( ',', $record->cat_id );
+								if ( $_definition->plugin_options['update_cats'] == 'add' )
+								{
+									if ( !is_array( $resource['cat_id'] ) )
+									{
+										$resource['cat_id'] = explode( ',', $resource['cat_id'] );
+									}
+									if ( !is_array( $record->cat_id ) )
+									{
+										$record->cat_id = explode( ',', $record->cat_id );
+									}
 									$record->cat_id = implode( ',', array_unique( array_merge( $record->cat_id, $resource['cat_id'] ) ) );
 								}
 								$success = $this->action(  $action['action'], $record, $import_csv->get_current_position() );
 							}
-						} else {
+						}
+						else
+						{
 							$action = $condition['false'];
 							$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
 						}
@@ -143,9 +164,14 @@ 
 						die('condition / action not supported!!!');
 						break;
 				}
-				if ($action['last']) break;
+				if ($action['last'])
+				{
+					break;
+				}
 			}
-		} else {
+		}
+		else
+		{
 			// unconditional insert
 			$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
 		}
@@ -159,9 +185,11 @@ 
 	 * @param importexport_iface_egw_record $record Entry record
 	 * @return bool success or not
 	 */
-	protected function action ( $_action, importexport_iface_egw_record &$record, $record_num = 0 ) {
+	protected function action ( $_action, importexport_iface_egw_record &$record, $record_num = 0 )
+	{
 		$_data = $record->get_record_array();
-		switch ($_action) {
+		switch ($_action)
+		{
 			case 'none' :
 				return true;
 			case 'update' :
@@ -173,20 +201,27 @@ 
 				
 				// Fall through
 			case 'insert' :
-				if($_action == 'insert') {
+				if($_action == 'insert')
+				{
 					// Backend doesn't like inserting with ID specified, it can overwrite
 					unset($_data['res_id']);
 				}
-				if ( $this->dry_run ) {
+				if ( $this->dry_run )
+				{
 					//print_r($_data);
 					$this->results[$_action]++;
 					return true;
-				} else {
+				}
+				else
+				{
 					$result = $this->bo->save( $_data );
-					if($result && !is_numeric($result)) {
+					if($result && !is_numeric($result))
+					{
 						$this->errors[$record_num] = $result;
 						return false;
-					} else {
+					}
+					else
+					{
 						$this->results[$_action]++;
 						return true;
 					}
@@ -202,7 +237,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Resources CSV import');
 	}
 
@@ -211,7 +247,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Imports a list of resources from a CSV file.");
 	}
 
@@ -220,7 +257,8 @@ 
 	 *
 	 * @return string suffix (comma seperated)
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
@@ -236,7 +274,8 @@ 
 	 * 		preserv		=> array,
 	 * )
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 		// lets do it!
 	}
 
@@ -245,7 +284,8 @@ 
 	 *
 	 * @return string etemplate name
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		// lets do it!
 	}
 
@@ -257,7 +297,8 @@ 
         *       record_# => warning message
         *       )
         */
-        public function get_warnings() {
+        public function get_warnings()
+        {
 		return $this->warnings;
 	}
 }

Spacing +33 added lines, -33 removed lines

@@ -15,7 +15,7 @@ 
 /**
  * class to import resources from CSV
  */
-class resources_import_csv extends importexport_basic_import_csv  {
+class resources_import_csv extends importexport_basic_import_csv {
 
 
 	/**
@@ -23,7 +23,7 @@ 
 	 *
 	 * @var array
 	 */
-	protected static $conditions = array( 'exists' );
+	protected static $conditions = array('exists');
 
 	/**
 	 * imports entries according to given definition object.
@@ -31,13 +31,13 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function init(importexport_definition $_definition ) {
+	public function init(importexport_definition $_definition) {
 
 		// fetch the resource bo
 		$this->bo = new resources_bo();
 
 		// For adding ACLs
-		$this->acl_bo = CreateObject('resources.bo_acl',True);
+		$this->acl_bo = CreateObject('resources.bo_acl', True);
 
 		// For checking categories
 		$this->start_time = time();
@@ -53,33 +53,33 @@ 
 	*
 	* @return boolean success
 	*/
-	protected function import_record(importexport_iface_egw_record &$record, &$import_csv)
+	protected function import_record(importexport_iface_egw_record&$record, &$import_csv)
 	{
 		// Check for an un-matched accessory of, try again on just name
-		if(!is_numeric($record->accessory_of))
+		if (!is_numeric($record->accessory_of))
 		{
 			$accessory_of = $record->accessory_of;
 
 			// Look for exact match in just name
-			$results = $this->bo->so->search(array('name' => $record->accessory_of),array('res_id','name'));
-			if(count($results) >= 1)
+			$results = $this->bo->so->search(array('name' => $record->accessory_of), array('res_id', 'name'));
+			if (count($results) >= 1)
 			{
 				// More than 1 result?  Bad names.  Pick one.
-				foreach($results as $result)
+				foreach ($results as $result)
 				{
-					if($result['name'] == $record->accessory_of)
+					if ($result['name'] == $record->accessory_of)
 					{
 						$record->accessory_of = $result['res_id'];
 						break;
 					}
 				}
-				if(is_numeric($record->accessory_of))
+				if (is_numeric($record->accessory_of))
 				{
 					// Import/Export conversion gave a warning, so cancel it
-					$pattern = lang('Unable to link to %1 "%2"',lang('resources'),$accessory_of) . ' - ('.lang('too many matches') . '|'.lang('no matches') . ')';
+					$pattern = lang('Unable to link to %1 "%2"', lang('resources'), $accessory_of).' - ('.lang('too many matches').'|'.lang('no matches').')';
 					$this->warnings[$import_csv->get_current_position()] = preg_replace($pattern, '', $this->warnings[$import_csv->get_current_position()], 1);
 					// If that was the only warning, clear it for this row
-					if(trim($this->warnings[$import_csv->get_current_position()]) == '')
+					if (trim($this->warnings[$import_csv->get_current_position()]) == '')
 					{
 						unset($this->warnings[$import_csv->get_current_position()]);
 					}
@@ -91,7 +91,7 @@ 
 		// Check for a new category, it needs permissions set
 		$category = $GLOBALS['egw']->categories->read($record->cat_id);
 
-		if($category['last_mod'] >= $this->start_time) {
+		if ($category['last_mod'] >= $this->start_time) {
 			// New category.  Give read & write permissions to the current user's default group
 			$this->acl_bo->set_rights($record['cat_id'],
 				array($GLOBALS['egw_info']['user']['account_primary_group']),
@@ -103,37 +103,37 @@ 
 			// Refresh ACL
 			//$GLOBALS['egw']->acl->read_repository();
 		}
-		if(!$record->accessory_of) $record->accessory_of = -1;
+		if (!$record->accessory_of) $record->accessory_of = -1;
 		//error_log(__METHOD__.__LINE__.array2string($_definition->plugin_options['conditions']));
 		if ($this->definition->plugin_options['conditions']) {
 		
-			foreach ( $this->definition->plugin_options['conditions'] as $condition ) {
+			foreach ($this->definition->plugin_options['conditions'] as $condition) {
 				$results = array();
-				switch ( $condition['type'] ) {
+				switch ($condition['type']) {
 					// exists
 					case 'exists' :
-						if($record->$condition['string']) {
+						if ($record->$condition['string']) {
 							$results = $this->bo->so->search(
-								array( $condition['string'] => $record->$condition['string']),
+								array($condition['string'] => $record->$condition['string']),
 								False
 							);
 						}
 
-						if ( is_array( $results ) && count( array_keys( $results )) >= 1) {
+						if (is_array($results) && count(array_keys($results)) >= 1) {
 							// apply action to all contacts matching this exists condition
 							$action = $condition['true'];
-							foreach ( (array)$results as $resource ) {
+							foreach ((array)$results as $resource) {
 								$record->res_id = $resource['res_id'];
-								if ( $_definition->plugin_options['update_cats'] == 'add' ) {
-									if ( !is_array( $resource['cat_id'] ) ) $resource['cat_id'] = explode( ',', $resource['cat_id'] );
-									if ( !is_array( $record->cat_id ) ) $record->cat_id = explode( ',', $record->cat_id );
-									$record->cat_id = implode( ',', array_unique( array_merge( $record->cat_id, $resource['cat_id'] ) ) );
+								if ($_definition->plugin_options['update_cats'] == 'add') {
+									if (!is_array($resource['cat_id'])) $resource['cat_id'] = explode(',', $resource['cat_id']);
+									if (!is_array($record->cat_id)) $record->cat_id = explode(',', $record->cat_id);
+									$record->cat_id = implode(',', array_unique(array_merge($record->cat_id, $resource['cat_id'])));
 								}
-								$success = $this->action(  $action['action'], $record, $import_csv->get_current_position() );
+								$success = $this->action($action['action'], $record, $import_csv->get_current_position());
 							}
 						} else {
 							$action = $condition['false'];
-							$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
+							$success = ($this->action($action['action'], $record, $import_csv->get_current_position()));
 						}
 						break;
 
@@ -146,7 +146,7 @@ 
 			}
 		} else {
 			// unconditional insert
-			$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
+			$success = $this->action('insert', $record, $import_csv->get_current_position());
 		}
 		return $success;
 	}
@@ -158,7 +158,7 @@ 
 	 * @param importexport_iface_egw_record $record Entry record
 	 * @return bool success or not
 	 */
-	protected function action ( $_action, importexport_iface_egw_record &$record, $record_num = 0 ) {
+	protected function action($_action, importexport_iface_egw_record&$record, $record_num = 0) {
 		$_data = $record->get_record_array();
 		switch ($_action) {
 			case 'none' :
@@ -172,17 +172,17 @@ 
 				
 				// Fall through
 			case 'insert' :
-				if($_action == 'insert') {
+				if ($_action == 'insert') {
 					// Backend doesn't like inserting with ID specified, it can overwrite
 					unset($_data['res_id']);
 				}
-				if ( $this->dry_run ) {
+				if ($this->dry_run) {
 					//print_r($_data);
 					$this->results[$_action]++;
 					return true;
 				} else {
-					$result = $this->bo->save( $_data );
-					if($result && !is_numeric($result)) {
+					$result = $this->bo->save($_data);
+					if ($result && !is_numeric($result)) {
 						$this->errors[$record_num] = $result;
 						return false;
 					} else {

resources/inc/class.resources_so.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 	 *
 	 * @param string $key key of value to get
 	 * @param int $res_id resource id
-	 * @return mixed value of key and resource, false if key or id not found.
+	 * @return integer value of key and resource, false if key or id not found.
 	 */
 	function get_value($key,$res_id)
 	{

Spacing +6 added lines, -7 removed lines

@@ -22,10 +22,10 @@ 
 {
 	function __construct()
 	{
-		parent::__construct('resources','egw_resources', 'egw_resources_extra', '',
-			'extra_name', 'extra_value', 'extra_id' );
+		parent::__construct('resources', 'egw_resources', 'egw_resources_extra', '',
+			'extra_name', 'extra_value', 'extra_id');
 
-		$this->columns_to_search = array('name','short_description','inventory_number','long_description','location');
+		$this->columns_to_search = array('name', 'short_description', 'inventory_number', 'long_description', 'location');
 	}
 
 	/**
@@ -35,10 +35,9 @@ 
 	 * @param int $res_id resource id
 	 * @return mixed value of key and resource, false if key or id not found.
 	 */
-	function get_value($key,$res_id)
+	function get_value($key, $res_id)
 	{
-		return $res_id == $this->data['res_id'] ? $this->data[$key] :
-			$this->db->select($this->table_name,$key,array('res_id' => $res_id),__LINE__,__FILE__)->fetchColumn();
+		return $res_id == $this->data['res_id'] ? $this->data[$key] : $this->db->select($this->table_name, $key, array('res_id' => $res_id), __LINE__, __FILE__)->fetchColumn();
 	}
 
 	/**
@@ -90,7 +89,7 @@ 
 	function save($resource)
 	{
 		$this->data = $resource;
-		if(parent::save() != 0) return false;
+		if (parent::save() != 0) return false;
 		$res_id = $this->data['res_id'];
 
 		return $res_id;

Braces +8 added lines, -2 removed lines

@@ -51,7 +51,10 @@ 
 	 */
 	function read($res_id)
 	{
-		if (is_array($res_id) && count($res_id) == 1 && isset($res_id['res_id'])) $res_id = $res_id['res_id'];
+		if (is_array($res_id) && count($res_id) == 1 && isset($res_id['res_id']))
+		{
+			$res_id = $res_id['res_id'];
+		}
 
 		/*if (!is_array($res_id) && $res_id == $this->data['res_id'])
 		{
@@ -90,7 +93,10 @@ 
 	function save($resource)
 	{
 		$this->data = $resource;
-		if(parent::save() != 0) return false;
+		if(parent::save() != 0)
+		{
+			return false;
+		}
 		$res_id = $this->data['res_id'];
 
 		return $res_id;

setup/inc/class.setup_cmd_ldap.inc.php

Doc Comments -3 removed lines

@@ -936,9 +936,6 @@
 	 *
 	 * Uses $this->ldap_host, $this->ldap_admin and $this->ldap_admin_pw to connect.
 	 *
-	 * @param string $this->object_class ='qmailUser'
-	 * @param string $this->mbox_attr ='mailmessagestore' lowercase!!!
-	 * @param string $this->mail_login_type ='email' 'email', 'vmailmgr', 'standard' or 'uidNumber'
 	 * @return string with success message N entries modified
 	 * @throws Api\Exception if dn not found, not listable or delete fails
 	 */

Spacing +144 added lines, -147 removed lines

@@ -82,9 +82,9 @@ 
 	 * @param string $ldap_encryption_type ='des'
 	 * @param boolean $truncate_egw_accounts =false truncate accounts table before migration to SQL
 	 */
-	function __construct($domain,$ldap_host=null,$ldap_suffix=null,$ldap_admin=null,$ldap_admin_pw=null,
-		$ldap_base=null,$ldap_root_dn=null,$ldap_root_pw=null,$ldap_context=null,$ldap_search_filter=null,
-		$ldap_group_context=null,$sub_command='create_ldap',$ldap_encryption_type='des',$truncate_egw_accounts=false)
+	function __construct($domain, $ldap_host = null, $ldap_suffix = null, $ldap_admin = null, $ldap_admin_pw = null,
+		$ldap_base = null, $ldap_root_dn = null, $ldap_root_pw = null, $ldap_context = null, $ldap_search_filter = null,
+		$ldap_group_context = null, $sub_command = 'create_ldap', $ldap_encryption_type = 'des', $truncate_egw_accounts = false)
 	{
 		if (!is_array($domain))
 		{
@@ -117,23 +117,23 @@ 
 	 * @throws Exception(lang('Wrong credentials to access the header.inc.php file!'),2);
 	 * @throws Exception('header.inc.php not found!');
 	 */
-	protected function exec($check_only=false)
+	protected function exec($check_only = false)
 	{
-		if (!empty($this->domain) && !preg_match('/^([a-z0-9_-]+\.)*[a-z0-9]+/i',$this->domain))
+		if (!empty($this->domain) && !preg_match('/^([a-z0-9_-]+\.)*[a-z0-9]+/i', $this->domain))
 		{
-			throw new egw_exception_wrong_userinput(lang("'%1' is no valid domain name!",$this->domain));
+			throw new egw_exception_wrong_userinput(lang("'%1' is no valid domain name!", $this->domain));
 		}
 		if ($this->remote_id && $check_only && !in_array($this->sub_command, array('set_mailbox', 'sid2uidnumber', 'copy2ad')))
 		{
-			return true;	// further checks can only done locally
+			return true; // further checks can only done locally
 		}
 		$this->_merge_defaults();
 		//_debug_array($this->as_array());
 
-		switch($this->sub_command)
+		switch ($this->sub_command)
 		{
 			case 'test_ldap_root':
-				$msg = $this->connect($this->ldap_admin,$this->ldap_admin_pw);
+				$msg = $this->connect($this->ldap_admin, $this->ldap_admin_pw);
 				break;
 			case 'test_ldap':
 				$msg = $this->connect();
@@ -178,28 +178,28 @@ 
 	 *
 	 * @param boolean $check_only =false true: only connect and output necessary commands
 	 */
-	private function sid2uidnumber($check_only=false)
+	private function sid2uidnumber($check_only = false)
 	{
 		$msg = array();
 		$this->connect();
 
 		// check if base does exist
-		if (!@ldap_read($this->test_ldap->ds,$this->ldap_base,'objectClass=*'))
+		if (!@ldap_read($this->test_ldap->ds, $this->ldap_base, 'objectClass=*'))
 		{
-			throw new egw_exception_wrong_userinput(lang('Base dn "%1" NOT found!',$this->ldap_base));
+			throw new egw_exception_wrong_userinput(lang('Base dn "%1" NOT found!', $this->ldap_base));
 		}
 
-		if (!($sr = ldap_search($this->test_ldap->ds,$this->ldap_base,
-			$search='(&(|(objectClass=posixAccount)(objectClass=posixGroup))('.self::sambaSID.'=*)(!(uid=*$)))',
-			array('uidNumber','gidNumber','uid','cn', 'objectClass',self::sambaSID))) ||
+		if (!($sr = ldap_search($this->test_ldap->ds, $this->ldap_base,
+			$search = '(&(|(objectClass=posixAccount)(objectClass=posixGroup))('.self::sambaSID.'=*)(!(uid=*$)))',
+			array('uidNumber', 'gidNumber', 'uid', 'cn', 'objectClass', self::sambaSID))) ||
 			!($entries = ldap_get_entries($this->test_ldap->ds, $sr)))
 		{
-			throw new egw_exception(lang('Error searching "dn=%1" for "%2"!',$this->ldap_base, $search));
+			throw new egw_exception(lang('Error searching "dn=%1" for "%2"!', $this->ldap_base, $search));
 		}
 		$change = $accounts = array();
 		$cmd_change_account_id = 'admin/admin-cli.php --change-account-id <admin>@<domain>,<adminpw>';
 		$change_account_id = '';
-		foreach($entries as $key => $entry)
+		foreach ($entries as $key => $entry)
 		{
 			if ($key === 'count') continue;
 
@@ -234,7 +234,7 @@ 
 
 		// now change them in LDAP
 		$changed = 0;
-		foreach($accounts as $dn => $account)
+		foreach ($accounts as $dn => $account)
 		{
 			$modify = array();
 			if (!empty($account['uidnumber']) && isset($change[$account['uidnumber']]))
@@ -248,7 +248,7 @@ 
 			if (!$check_only && $modify && !ldap_modify($this->test_ldap->ds, $dn, $modify))
 			{
 				throw new egw_exception("Failed to modify ldap: !ldap_modify({$this->test_ldap->ds}, '$dn', ".array2string($modify).") ".ldap_error($this->test_ldap->ds).
-					"\n- ".implode("\n- ", $msg));	// EGroupware change already run successful
+					"\n- ".implode("\n- ", $msg)); // EGroupware change already run successful
 			}
 			if ($modify) ++$changed;
 		}
@@ -263,13 +263,13 @@ 
 	 *
 	 * @param boolean $check_only =false true: only connect and output necessary commands
 	 */
-	private function copy2ad($check_only=false)
+	private function copy2ad($check_only = false)
 	{
 		$msg = array();
 		$attrs = $rename = array();
-		foreach(explode(',', $this->attributes) as $attr)
+		foreach (explode(',', $this->attributes) as $attr)
 		{
-			if ($attr[0] == '@' ||	// copy whole objectclass without renaming, eg. @inetOrgPerson
+			if ($attr[0] == '@' || // copy whole objectclass without renaming, eg. @inetOrgPerson
 				strpos($attr, '=') === false)
 			{
 				$attrs[] = $attr;
@@ -284,7 +284,7 @@ 
 		$ignore_attr = array_flip(array('dn', 'objectclass', 'cn', 'userpassword'));
 		if (!in_array('uid', $attrs))
 		{
-			$attrs[] = 'uid';	// need to match account
+			$attrs[] = 'uid'; // need to match account
 			$ignore_attr['uid'] = true;
 		}
 		// connect to destination ads
@@ -293,9 +293,8 @@ 
 			$this->ads_context = 'CN=Users,DC='.implode(',DC=', explode('.', $this->ads_domain));
 		}
 		if (empty($this->ads_admin_user)) $this->ads_admin_user = 'Administrator';
-		$admin_dn = strpos($this->ads_admin_user, '=') !== false ? $this->ads_admin_user :
-			'CN='.$this->ads_admin_user.','.$this->ads_context;
-		switch($this->ads_connection)
+		$admin_dn = strpos($this->ads_admin_user, '=') !== false ? $this->ads_admin_user : 'CN='.$this->ads_admin_user.','.$this->ads_context;
+		switch ($this->ads_connection)
 		{
 			case 'ssl':
 				$url = 'ldaps://'.$this->ads_host.'/';
@@ -313,28 +312,27 @@ 
 		// check if ads base does exist
 		if (!@ldap_read($ads->ds, $this->ads_context, 'objectClass=*'))
 		{
-			throw new egw_exception_wrong_userinput(lang('Ads dn "%1" NOT found!',$this->ads_context));
+			throw new egw_exception_wrong_userinput(lang('Ads dn "%1" NOT found!', $this->ads_context));
 		}
 
 		// connect to source ldap
 		$this->connect();
 
 		// check if ldap base does exist
-		if (!@ldap_read($this->test_ldap->ds,$this->ldap_base,'objectClass=*'))
+		if (!@ldap_read($this->test_ldap->ds, $this->ldap_base, 'objectClass=*'))
 		{
-			throw new egw_exception_wrong_userinput(lang('Base dn "%1" NOT found!',$this->ldap_base));
+			throw new egw_exception_wrong_userinput(lang('Base dn "%1" NOT found!', $this->ldap_base));
 		}
 
-		if (!($sr = ldap_search($this->test_ldap->ds,$this->ldap_base,
-			$search = $this->no_sid_check ? '(objectClass=posixAccount)' :
-				'(&(objectClass=posixAccount)('.self::sambaSID.'=*)(!(uid=*$)))', $attrs)) ||
+		if (!($sr = ldap_search($this->test_ldap->ds, $this->ldap_base,
+			$search = $this->no_sid_check ? '(objectClass=posixAccount)' : '(&(objectClass=posixAccount)('.self::sambaSID.'=*)(!(uid=*$)))', $attrs)) ||
 			!($entries = ldap_get_entries($this->test_ldap->ds, $sr)))
 		{
-			throw new egw_exception(lang('Error searching "dn=%1" for "%2"!',$this->ldap_base, $search));
+			throw new egw_exception(lang('Error searching "dn=%1" for "%2"!', $this->ldap_base, $search));
 		}
 		$changed = 0;
 		$utc_diff = null;
-		foreach($entries as $key => $entry)
+		foreach ($entries as $key => $entry)
 		{
 			if ($key === 'count') continue;
 
@@ -343,7 +341,7 @@ 
 			$entry = array_diff_key($entry_arr, $ignore_attr);
 
 			if (!($sr = ldap_search($ads->ds, $this->ads_context,
-				$search='(&(objectClass=user)(sAMAccountName='.ldap::quote($uid).'))', array('dn'))) ||
+				$search = '(&(objectClass=user)(sAMAccountName='.ldap::quote($uid).'))', array('dn'))) ||
 				!($dest = ldap_get_entries($ads->ds, $sr)))
 			{
 				$msg[] = lang('User "%1" not found!', $uid);
@@ -363,11 +361,11 @@ 
 				{
 					if (is_null($utc_diff)) $utc_diff = date('Z');
 					$entry['shadowexpire'] = accounts_ads::convertUnixTimeToWindowsTime(
-						$entry['shadowexpire']*24*3600+$utc_diff);	// ldap time to unixTime
+						$entry['shadowexpire'] * 24 * 3600 + $utc_diff); // ldap time to unixTime
 				}
 			}
 			$update = array();
-			foreach($entry as $attr => $value)
+			foreach ($entry as $attr => $value)
 			{
 				if ($value || $attr === '')
 				{
@@ -377,14 +375,14 @@ 
 					{
 						list($prefix, $to) = explode('}', substr($to, 1));
 					}
-					foreach((array)$value as $val)
+					foreach ((array)$value as $val)
 					{
 						if (isset($update[$to]))
 						{
 							if (!is_array($update[$to])) $update[$to] = array($update[$to]);
 							// we need to check (caseinsensitive) if value already exists in set
 							// as AD chokes on doublicate values "Type or value exists"
-							foreach($update[$to] as $v)
+							foreach ($update[$to] as $v)
 							{
 								if (!strcasecmp($v, $prefix.$val)) continue 2;
 							}
@@ -416,7 +414,7 @@ 
 		if ($check_only) return lang("%1 accounts to copy found.", count($entries));
 
 		return "Copied data of $changed accounts from LDAP to AD ".
-			(count($msg) > $changed ? ' ('.(count($msg)-$changed).' errors!)' : '');
+			(count($msg) > $changed ? ' ('.(count($msg) - $changed).' errors!)' : '');
 	}
 
 	/**
@@ -459,9 +457,9 @@ 
 		$accounts_created = $groups_created = $errors = $egw_info_set = 0;
 		$emailadmin_src = $ldap_class = null;
 		$target = strtoupper($to);
-		foreach($accounts as $account_id => $account)
+		foreach ($accounts as $account_id => $account)
 		{
-			if (isset($this->only) && !in_array($account_id,$this->only))
+			if (isset($this->only) && !in_array($account_id, $this->only))
 			{
 				continue;
 			}
@@ -481,12 +479,12 @@ 
 			{
 				if (!($sql_account = $accounts_obj->read($account_id)))
 				{
-					$msg[] = lang('%1 does NOT exist in %2.',$what,$target);
+					$msg[] = lang('%1 does NOT exist in %2.', $what, $target);
 					$errors++;
 				}
-				elseif(empty($account['account_pwd']))
+				elseif (empty($account['account_pwd']))
 				{
-					$msg[] = lang('%1 does NOT have a password (userPassword attribute) or we are not allowed to read it!',$what);
+					$msg[] = lang('%1 does NOT have a password (userPassword attribute) or we are not allowed to read it!', $what);
 					$errors++;
 				}
 				else
@@ -495,12 +493,12 @@ 
 
 					if (!$accounts_obj->save($sql_account))
 					{
-						$msg[] = lang('Update of %1 in %2 failed !!!',$what,$target);
+						$msg[] = lang('Update of %1 in %2 failed !!!', $what, $target);
 						$errors++;
 					}
 					else
 					{
-						$msg[] = lang('%1 password set in %2.',$what,$target);
+						$msg[] = lang('%1 password set in %2.', $what, $target);
 						$accounts_created++;
 					}
 				}
@@ -511,7 +509,7 @@ 
 			{
 				if ($accounts_obj->exists($account_id))
 				{
-					$msg[] = lang('%1 already exists in %2.',$what,$target);
+					$msg[] = lang('%1 already exists in %2.', $what, $target);
 					$errors++;
 					continue;
 				}
@@ -519,7 +517,7 @@ 
 				{
 					if ($GLOBALS['egw_info']['server']['ldap_extra_attributes'])
 					{
-						$account['homedirectory'] = $GLOBALS['egw_info']['server']['ldap_account_home'] . '/' . $account['account_lid'];
+						$account['homedirectory'] = $GLOBALS['egw_info']['server']['ldap_account_home'].'/'.$account['account_lid'];
 						$account['loginshell'] = $GLOBALS['egw_info']['server']['ldap_account_shell'];
 					}
 					$account['account_passwd'] = self::hash_sql2ldap($account['account_pwd']);
@@ -532,12 +530,12 @@ 
 
 				if (!$accounts_obj->save($account))
 				{
-					$msg[] = lang('Creation of %1 in %2 failed !!!',$what,$target);
+					$msg[] = lang('Creation of %1 in %2 failed !!!', $what, $target);
 					$errors++;
 					continue;
 				}
-				$accounts_obj->set_memberships($account['memberships'],$account_id);
-				$msg[] = lang('%1 created in %2.',$what,$target);
+				$accounts_obj->set_memberships($account['memberships'], $account_id);
+				$msg[] = lang('%1 created in %2.', $what, $target);
 				$accounts_created++;
 
 				// check if we need to migrate mail-account
@@ -546,7 +544,7 @@ 
 					$ldap_class = false;
 					$ldap = new ldap();
 					$ldap->ldapConnect();
-					foreach(array(	// todo: have these enumerated by emailadmin ...
+					foreach (array(	// todo: have these enumerated by emailadmin ...
 						'qmailUser' => 'postfixldap',
 						'dbMailUser' => 'postfixdbmailuser',
 						// nothing to migrate for inetOrgPerson ...
@@ -594,7 +592,7 @@ 
 					// setting up egw_info array with new ldap information, so hook can use ldap::ldapConnect()
 					if (!$egw_info_set++)
 					{
-						foreach(array('ldap_host','ldap_root_dn','ldap_root_pw','ldap_context','ldap_group_context','ldap_search_filter','ldap_encryptin_type','mail_suffix','mail_login_type') as $name)
+						foreach (array('ldap_host', 'ldap_root_dn', 'ldap_root_pw', 'ldap_context', 'ldap_group_context', 'ldap_search_filter', 'ldap_encryptin_type', 'mail_suffix', 'mail_login_type') as $name)
 						{
 							 if (!empty($this->$name)) $GLOBALS['egw_info']['server'][$name] = $this->$name;
 						}
@@ -606,14 +604,14 @@ 
 						// running all addAccount hooks (currently NOT working, as not all work in setup)
 						if ($this->add_account_hook === true)
 						{
-							$GLOBALS['egw']->hooks->process($account,array(),true);
+							$GLOBALS['egw']->hooks->process($account, array(), true);
 						}
-						elseif(is_callable($this->add_account_hook))
+						elseif (is_callable($this->add_account_hook))
 						{
-							call_user_func($this->add_account_hook,$account);
+							call_user_func($this->add_account_hook, $account);
 						}
 					}
-					catch(Exception $e)
+					catch (Exception $e)
 					{
 						$msg[] = $e->getMessage();
 						$errors++;
@@ -627,38 +625,38 @@ 
 				{
 					if (!$accounts_obj->save($account))
 					{
-						$msg[] = lang('Creation of %1 in %2 failed !!!',$what,$target);
+						$msg[] = lang('Creation of %1 in %2 failed !!!', $what, $target);
 						++$errors;
 						continue;
 					}
-					$msg[] = lang('%1 created in %2.',$what,$target);
+					$msg[] = lang('%1 created in %2.', $what, $target);
 					$groups_created++;
 				}
 				else
 				{
-					$msg[] = lang('%1 already exists in %2.',$what,$target);
+					$msg[] = lang('%1 already exists in %2.', $what, $target);
 					$errors++;
 
 					if ($accounts_obj->id2name($account_id) != $account['account_lid'])
 					{
-						$msg[] = lang("==> different group '%1' under that gidNumber %2, NOT setting memberships!",$account['account_lid'],$account_id);
+						$msg[] = lang("==> different group '%1' under that gidNumber %2, NOT setting memberships!", $account['account_lid'], $account_id);
 						++$errors;
-						continue;	// different group under that gidnumber!
+						continue; // different group under that gidnumber!
 					}
 				}
 				// now saving / updating the memberships
-				$accounts_obj->set_members($account['members'],$account_id);
+				$accounts_obj->set_members($account['members'], $account_id);
 			}
 		}
 		if ($passwords2sql)
 		{
-			return lang('%1 passwords updated, %3 errors',$accounts_created,$groups_created,$errors).
-				($errors || $this->verbose ? "\n- ".implode("\n- ",$msg) : '');
+			return lang('%1 passwords updated, %3 errors', $accounts_created, $groups_created, $errors).
+				($errors || $this->verbose ? "\n- ".implode("\n- ", $msg) : '');
 		}
 		// migrate addressbook data
-		$GLOBALS['egw_info']['user']['apps']['admin'] = true;	// otherwise migration will not run in setup!
+		$GLOBALS['egw_info']['user']['apps']['admin'] = true; // otherwise migration will not run in setup!
 		$addressbook = new addressbook_so();
-		foreach($this->as_array() as $name => $value)
+		foreach ($this->as_array() as $name => $value)
 		{
 			if (substr($name, 5) == 'ldap_')
 			{
@@ -671,8 +669,8 @@ 
 
 		$this->restore_db();
 
-		return lang('%1 users and %2 groups created, %3 errors',$accounts_created,$groups_created,$errors).
-			($errors || $this->verbose ? "\n- ".implode("\n- ",$msgs) : '');
+		return lang('%1 users and %2 groups created, %3 errors', $accounts_created, $groups_created, $errors).
+			($errors || $this->verbose ? "\n- ".implode("\n- ", $msgs) : '');
 	}
 
 	/**
@@ -686,22 +684,22 @@ 
 		if (!($type = $GLOBALS['egw_info']['server']['sql_encryption_type'])) $type = 'md5';
 
 		$matches = null;
-		if (preg_match('/^\\{(.*)\\}(.*)$/',$hash,$matches))
+		if (preg_match('/^\\{(.*)\\}(.*)$/', $hash, $matches))
 		{
-			list(,$type,$hash) = $matches;
+			list(,$type, $hash) = $matches;
 		}
-		elseif (preg_match('/^[0-9a-f]{32}$/',$hash))
+		elseif (preg_match('/^[0-9a-f]{32}$/', $hash))
 		{
 			$type = 'md5';
 		}
-		switch(strtolower($type))
+		switch (strtolower($type))
 		{
 			case 'plain':
 				// ldap stores plaintext passwords without {plain} prefix
 				break;
 
 			case 'md5':
-				$hash = base64_encode(pack("H*",$hash));
+				$hash = base64_encode(pack("H*", $hash));
 				// fall through
 			default:
 				$hash = '{'.strtoupper($type).'}'.$hash;
@@ -731,14 +729,14 @@ 
 	 * @param string $type ='both'
 	 * @return array
 	 */
-	public function accounts($from='ldap', $type='both')
+	public function accounts($from = 'ldap', $type = 'both')
 	{
 		$accounts_obj = $this->accounts_obj($from);
 		//error_log(__METHOD__."(from_ldap=".array2string($from_ldap).') get_class(accounts_obj->backend)='.get_class($accounts_obj->backend));
 
 		$accounts = $accounts_obj->search(array('type' => $type, 'objectclass' => true, 'active' => false));
 
-		foreach($accounts as $account_id => &$account)
+		foreach ($accounts as $account_id => &$account)
 		{
 			if ($account_id != $account['account_id'])	// not all backends have as key the account_id
 			{
@@ -749,11 +747,11 @@ 
 
 			if ($account['account_type'] == 'g')
 			{
-				$account['members'] = $accounts_obj->members($account_id,true);
+				$account['members'] = $accounts_obj->members($account_id, true);
 			}
 			else
 			{
-				$account['memberships'] = $accounts_obj->memberships($account_id,true);
+				$account['memberships'] = $accounts_obj->memberships($account_id, true);
 			}
 		}
 		accounts::cache_invalidate();
@@ -769,13 +767,13 @@ 
 	 */
 	private function accounts_obj($type)
 	{
-		static $enviroment_setup=null;
+		static $enviroment_setup = null;
 		if (!$enviroment_setup)
 		{
 			parent::_setup_enviroment($this->domain);
 			$enviroment_setup = true;
 		}
-		if ($type != 'sql') $this->connect();	// throws exception, if it can NOT connect
+		if ($type != 'sql') $this->connect(); // throws exception, if it can NOT connect
 
 		// otherwise search does NOT work, as accounts_sql uses addressbook_bo for it
 		$GLOBALS['egw_info']['server']['account_repository'] = $type;
@@ -784,8 +782,8 @@ 
 			array(
 				'account_repository' => $GLOBALS['egw_info']['server']['account_repository'],
 			) + $this->as_array()) ||
-			!is_a(self::$egw_setup->accounts,'accounts') ||
-			!is_a(self::$egw_setup->accounts->backend,'accounts_'.$type))
+			!is_a(self::$egw_setup->accounts, 'accounts') ||
+			!is_a(self::$egw_setup->accounts->backend, 'accounts_'.$type))
 		{
 			throw new Exception(lang("Can NOT instancate accounts object for %1", strtoupper($type)));
 		}
@@ -800,7 +798,7 @@ 
 	 * @param string $host =null default $this->ldap_host, hostname, ip or ldap-url
 	 * @throws egw_exception_wrong_userinput Can not connect to ldap ...
 	 */
-	private function connect($dn=null,$pw=null,$host=null)
+	private function connect($dn = null, $pw = null, $host = null)
 	{
 		if (is_null($dn)) $dn = $this->ldap_root_dn;
 		if (is_null($pw)) $pw = $this->ldap_root_pw;
@@ -813,18 +811,18 @@ 
 		$this->test_ldap = new ldap();
 
 		$error_rep = error_reporting();
-		error_reporting($error_rep & ~E_WARNING);	// switch warnings of, in case they are on
+		error_reporting($error_rep&~E_WARNING); // switch warnings of, in case they are on
 		ob_start();
-		$ds = $this->test_ldap->ldapConnect($host,$dn,$pw);
+		$ds = $this->test_ldap->ldapConnect($host, $dn, $pw);
 		ob_end_clean();
 		error_reporting($error_rep);
 
 		if (!$ds)
 		{
 			throw new egw_exception_wrong_userinput(lang('Can not connect to LDAP server on host %1 using DN %2!',
-				$host,$dn).($this->test_ldap->ds ? ' ('.ldap_error($this->test_ldap->ds).')' : ''));
+				$host, $dn).($this->test_ldap->ds ? ' ('.ldap_error($this->test_ldap->ds).')' : ''));
 		}
-		return lang('Successful connected to LDAP server on %1 using DN %2.',$this->ldap_host,$dn);
+		return lang('Successful connected to LDAP server on %1 using DN %2.', $this->ldap_host, $dn);
 	}
 
 	/**
@@ -837,16 +835,16 @@ 
 	{
 		$this->connect();
 
-		$sr = ldap_list($this->test_ldap->ds,$this->ldap_context,'ObjectClass=posixAccount',array('dn','shadowExpire'));
+		$sr = ldap_list($this->test_ldap->ds, $this->ldap_context, 'ObjectClass=posixAccount', array('dn', 'shadowExpire'));
 		if (!($entries = ldap_get_entries($this->test_ldap->ds, $sr)))
 		{
-			throw new egw_exception('Error listing "dn=%1"!',$this->ldap_context);
+			throw new egw_exception('Error listing "dn=%1"!', $this->ldap_context);
 		}
 		$num = 0;
-		foreach($entries as $n => $entry)
+		foreach ($entries as $n => $entry)
 		{
 			if ($n === 'count') continue;
-			if (isset($entry['shadowexpire']) && $entry['shadowexpire'][0]*24*3600 < time()) continue;
+			if (isset($entry['shadowexpire']) && $entry['shadowexpire'][0] * 24 * 3600 < time()) continue;
 			++$num;
 		}
 		return $num;
@@ -860,23 +858,23 @@ 
 	 */
 	private function create()
 	{
-		$this->connect($this->ldap_admin,$this->ldap_admin_pw);
+		$this->connect($this->ldap_admin, $this->ldap_admin_pw);
 
-		foreach(array(
+		foreach (array(
 			$this->ldap_base => array(),
 			$this->ldap_context => array(),
 			$this->ldap_group_context => array(),
-			$this->ldap_root_dn => array('userPassword' => auth::encrypt_ldap($this->ldap_root_pw,'ssha')),
+			$this->ldap_root_dn => array('userPassword' => auth::encrypt_ldap($this->ldap_root_pw, 'ssha')),
 		) as $dn => $extra)
 		{
-			if (!$this->_create_node($dn,$extra,$this->check_only) && $dn == $this->ldap_root_dn)
+			if (!$this->_create_node($dn, $extra, $this->check_only) && $dn == $this->ldap_root_dn)
 			{
 				// ldap_root already existed, lets check the pw is correct
 				$this->connect();
 			}
 		}
 		return lang('Successful connected to LDAP server on %1 and created/checked required structur %2.',
-			$this->ldap_host,$this->ldap_base);
+			$this->ldap_host, $this->ldap_base);
 	}
 
 	/**
@@ -887,25 +885,25 @@ 
 	 */
 	private function delete_base()
 	{
-		$this->connect($this->ldap_admin,$this->ldap_admin_pw);
+		$this->connect($this->ldap_admin, $this->ldap_admin_pw);
 
 		// if base not set, use context minus one hierarchy, eg. ou=accounts,(o=domain,dc=local)
 		if (empty($this->ldap_base) && $this->ldap_context)
 		{
-			list(,$this->ldap_base) = explode(',',$this->ldap_context,2);
+			list(,$this->ldap_base) = explode(',', $this->ldap_context, 2);
 		}
 		// some precausion to not delete whole ldap tree!
-		if (count(explode(',',$this->ldap_base)) < 2)
+		if (count(explode(',', $this->ldap_base)) < 2)
 		{
-			throw new egw_exception_assertion_failed(lang('Refusing to delete dn "%1"!',$this->ldap_base));
+			throw new egw_exception_assertion_failed(lang('Refusing to delete dn "%1"!', $this->ldap_base));
 		}
 		// check if base does exist
-		if (!@ldap_read($this->test_ldap->ds,$this->ldap_base,'objectClass=*'))
+		if (!@ldap_read($this->test_ldap->ds, $this->ldap_base, 'objectClass=*'))
 		{
-			throw new egw_exception_wrong_userinput(lang('Base dn "%1" NOT found!',$this->ldap_base));
+			throw new egw_exception_wrong_userinput(lang('Base dn "%1" NOT found!', $this->ldap_base));
 		}
 		return lang('LDAP dn="%1" with %2 entries deleted.',
-			$this->ldap_base,$this->rdelete($this->ldap_base));
+			$this->ldap_base, $this->rdelete($this->ldap_base));
 	}
 
 	/**
@@ -917,20 +915,20 @@ 
 	 */
 	private function rdelete($dn)
 	{
-		if (!($sr = ldap_list($this->test_ldap->ds,$dn,'ObjectClass=*',array(''))) ||
+		if (!($sr = ldap_list($this->test_ldap->ds, $dn, 'ObjectClass=*', array(''))) ||
 			!($entries = ldap_get_entries($this->test_ldap->ds, $sr)))
 		{
-			throw new egw_exception(lang('Error listing "dn=%1"!',$dn));
+			throw new egw_exception(lang('Error listing "dn=%1"!', $dn));
 		}
 		$deleted = 0;
-		foreach($entries as $n => $entry)
+		foreach ($entries as $n => $entry)
 		{
 			if ($n === 'count') continue;
 			$deleted += $this->rdelete($entry['dn']);
 		}
-		if (!ldap_delete($this->test_ldap->ds,$dn))
+		if (!ldap_delete($this->test_ldap->ds, $dn))
 		{
-			throw new egw_exception(lang('Error deleting "dn=%1"!',$dn));
+			throw new egw_exception(lang('Error deleting "dn=%1"!', $dn));
 		}
 		return ++$deleted;
 	}
@@ -946,32 +944,32 @@ 
 	 * @return string with success message N entries modified
 	 * @throws egw_exception if dn not found, not listable or delete fails
 	 */
-	private function set_mailbox($check_only=false)
+	private function set_mailbox($check_only = false)
 	{
-		$this->connect($this->ldap_admin,$this->ldap_admin_pw);
+		$this->connect($this->ldap_admin, $this->ldap_admin_pw);
 
 		// if base not set, use context minus one hierarchy, eg. ou=accounts,(o=domain,dc=local)
 		if (empty($this->ldap_base) && $this->ldap_context)
 		{
-			list(,$this->ldap_base) = explode(',',$this->ldap_context,2);
+			list(,$this->ldap_base) = explode(',', $this->ldap_context, 2);
 		}
 		// check if base does exist
-		if (!@ldap_read($this->test_ldap->ds,$this->ldap_base,'objectClass=*'))
+		if (!@ldap_read($this->test_ldap->ds, $this->ldap_base, 'objectClass=*'))
 		{
-			throw new egw_exception_wrong_userinput(lang('Base dn "%1" NOT found!',$this->ldap_base));
+			throw new egw_exception_wrong_userinput(lang('Base dn "%1" NOT found!', $this->ldap_base));
 		}
 		$object_class = $this->object_class ? $this->object_class : 'qmailUser';
 		$mbox_attr = $this->mbox_attr ? $this->mbox_attr : 'mailmessagestore';
 		$mail_login_type = $this->mail_login_type ? $this->mail_login_type : 'email';
 
-		if (!($sr = ldap_search($this->test_ldap->ds,$this->ldap_base,
-				'objectClass='.$object_class,array('mail','uidNumber','uid',$mbox_attr))) ||
+		if (!($sr = ldap_search($this->test_ldap->ds, $this->ldap_base,
+				'objectClass='.$object_class, array('mail', 'uidNumber', 'uid', $mbox_attr))) ||
 			!($entries = ldap_get_entries($this->test_ldap->ds, $sr)))
 		{
-			throw new egw_exception(lang('Error listing "dn=%1"!',$this->ldap_base));
+			throw new egw_exception(lang('Error listing "dn=%1"!', $this->ldap_base));
 		}
 		$modified = 0;
-		foreach($entries as $n => $entry)
+		foreach ($entries as $n => $entry)
 		{
 			if ($n === 'count') continue;
 
@@ -979,21 +977,20 @@ 
 				'account_id' => $entry['uidnumber'][0],
 				'account_lid' => $entry['uid'][0],
 				'account_email' => $entry['mail'][0],
-			),$this->domain,$mail_login_type);
+			), $this->domain, $mail_login_type);
 
-			if ($mbox === $entry[$mbox_attr][0]) continue;	// nothing to change
+			if ($mbox === $entry[$mbox_attr][0]) continue; // nothing to change
 
-			if (!$check_only && !ldap_modify($this->test_ldap->ds,$entry['dn'],array(
+			if (!$check_only && !ldap_modify($this->test_ldap->ds, $entry['dn'], array(
 				$mbox_attr => $mbox,
 			)))
 			{
-				throw new egw_exception(lang("Error modifying dn=%1: %2='%3'!",$entry['dn'],$mbox_attr,$mbox));
+				throw new egw_exception(lang("Error modifying dn=%1: %2='%3'!", $entry['dn'], $mbox_attr, $mbox));
 			}
 			++$modified;
 			if ($check_only) echo "$modified: $entry[dn]: $mbox_attr={$entry[$mbox_attr][0]} --> $mbox\n";
 		}
-		return $check_only ? lang('%1 entries would have been modified.',$modified) :
-			lang('%1 entries modified.',$modified);
+		return $check_only ? lang('%1 entries would have been modified.', $modified) : lang('%1 entries modified.', $modified);
 	}
 
 	/**
@@ -1004,9 +1001,9 @@ 
 	static $requiredObjectclasses = array(
 		'o' => 'organization',
 		'ou' => 'organizationalUnit',
-		'cn' => array('organizationalRole','simpleSecurityObject'),
-		'uid' => array('uidObject','organizationalRole','simpleSecurityObject'),
-		'dc' => array('organization','dcObject'),
+		'cn' => array('organizationalRole', 'simpleSecurityObject'),
+		'uid' => array('uidObject', 'organizationalRole', 'simpleSecurityObject'),
+		'dc' => array('organization', 'dcObject'),
 	);
 
 	/**
@@ -1017,37 +1014,37 @@ 
 	 * @return boolean true if the node was create, false if it was already there
 	 * @throws egw_exception_wrong_userinput
 	 */
-	private function _create_node($dn,$extra=array())
+	private function _create_node($dn, $extra = array())
 	{
 		// check if the node already exists and return if it does
-		if (@ldap_read($this->test_ldap->ds,$dn,'objectClass=*'))
+		if (@ldap_read($this->test_ldap->ds, $dn, 'objectClass=*'))
 		{
 			return false;
 		}
-		list($node,$base) = explode(',',$dn,2);
+		list($node, $base) = explode(',', $dn, 2);
 
-		if (!@ldap_read($this->test_ldap->ds,$base,'objectClass=*'))
+		if (!@ldap_read($this->test_ldap->ds, $base, 'objectClass=*'))
 		{
-			$this->_create_node($base);		// create the base if it's not already there
+			$this->_create_node($base); // create the base if it's not already there
 		}
 		// now we need to create the node itself
-		list($name,$value) = explode('=',$node);
+		list($name, $value) = explode('=', $node);
 
 		if (!isset(self::$requiredObjectclasses[$name]))
 		{
-			throw new egw_exception_wrong_userinput(lang('Can not create DN %1!',$dn).' '.
-				lang('Supported node types:').implode(', ',array_keys(self::$requiredObjectclasses)));
+			throw new egw_exception_wrong_userinput(lang('Can not create DN %1!', $dn).' '.
+				lang('Supported node types:').implode(', ', array_keys(self::$requiredObjectclasses)));
 		}
-		if ($name == 'dc') $extra['o'] = $value;	// required by organisation
-		if ($name == 'uid') $extra['cn'] = $value;	// required by organizationalRole
+		if ($name == 'dc') $extra['o'] = $value; // required by organisation
+		if ($name == 'uid') $extra['cn'] = $value; // required by organizationalRole
 
-		if (!@ldap_add($this->test_ldap->ds,$dn,$attr = array(
+		if (!@ldap_add($this->test_ldap->ds, $dn, $attr = array(
 			$name => $value,
 			'objectClass' => self::$requiredObjectclasses[$name],
-		)+$extra))
+		) + $extra))
 		{
-			throw new egw_exception_wrong_userinput(lang('Can not create DN %1!',$dn).
-				' ('.ldap_error($this->test_ldap->ds).', attributes='.print_r($attr,true).')');
+			throw new egw_exception_wrong_userinput(lang('Can not create DN %1!', $dn).
+				' ('.ldap_error($this->test_ldap->ds).', attributes='.print_r($attr, true).')');
 		}
 		return true;
 	}
@@ -1078,30 +1075,30 @@ 
 	 */
 	private function _merge_defaults()
 	{
-		foreach(self::defaults() as $name => $default)
+		foreach (self::defaults() as $name => $default)
 		{
-			if ($this->sub_command == 'delete_ldap' && in_array($name,array('ldap_base','ldap_context')))
+			if ($this->sub_command == 'delete_ldap' && in_array($name, array('ldap_base', 'ldap_context')))
 			{
-				continue;	// no default on what to delete!
+				continue; // no default on what to delete!
 			}
 			if (!$this->$name)
 			{
 				//echo "<p>setting $name='{$this->$name}' to it's default='$default'</p>\n";
 				$this->set_defaults[$name] = $this->$name = $default;
 			}
-			if (strpos($this->$name,'$') !== false)
+			if (strpos($this->$name, '$') !== false)
 			{
 				$this->set_defaults[$name] = $this->$name = str_replace(array(
 					'$domain',
 					'$suffix',
 					'$base',
 					'$admin_pw',
-				),array(
+				), array(
 					$this->domain,
 					$this->ldap_suffix,
 					$this->ldap_base,
 					$this->ldap_admin_pw,
-				),$this->$name);
+				), $this->$name);
 			}
 		}
 	}

Braces +124 added lines, -30 removed lines

@@ -201,7 +201,10 @@ 
 		$change_account_id = '';
 		foreach($entries as $key => $entry)
 		{
-			if ($key === 'count') continue;
+			if ($key === 'count')
+			{
+				continue;
+			}
 
 			$entry = ldap::result2array($entry);
 			$accounts[$entry['dn']] = $entry;
@@ -228,7 +231,10 @@ 
 		//print_r($change); die('Stop');
 
 		// change account-ids inside EGroupware
-		if ($check_only) $msg[] = "You need to run now:\n$cmd_change_account_id $change_account_id";
+		if ($check_only)
+		{
+			$msg[] = "You need to run now:\n$cmd_change_account_id $change_account_id";
+		}
 		//$cmd = new admin_cmd_change_account_id($change);
 		//$msg[] = $cmd->run($time=null, $set_modifier=false, $skip_checks=false, $check_only);
 
@@ -250,7 +256,10 @@ 
 				throw new egw_exception("Failed to modify ldap: !ldap_modify({$this->test_ldap->ds}, '$dn', ".array2string($modify).") ".ldap_error($this->test_ldap->ds).
 					"\n- ".implode("\n- ", $msg));	// EGroupware change already run successful
 			}
-			if ($modify) ++$changed;
+			if ($modify)
+			{
+				++$changed;
+			}
 		}
 		$msg[] = "You need to run now on your samba share(s):\nsetup/doc/chown.php -R $change_account_id <share>";
 
@@ -277,7 +286,10 @@ 
 			else
 			{
 				list($to, $from) = explode('=', $attr);
-				if ($from) $attrs[] = $from;
+				if ($from)
+				{
+					$attrs[] = $from;
+				}
 				$rename[strtolower($from)] = $to;
 			}
 		}
@@ -292,7 +304,10 @@ 
 		{
 			$this->ads_context = 'CN=Users,DC='.implode(',DC=', explode('.', $this->ads_domain));
 		}
-		if (empty($this->ads_admin_user)) $this->ads_admin_user = 'Administrator';
+		if (empty($this->ads_admin_user))
+		{
+			$this->ads_admin_user = 'Administrator';
+		}
 		$admin_dn = strpos($this->ads_admin_user, '=') !== false ? $this->ads_admin_user :
 			'CN='.$this->ads_admin_user.','.$this->ads_context;
 		switch($this->ads_connection)
@@ -336,7 +351,10 @@ 
 		$utc_diff = null;
 		foreach($entries as $key => $entry)
 		{
-			if ($key === 'count') continue;
+			if ($key === 'count')
+			{
+				continue;
+			}
 
 			$entry_arr = ldap::result2array($entry);
 			$uid = $entry_arr['uid'];
@@ -350,7 +368,10 @@ 
 				continue;
 			}
 			$dn = $dest[0]['dn'];
-			if (isset($rename[''])) $entry[''] = '';
+			if (isset($rename['']))
+			{
+				$entry[''] = '';
+			}
 			// special handling for copying shadowExpires to accountExpires
 			if (strtolower($rename['shadowexpire']) === 'accountexpires')
 			{
@@ -361,7 +382,10 @@ 
 				}
 				else
 				{
-					if (is_null($utc_diff)) $utc_diff = date('Z');
+					if (is_null($utc_diff))
+					{
+						$utc_diff = date('Z');
+					}
 					$entry['shadowexpire'] = accounts_ads::convertUnixTimeToWindowsTime(
 						$entry['shadowexpire']*24*3600+$utc_diff);	// ldap time to unixTime
 				}
@@ -373,20 +397,29 @@ 
 				{
 					$to = isset($rename[$attr]) ? $rename[$attr] : $attr;
 					$prefix = null;
-					if ($to[0] == '{')	// eg. {smtp:}proxyAddresses=forwardTo
+					if ($to[0] == '{')
+					{
+						// eg. {smtp:}proxyAddresses=forwardTo
 					{
 						list($prefix, $to) = explode('}', substr($to, 1));
 					}
+					}
 					foreach((array)$value as $val)
 					{
 						if (isset($update[$to]))
 						{
-							if (!is_array($update[$to])) $update[$to] = array($update[$to]);
+							if (!is_array($update[$to]))
+							{
+								$update[$to] = array($update[$to]);
+							}
 							// we need to check (caseinsensitive) if value already exists in set
 							// as AD chokes on doublicate values "Type or value exists"
 							foreach($update[$to] as $v)
 							{
-								if (!strcasecmp($v, $prefix.$val)) continue 2;
+								if (!strcasecmp($v, $prefix.$val))
+								{
+									continue 2;
+								}
 							}
 							$update[$to][] = $prefix.$val;
 						}
@@ -413,7 +446,10 @@ 
 				$changed++;
 			}
 		}
-		if ($check_only) return lang("%1 accounts to copy found.", count($entries));
+		if ($check_only)
+		{
+			return lang("%1 accounts to copy found.", count($entries));
+		}
 
 		return "Copied data of $changed accounts from LDAP to AD ".
 			(count($msg) > $changed ? ' ('.(count($msg)-$changed).' errors!)' : '');
@@ -429,7 +465,10 @@ 
 	private function migrate($mode)
 	{
 		// support old boolean mode
-		if (is_bool($mode)) $mode = $mode ? 'migrate_to_ldap' : 'migrate_to_sql';
+		if (is_bool($mode))
+		{
+			$mode = $mode ? 'migrate_to_ldap' : 'migrate_to_sql';
+		}
 
 		$passwords2sql = $mode === "passwords_to_sql";
 		list(,$to) = explode('_to_', $mode);
@@ -596,7 +635,10 @@ 
 					{
 						foreach(array('ldap_host','ldap_root_dn','ldap_root_pw','ldap_context','ldap_group_context','ldap_search_filter','ldap_encryptin_type','mail_suffix','mail_login_type') as $name)
 						{
-							 if (!empty($this->$name)) $GLOBALS['egw_info']['server'][$name] = $this->$name;
+							 if (!empty($this->$name))
+							 {
+							 	$GLOBALS['egw_info']['server'][$name] = $this->$name;
+							 }
 						}
 						//error_log(__METHOD__."() setup up egw_info[server]: ldap_host='{$GLOBALS['egw_info']['server']['ldap_host']}', ldap_root_dn='{$GLOBALS['egw_info']['server']['ldap_root_dn']}', ldap_root_pw='{$GLOBALS['egw_info']['server']['ldap_root_pw']}', ldap_context='{$GLOBALS['egw_info']['server']['ldap_context']}', mail_suffix='{$GLOBALS['egw_info']['server']['mail_suffix']}', mail_logig_type='{$GLOBALS['egw_info']['server']['mail_login-type']}'");
 					}
@@ -683,7 +725,10 @@ 
 	 */
 	public static function hash_sql2ldap($hash)
 	{
-		if (!($type = $GLOBALS['egw_info']['server']['sql_encryption_type'])) $type = 'md5';
+		if (!($type = $GLOBALS['egw_info']['server']['sql_encryption_type']))
+		{
+			$type = 'md5';
+		}
 
 		$matches = null;
 		if (preg_match('/^\\{(.*)\\}(.*)$/',$hash,$matches))
@@ -717,10 +762,13 @@ 
 	 */
 	public static function hash_ldap2sql($hash)
 	{
-		if ($hash[0] != '{')	// plain has to be explicitly specified for sql, in ldap it's the default
+		if ($hash[0] != '{')
+		{
+			// plain has to be explicitly specified for sql, in ldap it's the default
 		{
 			$hash = '{PLAIN}'.$hash;
 		}
+		}
 		return $hash;
 	}
 
@@ -740,9 +788,12 @@ 
 
 		foreach($accounts as $account_id => &$account)
 		{
-			if ($account_id != $account['account_id'])	// not all backends have as key the account_id
+			if ($account_id != $account['account_id'])
+			{
+				// not all backends have as key the account_id
 			{
 				unset($account);
+			}
 				$account_id = $account['account_id'];
 			}
 			$account += $accounts_obj->read($account_id);
@@ -775,7 +826,11 @@ 
 			parent::_setup_enviroment($this->domain);
 			$enviroment_setup = true;
 		}
-		if ($type != 'sql') $this->connect();	// throws exception, if it can NOT connect
+		if ($type != 'sql')
+		{
+			$this->connect();
+		}
+		// throws exception, if it can NOT connect
 
 		// otherwise search does NOT work, as accounts_sql uses addressbook_bo for it
 		$GLOBALS['egw_info']['server']['account_repository'] = $type;
@@ -802,14 +857,26 @@ 
 	 */
 	private function connect($dn=null,$pw=null,$host=null)
 	{
-		if (is_null($dn)) $dn = $this->ldap_root_dn;
-		if (is_null($pw)) $pw = $this->ldap_root_pw;
-		if (is_null($host)) $host = $this->ldap_host;
+		if (is_null($dn))
+		{
+			$dn = $this->ldap_root_dn;
+		}
+		if (is_null($pw))
+		{
+			$pw = $this->ldap_root_pw;
+		}
+		if (is_null($host))
+		{
+			$host = $this->ldap_host;
+		}
 
-		if (!$pw)	// ldap::ldapConnect use the current eGW's pw otherwise
+		if (!$pw)
+		{
+			// ldap::ldapConnect use the current eGW's pw otherwise
 		{
 			throw new egw_exception_wrong_userinput(lang('You need to specify a password!'));
 		}
+		}
 		$this->test_ldap = new ldap();
 
 		$error_rep = error_reporting();
@@ -845,8 +912,14 @@ 
 		$num = 0;
 		foreach($entries as $n => $entry)
 		{
-			if ($n === 'count') continue;
-			if (isset($entry['shadowexpire']) && $entry['shadowexpire'][0]*24*3600 < time()) continue;
+			if ($n === 'count')
+			{
+				continue;
+			}
+			if (isset($entry['shadowexpire']) && $entry['shadowexpire'][0]*24*3600 < time())
+			{
+				continue;
+			}
 			++$num;
 		}
 		return $num;
@@ -925,7 +998,10 @@ 
 		$deleted = 0;
 		foreach($entries as $n => $entry)
 		{
-			if ($n === 'count') continue;
+			if ($n === 'count')
+			{
+				continue;
+			}
 			$deleted += $this->rdelete($entry['dn']);
 		}
 		if (!ldap_delete($this->test_ldap->ds,$dn))
@@ -973,7 +1049,10 @@ 
 		$modified = 0;
 		foreach($entries as $n => $entry)
 		{
-			if ($n === 'count') continue;
+			if ($n === 'count')
+			{
+				continue;
+			}
 
 			$mbox = emailadmin_smtp_ldap::mailbox_addr(array(
 				'account_id' => $entry['uidnumber'][0],
@@ -981,7 +1060,11 @@ 
 				'account_email' => $entry['mail'][0],
 			),$this->domain,$mail_login_type);
 
-			if ($mbox === $entry[$mbox_attr][0]) continue;	// nothing to change
+			if ($mbox === $entry[$mbox_attr][0])
+			{
+				continue;
+			}
+			// nothing to change
 
 			if (!$check_only && !ldap_modify($this->test_ldap->ds,$entry['dn'],array(
 				$mbox_attr => $mbox,
@@ -990,7 +1073,10 @@ 
 				throw new egw_exception(lang("Error modifying dn=%1: %2='%3'!",$entry['dn'],$mbox_attr,$mbox));
 			}
 			++$modified;
-			if ($check_only) echo "$modified: $entry[dn]: $mbox_attr={$entry[$mbox_attr][0]} --> $mbox\n";
+			if ($check_only)
+			{
+				echo "$modified: $entry[dn]: $mbox_attr={$entry[$mbox_attr][0]} --> $mbox\n";
+			}
 		}
 		return $check_only ? lang('%1 entries would have been modified.',$modified) :
 			lang('%1 entries modified.',$modified);
@@ -1038,8 +1124,16 @@ 
 			throw new egw_exception_wrong_userinput(lang('Can not create DN %1!',$dn).' '.
 				lang('Supported node types:').implode(', ',array_keys(self::$requiredObjectclasses)));
 		}
-		if ($name == 'dc') $extra['o'] = $value;	// required by organisation
-		if ($name == 'uid') $extra['cn'] = $value;	// required by organizationalRole
+		if ($name == 'dc')
+		{
+			$extra['o'] = $value;
+		}
+		// required by organisation
+		if ($name == 'uid')
+		{
+			$extra['cn'] = $value;
+		}
+		// required by organizationalRole
 
 		if (!@ldap_add($this->test_ldap->ds,$dn,$attr = array(
 			$name => $value,

setup/inc/class.setup_detection.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -252,7 +252,7 @@
 	/**
 	 * Check if header exists and is up to date
 	 *
-	 * @return int 1=no header.inc.php, 2=no header admin pw, 3=no instances, 4=need upgrade, 10=ok
+	 * @return string 1=no header.inc.php, 2=no header admin pw, 3=no instances, 4=need upgrade, 10=ok
 	 */
 	function check_header()
 	{

Braces +20 added lines, -5 removed lines

@@ -65,7 +65,9 @@ 
 					foreach($GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->applications_table,'*',false,__LINE__,__FILE__) as $row)
 					{
 						$app = $row['app_name'];
-						if (!isset($setup_info[$app]))	// app source no longer there
+						if (!isset($setup_info[$app]))
+						{
+							// app source no longer there
 						{
 							$setup_info[$app] = array(
 								'name' => $app,
@@ -73,6 +75,7 @@ 
 								'version' => 'deleted',
 							);
 						}
+						}
 						$setup_info[$app]['currentver'] = $row['app_version'];
 						$setup_info[$app]['enabled'] = $row['app_enabled'];
 					}
@@ -212,7 +215,9 @@ 
 					if ($setup_info['depends'][$depkey]['status'] == False)
 					{
 						/* Only set this if it has not already failed to upgrade - Milosch */
-						if($setup_info[$key]['status'] != 'F')//&& $setup_info[$key]['status'] != 'C')
+						if($setup_info[$key]['status'] != 'F')
+						{
+							//&& $setup_info[$key]['status'] != 'C')
 						{
 							/* Added check for status U - uninstalled apps carry this flag (upgrade from nothing == install).
 							 * This should fix apps showing post-install dep failure when they are not yet installed.
@@ -220,6 +225,7 @@ 
 							if($setup_info[$key]['status'] == 'C' || $setup_info[$key]['status'] == 'U')
 							{
 								$setup_info[$key]['status'] = 'D';
+						}
 							}
 							else
 							{
@@ -292,7 +298,10 @@ 
 	 */
 	function check_db($setup_info=null)
 	{
-		if (!$setup_info) $setup_info = $GLOBALS['setup_info'];
+		if (!$setup_info)
+		{
+			$setup_info = $GLOBALS['setup_info'];
+		}
 
 		try {	// catch DB errors
 			if (!$GLOBALS['egw_setup']->db->Link_ID)
@@ -482,11 +491,14 @@ 
 				{
 					echo '<br>check_app_tables(): Checking: ' . $appname . ',table: ' . $val;
 				}
-				if(!in_array($val,$tables) && !in_array(strtolower($val),$tables))	// names in tables might be lowercase
+				if(!in_array($val,$tables) && !in_array(strtolower($val),$tables))
+				{
+					// names in tables might be lowercase
 				{
 					if($GLOBALS['DEBUG'])
 					{
 						echo '<br>check_app_tables(): ' . $val . ' missing!';
+				}
 					}
 					if(!$any)
 					{
@@ -543,9 +555,12 @@ 
 			$msg = lang('does not exist');
 			return false;
 		}
-		if (!@is_writeable($dir) && $_SERVER['HTTP_HOST'])	// only do the check if we run by the webserver
+		if (!@is_writeable($dir) && $_SERVER['HTTP_HOST'])
+		{
+			// only do the check if we run by the webserver
 		{
 			$msg = lang('is not writeable by the webserver');
+		}
 			return false;
 		}
 		if ($check_in_docroot)

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

@@ -464,7 +464,7 @@
 		{
 			/* Make a copy, else we send some callers into an infinite loop */
 			$copy = $setup_info;
-			$tables = Array();
+			$tables = array();
 			try {
 				$table_names = $GLOBALS['egw_setup']->db->table_names();
 				foreach($table_names as $key => $val)

Spacing +85 added lines, -85 removed lines

@@ -25,12 +25,12 @@ 
 	{
 		$setup_info = array();
 		$d = dir(EGW_SERVER_ROOT);
-		while($entry=$d->read())
+		while ($entry = $d->read())
 		{
-			if($entry != ".." && $entry != 'setup' && is_dir(EGW_SERVER_ROOT . '/' . $entry))
+			if ($entry != ".." && $entry != 'setup' && is_dir(EGW_SERVER_ROOT.'/'.$entry))
 			{
-				$f = EGW_SERVER_ROOT . '/' . $entry . '/setup/setup.inc.php';
-				if (@file_exists ($f))
+				$f = EGW_SERVER_ROOT.'/'.$entry.'/setup/setup.inc.php';
+				if (@file_exists($f))
 				{
 					include($f);
 					$setup_info[$entry]['filename'] = $f;
@@ -50,18 +50,18 @@ 
 	 * @param array $setup_info
 	 * @return array $setup_info
 	 */
-	function get_db_versions($setup_info=null)
+	function get_db_versions($setup_info = null)
 	{
 		try {	// catch DB errors
 			$GLOBALS['egw_setup']->set_table_names();
 
-			if($GLOBALS['egw_setup']->table_exist(array($GLOBALS['egw_setup']->applications_table),true))
+			if ($GLOBALS['egw_setup']->table_exist(array($GLOBALS['egw_setup']->applications_table), true))
 			{
 				/* one of these tables exists. checking for post/pre beta version */
-				if($GLOBALS['egw_setup']->applications_table != 'applications')
+				if ($GLOBALS['egw_setup']->applications_table != 'applications')
 				{
-					$GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->applications_table,'*',false,__LINE__,__FILE__);
-					while(@$GLOBALS['egw_setup']->db->next_record())
+					$GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->applications_table, '*', false, __LINE__, __FILE__);
+					while (@$GLOBALS['egw_setup']->db->next_record())
 					{
 						$app = $GLOBALS['egw_setup']->db->f('app_name');
 						if (!isset($setup_info[$app]))	// app source no longer there
@@ -77,7 +77,7 @@ 
 					}
 					/* This is to catch old setup installs that did not have phpgwapi listed as an app */
 					$tmp = @$setup_info['phpgwapi']['version']; /* save the file version */
-					if(!@$setup_info['phpgwapi']['currentver'])
+					if (!@$setup_info['phpgwapi']['currentver'])
 					{
 						$setup_info['phpgwapi']['currentver'] = $setup_info['admin']['currentver'];
 						$setup_info['phpgwapi']['version'] = $setup_info['admin']['currentver'];
@@ -97,9 +97,9 @@ 
 				else
 				{
 					$GLOBALS['egw_setup']->db->query('select * from applications');
-					while(@$GLOBALS['egw_setup']->db->next_record())
+					while (@$GLOBALS['egw_setup']->db->next_record())
 					{
-						if($GLOBALS['egw_setup']->db->f('app_name') == 'admin')
+						if ($GLOBALS['egw_setup']->db->f('app_name') == 'admin')
 						{
 							$setup_info['phpgwapi']['currentver'] = $GLOBALS['egw_setup']->db->f('app_version');
 						}
@@ -127,25 +127,25 @@ 
 	 * 	V	Version mismatch at end of upgrade (Not used, proposed only)
 	 * 	M	Missing files at start of upgrade (Not used, proposed only)
 	 */
-	function compare_versions($setup_info,$try_downgrade=false)
+	function compare_versions($setup_info, $try_downgrade = false)
 	{
-		foreach($setup_info as $key => $value)
+		foreach ($setup_info as $key => $value)
 		{
 			//echo '<br>'.$value['name'].'STATUS: '.$value['status'];
 			/* Only set this if it has not already failed to upgrade - Milosch */
-			if(!( (@$value['status'] == 'F') || (@$value['status'] == 'C') ))
+			if (!((@$value['status'] == 'F') || (@$value['status'] == 'C')))
 			{
 				//if ($setup_info[$key]['currentver'] > $setup_info[$key]['version'])
-				if(!$try_downgrade && $GLOBALS['egw_setup']->amorethanb($value['currentver'],@$value['version']) ||
+				if (!$try_downgrade && $GLOBALS['egw_setup']->amorethanb($value['currentver'], @$value['version']) ||
 					$value['version'] == 'deleted')
 				{
 					$setup_info[$key]['status'] = 'V';
 				}
-				elseif(@$value['currentver'] == @$value['version'])
+				elseif (@$value['currentver'] == @$value['version'])
 				{
 					$setup_info[$key]['status'] = 'C';
 				}
-				elseif($GLOBALS['egw_setup']->alessthanb(@$value['currentver'],@$value['version']))
+				elseif ($GLOBALS['egw_setup']->alessthanb(@$value['currentver'], @$value['version']))
 				{
 					$setup_info[$key]['status'] = 'U';
 				}
@@ -162,35 +162,35 @@ 
 	function check_depends($setup_info)
 	{
 		/* Run the list of apps */
-		foreach($setup_info as $key => $value)
+		foreach ($setup_info as $key => $value)
 		{
 			/* Does this app have any depends */
-			if(isset($value['depends']))
+			if (isset($value['depends']))
 			{
 				/* If so find out which apps it depends on */
-				foreach($value['depends'] as $depkey => $depvalue)
+				foreach ($value['depends'] as $depkey => $depvalue)
 				{
 					/* I set this to False until we find a compatible version of this app */
 					$setup_info['depends'][$depkey]['status'] = False;
 					/* Now we loop thru the versions looking for a compatible version */
 
-					foreach($depvalue['versions'] as $depsvalue)
+					foreach ($depvalue['versions'] as $depsvalue)
 					{
 						$currentver = $setup_info[$depvalue['appname']]['currentver'];
-						if ($depvalue['appname'] == 'phpgwapi' && substr($currentver,0,6) == '0.9.99')
+						if ($depvalue['appname'] == 'phpgwapi' && substr($currentver, 0, 6) == '0.9.99')
 						{
 							$currentver = '0.9.14.508';
 						}
 						$major = $GLOBALS['egw_setup']->get_major($currentver);
-						if ($major >= $depsvalue || $major == $depsvalue && substr($major,0,strlen($depsvalue)+1) == $depsvalue.'.')
+						if ($major >= $depsvalue || $major == $depsvalue && substr($major, 0, strlen($depsvalue) + 1) == $depsvalue.'.')
 						{
 							$setup_info['depends'][$depkey]['status'] = True;
 						}
 						else	// check if majors are equal and minors greater or equal
 						{
 							$major_depsvalue = $GLOBALS['egw_setup']->get_major($depsvalue);
-							$tmp = explode('.',$depsvalue); $minor_depsvalue = array_pop($tmp);
-							$tmp2 = explode('.',$currentver); $minor = array_pop($tmp2);
+							$tmp = explode('.', $depsvalue); $minor_depsvalue = array_pop($tmp);
+							$tmp2 = explode('.', $currentver); $minor = array_pop($tmp2);
 							if ($major == $major_depsvalue && $minor <= $minor_depsvalue)
 							{
 								$setup_info['depends'][$depkey]['status'] = True;
@@ -203,17 +203,17 @@ 
 				 Finally, we loop through the dependencies again to look for apps that still have a failure status
 				 If we find one, we set the apps overall status as a dependency failure.
 				*/
-				foreach($value['depends'] as $depkey => $depvalue)
+				foreach ($value['depends'] as $depkey => $depvalue)
 				{
 					if ($setup_info['depends'][$depkey]['status'] == False)
 					{
 						/* Only set this if it has not already failed to upgrade - Milosch */
-						if($setup_info[$key]['status'] != 'F')//&& $setup_info[$key]['status'] != 'C')
+						if ($setup_info[$key]['status'] != 'F')//&& $setup_info[$key]['status'] != 'C')
 						{
 							/* Added check for status U - uninstalled apps carry this flag (upgrade from nothing == install).
 							 * This should fix apps showing post-install dep failure when they are not yet installed.
 							 */
-							if($setup_info[$key]['status'] == 'C' || $setup_info[$key]['status'] == 'U')
+							if ($setup_info[$key]['status'] == 'C' || $setup_info[$key]['status'] == 'U')
 							{
 								$setup_info[$key]['status'] = 'D';
 							}
@@ -235,9 +235,9 @@ 
 	 */
 	function upgrade_exclude($setup_info)
 	{
-		foreach($setup_info as $key => $value)
+		foreach ($setup_info as $key => $value)
 		{
-			if(isset($value['no_mass_update']))
+			if (isset($value['no_mass_update']))
 			{
 				unset($setup_info[$key]);
 			}
@@ -252,24 +252,24 @@ 
 	 */
 	function check_header()
 	{
-		if(!file_exists(EGW_SERVER_ROOT.'/header.inc.php') || filesize(EGW_SERVER_ROOT.'/header.inc.php') < 200)
+		if (!file_exists(EGW_SERVER_ROOT.'/header.inc.php') || filesize(EGW_SERVER_ROOT.'/header.inc.php') < 200)
 		{
 			$GLOBALS['egw_info']['setup']['header_msg'] = 'Stage One';
 			return '1';
 		}
 		else
 		{
-			if(!@isset($GLOBALS['egw_info']['server']['header_admin_password']))
+			if (!@isset($GLOBALS['egw_info']['server']['header_admin_password']))
 			{
 				$GLOBALS['egw_info']['setup']['header_msg'] = 'Stage One (No header admin password set)';
 				return '2';
 			}
-			elseif(!@isset($GLOBALS['egw_domain']))
+			elseif (!@isset($GLOBALS['egw_domain']))
 			{
 				$GLOBALS['egw_info']['setup']['header_msg'] = 'Stage One (Add domains to your header.inc.php)';
 				return '3';
 			}
-			elseif(@$GLOBALS['egw_info']['server']['versions']['header'] != @$GLOBALS['egw_info']['server']['versions']['current_header'])
+			elseif (@$GLOBALS['egw_info']['server']['versions']['header'] != @$GLOBALS['egw_info']['server']['versions']['current_header'])
 			{
 				$GLOBALS['egw_info']['setup']['header_msg'] = 'Stage One (Upgrade your header.inc.php)';
 				return '4';
@@ -286,7 +286,7 @@ 
 	 * @param array $setup_info =null default use $GLOBALS['setup_info']
 	 * @return int 1=no database, 3=empty, 4=need upgrade, 10=complete
 	 */
-	function check_db($setup_info=null)
+	function check_db($setup_info = null)
 	{
 		if (!$setup_info) $setup_info = $GLOBALS['setup_info'];
 
@@ -294,14 +294,14 @@ 
 			if (!$GLOBALS['egw_setup']->db->Link_ID)
 			{
 				$old = error_reporting();
-				error_reporting($old & ~E_WARNING);	// no warnings
+				error_reporting($old&~E_WARNING); // no warnings
 				$GLOBALS['egw_setup']->db->connect();
 				error_reporting($old);
 
 				$GLOBALS['egw_setup']->set_table_names();
 			}
 		}
-		catch(egw_exception_db $e) {
+		catch (egw_exception_db $e) {
 			// ignore error
 		}
 
@@ -310,14 +310,14 @@ 
 			$GLOBALS['egw_info']['setup']['header_msg'] = 'Stage 1 (Create Database)';
 			return 1;
 		}
-		if(!isset($setup_info['phpgwapi']['currentver']))
+		if (!isset($setup_info['phpgwapi']['currentver']))
 		{
 			$setup_info = $this->get_db_versions($setup_info);
 		}
 		//_debug_array($setup_info);
 		if (isset($setup_info['phpgwapi']['currentver']))
 		{
-			if(@$setup_info['phpgwapi']['currentver'] == @$setup_info['phpgwapi']['version'])
+			if (@$setup_info['phpgwapi']['currentver'] == @$setup_info['phpgwapi']['version'])
 			{
 				$GLOBALS['egw_info']['setup']['header_msg'] = 'Stage 1 (Tables Complete)';
 				return 10;
@@ -351,14 +351,14 @@ 
 	 */
 	function check_config()
 	{
-		if(@$GLOBALS['egw_info']['setup']['stage']['db'] != 10)
+		if (@$GLOBALS['egw_info']['setup']['stage']['db'] != 10)
 		{
 			return '';
 		}
 
 		try {	// catch db errors
-			$GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->config_table,'config_name,config_value',array('config_app' => 'phpgwapi'),__LINE__,__FILE__);
-			while($GLOBALS['egw_setup']->db->next_record())
+			$GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->config_table, 'config_name,config_value', array('config_app' => 'phpgwapi'), __LINE__, __FILE__);
+			while ($GLOBALS['egw_setup']->db->next_record())
 			{
 				$config[$GLOBALS['egw_setup']->db->f(0)] = $GLOBALS['egw_setup']->db->f(1);
 			}
@@ -368,21 +368,21 @@ 
 			// ignore db errors
 		}
 		$GLOBALS['egw_info']['setup']['header_msg'] = 'Stage 2 (Needs Configuration)';
-		if(!count($config))
+		if (!count($config))
 		{
 			return 1;
 		}
-		$config_errors =& $GLOBALS['egw_info']['setup']['config_errors'];
+		$config_errors = & $GLOBALS['egw_info']['setup']['config_errors'];
 		$GLOBALS['egw_info']['setup']['config_errors'] = array();
 		$error_msg = null;
-		if (!$this->check_dir($config['temp_dir'],$error_msg))
+		if (!$this->check_dir($config['temp_dir'], $error_msg))
 		{
-			$config_errors[] = lang("Your temporary directory '%1' %2",$config['temp_dir'],$error_msg);
+			$config_errors[] = lang("Your temporary directory '%1' %2", $config['temp_dir'], $error_msg);
 		}
 
-		if (!$this->check_dir($config['files_dir'],$error_msg,true))
+		if (!$this->check_dir($config['files_dir'], $error_msg, true))
 		{
-			$config_errors[] = lang("Your files directory '%1' %2",$config['files_dir'],$error_msg);
+			$config_errors[] = lang("Your files directory '%1' %2", $config['files_dir'], $error_msg);
 		}
 		// set and create the default backup_dir
 		if (@is_writeable($config['files_dir']) && empty($config['backup_dir']))
@@ -390,35 +390,35 @@ 
 			$config['backup_dir'] = $config['files_dir'].'/db_backup';
 			if (!is_dir($config['backup_dir']) && mkdir($config['backup_dir']))
 			{
-				$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->config_table,array(
+				$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->config_table, array(
 					'config_value' => $config['backup_dir'],
-				),array(
+				), array(
 					'config_app'  => 'phpgwapi',
 					'config_name' => 'backup_dir',
-				),__LINE__,__FILE__);
+				), __LINE__, __FILE__);
 			}
 		}
 		if (isset($config['backup_mincount']))
 		{
-			$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->config_table,array(
+			$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->config_table, array(
 				'config_value' => $config['backup_mincount'],
-				),array(
+				), array(
 				'config_app'  => 'phpgwapi',
 				'config_name' => 'backup_mincount',
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 		}
 		if (isset($config['backup_files']))
 		{
-			$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->config_table,array(
+			$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->config_table, array(
 				'config_value' => (int)$config['backup_files'],
-				),array(
+				), array(
 				'config_app'  => 'phpgwapi',
 				'config_name' => 'backup_files',
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 		}
-		if (!$this->check_dir($config['backup_dir'],$error_msg,true))
+		if (!$this->check_dir($config['backup_dir'], $error_msg, true))
 		{
-			$config_errors[] = lang("Your backup directory '%1' %2",$config['backup_dir'],$error_msg);
+			$config_errors[] = lang("Your backup directory '%1' %2", $config['backup_dir'], $error_msg);
 		}
 		if ($config_errors)
 		{
@@ -430,7 +430,7 @@ 
 
 	function check_lang($check = True)
 	{
-		if($check && $GLOBALS['egw_info']['setup']['stage']['db'] != 10)
+		if ($check && $GLOBALS['egw_info']['setup']['stage']['db'] != 10)
 		{
 			return '';
 		}
@@ -439,21 +439,21 @@ 
 			$GLOBALS['setup_info'] = $GLOBALS['egw_setup']->detection->get_db_versions($GLOBALS['setup_info']);
 		}
 		try {
-			$GLOBALS['egw_setup']->db->query($q = "SELECT DISTINCT lang FROM {$GLOBALS['egw_setup']->lang_table}",__LINE__,__FILE__);
+			$GLOBALS['egw_setup']->db->query($q = "SELECT DISTINCT lang FROM {$GLOBALS['egw_setup']->lang_table}", __LINE__, __FILE__);
 		}
 		catch (egw_exception_db $e) {
 			// ignore db error
 		}
-		if($e || $GLOBALS['egw_setup']->db->num_rows() == 0)
+		if ($e || $GLOBALS['egw_setup']->db->num_rows() == 0)
 		{
 			$GLOBALS['egw_info']['setup']['header_msg'] = 'Stage 3 (No languages installed)';
 			return 1;
 		}
-		while(@$GLOBALS['egw_setup']->db->next_record())
+		while (@$GLOBALS['egw_setup']->db->next_record())
 		{
 			$GLOBALS['egw_info']['setup']['installed_langs'][$GLOBALS['egw_setup']->db->f('lang')] = $GLOBALS['egw_setup']->db->f('lang');
 		}
-		foreach($GLOBALS['egw_info']['setup']['installed_langs'] as $value)
+		foreach ($GLOBALS['egw_info']['setup']['installed_langs'] as $value)
 		{
 			$sql = "SELECT lang_name FROM {$GLOBALS['egw_setup']->languages_table} WHERE lang_id = '".$value."'";
 			$GLOBALS['egw_setup']->db->query($sql);
@@ -471,19 +471,19 @@ 
 	 * @param $appname
 	 * @param $any		optional, set to True to see if any of the apps tables are installed
 	 */
-	function check_app_tables($appname,$any=False)
+	function check_app_tables($appname, $any = False)
 	{
 		$none = 0;
 		$setup_info = $GLOBALS['setup_info'];
 
-		if(@$setup_info[$appname]['tables'])
+		if (@$setup_info[$appname]['tables'])
 		{
 			/* Make a copy, else we send some callers into an infinite loop */
 			$copy = $setup_info;
 			$tables = Array();
 			try {
 				$table_names = $GLOBALS['egw_setup']->db->table_names();
-				foreach($table_names as $key => $val)
+				foreach ($table_names as $key => $val)
 				{
 					$tables[] = $val['table_name'];
 				}
@@ -492,19 +492,19 @@ 
 				unset($e);
 				// ignore db error
 			}
-			foreach($copy[$appname]['tables'] as $key => $val)
+			foreach ($copy[$appname]['tables'] as $key => $val)
 			{
-				if($GLOBALS['DEBUG'])
+				if ($GLOBALS['DEBUG'])
 				{
-					echo '<br>check_app_tables(): Checking: ' . $appname . ',table: ' . $val;
+					echo '<br>check_app_tables(): Checking: '.$appname.',table: '.$val;
 				}
-				if(!in_array($val,$tables) && !in_array(strtolower($val),$tables))	// names in tables might be lowercase
+				if (!in_array($val, $tables) && !in_array(strtolower($val), $tables))	// names in tables might be lowercase
 				{
-					if($GLOBALS['DEBUG'])
+					if ($GLOBALS['DEBUG'])
 					{
-						echo '<br>check_app_tables(): ' . $val . ' missing!';
+						echo '<br>check_app_tables(): '.$val.' missing!';
 					}
-					if(!$any)
+					if (!$any)
 					{
 						return False;
 					}
@@ -515,9 +515,9 @@ 
 				}
 				else
 				{
-					if($any)
+					if ($any)
 					{
-						if($GLOBALS['DEBUG'])
+						if ($GLOBALS['DEBUG'])
 						{
 							echo '<br>check_app_tables(): Some tables installed';
 						}
@@ -526,9 +526,9 @@ 
 				}
 			}
 		}
-		if($none && $any)
+		if ($none && $any)
 		{
-			if($GLOBALS['DEBUG'])
+			if ($GLOBALS['DEBUG'])
 			{
 				echo '<br>check_app_tables(): No tables installed';
 			}
@@ -536,7 +536,7 @@ 
 		}
 		else
 		{
-			if($GLOBALS['DEBUG'])
+			if ($GLOBALS['DEBUG'])
 			{
 				echo '<br>check_app_tables(): All tables installed';
 			}
@@ -552,9 +552,9 @@ 
 	 * @param boolean $check_in_docroot =false run an optional in docroot check
 	 * @return boolean
 	 */
-	static function check_dir($dir,&$msg,$check_in_docroot=false)
+	static function check_dir($dir, &$msg, $check_in_docroot = false)
 	{
-		if (!@is_dir($dir) && !@mkdir($dir,0700,true))
+		if (!@is_dir($dir) && !@mkdir($dir, 0700, true))
 		{
 			$msg = lang('does not exist');
 			return false;
@@ -566,16 +566,16 @@ 
 		}
 		if ($check_in_docroot)
 		{
-			$docroots = array(realpath(EGW_SERVER_ROOT),realpath($_SERVER['DOCUMENT_ROOT']));
+			$docroots = array(realpath(EGW_SERVER_ROOT), realpath($_SERVER['DOCUMENT_ROOT']));
 			$dir = realpath($dir);
 
 			foreach ($docroots as $docroot)
 			{
 				$len = strlen($docroot);
 
-				if ($docroot == substr($dir,0,$len) && $len>0)
+				if ($docroot == substr($dir, 0, $len) && $len > 0)
 				{
-					$rest = substr($dir,$len);
+					$rest = substr($dir, $len);
 
 					if (!strlen($rest) || $rest[0] == DIRECTORY_SEPARATOR)
 					{