EGroupware / egroupware

api/src/Mailer.php

Doc Comments +2 added lines, -2 removed lines

@@ -251,7 +251,7 @@ 
 	/**
 	 * Add one or multiple addresses to Cc
 	 *
-	 * @param string|array|Horde_Mail_Rfc822_List $address
+	 * @param string $address
 	 * @param string $personal ='' only used if $address is a string
 	 */
 	function addCc($address, $personal=null)
@@ -381,7 +381,7 @@ 
 	/**
 	 * Adds an embedded image or other inline attachment
 	 *
-	 * @param string|resource $data Path to the attachment or open file-descriptor
+	 * @param string $data Path to the attachment or open file-descriptor
 	 * @param string $cid Content ID of the attachment.  Use this to identify
 	 *        the Id for accessing the image in an HTML form.
 	 * @param string $name Overrides the attachment name.

Indentation +61 added lines, -61 removed lines

@@ -490,24 +490,24 @@ 
 	 * Log mails to log file specified in $GLOBALS['egw_info']['server']['log_mail']
 	 * or regular error_log for true (can be set either in DB or header.inc.php).
 	 *
-     * @param Horde_Mail_Transport $transport =null using transport from mail-account
+	 * @param Horde_Mail_Transport $transport =null using transport from mail-account
 	 *		specified in construct, or default one, if not specified
-     * @param boolean $resend =true allways true in EGroupware!
-     * @param boolean $flowed =null send message in flowed text format,
+	 * @param boolean $resend =true allways true in EGroupware!
+	 * @param boolean $flowed =null send message in flowed text format,
 	 *		default null used flowed by default for everything but multipart/encrypted,
 	 *		unless disabled in site configuration ("disable_rfc3676_flowed")
 	 * * @param array $opts                   Additional options:
-     * <pre>
-     *   - broken_rfc2231: (boolean) Attempt to work around non-RFC
-     *                     2231-compliant MUAs by generating both a RFC
-     *                     2047-like parameter name and also the correct RFC
-     *                     2231 parameter (@since 2.5.0).
-     *                     DEFAULT: false
-     *   - encode: (integer) The encoding to use. A mask of self::ENCODE_*
-     *             values.
-     *             DEFAULT: Auto-determined based on transport driver.
-     * </pre>
-     *
+	 * <pre>
+	 *   - broken_rfc2231: (boolean) Attempt to work around non-RFC
+	 *                     2231-compliant MUAs by generating both a RFC
+	 *                     2047-like parameter name and also the correct RFC
+	 *                     2231 parameter (@since 2.5.0).
+	 *                     DEFAULT: false
+	 *   - encode: (integer) The encoding to use. A mask of self::ENCODE_*
+	 *             values.
+	 *             DEFAULT: Auto-determined based on transport driver.
+	 * </pre>
+	 *
 	 * @throws Exception\NotFound for no smtp account available
 	 * @throws Horde_Mime_Exception
 	 */
@@ -645,42 +645,42 @@ 
 	}
 
 	/**
-     * Sends this message.
-     *
-     * @param Mail $mailer     A Mail object.
-     * @param boolean $resend  If true, the message id and date are re-used;
-     *                         If false, they will be updated.
-     * @param boolean $flowed  Send message in flowed text format.
+	 * Sends this message.
+	 *
+	 * @param Mail $mailer     A Mail object.
+	 * @param boolean $resend  If true, the message id and date are re-used;
+	 *                         If false, they will be updated.
+	 * @param boolean $flowed  Send message in flowed text format.
 	 * * @param array $opts                   Additional options:
-     * <pre>
-     *   - broken_rfc2231: (boolean) Attempt to work around non-RFC
-     *                     2231-compliant MUAs by generating both a RFC
-     *                     2047-like parameter name and also the correct RFC
-     *                     2231 parameter (@since 2.5.0).
-     *                     DEFAULT: false
-     *   - encode: (integer) The encoding to use. A mask of self::ENCODE_*
-     *             values.
-     *             DEFAULT: Auto-determined based on transport driver.
-     * </pre>
-     *
-     *
-     * @throws Horde_Mime_Exception
-     */
-    public function _send($mailer, $resend = false, $flowed = true, array $opts = array())
-    {
+	 * <pre>
+	 *   - broken_rfc2231: (boolean) Attempt to work around non-RFC
+	 *                     2231-compliant MUAs by generating both a RFC
+	 *                     2047-like parameter name and also the correct RFC
+	 *                     2231 parameter (@since 2.5.0).
+	 *                     DEFAULT: false
+	 *   - encode: (integer) The encoding to use. A mask of self::ENCODE_*
+	 *             values.
+	 *             DEFAULT: Auto-determined based on transport driver.
+	 * </pre>
+	 *
+	 *
+	 * @throws Horde_Mime_Exception
+	 */
+	public function _send($mailer, $resend = false, $flowed = true, array $opts = array())
+	{
 		/* Add mandatory headers if missing. */
 		if (!$resend || !isset($this->_headers['Message-ID'])) {
 			$this->_headers->addHeaderOb(
-                Horde_Mime_Headers_MessageId::create()
+				Horde_Mime_Headers_MessageId::create()
 			);
 		}
 		if (!isset($this->_headers['User-Agent'])) {
 			$this->_headers->addHeaderOb(
-                Horde_Mime_Headers_UserAgent::create()
+				Horde_Mime_Headers_UserAgent::create()
 			);
 		}
 		if (!$resend || !isset($this->_headers['Date'])) {
-            $this->_headers->addHeaderOb(Horde_Mime_Headers_Date::create());
+			$this->_headers->addHeaderOb(Horde_Mime_Headers_Date::create());
 		}
 
 		if (isset($this->_base)) {
@@ -699,9 +699,9 @@ 
 			$body = new Horde_Mime_Part();
 			if (!empty($this->_body) && !empty($this->_htmlBody)) {
 				$body->setType('multipart/alternative');
-                $this->_body->setDescription(Horde_Mime_Translation::t("Plaintext Version of Message"));
+				$this->_body->setDescription(Horde_Mime_Translation::t("Plaintext Version of Message"));
 				$body[] = $this->_body;
-                $this->_htmlBody->setDescription(Horde_Mime_Translation::t("HTML Version of Message"));
+				$this->_htmlBody->setDescription(Horde_Mime_Translation::t("HTML Version of Message"));
 				$body[] = $this->_htmlBody;
 			} elseif (!empty($this->_htmlBody)) {
 				$body = $this->_htmlBody;
@@ -745,7 +745,7 @@ 
 
 		/* Remember the basepart */
 		$this->_base = $basepart;
-    }
+	}
 
 	/**
 	 * Reset all Settings to send multiple Messages
@@ -767,15 +767,15 @@ 
 	}
 
 	/**
-     * Get the raw email data sent by this object.
-     *
+	 * Get the raw email data sent by this object.
+	 *
 	 * Reimplement to be able to call it for saveAsDraft by calling
 	 * $this->send(new Horde_Mail_Transport_Null()),
 	 * if no base-part is set, because send is not called before.
 	 *
-     * @param  boolean $stream  If true, return a stream resource, otherwise
-     * @return stream|string  The raw email data.
-     */
+	 * @param  boolean $stream  If true, return a stream resource, otherwise
+	 * @return stream|string  The raw email data.
+	 */
 	function getRaw($stream=true)
 	{
 		try {
@@ -788,24 +788,24 @@ 
 		}
 		// code copied from Horde_Mime_Mail::getRaw(), as there is no way to inject charset in
 		// _headers->toString(), which is required to encode headers containing non-ascii chars correct
-        if ($stream) {
+		if ($stream) {
 			// Smime sign needs to be 7bit encoded to avoid any changes
 			$encode = $this->_base && $this->_base->getMetadata('X-EGroupware-Smime-signed')?
 					Horde_Mime_Part::ENCODE_7BIT :
 					(Horde_Mime_Part::ENCODE_7BIT | Horde_Mime_Part::ENCODE_8BIT | Horde_Mime_Part::ENCODE_BINARY);
-            $hdr = new Horde_Stream();
-            $hdr->add($this->_headers->toString(array('charset' => 'utf-8', 'canonical' => true)), true);
-            return Horde_Stream_Wrapper_Combine::getStream(
-                array($hdr->stream,
-                      $this->getBasePart()->toString(
-                        array('stream' => true, 'canonical' => true, 'encode' => $encode))
-                )
-            );
-        }
-
-        return $this->_headers->toString(array('charset' => 'utf-8', 'canonical' => true)) .
+			$hdr = new Horde_Stream();
+			$hdr->add($this->_headers->toString(array('charset' => 'utf-8', 'canonical' => true)), true);
+			return Horde_Stream_Wrapper_Combine::getStream(
+				array($hdr->stream,
+					  $this->getBasePart()->toString(
+						array('stream' => true, 'canonical' => true, 'encode' => $encode))
+				)
+			);
+		}
+
+		return $this->_headers->toString(array('charset' => 'utf-8', 'canonical' => true)) .
 			$this->getBasePart()->toString(array('canonical' => true));
-    }
+	}
 
 	/**
 	 * Convert charset of text-parts of message to utf-8. non static AND include Bcc
@@ -817,7 +817,7 @@ 
 	 * @return string|stream
 	 */
 	function convertMessageTextParts($message, $stream=false, $charset='utf-8', &$converted=false)
-        {
+		{
 		$headers = Horde_Mime_Headers::parseHeaders($message);
 		$this->addHeaders($headers);
 		$base = Horde_Mime_Part::parseMessage($message);

Spacing +61 added lines, -62 removed lines

@@ -69,13 +69,13 @@ 
 	 *	false: no NOT initialise account and set other EGroupware specific headers, used to parse mails (not sending them!)
 	 *	initbasic: return $this
 	 */
-	function __construct($account=null)
+	function __construct($account = null)
 	{
 		// Horde use locale for translation of error messages
 		Preferences::setlocale(LC_MESSAGES);
 
 		parent::__construct();
-		if ($account ==='initbasic')
+		if ($account === 'initbasic')
 		{
 			$this->_headers = new Horde_Mime_Headers();
 			$this->clearAllRecipients();
@@ -114,7 +114,7 @@ 
 	 * @param int|Mail\Account $account =null mail account to use, default use Mail\Account::get_default($smtp=true)
 	 * @throws Exception\NotFound if account was not found (or not valid for current user)
 	 */
-	function  setAccount($account=null)
+	function  setAccount($account = null)
 	{
 		if ($account instanceof Mail\Account)
 		{
@@ -136,7 +136,7 @@ 
 		{
 			$identity = Mail\Account::read_identity($this->account->ident_id, true, null, $this->account);
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			unset($e);
 			error_log(__METHOD__.__LINE__.' Could not read_identity for account:'.$account['acc_id'].' with IdentID:'.$account['ident_id']);
@@ -158,7 +158,7 @@ 
 	 * @param string $address
 	 * @param string $personal =''
 	 */
-	public function setFrom($address, $personal='')
+	public function setFrom($address, $personal = '')
 	{
 		$this->addHeader('From', self::add_personal($address, $personal));
 	}
@@ -170,13 +170,13 @@ 
 	 * @param string $personal ='' only used if $address is a string
 	 * @param string $type ='to' type of address to add "to", "cc", "bcc" or "replyto"
 	 */
-	function addAddress($address, $personal='', $type='to')
+	function addAddress($address, $personal = '', $type = 'to')
 	{
 		if (!isset(self::$type2header[$type]))
 		{
 			throw new Exception\WrongParameter("Unknown type '$type'!");
 		}
-		if ($personal) $address = self::add_personal ($address, $personal);
+		if ($personal) $address = self::add_personal($address, $personal);
 
 		// add to our local list
 		$this->$type->add($address);
@@ -190,7 +190,7 @@ 
 	 *
 	 * @param string $type ='to' type of address to add "to", "cc", "bcc" or "replyto"
 	 */
-	function clearAddresses($type='to')
+	function clearAddresses($type = 'to')
 	{
 		$this->$type = new Horde_Mail_Rfc822_List();
 
@@ -204,12 +204,12 @@ 
 	 * @param boolean $return_array =false true: return array of string, false: Horde_Mail_Rfc822_List
 	 * @return array|Horde_Mail_Rfc822_List supporting arrayAccess and Iterable
 	 */
-	function getAddresses($type='to', $return_array=false)
+	function getAddresses($type = 'to', $return_array = false)
 	{
 		if ($return_array)
 		{
 			$addresses = array();
-			foreach($this->$type as $addr)
+			foreach ($this->$type as $addr)
 			{
 				$addresses[] = (string)$addr;
 			}
@@ -250,7 +250,7 @@ 
 			//if (!preg_match('/^[!#$%&\'*+/0-9=?A-Z^_`a-z{|}~-]+$/u', $personal))	// that's how I read the rfc(2)822
 			if ($personal && !preg_match('/^[0-9A-Z -]*$/iu', $personal))	// but quoting is never wrong, so quote more then necessary
 			{
-				$personal = '"'.str_replace(array('\\', '"'),array('\\\\', '\\"'), $personal).'"';
+				$personal = '"'.str_replace(array('\\', '"'), array('\\\\', '\\"'), $personal).'"';
 			}
 			$address = ($personal ? $personal.' <' : '').$address.($personal ? '>' : '');
 		}
@@ -263,7 +263,7 @@ 
 	 * @param string|array|Horde_Mail_Rfc822_List $address
 	 * @param string $personal ='' only used if $address is a string
 	 */
-	function addCc($address, $personal=null)
+	function addCc($address, $personal = null)
 	{
 		$this->addAddress($address, $personal, 'cc');
 	}
@@ -282,7 +282,7 @@ 
 	 * @param string|array|Horde_Mail_Rfc822_List $address
 	 * @param string $personal ='' only used if $address is a string
 	 */
-	function addBcc($address, $personal=null)
+	function addBcc($address, $personal = null)
 	{
 		$this->addAddress($address, $personal, 'bcc');
 	}
@@ -301,7 +301,7 @@ 
 	 * @param string|array|Horde_Mail_Rfc822_List $address
 	 * @param string $personal ='' only used if $address is a string
 	 */
-	function addReplyTo($address, $personal=null)
+	function addReplyTo($address, $personal = null)
 	{
 		$this->addAddress($address, $personal, 'replyto');
 	}
@@ -336,7 +336,7 @@ 
 	 * @return integer part-number
 	 * @throws Exception\NotFound if $file could not be opened for reading
 	 */
-	public function addAttachment($data, $name = null, $type = null, $old_type=null)
+	public function addAttachment($data, $name = null, $type = null, $old_type = null)
 	{
 		// deprecated PHPMailer::AddAttachment($path, $name = '', $encoding = 'base64', $type = 'application/octet-stream') call
 		if ($type === 'base64')
@@ -369,7 +369,7 @@ 
 		// set content-type parameters, which get ignored by setType
 		if (preg_match_all('/;\s*([^=]+)=([^;]*)/', $type, $matches))
 		{
-			foreach($matches[1] as $n => $label)
+			foreach ($matches[1] as $n => $label)
 			{
 				$part->setContentTypeParameter($label, $matches[2][$n]);
 			}
@@ -471,11 +471,11 @@ 
 	 * @param array $parameters =array() eg. array('method' => 'REQUEST')
 	 * @param string $charset =null default to $this->_charset="utf-8"
 	 */
-	function setAlternativBody($content, $type, $parameters=array(), $charset=null)
+	function setAlternativBody($content, $type, $parameters = array(), $charset = null)
 	{
 		$this->_alternativBody = new Horde_Mime_Part();
 		$this->_alternativBody->setType($type);
-		foreach($parameters as $label => $data)
+		foreach ($parameters as $label => $data)
 		{
 			$this->_alternativBody->setContentTypeParameter($label, $data);
 		}
@@ -511,9 +511,9 @@ 
 	 * @throws Exception\NotFound for no smtp account available
 	 * @throws Horde_Mime_Exception
 	 */
-	function send(Horde_Mail_Transport $transport=null, $resend=true, $flowed=null, array $opts = array())
+	function send(Horde_Mail_Transport $transport = null, $resend = true, $flowed = null, array $opts = array())
 	{
-		unset($resend);	// parameter is not used, but required by function signature
+		unset($resend); // parameter is not used, but required by function signature
 
 		if (!($message_id = $this->getHeader('Message-ID')) &&
 			class_exists('Horde_Mime_Headers_MessageId'))	// since 2.5.0
@@ -521,27 +521,27 @@ 
 			$message_id = Horde_Mime_Headers_MessageId::create('EGroupware');
 			$this->addHeader('Message-ID', $message_id);
 		}
-		$body_sha1 = null;	// skip sha1, it requires whole mail in memory, which we traing to avoid now
+		$body_sha1 = null; // skip sha1, it requires whole mail in memory, which we traing to avoid now
 
 		// Smime sign needs to be 7bit encoded to avoid any changes during the transportation
 		if ($this->_base && $this->_base->getMetadata('X-EGroupware-Smime-signed')) $opts['encode'] = Horde_Mime_Part::ENCODE_7BIT;
 
 		$mail_id = Hooks::process(array(
 			'location' => 'send_mail',
-			'subject' => $subject=$this->getHeader('Subject'),
+			'subject' => $subject = $this->getHeader('Subject'),
 			'from' => $this->getHeader('Return-Path') ? $this->getHeader('Return-Path') : $this->getHeader('From'),
-			'to' => $to=$this->getAddresses('to', true),
-			'cc' => $cc=$this->getAddresses('cc', true),
-			'bcc' => $bcc=$this->getAddresses('bcc', true),
+			'to' => $to = $this->getAddresses('to', true),
+			'cc' => $cc = $this->getAddresses('cc', true),
+			'bcc' => $bcc = $this->getAddresses('bcc', true),
 			'body_sha1' => $body_sha1,
 			'message_id' => (string)$message_id,
-		), array(), true);	// true = call all apps
+		), array(), true); // true = call all apps
 
 		// check if we are sending an html mail with inline images
 		if (!empty($this->_htmlBody) && count($this->_parts))
 		{
 			$related = null;
-			foreach($this->_parts as $n => $part)
+			foreach ($this->_parts as $n => $part)
 			{
 				if ($part->getDisposition() == 'inline' && $part->getContentId())
 				{
@@ -597,7 +597,7 @@ 
 				$this->_body = $body;
 				$flowed = false;
 			}
-			$this->_send($transport ? $transport : $this->account->smtpTransport(), true, $flowed, $opts);	// true: keep Message-ID
+			$this->_send($transport ? $transport : $this->account->smtpTransport(), true, $flowed, $opts); // true: keep Message-ID
 		}
 		catch (\Exception $e) {
 			// in case of errors/exceptions call hook again with previous returned mail_id and error-message to log
@@ -612,7 +612,7 @@ 
 				'message_id' => (string)$message_id,
 				'mail_id' => $mail_id,
 				'error' => $e->getMessage(),
-			), array(), true);	// true = call all apps
+			), array(), true); // true = call all apps
 		}
 
 		// log mails to file specified in $GLOBALS['egw_info']['server']['log_mail'] or error_log for true
@@ -625,7 +625,7 @@ 
 			$msg .= ' from instance '.$GLOBALS['egw_info']['user']['domain'].' and IP '.Session::getuser_ip();
 			$msg .= ' from user #'.$GLOBALS['egw_info']['user']['account_id'];
 
-			if ($GLOBALS['egw_info']['user']['account_id'] && class_exists(__NAMESPACE__.'\\Accounts',false))
+			if ($GLOBALS['egw_info']['user']['account_id'] && class_exists(__NAMESPACE__.'\\Accounts', false))
 			{
 				$msg .= ' ('.Accounts::username($GLOBALS['egw_info']['user']['account_id']).')';
 			}
@@ -637,7 +637,7 @@ 
 			$msg .= ' cc='.implode(', ', $cc).', bcc='.implode(', ', $bcc);
 			if ($GLOBALS['egw_info']['server']['log_mail'] !== true) $msg .= "\n\n";
 
-			error_log($msg,$GLOBALS['egw_info']['server']['log_mail'] === true ? 0 : 3,
+			error_log($msg, $GLOBALS['egw_info']['server']['log_mail'] === true ? 0 : 3,
 				$GLOBALS['egw_info']['server']['log_mail']);
 		}
 		// rethrow error
@@ -763,7 +763,7 @@ 
 	 */
 	function getHeader($header)
 	{
-		if(strtolower($header) === 'bcc') return $this->bcc->addresses;
+		if (strtolower($header) === 'bcc') return $this->bcc->addresses;
 		return $this->_headers ? $this->_headers->getValue($header) : null;
 	}
 
@@ -777,23 +777,22 @@ 
      * @param  boolean $stream  If true, return a stream resource, otherwise
      * @return stream|string  The raw email data.
      */
-	function getRaw($stream=true)
+	function getRaw($stream = true)
 	{
 		try {
 			$this->getBasePart();
 		}
-		catch(Horde_Mail_Exception $e)
+		catch (Horde_Mail_Exception $e)
 		{
 			unset($e);
-			parent::send(new Horde_Mail_Transport_Null(), true);	// true: keep Message-ID
+			parent::send(new Horde_Mail_Transport_Null(), true); // true: keep Message-ID
 		}
 		// code copied from Horde_Mime_Mail::getRaw(), as there is no way to inject charset in
 		// _headers->toString(), which is required to encode headers containing non-ascii chars correct
         if ($stream) {
 			// Smime sign needs to be 7bit encoded to avoid any changes
-			$encode = $this->_base && $this->_base->getMetadata('X-EGroupware-Smime-signed')?
-					Horde_Mime_Part::ENCODE_7BIT :
-					(Horde_Mime_Part::ENCODE_7BIT | Horde_Mime_Part::ENCODE_8BIT | Horde_Mime_Part::ENCODE_BINARY);
+			$encode = $this->_base && $this->_base->getMetadata('X-EGroupware-Smime-signed') ?
+					Horde_Mime_Part::ENCODE_7BIT : (Horde_Mime_Part::ENCODE_7BIT|Horde_Mime_Part::ENCODE_8BIT|Horde_Mime_Part::ENCODE_BINARY);
             $hdr = new Horde_Stream();
             $hdr->add($this->_headers->toString(array('charset' => 'utf-8', 'canonical' => true)), true);
             return Horde_Stream_Wrapper_Combine::getStream(
@@ -804,7 +803,7 @@ 
             );
         }
 
-        return $this->_headers->toString(array('charset' => 'utf-8', 'canonical' => true)) .
+        return $this->_headers->toString(array('charset' => 'utf-8', 'canonical' => true)).
 			$this->getBasePart()->toString(array('canonical' => true));
     }
 
@@ -817,16 +816,16 @@ 
 	 * @param boolean &$converted =false on return if conversation was necessary
 	 * @return string|stream
 	 */
-	function convertMessageTextParts($message, $stream=false, $charset='utf-8', &$converted=false)
+	function convertMessageTextParts($message, $stream = false, $charset = 'utf-8', &$converted = false)
         {
 		$headers = Horde_Mime_Headers::parseHeaders($message);
 		$this->addHeaders($headers);
 		$base = Horde_Mime_Part::parseMessage($message);
-		foreach($headers->toArray(array('nowrap' => true)) as $header => $value)
+		foreach ($headers->toArray(array('nowrap' => true)) as $header => $value)
 		{
-			foreach((array)$value as $val)
+			foreach ((array)$value as $val)
 			{
-				switch($header)
+				switch ($header)
 				{
 					case 'Bcc':
 					case 'bcc':
@@ -836,18 +835,18 @@ 
 				}
 			}
 		}
-		foreach($base->partIterator() as $part)
+		foreach ($base->partIterator() as $part)
 		{
-			if ($part->getPrimaryType()== 'text')
+			if ($part->getPrimaryType() == 'text')
 			{
 				$charset = $part->getContentTypeParameter('charset');
 				if ($charset && $charset != 'utf-8')
 				{
 					$content = Translation::convert($part->toString(array(
-						'encode' => Horde_Mime_Part::ENCODE_BINARY,     // otherwise we cant recode charset
+						'encode' => Horde_Mime_Part::ENCODE_BINARY, // otherwise we cant recode charset
 						)), $charset, 'utf-8');
 					$part->setContents($content, array(
-						'encode' => Horde_Mime_Part::ENCODE_BINARY,     // $content is NOT encoded
+						'encode' => Horde_Mime_Part::ENCODE_BINARY, // $content is NOT encoded
 						));
 					$part->setContentTypeParameter('charset', 'utf-8');
 					if ($part === $base)
@@ -883,23 +882,23 @@ 
 	 * @param boolean &$converted =false on return if conversation was necessary
 	 * @return string|stream
 	 */
-	static function convert($message, $stream=false, $charset='utf-8', &$converted=false)
+	static function convert($message, $stream = false, $charset = 'utf-8', &$converted = false)
 	{
-		$mailer = new Mailer(false);	// false = no default headers and mail account
+		$mailer = new Mailer(false); // false = no default headers and mail account
 		$mailer->addHeaders(Horde_Mime_Headers::parseHeaders($message));
 		$base = Horde_Mime_Part::parseMessage($message);
-		foreach($base->partIterator() as $part)
+		foreach ($base->partIterator() as $part)
 		{
-			if ($part->getPrimaryType()== 'text')
+			if ($part->getPrimaryType() == 'text')
 			{
 				$charset = $part->getContentTypeParameter('charset');
 				if ($charset && $charset != 'utf-8')
 				{
 					$content = Translation::convert($part->toString(array(
-						'encode' => Horde_Mime_Part::ENCODE_BINARY,	// otherwise we cant recode charset
+						'encode' => Horde_Mime_Part::ENCODE_BINARY, // otherwise we cant recode charset
 					)), $charset, 'utf-8');
 					$part->setContents($content, array(
-						'encode' => Horde_Mime_Part::ENCODE_BINARY,	// $content is NOT encoded
+						'encode' => Horde_Mime_Part::ENCODE_BINARY, // $content is NOT encoded
 					));
 					$part->setContentTypeParameter('charset', 'utf-8');
 					if ($part === $base)
@@ -932,7 +931,7 @@ 
 	 * @param string $subtype =null
 	 * @return Horde_Mime_Part part with body or null
 	 */
-	function findBody($subtype=null)
+	function findBody($subtype = null)
 	{
 		try {
 			$base = $this->getBasePart();
@@ -964,11 +963,11 @@ 
 			$this->_body = $this->_htmlBody = $this->_alternativBody = null;
 			$this->clearParts();
 
-			foreach($base->partIterator() as $part)
+			foreach ($base->partIterator() as $part)
 			{
 				$id = $part->getMimeId();
 				//error_log(__METHOD__."() plain=$plain_id, html=$html_id: $id: ".$part->getType());
-				switch($id)
+				switch ($id)
 				{
 					case '0':	// base-part itself
 						continue 2;
@@ -1012,11 +1011,11 @@ 
 			$this->_body = $this->_htmlBody = $this->_alternativBody = null;
 			$this->clearParts();
 
-			foreach($base->partIterator() as $part)
+			foreach ($base->partIterator() as $part)
 			{
 				$id = $part->getMimeId();
 				//error_log(__METHOD__."() plain=$plain_id, html=$html_id: $id: ".$part->getType());
-				switch($id)
+				switch ($id)
 				{
 					case '0':	// base-part itself
 						continue 2;
@@ -1088,7 +1087,7 @@ 
 	 */
 	function clearCustomHeaders()
 	{
-		foreach($this->_headers->toArray() as $header => $value)
+		foreach ($this->_headers->toArray() as $header => $value)
 		{
 			if (stripos($header, 'x-') === 0 || $header == 'Received')
 			{
@@ -1130,10 +1129,10 @@ 
 		try {
 			$this->getBasePart();
 		}
-		catch(Horde_Mail_Exception $e)
+		catch (Horde_Mail_Exception $e)
 		{
 			unset($e);
-			parent::send(new Horde_Mail_Transport_Null(), true);	// true: keep Message-ID
+			parent::send(new Horde_Mail_Transport_Null(), true); // true: keep Message-ID
 			$this->getBasePart();
 		}
 
@@ -1163,7 +1162,7 @@ 
 		}
 
 		// parameters to pass on for sign mime part
-		$sign_params =  array(
+		$sign_params = array(
 			'type'		=> 'signature',
 			'pubkey'	=> $params['senderPubKey'],
 			'privkey'	=> $params['senderPrivKey'],

Braces +99 added lines, -33 removed lines

@@ -126,10 +126,13 @@ 
 		}
 		else
 		{
-			if (!($this->account = Mail\Account::get_default(true)))	// true = need an SMTP (not just IMAP) account
+			if (!($this->account = Mail\Account::get_default(true)))
+			{
+				// true = need an SMTP (not just IMAP) account
 			{
 				throw new Exception\NotFound('SMTP: '.lang('Account not found!'));
 			}
+			}
 		}
 
 		try
@@ -176,7 +179,10 @@ 
 		{
 			throw new Exception\WrongParameter("Unknown type '$type'!");
 		}
-		if ($personal) $address = self::add_personal ($address, $personal);
+		if ($personal)
+		{
+			$address = self::add_personal ($address, $personal);
+		}
 
 		// add to our local list
 		$this->$type->add($address);
@@ -248,10 +254,13 @@ 
 		if (is_string($address) && !empty($personal))
 		{
 			//if (!preg_match('/^[!#$%&\'*+/0-9=?A-Z^_`a-z{|}~-]+$/u', $personal))	// that's how I read the rfc(2)822
-			if ($personal && !preg_match('/^[0-9A-Z -]*$/iu', $personal))	// but quoting is never wrong, so quote more then necessary
+			if ($personal && !preg_match('/^[0-9A-Z -]*$/iu', $personal))
+			{
+				// but quoting is never wrong, so quote more then necessary
 			{
 				$personal = '"'.str_replace(array('\\', '"'),array('\\\\', '\\"'), $personal).'"';
 			}
+			}
 			$address = ($personal ? $personal.' <' : '').$address.($personal ? '>' : '');
 		}
 		return $address;
@@ -354,7 +363,10 @@ 
 			throw new Exception\NotFound("File '$data' not found!");
 		}
 
-		if (empty($type) && !is_resource($data)) $type = Vfs::mime_content_type($data);
+		if (empty($type) && !is_resource($data))
+		{
+			$type = Vfs::mime_content_type($data);
+		}
 
 		// set "text/calendar; method=*" as alternativ body
 		$matches = null;
@@ -377,11 +389,17 @@ 
 		$part->setContents($resource);
 
 		// setting name, also sets content-disposition attachment (!), therefore we have to do it after "text/calendar; method=" handling
-		if ($name || !is_resource($data)) $part->setName($name ? $name : Vfs::basename($data));
+		if ($name || !is_resource($data))
+		{
+			$part->setName($name ? $name : Vfs::basename($data));
+		}
 
 		// this should not be necessary, because binary data get detected by mime-type,
 		// but at least Cyrus complains about NUL characters
-		if (substr($type, 0, 5) != 'text/') $part->setTransferEncoding('base64', array('send' => true));
+		if (substr($type, 0, 5) != 'text/')
+		{
+			$part->setTransferEncoding('base64', array('send' => true));
+		}
 		$part->setDisposition('attachment');
 
 		return $this->addMimePart($part);
@@ -516,15 +534,21 @@ 
 		unset($resend);	// parameter is not used, but required by function signature
 
 		if (!($message_id = $this->getHeader('Message-ID')) &&
-			class_exists('Horde_Mime_Headers_MessageId'))	// since 2.5.0
+			class_exists('Horde_Mime_Headers_MessageId'))
+		{
+			// since 2.5.0
 		{
 			$message_id = Horde_Mime_Headers_MessageId::create('EGroupware');
+		}
 			$this->addHeader('Message-ID', $message_id);
 		}
 		$body_sha1 = null;	// skip sha1, it requires whole mail in memory, which we traing to avoid now
 
 		// Smime sign needs to be 7bit encoded to avoid any changes during the transportation
-		if ($this->_base && $this->_base->getMetadata('X-EGroupware-Smime-signed')) $opts['encode'] = Horde_Mime_Part::ENCODE_7BIT;
+		if ($this->_base && $this->_base->getMetadata('X-EGroupware-Smime-signed'))
+		{
+			$opts['encode'] = Horde_Mime_Part::ENCODE_7BIT;
+		}
 
 		$mail_id = Hooks::process(array(
 			'location' => 'send_mail',
@@ -561,7 +585,10 @@ 
 
 		try {
 			// no flowed for encrypted messages
-			if (!isset($flowed)) $flowed = $this->_body && !in_array($this->_body->getType(), array('multipart/encrypted', 'multipart/signed'));
+			if (!isset($flowed))
+			{
+				$flowed = $this->_body && !in_array($this->_body->getType(), array('multipart/encrypted', 'multipart/signed'));
+			}
 
 			// check if flowed is disabled in mail site configuration
 			if (($config = Config::read('mail')) && $config['disable_rfc3676_flowed'])
@@ -635,13 +662,19 @@ 
 				$msg .= 'ERROR '.$e->getMessage();
 			}
 			$msg .= ' cc='.implode(', ', $cc).', bcc='.implode(', ', $bcc);
-			if ($GLOBALS['egw_info']['server']['log_mail'] !== true) $msg .= "\n\n";
+			if ($GLOBALS['egw_info']['server']['log_mail'] !== true)
+			{
+				$msg .= "\n\n";
+			}
 
 			error_log($msg,$GLOBALS['egw_info']['server']['log_mail'] === true ? 0 : 3,
 				$GLOBALS['egw_info']['server']['log_mail']);
 		}
 		// rethrow error
-		if (isset($e)) throw $e;
+		if (isset($e))
+		{
+			throw $e;
+		}
 	}
 
 	/**
@@ -669,25 +702,32 @@ 
     public function _send($mailer, $resend = false, $flowed = true, array $opts = array())
     {
 		/* Add mandatory headers if missing. */
-		if (!$resend || !isset($this->_headers['Message-ID'])) {
+		if (!$resend || !isset($this->_headers['Message-ID']))
+		{
 			$this->_headers->addHeaderOb(
                 Horde_Mime_Headers_MessageId::create()
 			);
 		}
-		if (!isset($this->_headers['User-Agent'])) {
+		if (!isset($this->_headers['User-Agent']))
+		{
 			$this->_headers->addHeaderOb(
                 Horde_Mime_Headers_UserAgent::create()
 			);
 		}
-		if (!$resend || !isset($this->_headers['Date'])) {
+		if (!$resend || !isset($this->_headers['Date']))
+		{
             $this->_headers->addHeaderOb(Horde_Mime_Headers_Date::create());
 		}
 
-		if (isset($this->_base)) {
+		if (isset($this->_base))
+		{
 			$basepart = $this->_base;
-		} else {
+		}
+		else
+		{
 			/* Send in flowed format. */
-			if ($flowed && !empty($this->_body)) {
+			if ($flowed && !empty($this->_body))
+			{
 				$flowed = new Horde_Text_Flowed($this->_body->getContents(), $this->_body->getCharset());
 				$flowed->setDelSp(true);
 				$this->_body->setContentTypeParameter('format', 'flowed');
@@ -697,28 +737,38 @@ 
 
 			/* Build mime message. */
 			$body = new Horde_Mime_Part();
-			if (!empty($this->_body) && !empty($this->_htmlBody)) {
+			if (!empty($this->_body) && !empty($this->_htmlBody))
+			{
 				$body->setType('multipart/alternative');
                 $this->_body->setDescription(Horde_Mime_Translation::t("Plaintext Version of Message"));
 				$body[] = $this->_body;
                 $this->_htmlBody->setDescription(Horde_Mime_Translation::t("HTML Version of Message"));
 				$body[] = $this->_htmlBody;
-			} elseif (!empty($this->_htmlBody)) {
+			}
+			elseif (!empty($this->_htmlBody))
+			{
 				$body = $this->_htmlBody;
-			} elseif (!empty($this->_body)) {
+			}
+			elseif (!empty($this->_body))
+			{
 				$body = $this->_body;
 			}
-			if (count($this->_parts)) {
+			if (count($this->_parts))
+			{
 				$basepart = new Horde_Mime_Part();
 				$basepart->setType('multipart/mixed');
 				$basepart->isBasePart(true);
-				if ($body) {
+				if ($body)
+				{
 					$basepart[] = $body;
 				}
-				foreach ($this->_parts as $mime_part) {
+				foreach ($this->_parts as $mime_part)
+				{
 					$basepart[] = $mime_part;
 				}
-			} else {
+			}
+			else
+			{
 				$basepart = $body;
 				$basepart->isBasePart(true);
 			}
@@ -727,12 +777,15 @@ 
 
 		/* Build recipients. */
 		$recipients = clone $this->_recipients;
-		foreach (array('to', 'cc') as $header) {
-			if ($h = $this->_headers[$header]) {
+		foreach (array('to', 'cc') as $header)
+		{
+			if ($h = $this->_headers[$header])
+			{
 				$recipients->add($h->getAddressList());
 			}
 		}
-		if ($this->_bcc) {
+		if ($this->_bcc)
+		{
 			$recipients->add($this->_bcc);
 		}
 
@@ -763,7 +816,10 @@ 
 	 */
 	function getHeader($header)
 	{
-		if(strtolower($header) === 'bcc') return $this->bcc->addresses;
+		if(strtolower($header) === 'bcc')
+		{
+			return $this->bcc->addresses;
+		}
 		return $this->_headers ? $this->_headers->getValue($header) : null;
 	}
 
@@ -789,7 +845,8 @@ 
 		}
 		// code copied from Horde_Mime_Mail::getRaw(), as there is no way to inject charset in
 		// _headers->toString(), which is required to encode headers containing non-ascii chars correct
-        if ($stream) {
+        if ($stream)
+        {
 			// Smime sign needs to be 7bit encoded to avoid any changes
 			$encode = $this->_base && $this->_base->getMetadata('X-EGroupware-Smime-signed')?
 					Horde_Mime_Part::ENCODE_7BIT :
@@ -818,7 +875,7 @@ 
 	 * @return string|stream
 	 */
 	function convertMessageTextParts($message, $stream=false, $charset='utf-8', &$converted=false)
-        {
+	{
 		$headers = Horde_Mime_Headers::parseHeaders($message);
 		$this->addHeaders($headers);
 		$base = Horde_Mime_Part::parseMessage($message);
@@ -936,7 +993,10 @@ 
 	{
 		try {
 			$base = $this->getBasePart();
-			if (!($part_id = $base->findBody($subtype))) return null;
+			if (!($part_id = $base->findBody($subtype)))
+			{
+				return null;
+			}
 			return $base->getPart($part_id);
 		}
 		catch (Horde_Mail_Exception $e) {
@@ -1050,7 +1110,10 @@ 
 	 */
 	public function addMimePart($part)
 	{
-		if ($this->_base) $this->parseBasePart();
+		if ($this->_base)
+		{
+			$this->parseBasePart();
+		}
 
 		return parent::addMimePart($part);
 	}
@@ -1150,7 +1213,10 @@ 
 			{
 				throw new Exception\WrongUserinput('no certificate found to sign the messase');
 			}
-			if (Cache::getSession('mail', 'smime_passphrase')) $params['passphrase'] = Cache::getSession('mail', 'smime_passphrase');
+			if (Cache::getSession('mail', 'smime_passphrase'))
+			{
+				$params['passphrase'] = Cache::getSession('mail', 'smime_passphrase');
+			}
 			if (!$smime->verifyPassphrase($params['senderPrivKey'], $params['passphrase']))
 			{
 				return false;

mail/inc/class.mail_zpush.inc.php

Indentation +86 added lines, -86 removed lines

@@ -324,44 +324,44 @@ 
 		return $folderlist;
 	}
 
-    /**
-     * Sends a message which is passed as rfc822. You basically can do two things
-     * 1) Send the message to an SMTP server as-is
-     * 2) Parse the message yourself, and send it some other way
-     * It is up to you whether you want to put the message in the sent items folder. If you
-     * want it in 'sent items', then the next sync on the 'sent items' folder should return
-     * the new message as any other new message in a folder.
-     *
-     * @param array $smartdata = IMAP-SendMail: SyncSendMail (
-     *        (S) clientid => SendMail-30722448149304
-     *        (S) saveinsent => empty
-     *        (S) replacemime => null
-     *        (S) accountid => null
-     *        (S) source => SyncSendMailSource (
-     *                                (S) folderid => 101000000000
-     *                                (S) itemid => 33776
-     *                                (S) longid => null
-     *                                (S) instanceid => null
-     *                                unsetVars(Array) size: 0
-     *                                flags => false
-     *                                content => null
-     *                        )
-     *        (S) mime => Date: Tue, 23 Jun 2015 14:13:23 +0200
-     *Subject: AW: Blauer himmel
-     *....
-     *        (S) replyflag => true
-     *        (S) forwardflag => null
-     *        unsetVars(Array) size: 0
-     *        flags => false
-     *        content => null
-     *)
+	/**
+	 * Sends a message which is passed as rfc822. You basically can do two things
+	 * 1) Send the message to an SMTP server as-is
+	 * 2) Parse the message yourself, and send it some other way
+	 * It is up to you whether you want to put the message in the sent items folder. If you
+	 * want it in 'sent items', then the next sync on the 'sent items' folder should return
+	 * the new message as any other new message in a folder.
+	 *
+	 * @param array $smartdata = IMAP-SendMail: SyncSendMail (
+	 *        (S) clientid => SendMail-30722448149304
+	 *        (S) saveinsent => empty
+	 *        (S) replacemime => null
+	 *        (S) accountid => null
+	 *        (S) source => SyncSendMailSource (
+	 *                                (S) folderid => 101000000000
+	 *                                (S) itemid => 33776
+	 *                                (S) longid => null
+	 *                                (S) instanceid => null
+	 *                                unsetVars(Array) size: 0
+	 *                                flags => false
+	 *                                content => null
+	 *                        )
+	 *        (S) mime => Date: Tue, 23 Jun 2015 14:13:23 +0200
+	 *Subject: AW: Blauer himmel
+	 *....
+	 *        (S) replyflag => true
+	 *        (S) forwardflag => null
+	 *        unsetVars(Array) size: 0
+	 *        flags => false
+	 *        content => null
+	 *)
+	 *
+	 * @return boolean true on success, false on error
 	 *
-     * @return boolean true on success, false on error
-     *
-     * @see eg. BackendIMAP::SendMail()
-     * @todo implement either here or in mail backend
-     * 	(maybe sending here and storing to sent folder in plugin, as sending is supposed to always work in EGroupware)
-     */
+	 * @see eg. BackendIMAP::SendMail()
+	 * @todo implement either here or in mail backend
+	 * 	(maybe sending here and storing to sent folder in plugin, as sending is supposed to always work in EGroupware)
+	 */
 	public function SendMail($smartdata)
 	{
 		//$this->debugLevel=2;
@@ -508,8 +508,8 @@ 
 		//error_log(__METHOD__.__LINE__.array2string($mailObject));
 		// if this is a multipart message with a boundary, we must use the original body
 		//if ($this->debugLevel>2) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' mailObject after Inital Parse:'.array2string($mailObject));
-        if ($use_orgbody) {
-    	    ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") use_orgbody = true ContentType:".$ContentType);
+		if ($use_orgbody) {
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") use_orgbody = true ContentType:".$ContentType);
  			// if it is a ClientSideMeetingRequest, we report it as send at all times
 			if (($cal_body = $mailObject->findBody('calendar')) &&
 				($cSMRMethod = $cal_body->getContentTypeParameter('method')))
@@ -521,7 +521,7 @@ 
 				if ($this->debugLevel) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") we have a Client Side Meeting Request from organizer=$organizer");
 				$ClientSideMeetingRequest = true;
 			}
-        }
+		}
 		// now handle the addressee list
 		$toCount = 0;
 		//error_log(__METHOD__.__LINE__.array2string($toMailAddr));
@@ -586,7 +586,7 @@ 
 			$bodyStruct = $this->mail->getMessageBody($uid, 'html_only');
 			$bodyBUFFHtml = $this->mail->getdisplayableBody($this->mail,$bodyStruct,true,false);
 			if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' html_only:'.$bodyBUFFHtml);
-		    if ($bodyBUFFHtml != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/html')) {
+			if ($bodyBUFFHtml != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/html')) {
 				// may be html
 				if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") MIME Body".' Type:html (fetched with html_only):'.$bodyBUFFHtml);
 				$AltBody = $AltBody."</br>".$bodyBUFFHtml.$sigTextHtml;
@@ -633,7 +633,7 @@ 
 			$this->splitID($smartdata->source->folderid, $account, $folder);
 
 			$this->mail->reopen($folder);
-            // receive entire mail (header + body)
+			// receive entire mail (header + body)
 			// get message headers for specified message
 			$headers	= $this->mail->getMessageEnvelope($uid, $_partID, true, $folder);
 			// build a new mime message, forward entire old mail as file
@@ -720,7 +720,7 @@ 
 		}
 		//advanced debugging
 		// Horde SMTP Class uses utf-8 by default.
-        //ZLog::Write(LOGLEVEL_DEBUG, "IMAP-SendMail: parsed message: ". print_r($message,1));
+		//ZLog::Write(LOGLEVEL_DEBUG, "IMAP-SendMail: parsed message: ". print_r($message,1));
 		if ($this->debugLevel>2) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__."): MailObject:".array2string($mailObject));
 
 		// set a higher timeout for big messages
@@ -814,7 +814,7 @@ 
 						//$asf = false;
 						ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.'->'.lang("Import of message %1 failed. Destination Folder %2 does not exist.",$mailObject->getHeader('Subject'),$folderName));
 					}
-			        ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__."): Outgoing mail saved in configured 'Sent' folder '".$folderName."': ". (($asf)?"success":"failed"));
+					ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__."): Outgoing mail saved in configured 'Sent' folder '".$folderName."': ". (($asf)?"success":"failed"));
 				}
 				//$this->mail->closeConnection();
 			}
@@ -1157,8 +1157,8 @@ 
 			// end handle Attachments
 			unset($attachments);
 
-            // Language Code Page ID: http://msdn.microsoft.com/en-us/library/windows/desktop/dd317756%28v=vs.85%29.aspx
-            $output->internetcpid = INTERNET_CPID_UTF8;
+			// Language Code Page ID: http://msdn.microsoft.com/en-us/library/windows/desktop/dd317756%28v=vs.85%29.aspx
+			$output->internetcpid = INTERNET_CPID_UTF8;
 
 			if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($output));
 //$this->debugLevel=0;
@@ -1216,8 +1216,8 @@ 
 	 * the exact string that is returned in the 'AttName' property of an SyncAttachment. So, you should
 	 * encode any information you need to find the attachment in that 'attname' property.
 	 *
-     * @param string $fid - id
-     * @param string $attname - should contain (folder)id
+	 * @param string $fid - id
+	 * @param string $attname - should contain (folder)id
 	 * @return SyncItemOperationsAttachment-object
 	 */
 	function GetAttachmentData($fid,$attname) {
@@ -1231,8 +1231,8 @@ 
 	 * the exact string that is returned in the 'AttName' property of an SyncAttachment. So, you should
 	 * encode any information you need to find the attachment in that 'attname' property.
 	 *
-     * @param string $fid - id
-     * @param string $attname - should contain (folder)id
+	 * @param string $fid - id
+	 * @param string $attname - should contain (folder)id
 	 * @return SyncItemOperationsAttachment-object
 	 */
 	function ItemOperationsGetAttachmentData($fid,$attname) {
@@ -1245,8 +1245,8 @@ 
 	 * -ItemOperationsGetAttachmentData
 	 * -GetAttachmentData
 	 *
-     * @param string $fid - id
-     * @param string $attname - should contain (folder)id
+	 * @param string $fid - id
+	 * @param string $attname - should contain (folder)id
 	 * @return SyncItemOperationsAttachment-object
 	 */
 	private function _GetAttachmentData($fid,$attname)
@@ -1800,22 +1800,22 @@ 
 		return $id;
 	}
 
-    /**
-     * Called when the user has requested to delete (really delete) a message. Usually
-     * this means just unlinking the file its in or somesuch. After this call has succeeded, a call to
-     * GetMessageList() should no longer list the message. If it does, the message will be re-sent to the mobile
-     * as it will be seen as a 'new' item. This means that if this method is not implemented, it's possible to
-     * delete messages on the PDA, but as soon as a sync is done, the item will be resynched to the mobile
-     *
-     * @param string              $folderid             id of the folder
-     * @param string              $id                   id of the message
-     * @param ContentParameters   $contentParameters
-     *
-     * @access public
-     * @return boolean                      status of the operation
-     * @throws StatusException              could throw specific SYNC_STATUS_* exceptions
-     */
-    public function DeleteMessage($folderid, $id, $contentParameters)
+	/**
+	 * Called when the user has requested to delete (really delete) a message. Usually
+	 * this means just unlinking the file its in or somesuch. After this call has succeeded, a call to
+	 * GetMessageList() should no longer list the message. If it does, the message will be re-sent to the mobile
+	 * as it will be seen as a 'new' item. This means that if this method is not implemented, it's possible to
+	 * delete messages on the PDA, but as soon as a sync is done, the item will be resynched to the mobile
+	 *
+	 * @param string              $folderid             id of the folder
+	 * @param string              $id                   id of the message
+	 * @param ContentParameters   $contentParameters
+	 *
+	 * @access public
+	 * @return boolean                      status of the operation
+	 * @throws StatusException              could throw specific SYNC_STATUS_* exceptions
+	 */
+	public function DeleteMessage($folderid, $id, $contentParameters)
 	{
 		unset($contentParameters);	// not used, but required by function signature
 		ZLog::Write(LOGLEVEL_DEBUG, "IMAP-DeleteMessage: (fid: '$folderid'  id: '$id' )");
@@ -1857,24 +1857,24 @@ 
 		return $rv;
 	}
 
-    /**
-     * Changes the 'read' flag of a message on disk. The $flags
-     * parameter can only be '1' (read) or '0' (unread). After a call to
-     * SetReadFlag(), GetMessageList() should return the message with the
-     * new 'flags' but should not modify the 'mod' parameter. If you do
-     * change 'mod', simply setting the message to 'read' on the mobile will trigger
-     * a full resync of the item from the server.
-     *
-     * @param string              $folderid            id of the folder
-     * @param string              $id                  id of the message
-     * @param int                 $flags               read flag of the message
-     * @param ContentParameters   $contentParameters
-     *
-     * @access public
-     * @return boolean                      status of the operation
-     * @throws StatusException              could throw specific SYNC_STATUS_* exceptions
-     */
-    public function SetReadFlag($folderid, $id, $flags, $contentParameters)
+	/**
+	 * Changes the 'read' flag of a message on disk. The $flags
+	 * parameter can only be '1' (read) or '0' (unread). After a call to
+	 * SetReadFlag(), GetMessageList() should return the message with the
+	 * new 'flags' but should not modify the 'mod' parameter. If you do
+	 * change 'mod', simply setting the message to 'read' on the mobile will trigger
+	 * a full resync of the item from the server.
+	 *
+	 * @param string              $folderid            id of the folder
+	 * @param string              $id                  id of the message
+	 * @param int                 $flags               read flag of the message
+	 * @param ContentParameters   $contentParameters
+	 *
+	 * @access public
+	 * @return boolean                      status of the operation
+	 * @throws StatusException              could throw specific SYNC_STATUS_* exceptions
+	 */
+	public function SetReadFlag($folderid, $id, $flags, $contentParameters)
 	{
 		unset($contentParameters);	// not used, but required by function signature
 		// ZLog::Write(LOGLEVEL_DEBUG, "IMAP-SetReadFlag: (fid: '$folderid'  id: '$id'  flags: '$flags' )");

Braces +607 added lines, -178 removed lines

@@ -84,29 +84,47 @@ 
 	 */
 	public function __construct(activesync_backend $backend)
 	{
-		if ($GLOBALS['egw_setup']) return;
+		if ($GLOBALS['egw_setup'])
+		{
+			return;
+		}
 
 		//$this->debugLevel=2;
 		$this->backend = $backend;
 		if (!isset($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-ActiveSyncProfileID']))
 		{
-			if ($this->debugLevel>1) error_log(__METHOD__.__LINE__.' Noprefs set: using 0 as default');
+			if ($this->debugLevel>1)
+			{
+				error_log(__METHOD__.__LINE__.' Noprefs set: using 0 as default');
+			}
 			// globals preferences add appname varname value
 			$GLOBALS['egw']->preferences->add('activesync','mail-ActiveSyncProfileID',0,'user');
 			// save prefs
 			$GLOBALS['egw']->preferences->save_repository(true);
 		}
-		if ($this->debugLevel>1) error_log(__METHOD__.__LINE__.' ActiveProfileID:'.array2string(self::$profileID));
+		if ($this->debugLevel>1)
+		{
+			error_log(__METHOD__.__LINE__.' ActiveProfileID:'.array2string(self::$profileID));
+		}
 
 		if (is_null(self::$profileID))
 		{
-			if ($this->debugLevel>1) error_log(__METHOD__.__LINE__.' self::ProfileID isNUll:'.array2string(self::$profileID));
+			if ($this->debugLevel>1)
+			{
+				error_log(__METHOD__.__LINE__.' self::ProfileID isNUll:'.array2string(self::$profileID));
+			}
 			self::$profileID =& Api\Cache::getSession('mail','activeSyncProfileID');
-			if ($this->debugLevel>1) error_log(__METHOD__.__LINE__.' ActiveProfileID (after reading Cache):'.array2string(self::$profileID));
+			if ($this->debugLevel>1)
+			{
+				error_log(__METHOD__.__LINE__.' ActiveProfileID (after reading Cache):'.array2string(self::$profileID));
+			}
 		}
 		if (isset($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-ActiveSyncProfileID']))
 		{
-			if ($this->debugLevel>1) error_log(__METHOD__.__LINE__.' Pref for ProfileID:'.array2string($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-ActiveSyncProfileID']));
+			if ($this->debugLevel>1)
+			{
+				error_log(__METHOD__.__LINE__.' Pref for ProfileID:'.array2string($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-ActiveSyncProfileID']));
+			}
 			if ($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-ActiveSyncProfileID'] == 'G')
 			{
 				self::$profileID = 'G'; // this should trigger the fetch of the first negative profile (or if no negative profile is available the firstb there is)
@@ -116,7 +134,10 @@ 
 				self::$profileID = (int)$GLOBALS['egw_info']['user']['preferences']['activesync']['mail-ActiveSyncProfileID'];
 			}
 		}
-		if ($this->debugLevel>1) error_log(__METHOD__.__LINE__.' Profile Selected (after reading Prefs):'.array2string(self::$profileID));
+		if ($this->debugLevel>1)
+		{
+			error_log(__METHOD__.__LINE__.' Profile Selected (after reading Prefs):'.array2string(self::$profileID));
+		}
 
 		// verify we are on an existing profile, if not running in setup (settings can not be static according to interface!)
 		if (!isset($GLOBALS['egw_setup']))
@@ -129,7 +150,10 @@ 
 				self::$profileID = Mail\Account::get_default_acc_id();
 			}
 		}
-		if ($this->debugLevel>0) error_log(__METHOD__.'::'.__LINE__.' ProfileSelected:'.self::$profileID);
+		if ($this->debugLevel>0)
+		{
+			error_log(__METHOD__.'::'.__LINE__.' ProfileSelected:'.self::$profileID);
+		}
 		//$this->debugLevel=0;
 	}
 
@@ -245,8 +269,14 @@ 
 				$this->_connect(0,true);
 				$this->_disconnect();
 
-				if (!$this->_wasteID) $errors[] = lang('No valid %1 folder configured!', '<b>'.lang('trash').'</b>');
-				if (!$this->_sentID) $errors[] = lang('No valid %1 folder configured!', '<b>'.lang('send').'</b>');
+				if (!$this->_wasteID)
+				{
+					$errors[] = lang('No valid %1 folder configured!', '<b>'.lang('trash').'</b>');
+				}
+				if (!$this->_sentID)
+				{
+					$errors[] = lang('No valid %1 folder configured!', '<b>'.lang('send').'</b>');
+				}
 			}
 			catch(Exception $e) {
 				$errors[] = lang('Can not open IMAP connection').': '.$e->getMessage();
@@ -268,8 +298,14 @@ 
 	 */
 	private function _connect($account=0)
 	{
-		if (!$account) $account = self::$profileID ? self::$profileID : 0;
-		if ($this->mail && $this->account != $account) $this->_disconnect();
+		if (!$account)
+		{
+			$account = self::$profileID ? self::$profileID : 0;
+		}
+		if ($this->mail && $this->account != $account)
+		{
+			$this->_disconnect();
+		}
 
 		$this->_wasteID = false;
 		$this->_sentID = false;
@@ -280,12 +316,18 @@ 
 			// todo: tell mail which account to use
 			//error_log(__METHOD__.__LINE__.' create object with ProfileID:'.array2string(self::$profileID));
 			$this->mail = Mail::getInstance(false,self::$profileID,true,false,true);
-			if (self::$profileID == 0 && isset($this->mail->icServer->ImapServerId) && !empty($this->mail->icServer->ImapServerId)) self::$profileID = $this->mail->icServer->ImapServerId;
+			if (self::$profileID == 0 && isset($this->mail->icServer->ImapServerId) && !empty($this->mail->icServer->ImapServerId))
+			{
+				self::$profileID = $this->mail->icServer->ImapServerId;
+			}
 		}
 		else
 		{
 			//error_log(__METHOD__.__LINE__." connect with profileID: ".self::$profileID);
-			if (self::$profileID == 0 && isset($this->mail->icServer->ImapServerId) && !empty($this->mail->icServer->ImapServerId)) self::$profileID = $this->mail->icServer->ImapServerId;
+			if (self::$profileID == 0 && isset($this->mail->icServer->ImapServerId) && !empty($this->mail->icServer->ImapServerId))
+			{
+				self::$profileID = $this->mail->icServer->ImapServerId;
+			}
 		}
 		$this->mail->openConnection(self::$profileID,false);
 
@@ -302,8 +344,14 @@ 
 	 */
 	private function _disconnect()
 	{
-		if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__);
-		if ($this->mail) $this->mail->closeConnection();
+		if ($this->debugLevel>0)
+		{
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__);
+		}
+		if ($this->mail)
+		{
+			$this->mail->closeConnection();
+		}
 
 		unset($this->mail);
 		unset($this->account);
@@ -318,24 +366,43 @@ 
 	public function GetFolderList()
 	{
 		$folderlist = array();
-		if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__);
+		if ($this->debugLevel>0)
+		{
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__);
+		}
 		/*foreach($available_accounts as $account)*/ $account = 0;
 		{
 			$this->_connect($account);
-			if (!isset($this->folders)) $this->folders = $this->mail->getFolderObjects(true,false,$_alwaysGetDefaultFolders=true);
-			if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($this->folders));
+			if (!isset($this->folders))
+			{
+				$this->folders = $this->mail->getFolderObjects(true,false,$_alwaysGetDefaultFolders=true);
+			}
+			if ($this->debugLevel>1)
+			{
+				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($this->folders));
+			}
 
-			foreach ($this->folders as $folder => $folderObj) {
-				if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' folder='.$folder);
+			foreach ($this->folders as $folder => $folderObj)
+			{
+				if ($this->debugLevel>1)
+				{
+					ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' folder='.$folder);
+				}
 				$folderlist[] = $f = array(
 					'id'     => $this->createID($account,$folder),
 					'mod'    => $folderObj->shortDisplayName,
 					'parent' => $this->getParentID($account,$folder),
 				);
-				if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."() returning ".array2string($f));
+				if ($this->debugLevel>1)
+				{
+					ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."() returning ".array2string($f));
+				}
 			}
 		}
-		if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."() returning ".array2string($folderlist));
+		if ($this->debugLevel>0)
+		{
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."() returning ".array2string($folderlist));
+		}
 
 		return $folderlist;
 	}
@@ -396,11 +463,17 @@ 
 		$smartdata_task = ($smartdata->replyflag?'reply':($smartdata->forwardflag?'forward':'new'));
 
    		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__ . (isset($smartdata->mime) ? $smartdata->mime : ""). "task: ".(isset($smartdata_task) ? $smartdata_task : "")." itemid: ".(isset($smartdata->source->itemid) ? $smartdata->source->itemid : "")." folder: ".(isset($smartdata->source->folderid) ? $smartdata->source->folderid : ""));
-		if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__."): Smartdata = ".array2string($smartdata));
+		if ($this->debugLevel>0)
+		{
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__."): Smartdata = ".array2string($smartdata));
+		}
 		//error_log("IMAP-Sendmail: Smartdata = ".array2string($smartdata));
 
 		// initialize our Mail
-		if (!isset($this->mail)) $this->mail = Mail::getInstance(false,self::$profileID,true,false,true);
+		if (!isset($this->mail))
+		{
+			$this->mail = Mail::getInstance(false,self::$profileID,true,false,true);
+		}
 		$activeMailProfiles = $this->mail->getAccountIdentities(self::$profileID);
 		// use the standardIdentity
 		$activeMailProfile = Mail::getStandardIdentityForProfile($activeMailProfiles,self::$profileID);
@@ -428,12 +501,18 @@ 
 		$beforeHtml = ($disableRuler ?'&nbsp;<br>':'&nbsp;<br><hr style="border:dotted 1px silver; width:90%; border:dotted 1px silver;">');
 		$beforePlain = ($disableRuler ?"\r\n\r\n":"\r\n\r\n-- \r\n");
 		$sigText = Mail::merge($signature,array($GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'],'person_id')));
-		if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' Signature to use:'.$sigText);
+		if ($this->debugLevel>0)
+		{
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' Signature to use:'.$sigText);
+		}
 		$sigTextHtml = $beforeHtml.$sigText;
 		$sigTextPlain = $beforePlain.Api\Mail\Html::convertHTMLToText($sigText);
 
 		$force8bit=false;
-		if (Api\Translation::detect_encoding($sigTextPlain)!='ascii') $force8bit=true;
+		if (Api\Translation::detect_encoding($sigTextPlain)!='ascii')
+		{
+			$force8bit=true;
+		}
 		// beware. the section below might cause trouble regarding bcc and attachments, so maybe this is to be handeled differently
 		if ($force8bit)
 		{
@@ -451,22 +530,34 @@ 
 
 		// prepare addressee list; moved the adding of addresses to the mailobject down
 		// to
-		foreach(Mail::parseAddressList($mailObject->getHeader("To")) as $addressObject) {
-			if (!$addressObject->valid) continue;
+		foreach(Mail::parseAddressList($mailObject->getHeader("To")) as $addressObject)
+		{
+			if (!$addressObject->valid)
+			{
+				continue;
+			}
 			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") Header Sentmail To: ".array2string($addressObject) );
 			//$mailObject->AddAddress($addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''),$addressObject->personal);
 			$toMailAddr[] = imap_rfc822_write_address($addressObject->mailbox, $addressObject->host, $addressObject->personal);
 		}
 		// CC
-		foreach(Mail::parseAddressList($mailObject->getHeader("Cc")) as $addressObject) {
-			if (!$addressObject->valid) continue;
+		foreach(Mail::parseAddressList($mailObject->getHeader("Cc")) as $addressObject)
+		{
+			if (!$addressObject->valid)
+			{
+				continue;
+			}
 			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") Header Sentmail CC: ".array2string($addressObject) );
 			//$mailObject->AddCC($addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''),$addressObject->personal);
 			$ccMailAddr[] = imap_rfc822_write_address($addressObject->mailbox, $addressObject->host, $addressObject->personal);
 		}
 		// BCC
-		foreach($mailObject->getAddresses('bcc') as $addressObject) {
-			if (!$addressObject->valid) continue;
+		foreach($mailObject->getAddresses('bcc') as $addressObject)
+		{
+			if (!$addressObject->valid)
+			{
+				continue;
+			}
 			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") Header Sentmail BCC: ".array2string($addressObject) );
 			//$mailObject->AddBCC($addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''),$addressObject->personal);
 			$bccMailAddr[] = imap_rfc822_write_address($addressObject->mailbox, $addressObject->host, $addressObject->personal);
@@ -479,12 +570,14 @@ 
 		$ContentType =$mailObject->getHeader('Content-Type');
 		//error_log(__METHOD__.__LINE__." Header Sentmail original Header (filtered): " . $k.  " = ".trim($ContentType));
 		// if the message is a multipart message, then we should use the sent body
-		if (preg_match("/multipart/i", $ContentType)) {
+		if (preg_match("/multipart/i", $ContentType))
+		{
 			$use_orgbody = true;
 		}
 
 		// save the original content-type header for the body part when forwarding
-		if ($smartdata_task == 'forward' && $smartdata->source->itemid && !$use_orgbody) {
+		if ($smartdata_task == 'forward' && $smartdata->source->itemid && !$use_orgbody)
+		{
 			//continue; // ignore
 		}
 		// horde/egw_ mailer does everything as utf-8, the following should not be needed
@@ -493,7 +586,8 @@ 
 		// if the message is a multipart message, then we should use the sent body
 		if (($smartdata_task == 'new' || $smartdata_task == 'reply' || $smartdata_task == 'forward') &&
 			((isset($smartdata->replacemime) && $smartdata->replacemime == true) ||
-			$k == "Content-Type" && preg_match("/multipart/i", $ContentType))) {
+			$k == "Content-Type" && preg_match("/multipart/i", $ContentType)))
+		{
 			$use_orgbody = true;
 		}
 		$Body =  $AltBody = "";
@@ -526,12 +620,19 @@ 
 			$AltBody = preg_replace("/(<|&lt;)*(([\w\.,-.,_.,0-9.]+)@([\w\.,-.,_.,0-9.]+))(>|&gt;)*/i","[$2]",
 				($html_body = $mailObject->findBody('html')) ? $html_body->getContents() : null);
 		}
-		if ($this->debugLevel>1 && $Body) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") fetched Body as with MessageContentType:". $ContentType.'=>'.$Body);
-		if ($this->debugLevel>1 && $AltBody) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") fetched AltBody as with MessageContentType:". $ContentType.'=>'.$AltBody);
+		if ($this->debugLevel>1 && $Body)
+		{
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") fetched Body as with MessageContentType:". $ContentType.'=>'.$Body);
+		}
+		if ($this->debugLevel>1 && $AltBody)
+		{
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") fetched AltBody as with MessageContentType:". $ContentType.'=>'.$AltBody);
+		}
 		//error_log(__METHOD__.__LINE__.array2string($mailObject));
 		// if this is a multipart message with a boundary, we must use the original body
 		//if ($this->debugLevel>2) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' mailObject after Inital Parse:'.array2string($mailObject));
-        if ($use_orgbody) {
+        if ($use_orgbody)
+        {
     	    ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") use_orgbody = true ContentType:".$ContentType);
  			// if it is a ClientSideMeetingRequest, we report it as send at all times
 			if (($cal_body = $mailObject->findBody('calendar')) &&
@@ -541,15 +642,20 @@ 
 				{
 					$organizer = calendar_ical::getIcalOrganizer($cal_body->getContents());
 				}
-				if ($this->debugLevel) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") we have a Client Side Meeting Request from organizer=$organizer");
+				if ($this->debugLevel)
+				{
+					ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") we have a Client Side Meeting Request from organizer=$organizer");
+				}
 				$ClientSideMeetingRequest = true;
 			}
         }
 		// now handle the addressee list
 		$toCount = 0;
 		//error_log(__METHOD__.__LINE__.array2string($toMailAddr));
-		foreach((array)$toMailAddr as $address) {
-			foreach(Mail::parseAddressList((get_magic_quotes_gpc()?stripslashes($address):$address)) as $addressObject) {
+		foreach((array)$toMailAddr as $address)
+		{
+			foreach(Mail::parseAddressList((get_magic_quotes_gpc()?stripslashes($address):$address)) as $addressObject)
+			{
 				$emailAddress = $addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : '');
 				if ($ClientSideMeetingRequest === true && $allowSendingInvitations == 'sendifnocalnotif' &&
 					calendar_boupdate::email_update_requested($emailAddress, isset($cSMRMethod) ? $cSMRMethod : 'REQUEST',
@@ -563,19 +669,29 @@ 
 			}
 		}
 		$ccCount = 0;
-		foreach((array)$ccMailAddr as $address) {
-			foreach(Mail::parseAddressList((get_magic_quotes_gpc()?stripslashes($address):$address)) as $addressObject) {
+		foreach((array)$ccMailAddr as $address)
+		{
+			foreach(Mail::parseAddressList((get_magic_quotes_gpc()?stripslashes($address):$address)) as $addressObject)
+			{
 				$emailAddress = $addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : '');
-				if ($ClientSideMeetingRequest === true && $allowSendingInvitations == 'sendifnocalnotif' && calendar_boupdate::email_update_requested($emailAddress)) continue;
+				if ($ClientSideMeetingRequest === true && $allowSendingInvitations == 'sendifnocalnotif' && calendar_boupdate::email_update_requested($emailAddress))
+				{
+					continue;
+				}
 				$mailObject->AddCC($emailAddress, $addressObject->personal);
 				$ccCount++;
 			}
 		}
 		$bccCount = 0;
-		foreach((array)$bccMailAddr as $address) {
-			foreach(Mail::parseAddressList((get_magic_quotes_gpc()?stripslashes($address):$address)) as $addressObject) {
+		foreach((array)$bccMailAddr as $address)
+		{
+			foreach(Mail::parseAddressList((get_magic_quotes_gpc()?stripslashes($address):$address)) as $addressObject)
+			{
 				$emailAddress = $addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : '');
-				if ($ClientSideMeetingRequest === true && $allowSendingInvitations == 'sendifnocalnotif' && calendar_boupdate::email_update_requested($emailAddress)) continue;
+				if ($ClientSideMeetingRequest === true && $allowSendingInvitations == 'sendifnocalnotif' && calendar_boupdate::email_update_requested($emailAddress))
+				{
+					continue;
+				}
 				$mailObject->AddBCC($emailAddress, $addressObject->personal);
 				$bccCount++;
 			}
@@ -585,7 +701,10 @@ 
 		{
 			return $ClientSideMeetingRequest && $allowSendingInvitations === 'sendifnocalnotif' && $organizer ? true : 0; // noone to send mail to
 		}
-		if ($ClientSideMeetingRequest === true && $allowSendingInvitations===false) return true;
+		if ($ClientSideMeetingRequest === true && $allowSendingInvitations===false)
+		{
+			return true;
+		}
 		// as we use our mailer (horde mailer) it is detecting / setting the mimetype by itself while creating the mail
 /*
 		if ($this->debugLevel>2) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' retrieved Body:'.$body);
@@ -608,10 +727,17 @@ 
 			$this->mail->reopen($folder);
 			$bodyStruct = $this->mail->getMessageBody($uid, 'html_only');
 			$bodyBUFFHtml = $this->mail->getdisplayableBody($this->mail,$bodyStruct,true,false);
-			if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' html_only:'.$bodyBUFFHtml);
-		    if ($bodyBUFFHtml != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/html')) {
+			if ($this->debugLevel>3)
+			{
+				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' html_only:'.$bodyBUFFHtml);
+			}
+		    if ($bodyBUFFHtml != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/html'))
+		    {
 				// may be html
-				if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") MIME Body".' Type:html (fetched with html_only):'.$bodyBUFFHtml);
+				if ($this->debugLevel>0)
+				{
+					ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") MIME Body".' Type:html (fetched with html_only):'.$bodyBUFFHtml);
+				}
 				$AltBody = $AltBody."</br>".$bodyBUFFHtml.$sigTextHtml;
 				$isreply = true;
 			}
@@ -620,8 +746,12 @@ 
 			// if the new part of the message is html, we must preserve it, and handle that the original mail is text/plain
 			$bodyStruct = $this->mail->getMessageBody($uid,'never_display');//'never_display');
 			$bodyBUFF = $this->mail->getdisplayableBody($this->mail,$bodyStruct,false,false);
-			if ($bodyBUFF != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/plain')) {
-				if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") MIME Body".' Type:plain (fetched with never_display):'.$bodyBUFF);
+			if ($bodyBUFF != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/plain'))
+			{
+				if ($this->debugLevel>0)
+				{
+					ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") MIME Body".' Type:plain (fetched with never_display):'.$bodyBUFF);
+				}
 				$Body = $Body."\r\n".$bodyBUFF.$sigTextPlain;
 				$isreply = true;
 			}
@@ -629,7 +759,10 @@ 
 			{
 				$isreply = true;
 				$AltBody = $AltBody."</br><pre>".nl2br($bodyBUFF).'</pre>'.$sigTextHtml;
-				if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__." no Api\Html Body found use modified plaintext body for txt/html: ".$AltBody);
+				if ($this->debugLevel>0)
+				{
+					ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__." no Api\Html Body found use modified plaintext body for txt/html: ".$AltBody);
+				}
 			}
 		}
 
@@ -643,11 +776,17 @@ 
 			(isset($smartdata->replacemime) && $smartdata->replacemime == false)))
 		{
 			//force the default for the forwarding -> asmail
-			if (is_array($preferencesArray)) {
+			if (is_array($preferencesArray))
+			{
 				if (!array_key_exists('message_forwarding',$preferencesArray)
 					|| !isset($preferencesArray['message_forwarding'])
-					|| empty($preferencesArray['message_forwarding'])) $preferencesArray['message_forwarding'] = 'asmail';
-			} else {
+					|| empty($preferencesArray['message_forwarding']))
+				{
+					$preferencesArray['message_forwarding'] = 'asmail';
+				}
+			}
+			else
+			{
 				$preferencesArray['message_forwarding'] = 'asmail';
 			}
 			// construct the uid of the message out of the itemid - seems to be the uid, no construction needed
@@ -679,27 +818,44 @@ 
 				$this->mail->reopen($folder);
 				$bodyStruct = $this->mail->getMessageBody($uid, 'html_only');
 				$bodyBUFFHtml = $this->mail->getdisplayableBody($this->mail,$bodyStruct,true,false);
-				if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' html_only:'.$bodyBUFFHtml);
-				if ($bodyBUFFHtml != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/html')) {
+				if ($this->debugLevel>0)
+				{
+					ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' html_only:'.$bodyBUFFHtml);
+				}
+				if ($bodyBUFFHtml != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/html'))
+				{
 					// may be html
-					if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") MIME Body".' Type:html (fetched with html_only):'.$bodyBUFFHtml);
+					if ($this->debugLevel>0)
+					{
+						ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") MIME Body".' Type:html (fetched with html_only):'.$bodyBUFFHtml);
+					}
 					$AltBody = $AltBody."</br>".$bodyBUFFHtml.$sigTextHtml;
 					$isforward = true;
 				}
 				// plain text Message part
-				if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") MIME Body".' Type:plain, fetch text:');
+				if ($this->debugLevel>0)
+				{
+					ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") MIME Body".' Type:plain, fetch text:');
+				}
 				// if the new part of the message is html, we must preserve it, and handle that the original mail is text/plain
 				$bodyStruct = $this->mail->getMessageBody($uid,'never_display');//'never_display');
 				$bodyBUFF = $this->mail->getdisplayableBody($this->mail,$bodyStruct,false,false);
-				if ($bodyBUFF != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/plain')) {
-					if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") MIME Body".' Type:plain (fetched with never_display):'.$bodyBUFF);
+				if ($bodyBUFF != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/plain'))
+				{
+					if ($this->debugLevel>0)
+					{
+						ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") MIME Body".' Type:plain (fetched with never_display):'.$bodyBUFF);
+					}
 					$Body = $Body."\r\n".$bodyBUFF.$sigTextPlain;
 					$isforward = true;
 				}
 				if (!empty($bodyBUFF) && empty($bodyBUFFHtml) && !empty($AltBody))
 				{
 					$AltBody = $AltBody."</br><pre>".nl2br($bodyBUFF).'</pre>'.$sigTextHtml;
-					if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__." no html Body found use modified plaintext body for txt/html: ".$AltBody);
+					if ($this->debugLevel>0)
+					{
+						ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__." no html Body found use modified plaintext body for txt/html: ".$AltBody);
+					}
 					$isforward = true;
 				}
 				// get all the attachments and add them too.
@@ -712,7 +868,10 @@ 
 					ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' gather Attachments for BodyCreation of/for MessageID:'.$uid.' found:'.count($attachments));
 					foreach((array)$attachments as $key => $attachment)
 					{
-						if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' Key:'.$key.'->'.array2string($attachment));
+						if ($this->debugLevel>0)
+						{
+							ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' Key:'.$key.'->'.array2string($attachment));
+						}
 						$attachmentNames .= $attachment['name']."\n";
 						$attachmentData	= $this->mail->getAttachment($uid, $attachment['partID'],0,false,false,$folder);
 						/*$x =*/ $mailObject->AddStringAttachment($attachmentData['attachment'], $attachment['name'], $attachment['mimeType']);
@@ -731,20 +890,29 @@ 
 		// now set the body
 		if ($AltBody && ($html_body = $mailObject->findBody('html')))
 		{
-			if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' -> '.$AltBody);
+			if ($this->debugLevel>1)
+			{
+				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' -> '.$AltBody);
+			}
 			//error_log(__METHOD__.__LINE__.' html:'.$AltBody);
 			$html_body->setContents($AltBody,array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
 		}
 		if ($Body && ($text_body = $mailObject->findBody('plain')))
 		{
-			if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' -> '.$Body);
+			if ($this->debugLevel>1)
+			{
+				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' -> '.$Body);
+			}
 			//error_log(__METHOD__.__LINE__.' text:'.$Body);
 			$text_body->setContents($Body,array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
 		}
 		//advanced debugging
 		// Horde SMTP Class uses utf-8 by default.
         //ZLog::Write(LOGLEVEL_DEBUG, "IMAP-SendMail: parsed message: ". print_r($message,1));
-		if ($this->debugLevel>2) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__."): MailObject:".array2string($mailObject));
+		if ($this->debugLevel>2)
+		{
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__."): MailObject:".array2string($mailObject));
+		}
 
 		// set a higher timeout for big messages
 		@set_time_limit(120);
@@ -771,7 +939,9 @@ 
 			if ($this->mail->isDraftFolder($folder) && !$this->mail->isTemplateFolder($folder))
 			{
 				$this->mail->deleteMessages(array($uid),$folder);
-			} else {
+			}
+			else
+			{
 				$this->mail->flagMessages("answered", array($uid),$folder);
 				if ($smartdata_task== "forward")
 				{
@@ -785,7 +955,8 @@ 
 		{
 			$asf = false;
 			$sentFolder = $this->mail->getSentFolder();
-			if ($this->_sentID) {
+			if ($this->_sentID)
+			{
 				$folderArray[] = $this->_sentID;
 			}
 			else if(isset($sentFolder) && $sentFolder != 'none')
@@ -799,28 +970,41 @@ 
 				// we dont try guessing
 				$asf = true;
 			}
-			if (count($folderArray) > 0) {
-				foreach((array)$bccMailAddr as $address) {
-					foreach(Mail::parseAddressList((get_magic_quotes_gpc()?stripslashes($address):$address)) as $addressObject) {
+			if (count($folderArray) > 0)
+			{
+				foreach((array)$bccMailAddr as $address)
+				{
+					foreach(Mail::parseAddressList((get_magic_quotes_gpc()?stripslashes($address):$address)) as $addressObject)
+					{
 						$emailAddress = $addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : '');
 						$mailAddr[] = array($emailAddress, $addressObject->personal);
 					}
 				}
 				//$BCCmail='';
-				if (count($mailAddr)>0) $mailObject->forceBccHeader();
+				if (count($mailAddr)>0)
+				{
+					$mailObject->forceBccHeader();
+				}
 				//$BCCmail = $mailObject->AddrAppend("Bcc",$mailAddr);
-				foreach($folderArray as $folderName) {
-					if($this->mail->isSentFolder($folderName)) {
+				foreach($folderArray as $folderName)
+				{
+					if($this->mail->isSentFolder($folderName))
+					{
 						$flags = '\\Seen';
-					} elseif($this->mail->isDraftFolder($folderName)) {
+					}
+					elseif($this->mail->isDraftFolder($folderName))
+					{
 						$flags = '\\Draft';
-					} else {
+					}
+					else
+					{
 						$flags = '';
 					}
 					$asf = true;
 					//ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.'->'.array2string($this->mail->icServer));
 					$this->mail->openConnection(self::$profileID,false);
-					if ($this->mail->folderExists($folderName)) {
+					if ($this->mail->folderExists($folderName))
+					{
 						try
 						{
 							$this->mail->appendMessage($folderName,$mailObject->getRaw(), null,
@@ -878,17 +1062,26 @@ 
 		$bodypreference = $contentparameters->GetBodyPreference(); /* fmbiete's contribution r1528, ZP-320 */
 
 		// fix for z-push bug returning additional bodypreference type 4, even if only 1 is requested and mimessupport = 0
-		if (!$mimesupport && ($key = array_search('4', $bodypreference))) unset($bodypreference[$key]);
+		if (!$mimesupport && ($key = array_search('4', $bodypreference)))
+		{
+			unset($bodypreference[$key]);
+		}
 
 		//$this->debugLevel=4;
-		if (!isset($this->mail)) $this->mail = Mail::getInstance(false,self::$profileID,true,false,true);
+		if (!isset($this->mail))
+		{
+			$this->mail = Mail::getInstance(false,self::$profileID,true,false,true);
+		}
 		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' FolderID:'.$folderid.' ID:'.$id.' TruncSize:'.$truncsize.' Bodypreference: '.array2string($bodypreference));
 		$account = $_folderName = $xid = null;
 		$this->splitID($folderid,$account,$_folderName,$xid);
 		$this->mail->reopen($_folderName);
 		$messages = $this->fetchMessages($folderid, NULL, $id, true);	// true: return all headers
 		$headers = $messages[$id];
-		if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($headers));
+		if ($this->debugLevel>3)
+		{
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($headers));
+		}
 		// StatMessage should reopen the folder in question, so we dont need folderids in the following statements.
 		if ($headers)
 		{
@@ -898,16 +1091,25 @@ 
 			//$rawHeaders = $this->mail->getMessageRawHeader($id);
 			// simple style
 			// start AS12 Stuff (bodypreference === false) case = old behaviour
-			if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__. ' for message with ID:'.$id.' with headers:'.array2string($headers));
+			if ($this->debugLevel>0)
+			{
+				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__. ' for message with ID:'.$id.' with headers:'.array2string($headers));
+			}
 
-			if ($bodypreference === false) {
+			if ($bodypreference === false)
+			{
 				$bodyStruct = $this->mail->getMessageBody($id, 'only_if_no_text', '', null, true,$_folderName);
 				$raw_body = $this->mail->getdisplayableBody($this->mail,$bodyStruct,false,false);
 				//$body = html_entity_decode($body,ENT_QUOTES,$this->mail->detect_encoding($body));
-				if (stripos($raw_body,'<style')!==false) $body = preg_replace("/<style.*?<\/style>/is", "", $raw_body); // in case there is only a html part
+				if (stripos($raw_body,'<style')!==false)
+				{
+					$body = preg_replace("/<style.*?<\/style>/is", "", $raw_body);
+				}
+				// in case there is only a html part
 				// remove all other html
 				$body = strip_tags($raw_body);
-				if(strlen($body) > $truncsize) {
+				if(strlen($body) > $truncsize)
+				{
 					$body = Utils::Utf8_truncate($body, $truncsize);
 					$output->bodytruncated = 1;
 				}
@@ -922,7 +1124,8 @@ 
 			{
 				//Select body type preference
 				$bpReturnType = 1;//SYNC_BODYPREFERENCE_PLAIN;
-				if ($bodypreference !== false) {
+				if ($bodypreference !== false)
+				{
 					// bodypreference can occur multiple times
 					// usually we would use Utils::GetBodyPreferenceBestMatch($bodypreference);
 					$bpReturnType = Utils::GetBodyPreferenceBestMatch($bodypreference);
@@ -956,25 +1159,49 @@ 
 					// fetch the body (try to gather data only once)
 					$css ='';
 					$bodyStruct = $this->mail->getMessageBody($id, 'html_only', '', null, true,$_folderName);
-					if ($this->debugLevel>2) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' html_only Struct:'.array2string($bodyStruct));
+					if ($this->debugLevel>2)
+					{
+						ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' html_only Struct:'.array2string($bodyStruct));
+					}
 					$body = $this->mail->getdisplayableBody($this->mail,$bodyStruct,true,false);
-					if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' html_only:'.$body);
-					if ($body != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/html')) {
+					if ($this->debugLevel>3)
+					{
+						ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' html_only:'.$body);
+					}
+					if ($body != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/html'))
+					{
 						// may be html
-						if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG, "MIME Body".' Type:html (fetched with html_only)');
+						if ($this->debugLevel>0)
+						{
+							ZLog::Write(LOGLEVEL_DEBUG, "MIME Body".' Type:html (fetched with html_only)');
+						}
 						$css = $this->mail->getStyles($bodyStruct);
 						$output->nativebodytype=2;
-					} else {
+					}
+					else
+					{
 						// plain text Message
-						if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG, "MIME Body".' Type:plain, fetch text (HTML, if no text available)');
+						if ($this->debugLevel>0)
+						{
+							ZLog::Write(LOGLEVEL_DEBUG, "MIME Body".' Type:plain, fetch text (HTML, if no text available)');
+						}
 						$output->nativebodytype=1;
 						$bodyStruct = $this->mail->getMessageBody($id,'never_display', '', null, true,$_folderName); //'only_if_no_text');
-						if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' plain text Struct:'.array2string($bodyStruct));
+						if ($this->debugLevel>3)
+						{
+							ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' plain text Struct:'.array2string($bodyStruct));
+						}
 						$body = $this->mail->getdisplayableBody($this->mail,$bodyStruct,false,false);
-						if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' never display html(plain text only):'.$body);
+						if ($this->debugLevel>3)
+						{
+							ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' never display html(plain text only):'.$body);
+						}
 					}
 					// whatever format decode (using the correct encoding)
-					if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__."MIME Body".' Type:'.($output->nativebodytype==2?' html ':' plain ').$body);
+					if ($this->debugLevel>3)
+					{
+						ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__."MIME Body".' Type:'.($output->nativebodytype==2?' html ':' plain ').$body);
+					}
 					//$body = html_entity_decode($body,ENT_QUOTES,$this->mail->detect_encoding($body));
 					// prepare plaintextbody
 					$plainBody='';
@@ -995,12 +1222,18 @@ 
 					// remove all other html
 					$plainBody = preg_replace("/<br.*>/is","\r\n",$plainBody);
 					$plainBody = strip_tags($plainBody);
-					if ($this->debugLevel>3 && $output->nativebodytype==1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' Plain Text:'.$plainBody);
+					if ($this->debugLevel>3 && $output->nativebodytype==1)
+					{
+						ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' Plain Text:'.$plainBody);
+					}
 					//$body = str_replace("\n","\r\n", str_replace("\r","",$body)); // do we need that?
 
-					if ($bpReturnType==2) //SYNC_BODYPREFERENCE_HTML
+					if ($bpReturnType==2)
+					{
+						//SYNC_BODYPREFERENCE_HTML
 					{
 						if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG, "HTML Body with requested pref 2");
+					}
 						// Send HTML if requested and native type was html
 						$output->asbody->type = 2;
 						$htmlbody = '<html>'.
@@ -1012,7 +1245,10 @@ 
 							'<body>';
 						if ($output->nativebodytype==2)
 						{
-							if ($css) Api\Mail\Html::replaceTagsCompletley($body,'style');
+							if ($css)
+							{
+								Api\Mail\Html::replaceTagsCompletley($body,'style');
+							}
 							// as we fetch html, and body is HTML, we may not need to handle this
 							$htmlbody .= $body;
 						}
@@ -1037,7 +1273,10 @@ 
 					else
 					{
 						// Send Plaintext as Fallback or if original body is plainttext
-						if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG, "Plaintext Body:".$plainBody);
+						if ($this->debugLevel>0)
+						{
+							ZLog::Write(LOGLEVEL_DEBUG, "Plaintext Body:".$plainBody);
+						}
 						/* we use plainBody (set above) instead
 						$bodyStruct = $this->mail->getMessageBody($id,'only_if_no_text'); //'never_display');
 						$plain = $this->mail->getdisplayableBody($this->mail,$bodyStruct);
@@ -1074,7 +1313,9 @@ 
 			{
 				$output->flag->flagstatus = 2;
 				//$output->flag->flagtype = "Flag for Follow up";
-			} else {
+			}
+			else
+			{
 				$output->flag->flagstatus = 0;
 			}
 			if ($headers['answered'])
@@ -1090,10 +1331,20 @@ 
 				($headers['priority'] < 3 ? 2 : 1) ;
 			$output->datereceived = $this->mail->_strtotime($headers['date'],'ts',true);
 			$output->to = $headers['to_address'];
-			if ($headers['to']) $output->displayto = $headers['to_address']; //$headers['FETCHED_HEADER']['to_name']
+			if ($headers['to'])
+			{
+				$output->displayto = $headers['to_address'];
+			}
+			//$headers['FETCHED_HEADER']['to_name']
 			$output->from = $headers['sender_address'];
-			if (isset($headers['cc_addresses']) && $headers['cc_addresses']) $output->cc = $headers['cc_addresses'];
-			if (isset($headers['reply_to_address']) && $headers['reply_to_address']) $output->reply_to = $headers['reply_to_address'];
+			if (isset($headers['cc_addresses']) && $headers['cc_addresses'])
+			{
+				$output->cc = $headers['cc_addresses'];
+			}
+			if (isset($headers['reply_to_address']) && $headers['reply_to_address'])
+			{
+				$output->reply_to = $headers['reply_to_address'];
+			}
 
 			$output->messageclass = "IPM.Note";
 			if (stripos($headers['mimetype'],'multipart')!== false &&
@@ -1101,7 +1352,8 @@ 
 			{
 				$output->messageclass = "IPM.Note.SMIME.MultipartSigned";
 			}
-			if (Request::GetProtocolVersion() >= 12.0) {
+			if (Request::GetProtocolVersion() >= 12.0)
+			{
 				$output->contentclass = "urn:content-classes:message";
 			}
 
@@ -1114,7 +1366,10 @@ 
 				//error_log(__METHOD__.__LINE__.array2string($attachments));
 				foreach ($attachments as $key => $attach)
 				{
-					if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' Key:'.$key.'->'.array2string($attach));
+					if ($this->debugLevel>0)
+					{
+						ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' Key:'.$key.'->'.array2string($attach));
+					}
 
 					// pass meeting requests to calendar plugin
 					if (strtolower($attach['mimeType']) == 'text/calendar' && strtolower($attach['method']) == 'request' &&
@@ -1131,17 +1386,24 @@ 
 						unset($attachment);
 						continue;	// do NOT add attachment as attachment
 					}
-					if (Request::GetProtocolVersion() >= 12.0) {
+					if (Request::GetProtocolVersion() >= 12.0)
+					{
 						$attachment = new SyncBaseAttachment();
 						if (!isset($output->asattachments) || !is_array($output->asattachments))
-							$output->asattachments = array();
+						{
+													$output->asattachments = array();
+						}
 						$attachment->estimatedDataSize = $attach['size'];
 						$attachment->method = 1;
 						$attachment->filereference = $folderid . ":" . $id . ":" . $attach['partID'];
-					} else {
+					}
+					else
+					{
 						$attachment = new SyncAttachment();
 						if (!isset($output->attachments) || !is_array($output->attachments))
-							$output->attachments = array();
+						{
+													$output->attachments = array();
+						}
 						$attachment->attsize = $attach['size'];
 						$attachment->attmethod = 1;
 						$attachment->attname = $folderid . ":" . $id . ":" . $attach['partID'];//$key;
@@ -1158,10 +1420,13 @@ 
 						{
 							$attachment->isinline = true;
 						}
-						if (Request::GetProtocolVersion() >= 12.0) {
+						if (Request::GetProtocolVersion() >= 12.0)
+						{
 							$attachment->method=1;
 							$attachment->contentid= str_replace(array("<",">"), "",$attach['cid']);
-						} else {
+						}
+						else
+						{
 							$attachment->attmethod=6;
 							$attachment->attoid = str_replace(array("<",">"), "",$attach['cid']);
 						}
@@ -1169,9 +1434,12 @@ 
 						$attachment->contenttype = trim($attach['mimeType']);
 						//	ZLog::Write(LOGLEVEL_DEBUG, "'".$part->headers['content-type']."'  ".$attachment->contentid);
 					}
-					if (Request::GetProtocolVersion() >= 12.0) {
+					if (Request::GetProtocolVersion() >= 12.0)
+					{
 						array_push($output->asattachments, $attachment);
-					} else {
+					}
+					else
+					{
 						array_push($output->attachments, $attachment);
 					}
 					unset($attachment);
@@ -1184,8 +1452,11 @@ 
             // Language Code Page ID: http://msdn.microsoft.com/en-us/library/windows/desktop/dd317756%28v=vs.85%29.aspx
             $output->internetcpid = INTERNET_CPID_UTF8;
 
-			if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($output));
-//$this->debugLevel=0;
+			if ($this->debugLevel>3)
+			{
+				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($output));
+			}
+			//$this->debugLevel=0;
 			return $output;
 		}
 //$this->debugLevel=0;
@@ -1244,7 +1515,8 @@ 
      * @param string $attname - should contain (folder)id
 	 * @return SyncItemOperationsAttachment-object
 	 */
-	function GetAttachmentData($fid,$attname) {
+	function GetAttachmentData($fid,$attname)
+	{
 		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.": $fid (attname: '$attname')");
 		return $this->_GetAttachmentData($fid,$attname);
 	}
@@ -1259,7 +1531,8 @@ 
      * @param string $attname - should contain (folder)id
 	 * @return SyncItemOperationsAttachment-object
 	 */
-	function ItemOperationsGetAttachmentData($fid,$attname) {
+	function ItemOperationsGetAttachmentData($fid,$attname)
+	{
 		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.": $fid (attname: '$attname')");
 		return $this->_GetAttachmentData($fid,$attname);
 	}
@@ -1281,7 +1554,10 @@ 
 
 		$this->splitID($folderid, $account, $folder);
 
-		if (!isset($this->mail)) $this->mail = Mail::getInstance(false,self::$profileID,true,false,true);
+		if (!isset($this->mail))
+		{
+			$this->mail = Mail::getInstance(false,self::$profileID,true,false,true);
+		}
 
 		$this->mail->reopen($folder);
 		$attachment = $this->mail->getAttachment($id,$part,0,false,true,$folder);
@@ -1290,7 +1566,9 @@ 
 		$SIOattachment->data = $attachment['attachment'];
 		//ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.": $fid (attname: '$attname') Data:".$attachment['attachment']);
 		if (isset($attachment['type']) )
-			$SIOattachment->contenttype = $attachment['type'];
+		{
+					$SIOattachment->contenttype = $attachment['type'];
+		}
 
 		unset($attachment);
 
@@ -1336,11 +1614,15 @@ 
 		//unset($folderid, $id, $message, $contentParameters);
 		$account = $folder = null;
 		$this->splitID($folderid, $account, $folder);
-		if (isset($message->flag)) {
-			if (isset($message->flag->flagstatus) && $message->flag->flagstatus == 2) {
+		if (isset($message->flag))
+		{
+			if (isset($message->flag->flagstatus) && $message->flag->flagstatus == 2)
+			{
 				$rv = $this->mail->flagMessages((($message->flag->flagstatus == 2) ? "flagged" : "unflagged"), $id,$folder);
 				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__." -> set ".array2string($id).' in Folder '.$folder." as " . (($message->flag->flagstatus == 2) ? "flagged" : "unflagged") . "-->". $rv);
-			} else {
+			}
+			else
+			{
 				$rv = $this->mail->flagMessages("unflagged", $id,$folder);
 				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__." -> set ".array2string($id).' in Folder '.$folder." as " . "unflagged" . "-->". $rv);
 			}
@@ -1370,7 +1652,10 @@ 
 		$this->splitID($folderid, $account, $srcFolder);
 		$this->splitID($newfolderid, $account, $destFolder);
 		ZLog::Write(LOGLEVEL_DEBUG, "IMAP-MoveMessage: (SourceFolder: '$srcFolder'  id: '$id'  DestFolder: '$destFolder' )");
-		if (!isset($this->mail)) $this->mail = Mail::getInstance(false,self::$profileID,true,false,true);
+		if (!isset($this->mail))
+		{
+			$this->mail = Mail::getInstance(false,self::$profileID,true,false,true);
+		}
 		$this->mail->reopen($destFolder);
 		$status = $this->mail->getFolderStatus($destFolder);
 		$uidNext = $status['uidnext'];
@@ -1402,11 +1687,15 @@ 
 				$maximumSyncRangeInDays = $GLOBALS['egw_info']['user']['preferences']['activesync']['mail-maximumSyncRange'];
 			}
 			$cutoffdate = (is_numeric($maximumSyncRangeInDays) ? Api\DateTime::to('now','ts')-(3600*24*$maximumSyncRangeInDays):null);
-			if (is_numeric($maximumSyncRangeInDays)) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.' Client set no truncationdate. Using '.$maximumSyncRangeInDays.' days.'.date("d-M-Y", $cutoffdate));
+			if (is_numeric($maximumSyncRangeInDays))
+			{
+				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.' Client set no truncationdate. Using '.$maximumSyncRangeInDays.' days.'.date("d-M-Y", $cutoffdate));
+			}
 		}
 		try {
 			return $this->fetchMessages($folderid, $cutoffdate);
-		} catch (Exception $e)
+		}
+		catch (Exception $e)
 		{
 			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' failed for '.$e->getMessage().($e->details?$e->details:''));
 			return array();
@@ -1430,7 +1719,10 @@ 
 	{
 		static $headers = array();
 
-		if ($this->debugLevel>1) $gstarttime = microtime (true);
+		if ($this->debugLevel>1)
+		{
+			$gstarttime = microtime (true);
+		}
 		//ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__);
 		$rv_messages = array();
 		// if the message is still available within the class, we use it instead of fetching it again
@@ -1443,7 +1735,10 @@ 
 		{
 			$headers = array();	// clear cache to not use too much memory
 
-			if ($this->debugLevel>1) $starttime = microtime (true);
+			if ($this->debugLevel>1)
+			{
+				$starttime = microtime (true);
+			}
 			$this->_connect($this->account);
 			if ($this->debugLevel>1)
 			{
@@ -1452,8 +1747,14 @@ 
 			}
 			$messagelist = $_filter = array();
 			// if not connected, any further action must fail
-			if (!empty($cutoffdate)) $_filter = array('status'=>array('UNDELETED'),'range'=>"SINCE",'date'=> date("d-M-Y", $cutoffdate));
-			if ($this->debugLevel>1) $starttime = microtime (true);
+			if (!empty($cutoffdate))
+			{
+				$_filter = array('status'=>array('UNDELETED'),'range'=>"SINCE",'date'=> date("d-M-Y", $cutoffdate));
+			}
+			if ($this->debugLevel>1)
+			{
+				$starttime = microtime (true);
+			}
 			$account = $_folderName = $id = null;
 			$this->splitID($folderid,$account,$_folderName,$id);
 			if ($this->debugLevel>1)
@@ -1461,8 +1762,14 @@ 
 				$endtime = microtime(true) - $starttime;
 				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__. " splitID took : ".$endtime.' for FolderID:'.$folderid);
 			}
-			if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.' for Folder:'.$_folderName.' Filter:'.array2string($_filter).' Ids:'.array2string($_id).'/'.$id);
-			if ($this->debugLevel>1) $starttime = microtime (true);
+			if ($this->debugLevel>1)
+			{
+				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.' for Folder:'.$_folderName.' Filter:'.array2string($_filter).' Ids:'.array2string($_id).'/'.$id);
+			}
+			if ($this->debugLevel>1)
+			{
+				$starttime = microtime (true);
+			}
 			$_numberOfMessages = (empty($cutoffdate)?250:99999);
 			$rv_messages = $this->mail->getHeaders($_folderName, $_startMessage=1, $_numberOfMessages, $_sort=0, $_reverse=false, $_filter, $_id);
 			if ($this->debugLevel>1)
@@ -1471,27 +1778,56 @@ 
 				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__. " getHeaders call took : ".$endtime.' for FolderID:'.$_folderName);
 			}
 		}
-		if ($_id == NULL && $this->debugLevel>1)  ZLog::Write(LOGLEVEL_DEBUG,__METHOD__." found :". count($rv_messages['header']));
+		if ($_id == NULL && $this->debugLevel>1)
+		{
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__." found :". count($rv_messages['header']));
+		}
 		//ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' Result:'.array2string($rv_messages));
 		$messagelist = array();
-		if (!isset($rv_messages['header'])||empty($rv_messages['header'])) return $messagelist;
+		if (!isset($rv_messages['header'])||empty($rv_messages['header']))
+		{
+			return $messagelist;
+		}
 		//if ($_returnModHash) $messageFolderHash = array();
 		foreach ((array)$rv_messages['header'] as $k => $vars)
 		{
-			if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' ID to process:'.$vars['uid'].' Subject:'.$vars['subject']);
+			if ($this->debugLevel>3)
+			{
+				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' ID to process:'.$vars['uid'].' Subject:'.$vars['subject']);
+			}
 			$headers[$vars['uid']] = $vars;
-			if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' MailID:'.$k.'->'.array2string($vars));
-			if (!empty($vars['deleted'])) continue; // cut of deleted messages
-			if ($cutoffdate && $vars['date'] < $cutoffdate) continue; // message is out of range for cutoffdate, ignore it
-			if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' ID to report:'.$vars['uid'].' Subject:'.$vars['subject']);
+			if ($this->debugLevel>3)
+			{
+				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' MailID:'.$k.'->'.array2string($vars));
+			}
+			if (!empty($vars['deleted']))
+			{
+				continue;
+			}
+			// cut of deleted messages
+			if ($cutoffdate && $vars['date'] < $cutoffdate)
+			{
+				continue;
+			}
+			// message is out of range for cutoffdate, ignore it
+			if ($this->debugLevel>0)
+			{
+				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' ID to report:'.$vars['uid'].' Subject:'.$vars['subject']);
+			}
 			$mess = $return_all_headers ? $vars : array();
 			$mess["mod"] = self::doFlagsMod($vars).$vars['date'];
 			$mess["id"] = $vars['uid'];
 			// 'seen' aka 'read' is the only flag we want to know about
 			$mess["flags"] = 0;
 			// outlook supports additional flags, set them to 0
-			if($vars["seen"]) $mess["flags"] = 1;
-			if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($mess));
+			if($vars["seen"])
+			{
+				$mess["flags"] = 1;
+			}
+			if ($this->debugLevel>3)
+			{
+				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($mess));
+			}
 			$messagelist[$vars['uid']] = $mess;
 			unset($mess);
 		}
@@ -1516,9 +1852,18 @@ 
 	static function doFlagsMod($headerFlags)
 	{
 		$flags = 'nnn';
-		if ($headerFlags['flagged']) $flags[0] = 'f';
-		if ($headerFlags['answered']) $flags[1] = 'a';
-		if ($headerFlags['forwarded']) $flags[2] = 'f';
+		if ($headerFlags['flagged'])
+		{
+			$flags[0] = 'f';
+		}
+		if ($headerFlags['answered'])
+		{
+			$flags[1] = 'a';
+		}
+		if ($headerFlags['forwarded'])
+		{
+			$flags[2] = 'f';
+		}
 		//ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.'('.array2string($headerFlags).') returning '.array2string($flags));
 		return $flags;
 	}
@@ -1550,31 +1895,55 @@ 
 	{
 		//$this->debugLevel=1;
 		$searchquery=$_searchquery->GetDataArray();
-		if (!is_array($searchquery)) return array();
-		if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($searchquery));
+		if (!is_array($searchquery))
+		{
+			return array();
+		}
+		if ($this->debugLevel>0)
+		{
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($searchquery));
+		}
 
-		if (isset($searchquery['searchrebuildresults'])) {
+		if (isset($searchquery['searchrebuildresults']))
+		{
 			$rebuildresults = $searchquery['searchrebuildresults'];
-		} else {
+		}
+		else
+		{
 			$rebuildresults = false;
 		}
-		if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,  'RebuildResults ['.$rebuildresults.']' );
+		if ($this->debugLevel>0)
+		{
+			ZLog::Write(LOGLEVEL_DEBUG,  'RebuildResults ['.$rebuildresults.']' );
+		}
 
-		if (isset($searchquery['deeptraversal'])) {
+		if (isset($searchquery['deeptraversal']))
+		{
 			$deeptraversal = $searchquery['deeptraversal'];
-		} else {
+		}
+		else
+		{
 			$deeptraversal = false;
 		}
-		if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,  'DeepTraversal ['.$deeptraversal.']' );
+		if ($this->debugLevel>0)
+		{
+			ZLog::Write(LOGLEVEL_DEBUG,  'DeepTraversal ['.$deeptraversal.']' );
+		}
 
-		if (isset($searchquery['searchrange'])) {
+		if (isset($searchquery['searchrange']))
+		{
 			$range = explode("-",$_searchquery->GetSearchRange());
 			$start =$range[0] + 1;
 			$limit = $range[1] - $range[0] + 1;
-		} else {
+		}
+		else
+		{
 			$range = false;
 		}
-		if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,  'Range ['.print_r($range, true).']' );
+		if ($this->debugLevel>0)
+		{
+			ZLog::Write(LOGLEVEL_DEBUG,  'Range ['.print_r($range, true).']' );
+		}
 
 		//foreach($searchquery['query'] as $k => $value) {
 		//	$query = $value;
@@ -1626,7 +1995,10 @@ 
 			$_filter['since'] = date("d-M-Y", Api\DateTime::to($sincedate,'ts'));
 		}
 		//$_filter[] = array('type'=>"SINCE",'string'=> date("d-M-Y", $cutoffdate));
-		if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.' for Folder:'.$_folderName.' Filter:'.array2string($_filter));
+		if ($this->debugLevel>1)
+		{
+			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.' for Folder:'.$_folderName.' Filter:'.array2string($_filter));
+		}
 		$rv_messages = $this->mail->getHeaders($_folderName, $_startMessage=($range?$start:1), $_numberOfMessages=($limit?$limit:9999999), $_sort=0, $_reverse=false, $_filter, $_id=NULL);
 		//ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($rv_messages));
 		$list=array();
@@ -1658,17 +2030,26 @@ 
 	private function getParentID($account,$folder)
 	{
 		$this->_connect($account);
-		if (!isset($this->folders)) $this->folders = $this->mail->getFolderObjects(true,false);
+		if (!isset($this->folders))
+		{
+			$this->folders = $this->mail->getFolderObjects(true,false);
+		}
 
 		$mailFolder = $this->folders[$folder];
-		if (!isset($mailFolder)) return false;
+		if (!isset($mailFolder))
+		{
+			return false;
+		}
 		$delimiter = (isset($mailFolder->delimiter)?$mailFolder->delimiter:$this->mail->getHierarchyDelimiter());
 		$parent = explode($delimiter,$folder);
 		array_pop($parent);
 		$parent = implode($delimiter,$parent);
 
 		$id = $parent && $this->folders[$parent] ? $this->createID($account, $parent) : '0';
-		if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."('$folder') --> parent=$parent --> $id");
+		if ($this->debugLevel>1)
+		{
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."('$folder') --> parent=$parent --> $id");
+		}
 		return $id;
 	}
 
@@ -1682,7 +2063,10 @@ 
 	{
 		static $last_id = null;
 		static $folderObj = null;
-		if (isset($last_id) && $last_id === $id) return $folderObj;
+		if (isset($last_id) && $last_id === $id)
+		{
+			return $folderObj;
+		}
 
 		try {
 			$account = $folder = null;
@@ -1693,18 +2077,30 @@ 
 			return $folderObj=false;
 		}
 		$this->_connect($account);
-		if (!isset($this->folders)) $this->folders = $this->mail->getFolderObjects(true,false);
+		if (!isset($this->folders))
+		{
+			$this->folders = $this->mail->getFolderObjects(true,false);
+		}
 
 		$mailFolder = $this->folders[$folder];
-		if (!isset($mailFolder)) return $folderObj=false;
+		if (!isset($mailFolder))
+		{
+			return $folderObj=false;
+		}
 
 		$folderObj = new SyncFolder();
 		$folderObj->serverid = $id;
 		$folderObj->parentid = $this->getParentID($account,$folder);
 		$folderObj->displayname = $mailFolder->shortDisplayName;
-		if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__." ID: $id, Account:$account, Folder:$folder");
+		if ($this->debugLevel>1)
+		{
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__." ID: $id, Account:$account, Folder:$folder");
+		}
 		// get folder-type
-		foreach($this->folders as $inbox => $mailFolder) break;
+		foreach($this->folders as $inbox => $mailFolder)
+		{
+			break;
+		}
 		if ($folder == $inbox)
 		{
 			$folderObj->type = SYNC_FOLDER_TYPE_INBOX;
@@ -1741,7 +2137,10 @@ 
 			$folderObj->type = SYNC_FOLDER_TYPE_USER_MAIL;
 		}
 
-		if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."($id) --> $folder --> type=$folderObj->type, parentID=$folderObj->parentid, displayname=$folderObj->displayname");
+		if ($this->debugLevel>1)
+		{
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."($id) --> $folder --> type=$folderObj->type, parentID=$folderObj->parentid, displayname=$folderObj->displayname");
+		}
 		return $folderObj;
 	}
 
@@ -1785,11 +2184,20 @@ 
 	{
 		$account = $folder = null;
 		$this->splitID($folderid, $account, $folder);
-		if (is_numeric($account)) $type = 'mail';
+		if (is_numeric($account))
+		{
+			$type = 'mail';
+		}
 
-		if ($type != 'mail') return false;
+		if ($type != 'mail')
+		{
+			return false;
+		}
 
-		if (!isset($this->mail)) $this->mail = Mail::getInstance(false,self::$profileID,true,false,true);
+		if (!isset($this->mail))
+		{
+			$this->mail = Mail::getInstance(false,self::$profileID,true,false,true);
+		}
 		if (!$this->mail->folderIsSelectable($folder))
 		{
 			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.": could not select folder $folder returning fake state");
@@ -1840,7 +2248,7 @@ 
      * @throws StatusException              could throw specific SYNC_STATUS_* exceptions
      */
     public function DeleteMessage($folderid, $id, $contentParameters)
-	{
+    {
 		unset($contentParameters);	// not used, but required by function signature
 		ZLog::Write(LOGLEVEL_DEBUG, "IMAP-DeleteMessage: (fid: '$folderid'  id: '$id' )");
 		/*
@@ -1866,7 +2274,10 @@ 
 			$error = $e->getMessage();
 			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__." $_messageUID, $folder ->".$error);
 			// if the server thinks the message does not exist report deletion as success
-			if (stripos($error,'[NONEXISTENT]')!==false) return true;
+			if (stripos($error,'[NONEXISTENT]')!==false)
+			{
+				return true;
+			}
 			return false;
 		}
 
@@ -1899,7 +2310,7 @@ 
      * @throws StatusException              could throw specific SYNC_STATUS_* exceptions
      */
     public function SetReadFlag($folderid, $id, $flags, $contentParameters)
-	{
+    {
 		unset($contentParameters);	// not used, but required by function signature
 		// ZLog::Write(LOGLEVEL_DEBUG, "IMAP-SetReadFlag: (fid: '$folderid'  id: '$id'  flags: '$flags' )");
 		$account = $folder = null;
@@ -1983,10 +2394,16 @@ 
 		$account = $parent_id = $app = null;
 		$this->splitID($id, $account, $folder, $app);
 		$old_hash = $this->folder2hash($account, $folder);
-		if ($parentid) $this->splitID($parentid, $account, $parentfolder, $app);
+		if ($parentid)
+		{
+			$this->splitID($parentid, $account, $parentfolder, $app);
+		}
 		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."( '$id (-> $folder)','$parentid ".($parentid?'(->'.$parentfolder.')':'')."') called!");
 		$ret = $this->mail->deleteFolder($folder);
-		if ($ret) $newHash = $this->rename_folder_hash($account, $old_hash, "##Dele#edFolder#$folder##");
+		if ($ret)
+		{
+			$newHash = $this->rename_folder_hash($account, $old_hash, "##Dele#edFolder#$folder##");
+		}
 		$this->folders = $this->mail->getFolderObjects(true,false,$_alwaysGetDefaultFolders=true,false);
 		return $ret;
 	}
@@ -2032,7 +2449,10 @@ 
 
 		$str = $this->backend->createID($account, $folder, $id);
 
-		if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."($account,'$f',$id) type=$account, folder=$folder --> '$str'");
+		if ($this->debugLevel>1)
+		{
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."($account,'$f',$id) type=$account, folder=$folder --> '$str'");
+		}
 
 		return $str;
 	}
@@ -2053,7 +2473,10 @@ 
 		// convert numeric folder-id back to folder name
 		$folder = $this->hash2folder($account,$f=$folder);
 
-		if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."('$str','$account','$folder',$appid)");
+		if ($this->debugLevel>1)
+		{
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."('$str','$account','$folder',$appid)");
+		}
 	}
 
 	/**
@@ -2072,7 +2495,10 @@ 
 	 */
 	private function folder2hash($account,$folder)
 	{
-		if(!isset($this->folderHashes)) $this->readFolderHashes();
+		if(!isset($this->folderHashes))
+		{
+			$this->readFolderHashes();
+		}
 
 		if (($index = array_search($folder, (array)$this->folderHashes[$account])) === false)
 		{
@@ -2095,7 +2521,10 @@ 
 	 */
 	private function hash2folder($account,$index)
 	{
-		if(!isset($this->folderHashes)) $this->readFolderHashes();
+		if(!isset($this->folderHashes))
+		{
+			$this->readFolderHashes();
+		}
 
 		return isset($this->folderHashes[$account]) ? $this->folderHashes[$account][$index] : null;
 	}

Spacing +354 added lines, -355 removed lines

@@ -90,23 +90,23 @@ 
 		$this->backend = $backend;
 		if (!isset($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-ActiveSyncProfileID']))
 		{
-			if ($this->debugLevel>1) error_log(__METHOD__.__LINE__.' Noprefs set: using 0 as default');
+			if ($this->debugLevel > 1) error_log(__METHOD__.__LINE__.' Noprefs set: using 0 as default');
 			// globals preferences add appname varname value
-			$GLOBALS['egw']->preferences->add('activesync','mail-ActiveSyncProfileID',0,'user');
+			$GLOBALS['egw']->preferences->add('activesync', 'mail-ActiveSyncProfileID', 0, 'user');
 			// save prefs
 			$GLOBALS['egw']->preferences->save_repository(true);
 		}
-		if ($this->debugLevel>1) error_log(__METHOD__.__LINE__.' ActiveProfileID:'.array2string(self::$profileID));
+		if ($this->debugLevel > 1) error_log(__METHOD__.__LINE__.' ActiveProfileID:'.array2string(self::$profileID));
 
 		if (is_null(self::$profileID))
 		{
-			if ($this->debugLevel>1) error_log(__METHOD__.__LINE__.' self::ProfileID isNUll:'.array2string(self::$profileID));
-			self::$profileID =& Api\Cache::getSession('mail','activeSyncProfileID');
-			if ($this->debugLevel>1) error_log(__METHOD__.__LINE__.' ActiveProfileID (after reading Cache):'.array2string(self::$profileID));
+			if ($this->debugLevel > 1) error_log(__METHOD__.__LINE__.' self::ProfileID isNUll:'.array2string(self::$profileID));
+			self::$profileID = & Api\Cache::getSession('mail', 'activeSyncProfileID');
+			if ($this->debugLevel > 1) error_log(__METHOD__.__LINE__.' ActiveProfileID (after reading Cache):'.array2string(self::$profileID));
 		}
 		if (isset($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-ActiveSyncProfileID']))
 		{
-			if ($this->debugLevel>1) error_log(__METHOD__.__LINE__.' Pref for ProfileID:'.array2string($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-ActiveSyncProfileID']));
+			if ($this->debugLevel > 1) error_log(__METHOD__.__LINE__.' Pref for ProfileID:'.array2string($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-ActiveSyncProfileID']));
 			if ($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-ActiveSyncProfileID'] == 'G')
 			{
 				self::$profileID = 'G'; // this should trigger the fetch of the first negative profile (or if no negative profile is available the firstb there is)
@@ -116,7 +116,7 @@ 
 				self::$profileID = (int)$GLOBALS['egw_info']['user']['preferences']['activesync']['mail-ActiveSyncProfileID'];
 			}
 		}
-		if ($this->debugLevel>1) error_log(__METHOD__.__LINE__.' Profile Selected (after reading Prefs):'.array2string(self::$profileID));
+		if ($this->debugLevel > 1) error_log(__METHOD__.__LINE__.' Profile Selected (after reading Prefs):'.array2string(self::$profileID));
 
 		// verify we are on an existing profile, if not running in setup (settings can not be static according to interface!)
 		if (!isset($GLOBALS['egw_setup']))
@@ -124,12 +124,12 @@ 
 			try {
 				Mail\Account::read(self::$profileID);
 			}
-			catch(Exception $e) {
+			catch (Exception $e) {
 				unset($e);
 				self::$profileID = Mail\Account::get_default_acc_id();
 			}
 		}
-		if ($this->debugLevel>0) error_log(__METHOD__.'::'.__LINE__.' ProfileSelected:'.self::$profileID);
+		if ($this->debugLevel > 0) error_log(__METHOD__.'::'.__LINE__.' ProfileSelected:'.self::$profileID);
 		//$this->debugLevel=0;
 	}
 
@@ -242,13 +242,13 @@ 
 			$this->__construct($this->backend);
 
 			try {
-				$this->_connect(0,true);
+				$this->_connect(0, true);
 				$this->_disconnect();
 
 				if (!$this->_wasteID) $errors[] = lang('No valid %1 folder configured!', '<b>'.lang('trash').'</b>');
 				if (!$this->_sentID) $errors[] = lang('No valid %1 folder configured!', '<b>'.lang('send').'</b>');
 			}
-			catch(Exception $e) {
+			catch (Exception $e) {
 				$errors[] = lang('Can not open IMAP connection').': '.$e->getMessage();
 			}
 			if ($errors)
@@ -266,7 +266,7 @@ 
 	 * @param int $account integer id of account to use
 	 * @todo support different accounts
 	 */
-	private function _connect($account=0)
+	private function _connect($account = 0)
 	{
 		if (!$account) $account = self::$profileID ? self::$profileID : 0;
 		if ($this->mail && $this->account != $account) $this->_disconnect();
@@ -279,7 +279,7 @@ 
 			$this->account = $account;
 			// todo: tell mail which account to use
 			//error_log(__METHOD__.__LINE__.' create object with ProfileID:'.array2string(self::$profileID));
-			$this->mail = Mail::getInstance(false,self::$profileID,true,false,true);
+			$this->mail = Mail::getInstance(false, self::$profileID, true, false, true);
 			if (self::$profileID == 0 && isset($this->mail->icServer->ImapServerId) && !empty($this->mail->icServer->ImapServerId)) self::$profileID = $this->mail->icServer->ImapServerId;
 		}
 		else
@@ -287,7 +287,7 @@ 
 			//error_log(__METHOD__.__LINE__." connect with profileID: ".self::$profileID);
 			if (self::$profileID == 0 && isset($this->mail->icServer->ImapServerId) && !empty($this->mail->icServer->ImapServerId)) self::$profileID = $this->mail->icServer->ImapServerId;
 		}
-		$this->mail->openConnection(self::$profileID,false);
+		$this->mail->openConnection(self::$profileID, false);
 
 		$this->_wasteID = $this->mail->getTrashFolder(false);
 		//error_log(__METHOD__.__LINE__.' TrashFolder:'.$this->_wasteID);
@@ -302,7 +302,7 @@ 
 	 */
 	private function _disconnect()
 	{
-		if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__);
+		if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__);
 		if ($this->mail) $this->mail->closeConnection();
 
 		unset($this->mail);
@@ -318,24 +318,24 @@ 
 	public function GetFolderList()
 	{
 		$folderlist = array();
-		if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__);
+		if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__);
 		/*foreach($available_accounts as $account)*/ $account = 0;
 		{
 			$this->_connect($account);
-			if (!isset($this->folders)) $this->folders = $this->mail->getFolderObjects(true,false,$_alwaysGetDefaultFolders=true);
-			if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($this->folders));
+			if (!isset($this->folders)) $this->folders = $this->mail->getFolderObjects(true, false, $_alwaysGetDefaultFolders = true);
+			if ($this->debugLevel > 1) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.array2string($this->folders));
 
 			foreach ($this->folders as $folder => $folderObj) {
-				if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' folder='.$folder);
+				if ($this->debugLevel > 1) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' folder='.$folder);
 				$folderlist[] = $f = array(
-					'id'     => $this->createID($account,$folder),
+					'id'     => $this->createID($account, $folder),
 					'mod'    => $folderObj->shortDisplayName,
-					'parent' => $this->getParentID($account,$folder),
+					'parent' => $this->getParentID($account, $folder),
 				);
-				if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."() returning ".array2string($f));
+				if ($this->debugLevel > 1) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."() returning ".array2string($f));
 			}
 		}
-		if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."() returning ".array2string($folderlist));
+		if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."() returning ".array2string($folderlist));
 
 		return $folderlist;
 	}
@@ -384,90 +384,90 @@ 
 		$ClientSideMeetingRequest = false;
 		$allowSendingInvitations = 'sendifnocalnotif';
 		if (isset($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-allowSendingInvitations']) &&
-			$GLOBALS['egw_info']['user']['preferences']['activesync']['mail-allowSendingInvitations']=='nosend')
+			$GLOBALS['egw_info']['user']['preferences']['activesync']['mail-allowSendingInvitations'] == 'nosend')
 		{
 			$allowSendingInvitations = false;
 		}
 		elseif (isset($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-allowSendingInvitations']) &&
-			$GLOBALS['egw_info']['user']['preferences']['activesync']['mail-allowSendingInvitations']!='nosend')
+			$GLOBALS['egw_info']['user']['preferences']['activesync']['mail-allowSendingInvitations'] != 'nosend')
 		{
 			$allowSendingInvitations = $GLOBALS['egw_info']['user']['preferences']['activesync']['mail-allowSendingInvitations'];
 		}
-		$smartdata_task = ($smartdata->replyflag?'reply':($smartdata->forwardflag?'forward':'new'));
+		$smartdata_task = ($smartdata->replyflag ? 'reply' : ($smartdata->forwardflag ? 'forward' : 'new'));
 
-   		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__ . (isset($smartdata->mime) ? $smartdata->mime : ""). "task: ".(isset($smartdata_task) ? $smartdata_task : "")." itemid: ".(isset($smartdata->source->itemid) ? $smartdata->source->itemid : "")." folder: ".(isset($smartdata->source->folderid) ? $smartdata->source->folderid : ""));
-		if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__."): Smartdata = ".array2string($smartdata));
+   		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.(isset($smartdata->mime) ? $smartdata->mime : "")."task: ".(isset($smartdata_task) ? $smartdata_task : "")." itemid: ".(isset($smartdata->source->itemid) ? $smartdata->source->itemid : "")." folder: ".(isset($smartdata->source->folderid) ? $smartdata->source->folderid : ""));
+		if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__."): Smartdata = ".array2string($smartdata));
 		//error_log("IMAP-Sendmail: Smartdata = ".array2string($smartdata));
 
 		// initialize our Mail
-		if (!isset($this->mail)) $this->mail = Mail::getInstance(false,self::$profileID,true,false,true);
+		if (!isset($this->mail)) $this->mail = Mail::getInstance(false, self::$profileID, true, false, true);
 		$activeMailProfiles = $this->mail->getAccountIdentities(self::$profileID);
 		// use the standardIdentity
-		$activeMailProfile = Mail::getStandardIdentityForProfile($activeMailProfiles,self::$profileID);
+		$activeMailProfile = Mail::getStandardIdentityForProfile($activeMailProfiles, self::$profileID);
 
-		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.")".' ProfileID:'.self::$profileID.' ActiveMailProfile:'.array2string($activeMailProfile));
+		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.")".' ProfileID:'.self::$profileID.' ActiveMailProfile:'.array2string($activeMailProfile));
 		// collect identity / signature for later usage, and to determine if we may have to manipulate TransferEncoding and Charset
 		try
 		{
 			$acc = Mail\Account::read($this->mail->icServer->ImapServerId);
 			//error_log(__METHOD__.__LINE__.array2string($acc));
-			$_signature = Mail\Account::read_identity($acc['ident_id'],true);
+			$_signature = Mail\Account::read_identity($acc['ident_id'], true);
 		}
 		catch (Exception $e)
 		{
-			$_signature=array();
+			$_signature = array();
 		}
 		$signature = $_signature['ident_signature'];
 		if ((isset($preferencesArray['disableRulerForSignatureSeparation']) &&
 			$preferencesArray['disableRulerForSignatureSeparation']) ||
-			empty($signature) || trim(Api\Mail\Html::convertHTMLToText($signature)) =='')
+			empty($signature) || trim(Api\Mail\Html::convertHTMLToText($signature)) == '')
 		{
 			$disableRuler = true;
 		}
 		$beforePlain = $beforeHtml = "";
-		$beforeHtml = ($disableRuler ?'&nbsp;<br>':'&nbsp;<br><hr style="border:dotted 1px silver; width:90%; border:dotted 1px silver;">');
-		$beforePlain = ($disableRuler ?"\r\n\r\n":"\r\n\r\n-- \r\n");
-		$sigText = Mail::merge($signature,array($GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'],'person_id')));
-		if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' Signature to use:'.$sigText);
+		$beforeHtml = ($disableRuler ? '&nbsp;<br>' : '&nbsp;<br><hr style="border:dotted 1px silver; width:90%; border:dotted 1px silver;">');
+		$beforePlain = ($disableRuler ? "\r\n\r\n" : "\r\n\r\n-- \r\n");
+		$sigText = Mail::merge($signature, array($GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'], 'person_id')));
+		if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' Signature to use:'.$sigText);
 		$sigTextHtml = $beforeHtml.$sigText;
 		$sigTextPlain = $beforePlain.Api\Mail\Html::convertHTMLToText($sigText);
 
-		$force8bit=false;
-		if (Api\Translation::detect_encoding($sigTextPlain)!='ascii') $force8bit=true;
+		$force8bit = false;
+		if (Api\Translation::detect_encoding($sigTextPlain) != 'ascii') $force8bit = true;
 		// beware. the section below might cause trouble regarding bcc and attachments, so maybe this is to be handeled differently
 		if ($force8bit)
 		{
-			$converterObj =  new Api\Mailer('initbasic');
-			$smartdata->mime = $converterObj->convertMessageTextParts($smartdata->mime,false,'utf-8');
+			$converterObj = new Api\Mailer('initbasic');
+			$smartdata->mime = $converterObj->convertMessageTextParts($smartdata->mime, false, 'utf-8');
 		}
 		// initialize the new Api\Mailer object for sending
 		$mailObject = new Api\Mailer(self::$profileID);
 
-		$this->mail->parseRawMessageIntoMailObject($mailObject,$smartdata->mime,$force8bit);
+		$this->mail->parseRawMessageIntoMailObject($mailObject, $smartdata->mime, $force8bit);
 		// Horde SMTP Class uses utf-8 by default. as we set charset always to utf-8
-		$mailObject->Sender  = $activeMailProfile['ident_email'];
-		$mailObject->setFrom($activeMailProfile['ident_email'],Mail::generateIdentityString($activeMailProfile,false));
+		$mailObject->Sender = $activeMailProfile['ident_email'];
+		$mailObject->setFrom($activeMailProfile['ident_email'], Mail::generateIdentityString($activeMailProfile, false));
 		$mailObject->addHeader('X-Mailer', 'mail-Activesync');
 
 		// prepare addressee list; moved the adding of addresses to the mailobject down
 		// to
-		foreach(Mail::parseAddressList($mailObject->getHeader("To")) as $addressObject) {
+		foreach (Mail::parseAddressList($mailObject->getHeader("To")) as $addressObject) {
 			if (!$addressObject->valid) continue;
-			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") Header Sentmail To: ".array2string($addressObject) );
+			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.") Header Sentmail To: ".array2string($addressObject));
 			//$mailObject->AddAddress($addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''),$addressObject->personal);
 			$toMailAddr[] = imap_rfc822_write_address($addressObject->mailbox, $addressObject->host, $addressObject->personal);
 		}
 		// CC
-		foreach(Mail::parseAddressList($mailObject->getHeader("Cc")) as $addressObject) {
+		foreach (Mail::parseAddressList($mailObject->getHeader("Cc")) as $addressObject) {
 			if (!$addressObject->valid) continue;
-			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") Header Sentmail CC: ".array2string($addressObject) );
+			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.") Header Sentmail CC: ".array2string($addressObject));
 			//$mailObject->AddCC($addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''),$addressObject->personal);
 			$ccMailAddr[] = imap_rfc822_write_address($addressObject->mailbox, $addressObject->host, $addressObject->personal);
 		}
 		// BCC
-		foreach($mailObject->getAddresses('bcc') as $addressObject) {
+		foreach ($mailObject->getAddresses('bcc') as $addressObject) {
 			if (!$addressObject->valid) continue;
-			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") Header Sentmail BCC: ".array2string($addressObject) );
+			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.") Header Sentmail BCC: ".array2string($addressObject));
 			//$mailObject->AddBCC($addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''),$addressObject->personal);
 			$bccMailAddr[] = imap_rfc822_write_address($addressObject->mailbox, $addressObject->host, $addressObject->personal);
 		}
@@ -476,7 +476,7 @@ 
 		$use_orgbody = false;
 
 		$k = 'Content-Type';
-		$ContentType =$mailObject->getHeader('Content-Type');
+		$ContentType = $mailObject->getHeader('Content-Type');
 		//error_log(__METHOD__.__LINE__." Header Sentmail original Header (filtered): " . $k.  " = ".trim($ContentType));
 		// if the message is a multipart message, then we should use the sent body
 		if (preg_match("/multipart/i", $ContentType)) {
@@ -496,43 +496,43 @@ 
 			$k == "Content-Type" && preg_match("/multipart/i", $ContentType))) {
 			$use_orgbody = true;
 		}
-		$Body =  $AltBody = "";
+		$Body = $AltBody = "";
 		// get body of the transmitted message
 		// if this is a simple message, no structure at all
 		if (preg_match("/text/i", $ContentType))
 		{
-			$simpleBodyType = (preg_match("/html/i", $ContentType)?'text/html':'text/plain');
+			$simpleBodyType = (preg_match("/html/i", $ContentType) ? 'text/html' : 'text/plain');
 			$bodyObj = $mailObject->findBody(preg_match("/html/i", $ContentType) ? 'html' : 'plain');
-			$body = preg_replace("/(<|&lt;)*(([\w\.,-.,_.,0-9.]+)@([\w\.,-.,_.,0-9.]+))(>|&gt;)*/i","[$2]", $bodyObj ?$bodyObj->getContents() : null);
-			if  ($simpleBodyType == "text/plain")
+			$body = preg_replace("/(<|&lt;)*(([\w\.,-.,_.,0-9.]+)@([\w\.,-.,_.,0-9.]+))(>|&gt;)*/i", "[$2]", $bodyObj ? $bodyObj->getContents() : null);
+			if ($simpleBodyType == "text/plain")
 			{
 				$Body = $body;
 				$AltBody = "<pre>".nl2br($body)."</pre>";
-				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") fetched Body as :". $simpleBodyType.'=> Created AltBody');
+				ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.") fetched Body as :".$simpleBodyType.'=> Created AltBody');
 			}
 			else
 			{
 				$AltBody = $body;
-				$Body =  trim(Api\Mail\Html::convertHTMLToText($body));
-				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") fetched Body as :". $simpleBodyType.'=> Created Body');
+				$Body = trim(Api\Mail\Html::convertHTMLToText($body));
+				ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.") fetched Body as :".$simpleBodyType.'=> Created Body');
 			}
 		}
 		else
 		{
 			// if this is a structured message
 			// prefer plain over html
-			$Body = preg_replace("/(<|&lt;)*(([\w\.,-.,_.,0-9.]+)@([\w\.,-.,_.,0-9.]+))(>|&gt;)*/i","[$2]",
+			$Body = preg_replace("/(<|&lt;)*(([\w\.,-.,_.,0-9.]+)@([\w\.,-.,_.,0-9.]+))(>|&gt;)*/i", "[$2]",
 				($text_body = $mailObject->findBody('plain')) ? $text_body->getContents() : null);
-			$AltBody = preg_replace("/(<|&lt;)*(([\w\.,-.,_.,0-9.]+)@([\w\.,-.,_.,0-9.]+))(>|&gt;)*/i","[$2]",
+			$AltBody = preg_replace("/(<|&lt;)*(([\w\.,-.,_.,0-9.]+)@([\w\.,-.,_.,0-9.]+))(>|&gt;)*/i", "[$2]",
 				($html_body = $mailObject->findBody('html')) ? $html_body->getContents() : null);
 		}
-		if ($this->debugLevel>1 && $Body) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") fetched Body as with MessageContentType:". $ContentType.'=>'.$Body);
-		if ($this->debugLevel>1 && $AltBody) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") fetched AltBody as with MessageContentType:". $ContentType.'=>'.$AltBody);
+		if ($this->debugLevel > 1 && $Body) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.") fetched Body as with MessageContentType:".$ContentType.'=>'.$Body);
+		if ($this->debugLevel > 1 && $AltBody) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.") fetched AltBody as with MessageContentType:".$ContentType.'=>'.$AltBody);
 		//error_log(__METHOD__.__LINE__.array2string($mailObject));
 		// if this is a multipart message with a boundary, we must use the original body
 		//if ($this->debugLevel>2) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' mailObject after Inital Parse:'.array2string($mailObject));
         if ($use_orgbody) {
-    	    ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") use_orgbody = true ContentType:".$ContentType);
+    	    ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.") use_orgbody = true ContentType:".$ContentType);
  			// if it is a ClientSideMeetingRequest, we report it as send at all times
 			if (($cal_body = $mailObject->findBody('calendar')) &&
 				($cSMRMethod = $cal_body->getContentTypeParameter('method')))
@@ -541,21 +541,21 @@ 
 				{
 					$organizer = calendar_ical::getIcalOrganizer($cal_body->getContents());
 				}
-				if ($this->debugLevel) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") we have a Client Side Meeting Request from organizer=$organizer");
+				if ($this->debugLevel) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.") we have a Client Side Meeting Request from organizer=$organizer");
 				$ClientSideMeetingRequest = true;
 			}
         }
 		// now handle the addressee list
 		$toCount = 0;
 		//error_log(__METHOD__.__LINE__.array2string($toMailAddr));
-		foreach((array)$toMailAddr as $address) {
-			foreach(Mail::parseAddressList((get_magic_quotes_gpc()?stripslashes($address):$address)) as $addressObject) {
-				$emailAddress = $addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : '');
+		foreach ((array)$toMailAddr as $address) {
+			foreach (Mail::parseAddressList((get_magic_quotes_gpc() ?stripslashes($address) : $address)) as $addressObject) {
+				$emailAddress = $addressObject->mailbox.($addressObject->host ? '@'.$addressObject->host : '');
 				if ($ClientSideMeetingRequest === true && $allowSendingInvitations == 'sendifnocalnotif' &&
 					calendar_boupdate::email_update_requested($emailAddress, isset($cSMRMethod) ? $cSMRMethod : 'REQUEST',
 						$organizer && !strcasecmp($emailAddress, $organizer) ? 'CHAIR' : ''))
 				{
-					ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") skiping mail to organizer '$organizer', as it will be send by calendar app");
+					ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.") skiping mail to organizer '$organizer', as it will be send by calendar app");
 					continue;
 				}
 				$mailObject->AddAddress($emailAddress, $addressObject->personal);
@@ -563,29 +563,29 @@ 
 			}
 		}
 		$ccCount = 0;
-		foreach((array)$ccMailAddr as $address) {
-			foreach(Mail::parseAddressList((get_magic_quotes_gpc()?stripslashes($address):$address)) as $addressObject) {
-				$emailAddress = $addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : '');
+		foreach ((array)$ccMailAddr as $address) {
+			foreach (Mail::parseAddressList((get_magic_quotes_gpc() ?stripslashes($address) : $address)) as $addressObject) {
+				$emailAddress = $addressObject->mailbox.($addressObject->host ? '@'.$addressObject->host : '');
 				if ($ClientSideMeetingRequest === true && $allowSendingInvitations == 'sendifnocalnotif' && calendar_boupdate::email_update_requested($emailAddress)) continue;
 				$mailObject->AddCC($emailAddress, $addressObject->personal);
 				$ccCount++;
 			}
 		}
 		$bccCount = 0;
-		foreach((array)$bccMailAddr as $address) {
-			foreach(Mail::parseAddressList((get_magic_quotes_gpc()?stripslashes($address):$address)) as $addressObject) {
-				$emailAddress = $addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : '');
+		foreach ((array)$bccMailAddr as $address) {
+			foreach (Mail::parseAddressList((get_magic_quotes_gpc() ?stripslashes($address) : $address)) as $addressObject) {
+				$emailAddress = $addressObject->mailbox.($addressObject->host ? '@'.$addressObject->host : '');
 				if ($ClientSideMeetingRequest === true && $allowSendingInvitations == 'sendifnocalnotif' && calendar_boupdate::email_update_requested($emailAddress)) continue;
 				$mailObject->AddBCC($emailAddress, $addressObject->personal);
 				$bccCount++;
 			}
 		}
 		// typical organizer reply will end here with nothing send --> return true, because we suppressed the send above
-		if ($toCount+$ccCount+$bccCount == 0)
+		if ($toCount + $ccCount + $bccCount == 0)
 		{
 			return $ClientSideMeetingRequest && $allowSendingInvitations === 'sendifnocalnotif' && $organizer ? true : 0; // noone to send mail to
 		}
-		if ($ClientSideMeetingRequest === true && $allowSendingInvitations===false) return true;
+		if ($ClientSideMeetingRequest === true && $allowSendingInvitations === false) return true;
 		// as we use our mailer (horde mailer) it is detecting / setting the mimetype by itself while creating the mail
 /*
 		if ($this->debugLevel>2) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' retrieved Body:'.$body);
@@ -602,26 +602,26 @@ 
 		{
 			// now get on, and fetch the original mail
 			$uid = $smartdata->source->itemid;
-			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") IMAP Smartreply is called with FolderID:".$smartdata->source->folderid.' and ItemID:'.$smartdata->source->itemid);
+			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.") IMAP Smartreply is called with FolderID:".$smartdata->source->folderid.' and ItemID:'.$smartdata->source->itemid);
 			$this->splitID($smartdata->source->folderid, $account, $folder);
 
 			$this->mail->reopen($folder);
 			$bodyStruct = $this->mail->getMessageBody($uid, 'html_only');
-			$bodyBUFFHtml = $this->mail->getdisplayableBody($this->mail,$bodyStruct,true,false);
-			if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' html_only:'.$bodyBUFFHtml);
-		    if ($bodyBUFFHtml != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/html')) {
+			$bodyBUFFHtml = $this->mail->getdisplayableBody($this->mail, $bodyStruct, true, false);
+			if ($this->debugLevel > 3) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' html_only:'.$bodyBUFFHtml);
+		    if ($bodyBUFFHtml != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType'] == 'text/html')) {
 				// may be html
-				if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") MIME Body".' Type:html (fetched with html_only):'.$bodyBUFFHtml);
+				if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.") MIME Body".' Type:html (fetched with html_only):'.$bodyBUFFHtml);
 				$AltBody = $AltBody."</br>".$bodyBUFFHtml.$sigTextHtml;
 				$isreply = true;
 			}
 			// plain text Message part
-			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") MIME Body".' Type:plain, fetch text:');
+			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.") MIME Body".' Type:plain, fetch text:');
 			// if the new part of the message is html, we must preserve it, and handle that the original mail is text/plain
-			$bodyStruct = $this->mail->getMessageBody($uid,'never_display');//'never_display');
-			$bodyBUFF = $this->mail->getdisplayableBody($this->mail,$bodyStruct,false,false);
-			if ($bodyBUFF != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/plain')) {
-				if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") MIME Body".' Type:plain (fetched with never_display):'.$bodyBUFF);
+			$bodyStruct = $this->mail->getMessageBody($uid, 'never_display'); //'never_display');
+			$bodyBUFF = $this->mail->getdisplayableBody($this->mail, $bodyStruct, false, false);
+			if ($bodyBUFF != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType'] == 'text/plain')) {
+				if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.") MIME Body".' Type:plain (fetched with never_display):'.$bodyBUFF);
 				$Body = $Body."\r\n".$bodyBUFF.$sigTextPlain;
 				$isreply = true;
 			}
@@ -629,12 +629,12 @@ 
 			{
 				$isreply = true;
 				$AltBody = $AltBody."</br><pre>".nl2br($bodyBUFF).'</pre>'.$sigTextHtml;
-				if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__." no Api\Html Body found use modified plaintext body for txt/html: ".$AltBody);
+				if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." no Api\Html Body found use modified plaintext body for txt/html: ".$AltBody);
 			}
 		}
 
 		// how to forward and other prefs
-		$preferencesArray =& $GLOBALS['egw_info']['user']['preferences']['mail'];
+		$preferencesArray = & $GLOBALS['egw_info']['user']['preferences']['mail'];
 
 		// forward -------------------------------------------------------------------------
 		if ($smartdata_task == 'forward' && isset($smartdata->source->itemid) &&
@@ -644,7 +644,7 @@ 
 		{
 			//force the default for the forwarding -> asmail
 			if (is_array($preferencesArray)) {
-				if (!array_key_exists('message_forwarding',$preferencesArray)
+				if (!array_key_exists('message_forwarding', $preferencesArray)
 					|| !isset($preferencesArray['message_forwarding'])
 					|| empty($preferencesArray['message_forwarding'])) $preferencesArray['message_forwarding'] = 'asmail';
 			} else {
@@ -652,18 +652,18 @@ 
 			}
 			// construct the uid of the message out of the itemid - seems to be the uid, no construction needed
 			$uid = $smartdata->source->itemid;
-			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.")IMAP Smartfordward is called with FolderID:".$smartdata->source->folderid.' and ItemID:'.$smartdata->source->itemid);
+			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.")IMAP Smartfordward is called with FolderID:".$smartdata->source->folderid.' and ItemID:'.$smartdata->source->itemid);
 			$this->splitID($smartdata->source->folderid, $account, $folder);
 
 			$this->mail->reopen($folder);
             // receive entire mail (header + body)
 			// get message headers for specified message
-			$headers	= $this->mail->getMessageEnvelope($uid, $_partID, true, $folder);
+			$headers = $this->mail->getMessageEnvelope($uid, $_partID, true, $folder);
 			// build a new mime message, forward entire old mail as file
 			if ($preferencesArray['message_forwarding'] == 'asmail')
 			{
-				$rawHeader      = $this->mail->getMessageRawHeader($smartdata->source->itemid, $_partID,$folder);
-				$rawBody        = $this->mail->getMessageRawBody($smartdata->source->itemid, $_partID,$folder);
+				$rawHeader      = $this->mail->getMessageRawHeader($smartdata->source->itemid, $_partID, $folder);
+				$rawBody        = $this->mail->getMessageRawBody($smartdata->source->itemid, $_partID, $folder);
 				$mailObject->AddStringAttachment($rawHeader.$rawBody, $headers['SUBJECT'].'.eml', 'message/rfc822');
 				$AltBody = $AltBody."</br>".lang("See Attachments for Content of the Orignial Mail").$sigTextHtml;
 				$Body = $Body."\r\n".lang("See Attachments for Content of the Orignial Mail").$sigTextPlain;
@@ -673,49 +673,49 @@ 
 			{
 				// now get on, and fetch the original mail
 				$uid = $smartdata->source->itemid;
-				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") IMAP Smartreply is called with FolderID:".$smartdata->source->folderid.' and ItemID:'.$smartdata->source->itemid);
+				ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.") IMAP Smartreply is called with FolderID:".$smartdata->source->folderid.' and ItemID:'.$smartdata->source->itemid);
 				$this->splitID($smartdata->source->folderid, $account, $folder);
 
 				$this->mail->reopen($folder);
 				$bodyStruct = $this->mail->getMessageBody($uid, 'html_only');
-				$bodyBUFFHtml = $this->mail->getdisplayableBody($this->mail,$bodyStruct,true,false);
-				if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' html_only:'.$bodyBUFFHtml);
-				if ($bodyBUFFHtml != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/html')) {
+				$bodyBUFFHtml = $this->mail->getdisplayableBody($this->mail, $bodyStruct, true, false);
+				if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' html_only:'.$bodyBUFFHtml);
+				if ($bodyBUFFHtml != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType'] == 'text/html')) {
 					// may be html
-					if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") MIME Body".' Type:html (fetched with html_only):'.$bodyBUFFHtml);
+					if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.") MIME Body".' Type:html (fetched with html_only):'.$bodyBUFFHtml);
 					$AltBody = $AltBody."</br>".$bodyBUFFHtml.$sigTextHtml;
 					$isforward = true;
 				}
 				// plain text Message part
-				if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") MIME Body".' Type:plain, fetch text:');
+				if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.") MIME Body".' Type:plain, fetch text:');
 				// if the new part of the message is html, we must preserve it, and handle that the original mail is text/plain
-				$bodyStruct = $this->mail->getMessageBody($uid,'never_display');//'never_display');
-				$bodyBUFF = $this->mail->getdisplayableBody($this->mail,$bodyStruct,false,false);
-				if ($bodyBUFF != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/plain')) {
-					if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") MIME Body".' Type:plain (fetched with never_display):'.$bodyBUFF);
+				$bodyStruct = $this->mail->getMessageBody($uid, 'never_display'); //'never_display');
+				$bodyBUFF = $this->mail->getdisplayableBody($this->mail, $bodyStruct, false, false);
+				if ($bodyBUFF != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType'] == 'text/plain')) {
+					if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.") MIME Body".' Type:plain (fetched with never_display):'.$bodyBUFF);
 					$Body = $Body."\r\n".$bodyBUFF.$sigTextPlain;
 					$isforward = true;
 				}
 				if (!empty($bodyBUFF) && empty($bodyBUFFHtml) && !empty($AltBody))
 				{
 					$AltBody = $AltBody."</br><pre>".nl2br($bodyBUFF).'</pre>'.$sigTextHtml;
-					if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__." no html Body found use modified plaintext body for txt/html: ".$AltBody);
+					if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." no html Body found use modified plaintext body for txt/html: ".$AltBody);
 					$isforward = true;
 				}
 				// get all the attachments and add them too.
 				// start handle Attachments
-				$attachments = $this->mail->getMessageAttachments($uid,null,null,true,false,true,$folder);
+				$attachments = $this->mail->getMessageAttachments($uid, null, null, true, false, true, $folder);
 				$attachmentNames = false;
-				if (is_array($attachments) && count($attachments)>0)
+				if (is_array($attachments) && count($attachments) > 0)
 				{
-					ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' gather Attachments for BodyCreation of/for MessageID:'.$uid.' found:'.count($attachments));
-					foreach((array)$attachments as $key => $attachment)
+					ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' gather Attachments for BodyCreation of/for MessageID:'.$uid.' found:'.count($attachments));
+					foreach ((array)$attachments as $key => $attachment)
 					{
-						if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' Key:'.$key.'->'.array2string($attachment));
+						if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' Key:'.$key.'->'.array2string($attachment));
 						$attachmentNames .= $attachment['name']."\n";
-						$attachmentData	= $this->mail->getAttachment($uid, $attachment['partID'],0,false,false,$folder);
+						$attachmentData = $this->mail->getAttachment($uid, $attachment['partID'], 0, false, false, $folder);
 						/*$x =*/ $mailObject->AddStringAttachment($attachmentData['attachment'], $attachment['name'], $attachment['mimeType']);
-						ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' added part with number:'.$x);
+						ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' added part with number:'.$x);
 					}
 				}
 			}
@@ -730,38 +730,38 @@ 
 		// now set the body
 		if ($AltBody && ($html_body = $mailObject->findBody('html')))
 		{
-			if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' -> '.$AltBody);
+			if ($this->debugLevel > 1) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' -> '.$AltBody);
 			//error_log(__METHOD__.__LINE__.' html:'.$AltBody);
-			$html_body->setContents($AltBody,array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
+			$html_body->setContents($AltBody, array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
 		}
 		if ($Body && ($text_body = $mailObject->findBody('plain')))
 		{
-			if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' -> '.$Body);
+			if ($this->debugLevel > 1) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' -> '.$Body);
 			//error_log(__METHOD__.__LINE__.' text:'.$Body);
-			$text_body->setContents($Body,array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
+			$text_body->setContents($Body, array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
 		}
 		//advanced debugging
 		// Horde SMTP Class uses utf-8 by default.
         //ZLog::Write(LOGLEVEL_DEBUG, "IMAP-SendMail: parsed message: ". print_r($message,1));
-		if ($this->debugLevel>2) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__."): MailObject:".array2string($mailObject));
+		if ($this->debugLevel > 2) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__."): MailObject:".array2string($mailObject));
 
 		// set a higher timeout for big messages
 		@set_time_limit(120);
-		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' -> '.' about to send ....');
+		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' -> '.' about to send ....');
 		// send
 		$send = true;
 		try {
 			$mailObject->Send();
 		}
-		catch(Exception $e) {
-			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") The email could not be sent. Last-SMTP-error: ". $e->getMessage());
+		catch (Exception $e) {
+			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.") The email could not be sent. Last-SMTP-error: ".$e->getMessage());
 			$send = false;
 		}
 
-		if (( $smartdata_task == 'reply' || $smartdata_task == 'forward') && $send == true)
+		if (($smartdata_task == 'reply' || $smartdata_task == 'forward') && $send == true)
 		{
 			$uid = $smartdata->source->itemid;
-			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' tASK:'.$smartdata_task." FolderID:".$smartdata->source->folderid.' and ItemID:'.$smartdata->source->itemid);
+			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' tASK:'.$smartdata_task." FolderID:".$smartdata->source->folderid.' and ItemID:'.$smartdata->source->itemid);
 			$this->splitID($smartdata->source->folderid, $account, $folder);
 			//error_log(__METHOD__.__LINE__.' Folder:'.$folder.' Uid:'.$uid);
 			$this->mail->reopen($folder);
@@ -769,90 +769,90 @@ 
 			// unless your templatefolder is a subfolder of your draftfolder, and the message is in there
 			if ($this->mail->isDraftFolder($folder) && !$this->mail->isTemplateFolder($folder))
 			{
-				$this->mail->deleteMessages(array($uid),$folder);
+				$this->mail->deleteMessages(array($uid), $folder);
 			} else {
-				$this->mail->flagMessages("answered", array($uid),$folder);
-				if ($smartdata_task== "forward")
+				$this->mail->flagMessages("answered", array($uid), $folder);
+				if ($smartdata_task == "forward")
 				{
-					$this->mail->flagMessages("forwarded", array($uid),$folder);
+					$this->mail->flagMessages("forwarded", array($uid), $folder);
 				}
 			}
 		}
 
 		$asf = ($send ? true:false); // initalize accordingly
-		if (/*($smartdata->saveinsent==1 || !isset($smartdata->saveinsent)) && */  $send==true && $this->mail->mailPreferences['sendOptions'] != 'send_only')
+		if (/*($smartdata->saveinsent==1 || !isset($smartdata->saveinsent)) && */  $send == true && $this->mail->mailPreferences['sendOptions'] != 'send_only')
 		{
 			$asf = false;
 			$sentFolder = $this->mail->getSentFolder();
 			if ($this->_sentID) {
 				$folderArray[] = $this->_sentID;
 			}
-			else if(isset($sentFolder) && $sentFolder != 'none')
+			else if (isset($sentFolder) && $sentFolder != 'none')
 			{
 				$folderArray[] = $sentFolder;
 			}
 			// No Sent folder set, try defaults
 			else
 			{
-				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") IMAP-SendMail: No Sent mailbox set");
+				ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.") IMAP-SendMail: No Sent mailbox set");
 				// we dont try guessing
 				$asf = true;
 			}
 			if (count($folderArray) > 0) {
-				foreach((array)$bccMailAddr as $address) {
-					foreach(Mail::parseAddressList((get_magic_quotes_gpc()?stripslashes($address):$address)) as $addressObject) {
-						$emailAddress = $addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : '');
+				foreach ((array)$bccMailAddr as $address) {
+					foreach (Mail::parseAddressList((get_magic_quotes_gpc() ?stripslashes($address) : $address)) as $addressObject) {
+						$emailAddress = $addressObject->mailbox.($addressObject->host ? '@'.$addressObject->host : '');
 						$mailAddr[] = array($emailAddress, $addressObject->personal);
 					}
 				}
 				//$BCCmail='';
-				if (count($mailAddr)>0) $mailObject->forceBccHeader();
+				if (count($mailAddr) > 0) $mailObject->forceBccHeader();
 				//$BCCmail = $mailObject->AddrAppend("Bcc",$mailAddr);
-				foreach($folderArray as $folderName) {
-					if($this->mail->isSentFolder($folderName)) {
+				foreach ($folderArray as $folderName) {
+					if ($this->mail->isSentFolder($folderName)) {
 						$flags = '\\Seen';
-					} elseif($this->mail->isDraftFolder($folderName)) {
+					} elseif ($this->mail->isDraftFolder($folderName)) {
 						$flags = '\\Draft';
 					} else {
 						$flags = '';
 					}
 					$asf = true;
 					//ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.'->'.array2string($this->mail->icServer));
-					$this->mail->openConnection(self::$profileID,false);
+					$this->mail->openConnection(self::$profileID, false);
 					if ($this->mail->folderExists($folderName)) {
 						try
 						{
-							$this->mail->appendMessage($folderName,$mailObject->getRaw(), null,
+							$this->mail->appendMessage($folderName, $mailObject->getRaw(), null,
 									$flags);
 						}
 						catch (Api\Exception\WrongUserinput $e)
 						{
 							//$asf = false;
-							ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.'->'.lang("Import of message %1 failed. Could not save message to folder %2 due to: %3",$mailObject->getHeader('Subject'),$folderName,$e->getMessage()));
+							ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.'->'.lang("Import of message %1 failed. Could not save message to folder %2 due to: %3", $mailObject->getHeader('Subject'), $folderName, $e->getMessage()));
 						}
 					}
 					else
 					{
 						//$asf = false;
-						ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.'->'.lang("Import of message %1 failed. Destination Folder %2 does not exist.",$mailObject->getHeader('Subject'),$folderName));
+						ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.'->'.lang("Import of message %1 failed. Destination Folder %2 does not exist.", $mailObject->getHeader('Subject'), $folderName));
 					}
-			        ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__."): Outgoing mail saved in configured 'Sent' folder '".$folderName."': ". (($asf)?"success":"failed"));
+			        ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__."): Outgoing mail saved in configured 'Sent' folder '".$folderName."': ".(($asf) ? "success" : "failed"));
 				}
 				//$this->mail->closeConnection();
 			}
 		}
 
-		$this->debugLevel=0;
+		$this->debugLevel = 0;
 
 		if ($send && $asf)
 		{
-			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' -> send successfully');
+			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' -> send successfully');
 			return true;
 		}
 		else
 		{
-			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__." returning ".($ClientSideMeetingRequest ? true : 120)." (MailSubmissionFailed)".($ClientSideMeetingRequest ?" is ClientSideMeetingRequest (we ignore the failure)":""));
-			return ($ClientSideMeetingRequest ? true : 120);   //MAIL Submission failed, see MS-ASCMD
+			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__." returning ".($ClientSideMeetingRequest ? true : 120)." (MailSubmissionFailed)".($ClientSideMeetingRequest ? " is ClientSideMeetingRequest (we ignore the failure)" : ""));
+			return ($ClientSideMeetingRequest ? true : 120); //MAIL Submission failed, see MS-ASCMD
 		}
 	}
 
@@ -870,43 +870,43 @@ 
 	public function GetMessage($folderid, $id, $contentparameters)
 	{
 		//$this->debugLevel=4;
-		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' FolderID:'.$folderid.' ID:'.$id.' ContentParams='.array2string($contentparameters));
+		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' FolderID:'.$folderid.' ID:'.$id.' ContentParams='.array2string($contentparameters));
 		$truncsize = Utils::GetTruncSize($contentparameters->GetTruncation());
 		$mimesupport = $contentparameters->GetMimeSupport();
-		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."() truncsize=$truncsize, mimeSupport=".array2string($mimesupport));
+		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."() truncsize=$truncsize, mimeSupport=".array2string($mimesupport));
 		$bodypreference = $contentparameters->GetBodyPreference(); /* fmbiete's contribution r1528, ZP-320 */
 
 		// fix for z-push bug returning additional bodypreference type 4, even if only 1 is requested and mimessupport = 0
 		if (!$mimesupport && ($key = array_search('4', $bodypreference))) unset($bodypreference[$key]);
 
 		//$this->debugLevel=4;
-		if (!isset($this->mail)) $this->mail = Mail::getInstance(false,self::$profileID,true,false,true);
-		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' FolderID:'.$folderid.' ID:'.$id.' TruncSize:'.$truncsize.' Bodypreference: '.array2string($bodypreference));
+		if (!isset($this->mail)) $this->mail = Mail::getInstance(false, self::$profileID, true, false, true);
+		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' FolderID:'.$folderid.' ID:'.$id.' TruncSize:'.$truncsize.' Bodypreference: '.array2string($bodypreference));
 		$account = $_folderName = $xid = null;
-		$this->splitID($folderid,$account,$_folderName,$xid);
+		$this->splitID($folderid, $account, $_folderName, $xid);
 		$this->mail->reopen($_folderName);
-		$messages = $this->fetchMessages($folderid, NULL, $id, true);	// true: return all headers
+		$messages = $this->fetchMessages($folderid, NULL, $id, true); // true: return all headers
 		$headers = $messages[$id];
-		if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($headers));
+		if ($this->debugLevel > 3) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.array2string($headers));
 		// StatMessage should reopen the folder in question, so we dont need folderids in the following statements.
 		if ($headers)
 		{
-			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__." Message $id with stat ".array2string($headers));
+			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." Message $id with stat ".array2string($headers));
 			// initialize the object
 			$output = new SyncMail();
 			//$rawHeaders = $this->mail->getMessageRawHeader($id);
 			// simple style
 			// start AS12 Stuff (bodypreference === false) case = old behaviour
-			if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__. ' for message with ID:'.$id.' with headers:'.array2string($headers));
+			if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' for message with ID:'.$id.' with headers:'.array2string($headers));
 
 			if ($bodypreference === false) {
-				$bodyStruct = $this->mail->getMessageBody($id, 'only_if_no_text', '', null, true,$_folderName);
-				$raw_body = $this->mail->getdisplayableBody($this->mail,$bodyStruct,false,false);
+				$bodyStruct = $this->mail->getMessageBody($id, 'only_if_no_text', '', null, true, $_folderName);
+				$raw_body = $this->mail->getdisplayableBody($this->mail, $bodyStruct, false, false);
 				//$body = html_entity_decode($body,ENT_QUOTES,$this->mail->detect_encoding($body));
-				if (stripos($raw_body,'<style')!==false) $body = preg_replace("/<style.*?<\/style>/is", "", $raw_body); // in case there is only a html part
+				if (stripos($raw_body, '<style') !== false) $body = preg_replace("/<style.*?<\/style>/is", "", $raw_body); // in case there is only a html part
 				// remove all other html
 				$body = strip_tags($raw_body);
-				if(strlen($body) > $truncsize) {
+				if (strlen($body) > $truncsize) {
 					$body = Utils::Utf8_truncate($body, $truncsize);
 					$output->bodytruncated = 1;
 				}
@@ -920,7 +920,7 @@ 
 			else // style with bodypreferences
 			{
 				//Select body type preference
-				$bpReturnType = 1;//SYNC_BODYPREFERENCE_PLAIN;
+				$bpReturnType = 1; //SYNC_BODYPREFERENCE_PLAIN;
 				if ($bodypreference !== false) {
 					// bodypreference can occur multiple times
 					// usually we would use Utils::GetBodyPreferenceBestMatch($bodypreference);
@@ -934,12 +934,12 @@ 
 					}
 */
 				}
-				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__." getBodyPreferenceBestMatch: ".array2string($bpReturnType));
+				ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." getBodyPreferenceBestMatch: ".array2string($bpReturnType));
 				// set the protocoll class
 				$output->asbody = new SyncBaseBody();
 
 				// return full mime-message without any (charset) conversation directly as stream
-				if ($bpReturnType==SYNC_BODYPREFERENCE_MIME)
+				if ($bpReturnType == SYNC_BODYPREFERENCE_MIME)
 				{
 					//SYNC_BODYPREFERENCE_MIME
 					$output->asbody->type = SYNC_BODYPREFERENCE_MIME;
@@ -948,58 +948,58 @@ 
 					fseek($stream, 0, SEEK_SET);
 					$output->asbody->data = $stream;
 					$output->asbody->estimatedDataSize = $fstat['size'];
-					ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__." bodypreference 4=SYNC_BODYPREFERENCE_MIME=full mime message requested, size=$fstat[size]");
+					ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." bodypreference 4=SYNC_BODYPREFERENCE_MIME=full mime message requested, size=$fstat[size]");
 				}
 				else
 				{
 					// fetch the body (try to gather data only once)
-					$css ='';
-					$bodyStruct = $this->mail->getMessageBody($id, 'html_only', '', null, true,$_folderName);
-					if ($this->debugLevel>2) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' html_only Struct:'.array2string($bodyStruct));
-					$body = $this->mail->getdisplayableBody($this->mail,$bodyStruct,true,false);
-					if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' html_only:'.$body);
-					if ($body != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/html')) {
+					$css = '';
+					$bodyStruct = $this->mail->getMessageBody($id, 'html_only', '', null, true, $_folderName);
+					if ($this->debugLevel > 2) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' html_only Struct:'.array2string($bodyStruct));
+					$body = $this->mail->getdisplayableBody($this->mail, $bodyStruct, true, false);
+					if ($this->debugLevel > 3) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' html_only:'.$body);
+					if ($body != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType'] == 'text/html')) {
 						// may be html
-						if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG, "MIME Body".' Type:html (fetched with html_only)');
+						if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, "MIME Body".' Type:html (fetched with html_only)');
 						$css = $this->mail->getStyles($bodyStruct);
-						$output->nativebodytype=2;
+						$output->nativebodytype = 2;
 					} else {
 						// plain text Message
-						if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG, "MIME Body".' Type:plain, fetch text (HTML, if no text available)');
-						$output->nativebodytype=1;
-						$bodyStruct = $this->mail->getMessageBody($id,'never_display', '', null, true,$_folderName); //'only_if_no_text');
-						if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' plain text Struct:'.array2string($bodyStruct));
-						$body = $this->mail->getdisplayableBody($this->mail,$bodyStruct,false,false);
-						if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' never display html(plain text only):'.$body);
+						if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, "MIME Body".' Type:plain, fetch text (HTML, if no text available)');
+						$output->nativebodytype = 1;
+						$bodyStruct = $this->mail->getMessageBody($id, 'never_display', '', null, true, $_folderName); //'only_if_no_text');
+						if ($this->debugLevel > 3) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' plain text Struct:'.array2string($bodyStruct));
+						$body = $this->mail->getdisplayableBody($this->mail, $bodyStruct, false, false);
+						if ($this->debugLevel > 3) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' never display html(plain text only):'.$body);
 					}
 					// whatever format decode (using the correct encoding)
-					if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__."MIME Body".' Type:'.($output->nativebodytype==2?' html ':' plain ').$body);
+					if ($this->debugLevel > 3) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__."MIME Body".' Type:'.($output->nativebodytype == 2 ? ' html ' : ' plain ').$body);
 					//$body = html_entity_decode($body,ENT_QUOTES,$this->mail->detect_encoding($body));
 					// prepare plaintextbody
-					$plainBody='';
+					$plainBody = '';
 					if ($output->nativebodytype == 2)
 					{
-						$bodyStructplain = $this->mail->getMessageBody($id,'never_display', '', null, true,$_folderName); //'only_if_no_text');
-						if(isset($bodyStructplain[0])&&isset($bodyStructplain[0]['error'])&&$bodyStructplain[0]['error']==1)
+						$bodyStructplain = $this->mail->getMessageBody($id, 'never_display', '', null, true, $_folderName); //'only_if_no_text');
+						if (isset($bodyStructplain[0]) && isset($bodyStructplain[0]['error']) && $bodyStructplain[0]['error'] == 1)
 						{
 							$plainBody = Api\Mail\Html::convertHTMLToText($body); // always display with preserved HTML
 						}
 						else
 						{
-							$plainBody = $this->mail->getdisplayableBody($this->mail,$bodyStructplain,false,false);
+							$plainBody = $this->mail->getdisplayableBody($this->mail, $bodyStructplain, false, false);
 						}
 					}
 					//if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG, "MIME Body".$body);
-					$plainBody = preg_replace("/<style.*?<\/style>/is", "", (strlen($plainBody)?$plainBody:$body));
+					$plainBody = preg_replace("/<style.*?<\/style>/is", "", (strlen($plainBody) ? $plainBody : $body));
 					// remove all other html
-					$plainBody = preg_replace("/<br.*>/is","\r\n",$plainBody);
+					$plainBody = preg_replace("/<br.*>/is", "\r\n", $plainBody);
 					$plainBody = strip_tags($plainBody);
-					if ($this->debugLevel>3 && $output->nativebodytype==1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' Plain Text:'.$plainBody);
+					if ($this->debugLevel > 3 && $output->nativebodytype == 1) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' Plain Text:'.$plainBody);
 					//$body = str_replace("\n","\r\n", str_replace("\r","",$body)); // do we need that?
 
-					if ($bpReturnType==2) //SYNC_BODYPREFERENCE_HTML
+					if ($bpReturnType == 2) //SYNC_BODYPREFERENCE_HTML
 					{
-						if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG, "HTML Body with requested pref 2");
+						if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, "HTML Body with requested pref 2");
 						// Send HTML if requested and native type was html
 						$output->asbody->type = 2;
 						$htmlbody = '<html>'.
@@ -1009,23 +1009,23 @@ 
 							$css.
 							'</head>'.
 							'<body>';
-						if ($output->nativebodytype==2)
+						if ($output->nativebodytype == 2)
 						{
-							if ($css) Api\Mail\Html::replaceTagsCompletley($body,'style');
+							if ($css) Api\Mail\Html::replaceTagsCompletley($body, 'style');
 							// as we fetch html, and body is HTML, we may not need to handle this
 							$htmlbody .= $body;
 						}
 						else
 						{
 							// html requested but got only plaintext, so fake html
-							$htmlbody .= str_replace("\n","<BR>",str_replace("\r","<BR>", str_replace("\r\n","<BR>",$plainBody)));
+							$htmlbody .= str_replace("\n", "<BR>", str_replace("\r", "<BR>", str_replace("\r\n", "<BR>", $plainBody)));
 						}
 						$htmlbody .= '</body>'.
 								'</html>';
 
-						if(isset($truncsize) && strlen($htmlbody) > $truncsize)
+						if (isset($truncsize) && strlen($htmlbody) > $truncsize)
 						{
-							$htmlbody = Utils::Utf8_truncate($htmlbody,$truncsize);
+							$htmlbody = Utils::Utf8_truncate($htmlbody, $truncsize);
 							$output->asbody->truncated = 1;
 						}
 						// output->nativebodytype is used as marker that the original message was of type ... but is now converted to, as type 2 is requested.
@@ -1036,7 +1036,7 @@ 
 					else
 					{
 						// Send Plaintext as Fallback or if original body is plainttext
-						if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG, "Plaintext Body:".$plainBody);
+						if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, "Plaintext Body:".$plainBody);
 						/* we use plainBody (set above) instead
 						$bodyStruct = $this->mail->getMessageBody($id,'only_if_no_text'); //'never_display');
 						$plain = $this->mail->getdisplayableBody($this->mail,$bodyStruct);
@@ -1046,7 +1046,7 @@ 
 						*/
 						$output->asbody->type = 1;
 						$output->nativebodytype = 1;
-						if(isset($truncsize) &&
+						if (isset($truncsize) &&
 							strlen($plainBody) > $truncsize)
 						{
 							$plainBody = Utils::Utf8_truncate($plainBody, $truncsize);
@@ -1065,7 +1065,7 @@ 
 				}
 			}
 			// end AS12 Stuff
-			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' gather Header info:'.$headers['subject'].' from:'.$headers['date']);
+			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' gather Header info:'.$headers['subject'].' from:'.$headers['date']);
 			$output->read = $headers["flags"];
 
 			$output->flag = new SyncMailFlags();
@@ -1085,9 +1085,8 @@ 
 				$output->lastverexecuted = AS_FORWARD;
 			}
 			$output->subject = $headers['subject'];
-			$output->importance = $headers['priority'] > 3 ? 0 :
-				($headers['priority'] < 3 ? 2 : 1) ;
-			$output->datereceived = $this->mail->_strtotime($headers['date'],'ts',true);
+			$output->importance = $headers['priority'] > 3 ? 0 : ($headers['priority'] < 3 ? 2 : 1);
+			$output->datereceived = $this->mail->_strtotime($headers['date'], 'ts', true);
 			$output->to = $headers['to_address'];
 			if ($headers['to']) $output->displayto = $headers['to_address']; //$headers['FETCHED_HEADER']['to_name']
 			$output->from = $headers['sender_address'];
@@ -1095,8 +1094,8 @@ 
 			if (isset($headers['reply_to_address']) && $headers['reply_to_address']) $output->reply_to = $headers['reply_to_address'];
 
 			$output->messageclass = "IPM.Note";
-			if (stripos($headers['mimetype'],'multipart')!== false &&
-				stripos($headers['mimetype'],'signed')!== false)
+			if (stripos($headers['mimetype'], 'multipart') !== false &&
+				stripos($headers['mimetype'], 'signed') !== false)
 			{
 				$output->messageclass = "IPM.Note.SMIME.MultipartSigned";
 			}
@@ -1105,20 +1104,20 @@ 
 			}
 
 			// start handle Attachments (include text/calendar multipart alternative)
-			$attachments = $this->mail->getMessageAttachments($id, $_partID='', $_structure=null, $fetchEmbeddedImages=true, $fetchTextCalendar=true, true, $_folderName);
+			$attachments = $this->mail->getMessageAttachments($id, $_partID = '', $_structure = null, $fetchEmbeddedImages = true, $fetchTextCalendar = true, true, $_folderName);
 			// Attachments should not needed for MIME messages, so skip this part if bpReturnType==4
-			if (/*$bpReturnType != SYNC_BODYPREFERENCE_MIME &&*/ is_array($attachments) && count($attachments)>0)
+			if (/*$bpReturnType != SYNC_BODYPREFERENCE_MIME &&*/ is_array($attachments) && count($attachments) > 0)
 			{
-				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' gather Attachments for MessageID:'.$id.' found:'.count($attachments));
+				ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' gather Attachments for MessageID:'.$id.' found:'.count($attachments));
 				//error_log(__METHOD__.__LINE__.array2string($attachments));
 				foreach ($attachments as $key => $attach)
 				{
-					if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' Key:'.$key.'->'.array2string($attach));
+					if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' Key:'.$key.'->'.array2string($attach));
 
 					// pass meeting requests to calendar plugin
 					if (strtolower($attach['mimeType']) == 'text/calendar' && strtolower($attach['method']) == 'request' &&
 						isset($GLOBALS['egw_info']['user']['apps']['calendar']) &&
-						($attachment = $this->mail->getAttachment($id, $attach['partID'],0,false,false,$_folderName)) &&
+						($attachment = $this->mail->getAttachment($id, $attach['partID'], 0, false, false, $_folderName)) &&
 						($output->meetingrequest = calendar_zpush::meetingRequest($attachment['attachment'])))
 					{
 						//overwrite the globalobjId from calendar object, as: if you delete the mail, that is
@@ -1128,7 +1127,7 @@ 
 						$output->messageclass = "IPM.Schedule.Meeting.Request";
 						//$output->messageclass = "IPM.Schedule.Meeting";
 						unset($attachment);
-						continue;	// do NOT add attachment as attachment
+						continue; // do NOT add attachment as attachment
 					}
 					if (Request::GetProtocolVersion() >= 12.0) {
 						$attachment = new SyncBaseAttachment();
@@ -1136,33 +1135,33 @@ 
 							$output->asattachments = array();
 						$attachment->estimatedDataSize = $attach['size'];
 						$attachment->method = 1;
-						$attachment->filereference = $folderid . ":" . $id . ":" . $attach['partID'];
+						$attachment->filereference = $folderid.":".$id.":".$attach['partID'];
 					} else {
 						$attachment = new SyncAttachment();
 						if (!isset($output->attachments) || !is_array($output->attachments))
 							$output->attachments = array();
 						$attachment->attsize = $attach['size'];
 						$attachment->attmethod = 1;
-						$attachment->attname = $folderid . ":" . $id . ":" . $attach['partID'];//$key;
+						$attachment->attname = $folderid.":".$id.":".$attach['partID']; //$key;
 					}
 
 					$attachment->displayname = $attach['name'];
 					//error_log(__METHOD__.__LINE__.'->'.$folderid . ":" . $id . ":" . $attach['partID']);
 
-					$attachment->attoid = "";//isset($part->headers['content-id']) ? trim($part->headers['content-id']) : "";
+					$attachment->attoid = ""; //isset($part->headers['content-id']) ? trim($part->headers['content-id']) : "";
 					//$attachment->isinline=0; // if not inline, do not use isinline
-					if (!empty($attach['cid']) && $attach['cid'] <> 'NIL' )
+					if (!empty($attach['cid']) && $attach['cid'] <> 'NIL')
 					{
 						if ($bpReturnType != 4 && $attach['disposition'] == 'inline')
 						{
 							$attachment->isinline = true;
 						}
 						if (Request::GetProtocolVersion() >= 12.0) {
-							$attachment->method=1;
-							$attachment->contentid= str_replace(array("<",">"), "",$attach['cid']);
+							$attachment->method = 1;
+							$attachment->contentid = str_replace(array("<", ">"), "", $attach['cid']);
 						} else {
-							$attachment->attmethod=6;
-							$attachment->attoid = str_replace(array("<",">"), "",$attach['cid']);
+							$attachment->attmethod = 6;
+							$attachment->attoid = str_replace(array("<", ">"), "", $attach['cid']);
 						}
 						//	ZLog::Write(LOGLEVEL_DEBUG, "'".$part->headers['content-id']."'  ".$attachment->contentid);
 						$attachment->contenttype = trim($attach['mimeType']);
@@ -1183,7 +1182,7 @@ 
             // Language Code Page ID: http://msdn.microsoft.com/en-us/library/windows/desktop/dd317756%28v=vs.85%29.aspx
             $output->internetcpid = INTERNET_CPID_UTF8;
 
-			if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($output));
+			if ($this->debugLevel > 3) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.array2string($output));
 //$this->debugLevel=0;
 			return $output;
 		}
@@ -1206,30 +1205,30 @@ 
 	{
 		if (!class_exists('calendar_zpush'))
 		{
-			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(...) no EGroupware calendar installed!");
+			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(...) no EGroupware calendar installed!");
 			return null;
 		}
 		if (!($stat = $this->StatMessage($folderid, $requestid)))
 		{
-			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."($requestid, '$folderid', $response) returning FALSE (can NOT stat message)");
+			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."($requestid, '$folderid', $response) returning FALSE (can NOT stat message)");
 			return false;
 		}
 		$ret = false;
-		foreach($this->mail->getMessageAttachments($requestid, $_partID='', $_structure=null, $fetchEmbeddedImages=true, $fetchTextCalendar=true) as $key => $attach)
+		foreach ($this->mail->getMessageAttachments($requestid, $_partID = '', $_structure = null, $fetchEmbeddedImages = true, $fetchTextCalendar = true) as $key => $attach)
 		{
 			if (strtolower($attach['mimeType']) == 'text/calendar' && strtolower($attach['method']) == 'request' &&
-				($attachment = $this->mail->getAttachment($requestid, $attach['partID'],0,false)))
+				($attachment = $this->mail->getAttachment($requestid, $attach['partID'], 0, false)))
 			{
-				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."($requestid, '$folderid', $response) iCal found, calling now backend->MeetingResponse('$attachment[attachment]')");
+				ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."($requestid, '$folderid', $response) iCal found, calling now backend->MeetingResponse('$attachment[attachment]')");
 
 				// calling backend again with iCal attachment, to let calendar add the event
 				$ret = $this->backend->MeetingResponse($attachment['attachment'],
-					$this->backend->createID('calendar',$GLOBALS['egw_info']['user']['account_id']),
+					$this->backend->createID('calendar', $GLOBALS['egw_info']['user']['account_id']),
 					$response);
 				break;
 			}
 		}
-		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."($requestid, '$folderid', $response) returning ".array2string($ret));
+		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."($requestid, '$folderid', $response) returning ".array2string($ret));
 		return $ret;
 	}
 
@@ -1243,9 +1242,9 @@ 
      * @param string $attname - should contain (folder)id
 	 * @return SyncItemOperationsAttachment-object
 	 */
-	function GetAttachmentData($fid,$attname) {
-		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.": $fid (attname: '$attname')");
-		return $this->_GetAttachmentData($fid,$attname);
+	function GetAttachmentData($fid, $attname) {
+		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.": $fid (attname: '$attname')");
+		return $this->_GetAttachmentData($fid, $attname);
 	}
 
 	/**
@@ -1258,9 +1257,9 @@ 
      * @param string $attname - should contain (folder)id
 	 * @return SyncItemOperationsAttachment-object
 	 */
-	function ItemOperationsGetAttachmentData($fid,$attname) {
-		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.": $fid (attname: '$attname')");
-		return $this->_GetAttachmentData($fid,$attname);
+	function ItemOperationsGetAttachmentData($fid, $attname) {
+		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.": $fid (attname: '$attname')");
+		return $this->_GetAttachmentData($fid, $attname);
 	}
 
 	/**
@@ -1272,23 +1271,23 @@ 
      * @param string $attname - should contain (folder)id
 	 * @return SyncItemOperationsAttachment-object
 	 */
-	private function _GetAttachmentData($fid,$attname)
+	private function _GetAttachmentData($fid, $attname)
 	{
-		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.": $fid (attname: '$attname')".function_backtrace());
+		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.": $fid (attname: '$attname')".function_backtrace());
 		//error_log(__METHOD__.__LINE__." Fid: $fid (attname: '$attname')");
 		list($folderid, $id, $part) = explode(":", $attname);
 
 		$this->splitID($folderid, $account, $folder);
 
-		if (!isset($this->mail)) $this->mail = Mail::getInstance(false,self::$profileID,true,false,true);
+		if (!isset($this->mail)) $this->mail = Mail::getInstance(false, self::$profileID, true, false, true);
 
 		$this->mail->reopen($folder);
-		$attachment = $this->mail->getAttachment($id,$part,0,false,true,$folder);
+		$attachment = $this->mail->getAttachment($id, $part, 0, false, true, $folder);
 		$SIOattachment = new SyncItemOperationsAttachment();
-		fseek($attachment['attachment'], 0, SEEK_SET);	// z-push requires stream seeked to start
+		fseek($attachment['attachment'], 0, SEEK_SET); // z-push requires stream seeked to start
 		$SIOattachment->data = $attachment['attachment'];
 		//ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.": $fid (attname: '$attname') Data:".$attachment['attachment']);
-		if (isset($attachment['type']) )
+		if (isset($attachment['type']))
 			$SIOattachment->contenttype = $attachment['type'];
 
 		unset($attachment);
@@ -1331,17 +1330,17 @@ 
 	 */
 	function ChangeMessage($folderid, $id, $message, $contentParameters)
 	{
-		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__." $folderid, $id,".array2string($message).",".array2string($contentParameters));
+		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." $folderid, $id,".array2string($message).",".array2string($contentParameters));
 		//unset($folderid, $id, $message, $contentParameters);
 		$account = $folder = null;
 		$this->splitID($folderid, $account, $folder);
 		if (isset($message->flag)) {
 			if (isset($message->flag->flagstatus) && $message->flag->flagstatus == 2) {
-				$rv = $this->mail->flagMessages((($message->flag->flagstatus == 2) ? "flagged" : "unflagged"), $id,$folder);
-				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__." -> set ".array2string($id).' in Folder '.$folder." as " . (($message->flag->flagstatus == 2) ? "flagged" : "unflagged") . "-->". $rv);
+				$rv = $this->mail->flagMessages((($message->flag->flagstatus == 2) ? "flagged" : "unflagged"), $id, $folder);
+				ZLog::Write(LOGLEVEL_DEBUG, __METHOD__." -> set ".array2string($id).' in Folder '.$folder." as ".(($message->flag->flagstatus == 2) ? "flagged" : "unflagged")."-->".$rv);
 			} else {
-				$rv = $this->mail->flagMessages("unflagged", $id,$folder);
-				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__." -> set ".array2string($id).' in Folder '.$folder." as " . "unflagged" . "-->". $rv);
+				$rv = $this->mail->flagMessages("unflagged", $id, $folder);
+				ZLog::Write(LOGLEVEL_DEBUG, __METHOD__." -> set ".array2string($id).' in Folder '.$folder." as "."unflagged"."-->".$rv);
 			}
 		}
 		return $this->StatMessage($folderid, $id);
@@ -1363,23 +1362,23 @@ 
 	 */
 	public function MoveMessage($folderid, $id, $newfolderid, $contentParameters)
 	{
-		unset($contentParameters);	// not used, but required by function signature
+		unset($contentParameters); // not used, but required by function signature
 		ZLog::Write(LOGLEVEL_DEBUG, "IMAP-MoveMessage: (sfid: '$folderid'  id: '$id'  dfid: '$newfolderid' )");
 		$account = $srcFolder = $destFolder = null;
 		$this->splitID($folderid, $account, $srcFolder);
 		$this->splitID($newfolderid, $account, $destFolder);
 		ZLog::Write(LOGLEVEL_DEBUG, "IMAP-MoveMessage: (SourceFolder: '$srcFolder'  id: '$id'  DestFolder: '$destFolder' )");
-		if (!isset($this->mail)) $this->mail = Mail::getInstance(false,self::$profileID,true,false,true);
+		if (!isset($this->mail)) $this->mail = Mail::getInstance(false, self::$profileID, true, false, true);
 		$this->mail->reopen($destFolder);
 		$status = $this->mail->getFolderStatus($destFolder);
 		$uidNext = $status['uidnext'];
 		$this->mail->reopen($srcFolder);
 
 		// move message
-		$rv = $this->mail->moveMessages($destFolder,(array)$id,true,$srcFolder,true);
-		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.": New Status of $destFolder :".array2string($status).", ReturnValOf moveMessage".array2string($rv)); // this may be true, so try using the nextUID value by examine
+		$rv = $this->mail->moveMessages($destFolder, (array)$id, true, $srcFolder, true);
+		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.": New Status of $destFolder :".array2string($status).", ReturnValOf moveMessage".array2string($rv)); // this may be true, so try using the nextUID value by examine
 		// return the new id "as string"
-		return ($rv===true ? $uidNext : $rv[$id]) . "";
+		return ($rv === true ? $uidNext : $rv[$id])."";
 	}
 
 	/**
@@ -1387,7 +1386,7 @@ 
 	 *
 	 *  @param int $cutoffdate =null timestamp with cutoffdate, default 12 weeks
 	 */
-	public function GetMessageList($folderid, $cutoffdate=NULL)
+	public function GetMessageList($folderid, $cutoffdate = NULL)
 	{
 		if ($cutoffdate > 0)
 		{
@@ -1400,14 +1399,14 @@ 
 			{
 				$maximumSyncRangeInDays = $GLOBALS['egw_info']['user']['preferences']['activesync']['mail-maximumSyncRange'];
 			}
-			$cutoffdate = (is_numeric($maximumSyncRangeInDays) ? Api\DateTime::to('now','ts')-(3600*24*$maximumSyncRangeInDays):null);
-			if (is_numeric($maximumSyncRangeInDays)) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.' Client set no truncationdate. Using '.$maximumSyncRangeInDays.' days.'.date("d-M-Y", $cutoffdate));
+			$cutoffdate = (is_numeric($maximumSyncRangeInDays) ? Api\DateTime::to('now', 'ts') - (3600 * 24 * $maximumSyncRangeInDays) : null);
+			if (is_numeric($maximumSyncRangeInDays)) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.' Client set no truncationdate. Using '.$maximumSyncRangeInDays.' days.'.date("d-M-Y", $cutoffdate));
 		}
 		try {
 			return $this->fetchMessages($folderid, $cutoffdate);
 		} catch (Exception $e)
 		{
-			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' failed for '.$e->getMessage().($e->details?$e->details:''));
+			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' failed for '.$e->getMessage().($e->details ? $e->details : ''));
 			return array();
 		}
 	}
@@ -1425,11 +1424,11 @@ 
 	 * @param boolean $return_all_headers =false true: additinal contain all headers eg. "subject"
 	 * @return array uid => array StatMessage($folderid, $_id)
 	 */
-	private function fetchMessages($folderid, $cutoffdate=NULL, $_id=NULL, $return_all_headers=false)
+	private function fetchMessages($folderid, $cutoffdate = NULL, $_id = NULL, $return_all_headers = false)
 	{
 		static $headers = array();
 
-		if ($this->debugLevel>1) $gstarttime = microtime (true);
+		if ($this->debugLevel > 1) $gstarttime = microtime(true);
 		//ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__);
 		$rv_messages = array();
 		// if the message is still available within the class, we use it instead of fetching it again
@@ -1440,64 +1439,64 @@ 
 		}
 		else
 		{
-			$headers = array();	// clear cache to not use too much memory
+			$headers = array(); // clear cache to not use too much memory
 
-			if ($this->debugLevel>1) $starttime = microtime (true);
+			if ($this->debugLevel > 1) $starttime = microtime(true);
 			$this->_connect($this->account);
-			if ($this->debugLevel>1)
+			if ($this->debugLevel > 1)
 			{
 				$endtime = microtime(true) - $starttime;
-				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__. " connect took : ".$endtime.' for account:'.$this->account);
+				ZLog::Write(LOGLEVEL_DEBUG, __METHOD__." connect took : ".$endtime.' for account:'.$this->account);
 			}
 			$messagelist = $_filter = array();
 			// if not connected, any further action must fail
-			if (!empty($cutoffdate)) $_filter = array('status'=>array('UNDELETED'),'range'=>"SINCE",'date'=> date("d-M-Y", $cutoffdate));
-			if ($this->debugLevel>1) $starttime = microtime (true);
+			if (!empty($cutoffdate)) $_filter = array('status'=>array('UNDELETED'), 'range'=>"SINCE", 'date'=> date("d-M-Y", $cutoffdate));
+			if ($this->debugLevel > 1) $starttime = microtime(true);
 			$account = $_folderName = $id = null;
-			$this->splitID($folderid,$account,$_folderName,$id);
-			if ($this->debugLevel>1)
+			$this->splitID($folderid, $account, $_folderName, $id);
+			if ($this->debugLevel > 1)
 			{
 				$endtime = microtime(true) - $starttime;
-				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__. " splitID took : ".$endtime.' for FolderID:'.$folderid);
+				ZLog::Write(LOGLEVEL_DEBUG, __METHOD__." splitID took : ".$endtime.' for FolderID:'.$folderid);
 			}
-			if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.' for Folder:'.$_folderName.' Filter:'.array2string($_filter).' Ids:'.array2string($_id).'/'.$id);
-			if ($this->debugLevel>1) $starttime = microtime (true);
-			$_numberOfMessages = (empty($cutoffdate)?250:99999);
-			$rv_messages = $this->mail->getHeaders($_folderName, $_startMessage=1, $_numberOfMessages, $_sort=0, $_reverse=false, $_filter, $_id);
-			if ($this->debugLevel>1)
+			if ($this->debugLevel > 1) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.' for Folder:'.$_folderName.' Filter:'.array2string($_filter).' Ids:'.array2string($_id).'/'.$id);
+			if ($this->debugLevel > 1) $starttime = microtime(true);
+			$_numberOfMessages = (empty($cutoffdate) ? 250 : 99999);
+			$rv_messages = $this->mail->getHeaders($_folderName, $_startMessage = 1, $_numberOfMessages, $_sort = 0, $_reverse = false, $_filter, $_id);
+			if ($this->debugLevel > 1)
 			{
 				$endtime = microtime(true) - $starttime;
-				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__. " getHeaders call took : ".$endtime.' for FolderID:'.$_folderName);
+				ZLog::Write(LOGLEVEL_DEBUG, __METHOD__." getHeaders call took : ".$endtime.' for FolderID:'.$_folderName);
 			}
 		}
-		if ($_id == NULL && $this->debugLevel>1)  ZLog::Write(LOGLEVEL_DEBUG,__METHOD__." found :". count($rv_messages['header']));
+		if ($_id == NULL && $this->debugLevel > 1)  ZLog::Write(LOGLEVEL_DEBUG, __METHOD__." found :".count($rv_messages['header']));
 		//ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' Result:'.array2string($rv_messages));
 		$messagelist = array();
-		if (!isset($rv_messages['header'])||empty($rv_messages['header'])) return $messagelist;
+		if (!isset($rv_messages['header']) || empty($rv_messages['header'])) return $messagelist;
 		//if ($_returnModHash) $messageFolderHash = array();
 		foreach ((array)$rv_messages['header'] as $k => $vars)
 		{
-			if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' ID to process:'.$vars['uid'].' Subject:'.$vars['subject']);
+			if ($this->debugLevel > 3) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' ID to process:'.$vars['uid'].' Subject:'.$vars['subject']);
 			$headers[$vars['uid']] = $vars;
-			if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' MailID:'.$k.'->'.array2string($vars));
+			if ($this->debugLevel > 3) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' MailID:'.$k.'->'.array2string($vars));
 			if (!empty($vars['deleted'])) continue; // cut of deleted messages
 			if ($cutoffdate && $vars['date'] < $cutoffdate) continue; // message is out of range for cutoffdate, ignore it
-			if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' ID to report:'.$vars['uid'].' Subject:'.$vars['subject']);
+			if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' ID to report:'.$vars['uid'].' Subject:'.$vars['subject']);
 			$mess = $return_all_headers ? $vars : array();
 			$mess["mod"] = self::doFlagsMod($vars).$vars['date'];
 			$mess["id"] = $vars['uid'];
 			// 'seen' aka 'read' is the only flag we want to know about
 			$mess["flags"] = 0;
 			// outlook supports additional flags, set them to 0
-			if($vars["seen"]) $mess["flags"] = 1;
-			if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($mess));
+			if ($vars["seen"]) $mess["flags"] = 1;
+			if ($this->debugLevel > 3) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.array2string($mess));
 			$messagelist[$vars['uid']] = $mess;
 			unset($mess);
 		}
-		if ($this->debugLevel>1)
+		if ($this->debugLevel > 1)
 		{
 			$endtime = microtime(true) - $gstarttime;
-			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__. " total time used : ".$endtime.' for Folder:'.$_folderName.' Filter:'.array2string($_filter).' Ids:'.array2string($_id).'/'.$id);
+			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__." total time used : ".$endtime.' for Folder:'.$_folderName.' Filter:'.array2string($_filter).' Ids:'.array2string($_id).'/'.$id);
 		}
 		return $messagelist;
 	}
@@ -1548,32 +1547,32 @@ 
 	public function getSearchResultsMailbox($_searchquery)
 	{
 		//$this->debugLevel=1;
-		$searchquery=$_searchquery->GetDataArray();
+		$searchquery = $_searchquery->GetDataArray();
 		if (!is_array($searchquery)) return array();
-		if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($searchquery));
+		if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.array2string($searchquery));
 
 		if (isset($searchquery['searchrebuildresults'])) {
 			$rebuildresults = $searchquery['searchrebuildresults'];
 		} else {
 			$rebuildresults = false;
 		}
-		if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,  'RebuildResults ['.$rebuildresults.']' );
+		if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, 'RebuildResults ['.$rebuildresults.']');
 
 		if (isset($searchquery['deeptraversal'])) {
 			$deeptraversal = $searchquery['deeptraversal'];
 		} else {
 			$deeptraversal = false;
 		}
-		if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,  'DeepTraversal ['.$deeptraversal.']' );
+		if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, 'DeepTraversal ['.$deeptraversal.']');
 
 		if (isset($searchquery['searchrange'])) {
-			$range = explode("-",$_searchquery->GetSearchRange());
-			$start =$range[0] + 1;
+			$range = explode("-", $_searchquery->GetSearchRange());
+			$start = $range[0] + 1;
 			$limit = $range[1] - $range[0] + 1;
 		} else {
 			$range = false;
 		}
-		if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,  'Range ['.print_r($range, true).']' );
+		if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, 'Range ['.print_r($range, true).']');
 
 		//foreach($searchquery['query'] as $k => $value) {
 		//	$query = $value;
@@ -1596,15 +1595,15 @@ 
 		}
 		if (!$folderid)
 		{
-			$_folderName = ($this->mail->sessionData['mailbox']?$this->mail->sessionData['mailbox']:'INBOX');
-			$folderid = $this->createID($account=0,$_folderName);
+			$_folderName = ($this->mail->sessionData['mailbox'] ? $this->mail->sessionData['mailbox'] : 'INBOX');
+			$folderid = $this->createID($account = 0, $_folderName);
 		}
-		$rv = $this->splitID($folderid,$account,$_folderName,$id);
-		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' ProfileID:'.self::$profileID.' FolderID:'.$folderid.' Foldername:'.$_folderName);
+		$rv = $this->splitID($folderid, $account, $_folderName, $id);
+		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' ProfileID:'.self::$profileID.' FolderID:'.$folderid.' Foldername:'.$_folderName);
 		$this->_connect($account);
 		// this should not be needed ???
-		Mail::$supportsORinQuery[self::$profileID]=true; // trigger quicksearch (if possible)
-		$_filter = array('type'=> (Mail::$supportsORinQuery[self::$profileID]?'quick':'subject'),
+		Mail::$supportsORinQuery[self::$profileID] = true; // trigger quicksearch (if possible)
+		$_filter = array('type'=> (Mail::$supportsORinQuery[self::$profileID] ? 'quick' : 'subject'),
 						 'string'=> $searchText,
 						 'status'=>'any'
 						);
@@ -1619,22 +1618,22 @@ 
 		 * 		[searchvalueless] => 2015-07-14T15:11:00.000Z , BEFORE
 		 */
 			$_filter['range'] = "BETWEEN";
-			list($sincedate,$crap) = explode('T',$searchquery['searchvaluegreater']);
-			list($beforedate,$crap) = explode('T',$searchquery['searchvalueless']);
-			$_filter['before'] = date("d-M-Y", Api\DateTime::to($beforedate,'ts'));
-			$_filter['since'] = date("d-M-Y", Api\DateTime::to($sincedate,'ts'));
+			list($sincedate, $crap) = explode('T', $searchquery['searchvaluegreater']);
+			list($beforedate, $crap) = explode('T', $searchquery['searchvalueless']);
+			$_filter['before'] = date("d-M-Y", Api\DateTime::to($beforedate, 'ts'));
+			$_filter['since'] = date("d-M-Y", Api\DateTime::to($sincedate, 'ts'));
 		}
 		//$_filter[] = array('type'=>"SINCE",'string'=> date("d-M-Y", $cutoffdate));
-		if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.' for Folder:'.$_folderName.' Filter:'.array2string($_filter));
-		$rv_messages = $this->mail->getHeaders($_folderName, $_startMessage=($range?$start:1), $_numberOfMessages=($limit?$limit:9999999), $_sort=0, $_reverse=false, $_filter, $_id=NULL);
+		if ($this->debugLevel > 1) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.' for Folder:'.$_folderName.' Filter:'.array2string($_filter));
+		$rv_messages = $this->mail->getHeaders($_folderName, $_startMessage = ($range ? $start : 1), $_numberOfMessages = ($limit ? $limit : 9999999), $_sort = 0, $_reverse = false, $_filter, $_id = NULL);
 		//ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($rv_messages));
-		$list=array();
+		$list = array();
 
 		$cnt = count($rv_messages['header']);
 		//$list['status'] = 1;
 		$list['searchtotal'] = $cnt;
 		$list["range"] = $_searchquery->GetSearchRange();
-		foreach((array)$rv_messages['header'] as $i => $vars)
+		foreach ((array)$rv_messages['header'] as $i => $vars)
 		{
 			$list[] = array(
 				"class" => "Email",
@@ -1654,20 +1653,20 @@ 
 	 * @param string $folder
 	 * @return string
 	 */
-	private function getParentID($account,$folder)
+	private function getParentID($account, $folder)
 	{
 		$this->_connect($account);
-		if (!isset($this->folders)) $this->folders = $this->mail->getFolderObjects(true,false);
+		if (!isset($this->folders)) $this->folders = $this->mail->getFolderObjects(true, false);
 
 		$mailFolder = $this->folders[$folder];
 		if (!isset($mailFolder)) return false;
-		$delimiter = (isset($mailFolder->delimiter)?$mailFolder->delimiter:$this->mail->getHierarchyDelimiter());
-		$parent = explode($delimiter,$folder);
+		$delimiter = (isset($mailFolder->delimiter) ? $mailFolder->delimiter : $this->mail->getHierarchyDelimiter());
+		$parent = explode($delimiter, $folder);
 		array_pop($parent);
-		$parent = implode($delimiter,$parent);
+		$parent = implode($delimiter, $parent);
 
 		$id = $parent && $this->folders[$parent] ? $this->createID($account, $parent) : '0';
-		if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."('$folder') --> parent=$parent --> $id");
+		if ($this->debugLevel > 1) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$folder') --> parent=$parent --> $id");
 		return $id;
 	}
 
@@ -1687,48 +1686,48 @@ 
 			$account = $folder = null;
 			$this->splitID($id, $account, $folder);
 		}
-		catch(Exception $e) {
-			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' failed for '.$e->getMessage());
-			return $folderObj=false;
+		catch (Exception $e) {
+			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' failed for '.$e->getMessage());
+			return $folderObj = false;
 		}
 		$this->_connect($account);
-		if (!isset($this->folders)) $this->folders = $this->mail->getFolderObjects(true,false);
+		if (!isset($this->folders)) $this->folders = $this->mail->getFolderObjects(true, false);
 
 		$mailFolder = $this->folders[$folder];
-		if (!isset($mailFolder)) return $folderObj=false;
+		if (!isset($mailFolder)) return $folderObj = false;
 
 		$folderObj = new SyncFolder();
 		$folderObj->serverid = $id;
-		$folderObj->parentid = $this->getParentID($account,$folder);
+		$folderObj->parentid = $this->getParentID($account, $folder);
 		$folderObj->displayname = $mailFolder->shortDisplayName;
-		if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__." ID: $id, Account:$account, Folder:$folder");
+		if ($this->debugLevel > 1) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." ID: $id, Account:$account, Folder:$folder");
 		// get folder-type
-		foreach($this->folders as $inbox => $mailFolder) break;
+		foreach ($this->folders as $inbox => $mailFolder) break;
 		if ($folder == $inbox)
 		{
 			$folderObj->type = SYNC_FOLDER_TYPE_INBOX;
 		}
-		elseif($this->mail->isDraftFolder($folder, false, true))
+		elseif ($this->mail->isDraftFolder($folder, false, true))
 		{
 			//ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.' isDraft');
 			$folderObj->type = SYNC_FOLDER_TYPE_DRAFTS;
 			$folderObj->parentid = 0; // required by devices
 		}
-		elseif($this->mail->isTrashFolder($folder, false, true))
+		elseif ($this->mail->isTrashFolder($folder, false, true))
 		{
 			$folderObj->type = SYNC_FOLDER_TYPE_WASTEBASKET;
 			$this->_wasteID = $folder;
 			//error_log(__METHOD__.__LINE__.' TrashFolder:'.$this->_wasteID);
 			$folderObj->parentid = 0; // required by devices
 		}
-		elseif($this->mail->isSentFolder($folder, false, true))
+		elseif ($this->mail->isSentFolder($folder, false, true))
 		{
 			$folderObj->type = SYNC_FOLDER_TYPE_SENTMAIL;
 			$folderObj->parentid = 0; // required by devices
 			$this->_sentID = $folder;
 			//error_log(__METHOD__.__LINE__.' SentFolder:'.$this->_sentID);
 		}
-		elseif($this->mail->isOutbox($folder, false, true))
+		elseif ($this->mail->isOutbox($folder, false, true))
 		{
 			//ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.' isOutbox');
 			$folderObj->type = SYNC_FOLDER_TYPE_OUTBOX;
@@ -1740,7 +1739,7 @@ 
 			$folderObj->type = SYNC_FOLDER_TYPE_USER_MAIL;
 		}
 
-		if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."($id) --> $folder --> type=$folderObj->type, parentID=$folderObj->parentid, displayname=$folderObj->displayname");
+		if ($this->debugLevel > 1) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."($id) --> $folder --> type=$folderObj->type, parentID=$folderObj->parentid, displayname=$folderObj->displayname");
 		return $folderObj;
 	}
 
@@ -1788,24 +1787,24 @@ 
 
 		if ($type != 'mail') return false;
 
-		if (!isset($this->mail)) $this->mail = Mail::getInstance(false,self::$profileID,true,false,true);
+		if (!isset($this->mail)) $this->mail = Mail::getInstance(false, self::$profileID, true, false, true);
 		if (!$this->mail->folderIsSelectable($folder))
 		{
-			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.": could not select folder $folder returning fake state");
+			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.": could not select folder $folder returning fake state");
 			$syncstate = "M:".'0'."-R:".'0'."-U:".'0'."-NUID:".'0'."-UIDV:".'0';
 			return array();
 		}
 
 		$this->mail->reopen($folder);
 
-		if (!($status = $this->mail->getFolderStatus($folder,$ignoreStatusCache=true)))
+		if (!($status = $this->mail->getFolderStatus($folder, $ignoreStatusCache = true)))
 		{
-			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.": could not stat folder $folder ");
+			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.": could not stat folder $folder ");
 			return false;
 		}
-		$syncstate = "M:". $status['messages'] ."-R:". $status['recent'] ."-U:". $status['unseen']."-NUID:".$status['uidnext']."-UIDV:".$status['uidvalidity'];
+		$syncstate = "M:".$status['messages']."-R:".$status['recent']."-U:".$status['unseen']."-NUID:".$status['uidnext']."-UIDV:".$status['uidvalidity'];
 
-		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."($folderid, ...) $folder ($account) returning ".array2string($syncstate));
+		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."($folderid, ...) $folder ($account) returning ".array2string($syncstate));
 		return array();
 	}
 
@@ -1818,8 +1817,8 @@ 
 	function GetWasteBasket()
 	{
 		$this->_connect($this->account);
-		$id = $this->createID($account=0, $this->_wasteID);
-		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__."() account=$this->account returned $id for folder $this->_wasteID");
+		$id = $this->createID($account = 0, $this->_wasteID);
+		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__."() account=$this->account returned $id for folder $this->_wasteID");
 		return $id;
 	}
 
@@ -1840,7 +1839,7 @@ 
      */
     public function DeleteMessage($folderid, $id, $contentParameters)
 	{
-		unset($contentParameters);	// not used, but required by function signature
+		unset($contentParameters); // not used, but required by function signature
 		ZLog::Write(LOGLEVEL_DEBUG, "IMAP-DeleteMessage: (fid: '$folderid'  id: '$id' )");
 		/*
 		$this->imap_reopenFolder($folderid);
@@ -1851,7 +1850,7 @@ 
 		// we may have to split folderid
 		$account = $folder = null;
 		$this->splitID($folderid, $account, $folder);
-		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' '.$folderid.'->'.$folder);
+		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' '.$folderid.'->'.$folder);
 		$_messageUID = (array)$id;
 
 		$this->_connect($this->account);
@@ -1863,9 +1862,9 @@ 
 		catch (Api\Exception $e)
 		{
 			$error = $e->getMessage();
-			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__." $_messageUID, $folder ->".$error);
+			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." $_messageUID, $folder ->".$error);
 			// if the server thinks the message does not exist report deletion as success
-			if (stripos($error,'[NONEXISTENT]')!==false) return true;
+			if (stripos($error, '[NONEXISTENT]') !== false) return true;
 			return false;
 		}
 
@@ -1899,15 +1898,15 @@ 
      */
     public function SetReadFlag($folderid, $id, $flags, $contentParameters)
 	{
-		unset($contentParameters);	// not used, but required by function signature
+		unset($contentParameters); // not used, but required by function signature
 		// ZLog::Write(LOGLEVEL_DEBUG, "IMAP-SetReadFlag: (fid: '$folderid'  id: '$id'  flags: '$flags' )");
 		$account = $folder = null;
 		$this->splitID($folderid, $account, $folder);
 
 		$_messageUID = (array)$id;
 		$this->_connect($this->account);
-		$rv = $this->mail->flagMessages((($flags) ? "read" : "unread"), $_messageUID,$folder);
-		ZLog::Write(LOGLEVEL_DEBUG, "IMAP-SetReadFlag -> set ".array2string($_messageUID).' in Folder '.$folder." as " . (($flags) ? "read" : "unread") . "-->". $rv);
+		$rv = $this->mail->flagMessages((($flags) ? "read" : "unread"), $_messageUID, $folder);
+		ZLog::Write(LOGLEVEL_DEBUG, "IMAP-SetReadFlag -> set ".array2string($_messageUID).' in Folder '.$folder." as ".(($flags) ? "read" : "unread")."-->".$rv);
 
 		return $rv;
 	}
@@ -1925,7 +1924,7 @@ 
 	 */
 	public function ChangeFolder($id, $oldid, $displayname, $type)
 	{
-		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."('$id', '$oldid', '$displayname', $type)");
+		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$id', '$oldid', '$displayname', $type)");
 		$account = $parent_id = null;
 		$this->splitID($id, $account, $parentFolder, $app);
 
@@ -1942,17 +1941,17 @@ 
 			$this->splitID($oldid, $account, $oldFolder, $app);
 			$old_hash = $this->folder2hash($account, $oldFolder);
 		}
-		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.":{$action}Folder('$id'=>($parentFolder ($parent_id)), '$oldid'".($oldid?"=>($oldFolder ($old_hash))":'').", '$displayname', $type)");
+		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.":{$action}Folder('$id'=>($parentFolder ($parent_id)), '$oldid'".($oldid ? "=>($oldFolder ($old_hash))" : '').", '$displayname', $type)");
 		$this->_connect($this->account);
 		try
 		{
-			if ($action=='rename')
+			if ($action == 'rename')
 			{
 				$newFolderName = $this->mail->renameFolder($oldFolder, $parentFolder, $displayname);
 			}
-			elseif ($action=='create')
+			elseif ($action == 'create')
 			{
-				$error=null;
+				$error = null;
 				$newFolderName = $this->mail->createFolder($parentFolder, $displayname, $error);
 			}
 		}
@@ -1963,8 +1962,8 @@ 
 		}
 		$newHash = $this->rename_folder_hash($account, $old_hash, $newFolderName);
 		$newID = $this->createID($account, $newHash);
-		$this->folders = $this->mail->getFolderObjects(true,false,$_alwaysGetDefaultFolders=true,false);
-		ZLog::Write(LOGLEVEL_DEBUG,":{$action}Folder('$id'=>($parentFolder), '$oldid'".($oldid?"=>($oldFolder)":'').", '$displayname' => $newFolderName (ID:$newID))");
+		$this->folders = $this->mail->getFolderObjects(true, false, $_alwaysGetDefaultFolders = true, false);
+		ZLog::Write(LOGLEVEL_DEBUG, ":{$action}Folder('$id'=>($parentFolder), '$oldid'".($oldid ? "=>($oldFolder)" : '').", '$displayname' => $newFolderName (ID:$newID))");
 		return $this->StatFolder($newID);
 	}
 
@@ -1977,16 +1976,16 @@ 
 	 * @throws StatusException              could throw specific SYNC_FSSTATUS_* exceptions
 	 * @return boolean true or false on error
 	 */
-	public function DeleteFolder($id, $parentid=false)
+	public function DeleteFolder($id, $parentid = false)
 	{
 		$account = $parent_id = $app = null;
 		$this->splitID($id, $account, $folder, $app);
 		$old_hash = $this->folder2hash($account, $folder);
 		if ($parentid) $this->splitID($parentid, $account, $parentfolder, $app);
-		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."( '$id (-> $folder)','$parentid ".($parentid?'(->'.$parentfolder.')':'')."') called!");
+		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."( '$id (-> $folder)','$parentid ".($parentid ? '(->'.$parentfolder.')' : '')."') called!");
 		$ret = $this->mail->deleteFolder($folder);
 		if ($ret) $newHash = $this->rename_folder_hash($account, $old_hash, "##Dele#edFolder#$folder##");
-		$this->folders = $this->mail->getFolderObjects(true,false,$_alwaysGetDefaultFolders=true,false);
+		$this->folders = $this->mail->getFolderObjects(true, false, $_alwaysGetDefaultFolders = true, false);
 		return $ret;
 	}
 
@@ -2006,8 +2005,8 @@ 
 		$this->_connect($this->account);
 		$account = $folder = null;
 		$this->splitID($folderid, $account, $folder);
-		$rv = $this->mail->flagMessages((($flags->flagstatus == 2) ? "flagged" : "unflagged"), $_messageUID,$folder);
-		ZLog::Write(LOGLEVEL_DEBUG, "IMAP-SetFlaggedFlag -> set ".array2string($_messageUID).' in Folder '.$folder." as " . (($flags->flagstatus == 2) ? "flagged" : "unflagged") . "-->". $rv);
+		$rv = $this->mail->flagMessages((($flags->flagstatus == 2) ? "flagged" : "unflagged"), $_messageUID, $folder);
+		ZLog::Write(LOGLEVEL_DEBUG, "IMAP-SetFlaggedFlag -> set ".array2string($_messageUID).' in Folder '.$folder." as ".(($flags->flagstatus == 2) ? "flagged" : "unflagged")."-->".$rv);
 
 		return $rv;
 	}
@@ -2021,17 +2020,17 @@ 
 	 * @return string
 	 * @throws Api\Exception\WrongParameter
 	 */
-	private function createID($account,$folder,$id=0)
+	private function createID($account, $folder, $id = 0)
 	{
 		if (!is_numeric($folder))
 		{
 			// convert string $folder in numeric id
-			$folder = $this->folder2hash($account,$f=$folder);
+			$folder = $this->folder2hash($account, $f = $folder);
 		}
 
 		$str = $this->backend->createID($account, $folder, $id);
 
-		if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."($account,'$f',$id) type=$account, folder=$folder --> '$str'");
+		if ($this->debugLevel > 1) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."($account,'$f',$id) type=$account, folder=$folder --> '$str'");
 
 		return $str;
 	}
@@ -2045,14 +2044,14 @@ 
 	 * @param int &$appid=null (for mail=mail is to be expected)
 	 * @throws Api\Exception\WrongParameter
 	 */
-	private function splitID($str,&$account,&$folder,&$appid=null)
+	private function splitID($str, &$account, &$folder, &$appid = null)
 	{
 		$this->backend->splitID($str, $account, $folder, $appid);
 
 		// convert numeric folder-id back to folder name
-		$folder = $this->hash2folder($account,$f=$folder);
+		$folder = $this->hash2folder($account, $f = $folder);
 
-		if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."('$str','$account','$folder',$appid)");
+		if ($this->debugLevel > 1) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$str','$account','$folder',$appid)");
 	}
 
 	/**
@@ -2069,9 +2068,9 @@ 
 	 * @param string $folder
 	 * @return int
 	 */
-	private function folder2hash($account,$folder)
+	private function folder2hash($account, $folder)
 	{
-		if(!isset($this->folderHashes)) $this->readFolderHashes();
+		if (!isset($this->folderHashes)) $this->readFolderHashes();
 
 		if (($index = array_search($folder, (array)$this->folderHashes[$account])) === false)
 		{
@@ -2092,9 +2091,9 @@ 
 	 * @param int $index
 	 * @return string NULL if not used so far
 	 */
-	private function hash2folder($account,$index)
+	private function hash2folder($account, $index)
 	{
-		if(!isset($this->folderHashes)) $this->readFolderHashes();
+		if (!isset($this->folderHashes)) $this->readFolderHashes();
 
 		return isset($this->folderHashes[$account]) ? $this->folderHashes[$account][$index] : null;
 	}
@@ -2150,9 +2149,9 @@ 
 			if ((file_exists($file = $this->hashFile()) || file_exists($file = $this->hashFile(true))) &&
 				($hashes = file_get_contents($file)))
 			{
-				$this->folderHashes = json_decode($hashes,true);
+				$this->folderHashes = json_decode($hashes, true);
 				// fallback in case hashes have been serialized instead of being json-encoded
-				if (json_last_error()!=JSON_ERROR_NONE)
+				if (json_last_error() != JSON_ERROR_NONE)
 				{
 					//error_log(__METHOD__.__LINE__." error decoding with json");
 					$this->folderHashes = unserialize($hashes);
@@ -2198,9 +2197,9 @@ 
 	 * @param boolean $old =false true: return old / pre-15 hash-file
 	 * @throws Api\Exception\AssertionFailed
 	 */
-	private function hashFile($old=false)
+	private function hashFile($old = false)
 	{
-		if (!($dev_id=Request::GetDeviceID()))
+		if (!($dev_id = Request::GetDeviceID()))
 		{
 			throw new Api\Exception\AssertionFailed(__METHOD__."() no DeviceID set!");
 		}

Doc Comments +3 added lines, -2 removed lines

@@ -1200,7 +1200,7 @@ 
 	 * @param string $folderid folder of meeting request mail
 	 * @param int|string $requestid uid of mail with meeting request
 	 * @param int $response 1=accepted, 2=tentative, 3=decline
-	 * @return int|boolean id of calendar item, false on error
+	 * @return null|boolean id of calendar item, false on error
 	 */
 	function MeetingResponse($folderid, $requestid, $response)
 	{
@@ -1358,7 +1358,7 @@ 
 	 * @param string              $newfolderid         id of the destination folder
 	 * @param ContentParameters   $contentParameters
 	 *
-	 * @return boolean                      status of the operation
+	 * @return string                      status of the operation
 	 * @throws StatusException              could throw specific SYNC_MOVEITEMSSTATUS_* exceptions
 	 */
 	public function MoveMessage($folderid, $id, $newfolderid, $contentParameters)
@@ -1755,6 +1755,7 @@ 
 	 *		  the folder has not changed. In practice this means that 'mod' can be equal to the folder name
 	 *		  as this is the only thing that ever changes in folders. (the type is normally constant)
 	 *
+	 * @param string $id
 	 * @return array with values for keys 'id', 'mod' and 'parent'
 	 */
 	public function StatFolder($id)

api/emclient-signatures.php

Spacing +6 added lines, -6 removed lines

@@ -24,10 +24,10 @@ 
 	'flags' => array(
 		'noheader'  => True,
 		'currentapp' => 'mail',
-		'no_exception_handler' => 'basic_auth',	// we use a basic auth exception handler (sends exception message as basic auth realm)
+		'no_exception_handler' => 'basic_auth', // we use a basic auth exception handler (sends exception message as basic auth realm)
 		'autocreate_session_callback' => 'EGroupware\\Api\\Header\\Authenticate::autocreate_session_callback',
 		// use same REALM as CalDAV/CardDAV eM Client already uses
-		'auth_realm' => 'EGroupware CalDAV/CardDAV/GroupDAV server',	// cant use groupdav::REALM as autoloading and include path not yet setup!
+		'auth_realm' => 'EGroupware CalDAV/CardDAV/GroupDAV server', // cant use groupdav::REALM as autoloading and include path not yet setup!
 	)
 );
 // if you move this file somewhere else, you need to adapt the path to the header!
@@ -42,15 +42,15 @@ 
 $xml->startDocument('1.0', 'UTF-8');
 $xml->startElement('signatures');
 
-foreach(Api\Mail\Account::search(true, false) as $acc_id => $account)
+foreach (Api\Mail\Account::search(true, false) as $acc_id => $account)
 {
-	foreach($account->identities($account, true, 'params') as $ident_id => $identity)
+	foreach ($account->identities($account, true, 'params') as $ident_id => $identity)
 	{
 		// dont write empty signatures
 		if (strlen(trim(strip_tags($identity['ident_signature']))) < 10) continue;
 
 		// check if we have an non-empty email address
-		foreach(array($identity['ident_email'], $account->ident_email, $account->acc_imap_username,
+		foreach (array($identity['ident_email'], $account->ident_email, $account->acc_imap_username,
 			$GLOBALS['egw_info']['user']['account_email']) as $email)
 		{
 			if (strpos($email, '@')) break;
@@ -58,7 +58,7 @@ 
 		if (!strpos($email, '@')) continue;
 
 		$xml->startElement('signature');
-		$xml->writeAttribute('name', Api\Mail\Account::identity_name($identity+$account->params, true));
+		$xml->writeAttribute('name', Api\Mail\Account::identity_name($identity + $account->params, true));
 		$xml->writeAttribute('allow-edit', 'true');
 		$xml->writeAttribute('overwrite', 'true');
 		$xml->writeAttribute('targetMail', $email.' <mailto:'.$email.'>');

Braces +12 added lines, -3 removed lines

@@ -47,15 +47,24 @@
 	foreach($account->identities($account, true, 'params') as $ident_id => $identity)
 	{
 		// dont write empty signatures
-		if (strlen(trim(strip_tags($identity['ident_signature']))) < 10) continue;
+		if (strlen(trim(strip_tags($identity['ident_signature']))) < 10)
+		{
+			continue;
+		}
 
 		// check if we have an non-empty email address
 		foreach(array($identity['ident_email'], $account->ident_email, $account->acc_imap_username,
 			$GLOBALS['egw_info']['user']['account_email']) as $email)
 		{
-			if (strpos($email, '@')) break;
+			if (strpos($email, '@'))
+			{
+				break;
+			}
+		}
+		if (!strpos($email, '@'))
+		{
+			continue;
 		}
-		if (!strpos($email, '@')) continue;
 
 		$xml->startElement('signature');
 		$xml->writeAttribute('name', Api\Mail\Account::identity_name($identity+$account->params, true));

addressbook/sitemgr/class.module_addressbook_contactform.inc.php

Spacing +4 added lines, -4 removed lines

@@ -27,14 +27,14 @@ 
 	function __construct()
 	{
 		$this->i18n = true;
-		$this->arguments = array();	// get's set in get_user_interface
+		$this->arguments = array(); // get's set in get_user_interface
 		$this->title = lang('Contactform');
 		$this->description = lang('This module displays a contactform, that stores direct into the addressbook.');
 
 		$this->etemplate_method = 'addressbook.addressbook_contactform.display';
 	}
 
-	function get_content (&$arguments,$properties)
+	function get_content(&$arguments, $properties)
 	{
 		$parent = parent::get_content($arguments, $properties);
 
@@ -76,7 +76,7 @@ 
 			'adr_one_locality'     => lang('city').' + '.lang('zip code'),
 			'sep3'                 => '----------------------------',
 		);
-		foreach($uicontacts->customfields as $name => $data)
+		foreach ($uicontacts->customfields as $name => $data)
 		{
 			$fields['#'.$name] = $data['label'];
 		}
@@ -93,7 +93,7 @@ 
 				'label' => lang('Addressbook the contact should be saved to').' ('.lang('The anonymous user needs add rights for it!').')',
 				'options' => array(
 					'' => lang('None'),
-				)+$uicontacts->get_addressbooks(Acl::ADD)	// add to not show the accounts!
+				) + $uicontacts->get_addressbooks(Acl::ADD)	// add to not show the accounts!
 			),
 			'arg4' => array(
 				'type' => 'textfield',

calendar/inc/class.calendar_category_report.inc.php

Doc Comments +1 added lines

@@ -89,6 +89,7 @@
 	 * @param int $weekend weekend option
 	 * @param int $min_days min_days option
 	 * @param int $unit unit option
+	 * @param integer $end_range
 	 *
 	 */
 	public function process_days(&$events_log, &$week_sum, &$day,$day_index, $events, $cat_id, $holidays, $weekend, $min_days, $unit, $start_range, $end_range)

Braces +32 added lines, -10 removed lines

@@ -26,7 +26,8 @@ 
  * of time (hour|minute|second).
  *
  */
-class calendar_category_report extends calendar_ui{
+class calendar_category_report extends calendar_ui
+{
 
 	/**
 	 * Public functions allowed to get called
@@ -71,7 +72,10 @@ 
 		$date = date('Ymd', $_date);
 		foreach ($holidays[$date] as $holiday)
 		{
-			if (is_array($holiday) && !$holiday['birthyear']) return true;
+			if (is_array($holiday) && !$holiday['birthyear'])
+			{
+				return true;
+			}
 		}
 		return false;
 	}
@@ -98,10 +102,16 @@ 
 			foreach ($event['participants'] as $user_id => $status)
 			{
 				// if the participant has not accepted the event, not a chair or not an user then skip.
-				if (!($status == 'A' || $status == 'ACHAIR') || preg_match('/^(.*<)?([a-z0-9_.-]+@[a-z0-9_.-]{5,})>?$/i',$user_id)) continue;
+				if (!($status == 'A' || $status == 'ACHAIR') || preg_match('/^(.*<)?([a-z0-9_.-]+@[a-z0-9_.-]{5,})>?$/i',$user_id))
+				{
+					continue;
+				}
 
 				$categories = explode(',', $event['category']);
-				if (!in_array($cat_id, $categories)) continue;
+				if (!in_array($cat_id, $categories))
+				{
+					continue;
+				}
 
 				// processing day as timestamp
 				$day_timestamp = strtotime($day_index);
@@ -169,10 +179,13 @@ 
 					{
 						$amount =  $event['end'] - $start_range;
 					}
-					else if ($is_over_end_range) // over end range multidays event
+					else if ($is_over_end_range)
+					{
+						// over end range multidays event
 					{
 						$amount = $end_range - $event['start'];
 					}
+					}
 					else
 					{
 						$amount = $event['end'] - $event['start'];
@@ -205,7 +218,8 @@ 
 	 * @param array $days array of days
 	 * @return int returns sum of amount of events
 	 */
-	public static function add_days ($days) {
+	public static function add_days ($days)
+	{
 		$sum = 0;
 		foreach ($days as $val)
 		{
@@ -379,7 +393,10 @@ 
 						$cats_row [$cat_id] = ceil($cats_data[$cat_id]['amount']?
 								($cats_data[$cat_id]['amount'] - $events_log['reductions'][$user_id][$cat_id]) /
 								$cats_data[$cat_id]['unit']: 0);
-						if ($cats_data[$cat_id]['unit'] == 86400) $cats_row [$cat_id] = $cats_data[$cat_id]['days'];
+						if ($cats_data[$cat_id]['unit'] == 86400)
+						{
+							$cats_row [$cat_id] = $cats_data[$cat_id]['days'];
+						}
 					}
 					// first name
 					$n_given =  array('n_given' => Api\Accounts::id2name($user_id, 'account_firstname')) ?
@@ -390,8 +407,10 @@ 
 					$raw_csv[] = $n_family + $n_given+ $cats_row;
 				}
 				// comparision function for usort
-				function compareByFamily ($key='n_family') {
-					return function ($a, $b) use ($key){
+				function compareByFamily ($key='n_family')
+				{
+					return function ($a, $b) use ($key)
+					{
 						return strcasecmp($a[$key], $b[$key]);
 					};
 				}
@@ -405,7 +424,10 @@ 
 						$check_row += $val;
 					}
 					//check if all values of the row is zero then escape the row
-					if (!$check_row) continue;
+					if (!$check_row)
+					{
+						continue;
+					}
 
 					// printout each row into file
 					fputcsv($fp, array_values($row));

Spacing +38 added lines, -38 removed lines

@@ -26,7 +26,7 @@ 
  * of time (hour|minute|second).
  *
  */
-class calendar_category_report extends calendar_ui{
+class calendar_category_report extends calendar_ui {
 
 	/**
 	 * Public functions allowed to get called
@@ -42,7 +42,7 @@ 
 	 */
 	function __construct()
 	{
-		parent::__construct(true);	// call the parent's constructor
+		parent::__construct(true); // call the parent's constructor
 		$this->tmpl = new Api\Etemplate('calendar.category_report');
 	}
 
@@ -55,7 +55,7 @@ 
 	 */
 	public static function isWeekend($date)
 	{
-		return (date('N',$date) >= 6);
+		return (date('N', $date) >= 6);
 	}
 
 	/**
@@ -67,7 +67,7 @@ 
 	 */
 	public function isHoliday($_date)
 	{
-		$holidays =  $this->bo->read_holidays(date('Y', $_date));
+		$holidays = $this->bo->read_holidays(date('Y', $_date));
 		$date = date('Ymd', $_date);
 		foreach ($holidays[$date] as $holiday)
 		{
@@ -91,14 +91,14 @@ 
 	 * @param int $unit unit option
 	 *
 	 */
-	public function process_days(&$events_log, &$week_sum, &$day,$day_index, $events, $cat_id, $holidays, $weekend, $min_days, $unit, $start_range, $end_range)
+	public function process_days(&$events_log, &$week_sum, &$day, $day_index, $events, $cat_id, $holidays, $weekend, $min_days, $unit, $start_range, $end_range)
 	{
 		foreach ($events as &$event)
 		{
 			foreach ($event['participants'] as $user_id => $status)
 			{
 				// if the participant has not accepted the event, not a chair or not an user then skip.
-				if (!($status == 'A' || $status == 'ACHAIR') || preg_match('/^(.*<)?([a-z0-9_.-]+@[a-z0-9_.-]{5,})>?$/i',$user_id)) continue;
+				if (!($status == 'A' || $status == 'ACHAIR') || preg_match('/^(.*<)?([a-z0-9_.-]+@[a-z0-9_.-]{5,})>?$/i', $user_id)) continue;
 
 				$categories = explode(',', $event['category']);
 				if (!in_array($cat_id, $categories)) continue;
@@ -109,13 +109,13 @@ 
 				// week number
 				$week_number = ltrim(date('W', $day_timestamp), '0');
 
-				$previous_week_number = $week_number == 1? ($events_log[$user_id]['53']? 53: 52): $week_number -1;
+				$previous_week_number = $week_number == 1 ? ($events_log[$user_id]['53'] ? 53 : 52) : $week_number - 1;
 				// check if multidays event starts before start range
-				$is_over_range_event = $day_timestamp< $event['end'] && $start_range > $event['start'];
+				$is_over_range_event = $day_timestamp < $event['end'] && $start_range > $event['start'];
 				// check if multidays event ends after end range
-				$is_over_end_range = $day_timestamp< $event['end'] && $end_range < $event['end'];
+				$is_over_end_range = $day_timestamp < $event['end'] && $end_range < $event['end'];
 
-				$is_multiple_days_event = $event['start']< $day_timestamp && $day_timestamp< $event['end'];
+				$is_multiple_days_event = $event['start'] < $day_timestamp && $day_timestamp < $event['end'];
 
 
 				if (($weekend && self::isWeekend($day_timestamp)) || (!$holidays && $this->isHoliday($day_timestamp)))
@@ -125,7 +125,7 @@ 
 					if ($is_multiple_days_event)
 					{
 						$day_diff_to_end = $event['end'] - $day_timestamp;
-						$reduction_amount = $day_diff_to_end > 86400? 86400: $day_diff_to_end;
+						$reduction_amount = $day_diff_to_end > 86400 ? 86400 : $day_diff_to_end;
 						$events_log['reductions'][$user_id][$cat_id] = $events_log['reductions'][$user_id][$cat_id] + $reduction_amount;
 					}
 					continue;
@@ -134,12 +134,12 @@ 
 				// Mark multidays event as counted after the first day of event, therefore
 				// we can procced calculating the amount of the event via the first day
 				// and mark as counted for the rest of the days to avoid miscalculation.
-				if ($event['start']< $day_timestamp && $day_timestamp< $event['end'] &&
+				if ($event['start'] < $day_timestamp && $day_timestamp < $event['end'] &&
 						($events_log[$user_id][$week_number][$event['id']]['counted'] ||
 						$events_log[$user_id][$previous_week_number][$event['id']]['counted']))
 				{
 					$events_log[$user_id][$week_number][$event['id']]['counted'] = true;
-					$events_log[$user_id][$week_number][$event['id']]['over_range'] = $is_over_range_event? true: false;
+					$events_log[$user_id][$week_number][$event['id']]['over_range'] = $is_over_range_event ? true: false;
 				}
 				// In case of start range is in middle of multidays event, we need to calculate the
 				// amount base on the part of event on the range and keep track of counting to avoid
@@ -167,7 +167,7 @@ 
 					}
 					else if ($is_over_range_event)
 					{
-						$amount =  $event['end'] - $start_range;
+						$amount = $event['end'] - $start_range;
 					}
 					else if ($is_over_end_range) // over end range multidays event
 					{
@@ -180,7 +180,7 @@ 
 					$events_log[$user_id][$week_number][$event['id']]['counted'] = true;
 				}
 				// store day
-				$day[$user_id][$cat_id][$event['id']] = array (
+				$day[$user_id][$cat_id][$event['id']] = array(
 					'weekN' => date('W', $event['start']),
 					'cat_id' => $cat_id,
 					'event_id' => $event['id'],
@@ -205,7 +205,7 @@ 
 	 * @param array $days array of days
 	 * @return int returns sum of amount of events
 	 */
-	public static function add_days ($days) {
+	public static function add_days($days) {
 		$sum = 0;
 		foreach ($days as $val)
 		{
@@ -219,12 +219,12 @@ 
 	 *
 	 * @param type $content
 	 */
-	public function index ($content = null)
+	public function index($content = null)
 	{
-		$api_cats = new Api\Categories($GLOBALS['egw_info']['user']['account_id'],'calendar');
+		$api_cats = new Api\Categories($GLOBALS['egw_info']['user']['account_id'], 'calendar');
 		if (is_null($content))
 		{
-			$cats = $api_cats->return_sorted_array($start=0, false, '', 'ASC', 'cat_name', true, 0, true);
+			$cats = $api_cats->return_sorted_array($start = 0, false, '', 'ASC', 'cat_name', true, 0, true);
 			$cats_status = $GLOBALS['egw_info']['user']['preferences']['calendar']['category_report'];
 			foreach ($cats as &$value)
 			{
@@ -246,7 +246,7 @@ 
 		else
 		{
 			list($button) = @each($content['button']);
-			$result = $categories = $content_rows = array ();
+			$result = $categories = $content_rows = array();
 			$users = array_keys($GLOBALS['egw']->accounts->search(array('type'=>'accounts', active=>true)));
 
 			// report button pressed
@@ -255,7 +255,7 @@ 
 				// shift the grid content by one because of the reserved first row
 				// for the header.
 				array_shift($content['grid']);
-				Api\Framework::ajax_set_preference('calendar', 'category_report',$content['grid']);
+				Api\Framework::ajax_set_preference('calendar', 'category_report', $content['grid']);
 
 				foreach ($content['grid'] as $key => $row)
 				{
@@ -268,14 +268,14 @@ 
 				// query calendar for events
 				$events = $this->bo->search(array(
 					'start' => $content['start'],
-					'end' => $content['end']+86399, // range till midnight of the sele3cted end date
+					'end' => $content['end'] + 86399, // range till midnight of the sele3cted end date
 					'users' => $users,
 					'cat_id' => $categories,
 					'daywise' => true
 				));
-				$days_sum = $weeks_sum = $events_log = array ();
+				$days_sum = $weeks_sum = $events_log = array();
 				// iterate over found events
-				foreach($events as $day_index => $day_events)
+				foreach ($events as $day_index => $day_events)
 				{
 					if (is_array($day_events))
 					{
@@ -293,7 +293,7 @@ 
 									$content['grid'][$row_id]['min_days'],
 									$content['grid'][$row_id]['unit'],
 									$content['start'],
-									$content['end']+86399 // range till midnight of the selected end date
+									$content['end'] + 86399 // range till midnight of the selected end date
 							);
 						}
 					}
@@ -301,9 +301,9 @@ 
 
 				asort($days_sum);
 				ksort($days_sum);
-				$days_output = $min_days_output = array ();
+				$days_output = $min_days_output = array();
 
-				foreach($days_sum as $day_index => $users)
+				foreach ($days_sum as $day_index => $users)
 				{
 					foreach ($users as $user_id => $cat_ids)
 					{
@@ -333,10 +333,10 @@ 
 									$days = $weeks_sum[$user_id][$week_id][$cat_id][$event_id];
 									$min_days_output[$user_id][$cat_id]['amount'] =
 											$min_days_output[$user_id][$cat_id]['amount'] +
-											(count($days) >= (int)$events['min_days']?self::add_days($days):0);
+											(count($days) >= (int)$events['min_days'] ?self::add_days($days) : 0);
 									$min_days_output[$user_id][$cat_id]['days'] =
 											$min_days_output[$user_id][$cat_id]['days'] +
-											(count($days) >= (int)$events['min_days']?count($days):0);
+											(count($days) >= (int)$events['min_days'] ?count($days) : 0);
 								}
 							}
 						}
@@ -352,7 +352,7 @@ 
 				//          ]
 				//
 				$result = array_replace_recursive($days_output, $min_days_output);
-				$raw_csv = $csv_header =  array ();
+				$raw_csv = $csv_header = array();
 
 				// create csv header
 				foreach ($categories as $cat_id)
@@ -379,22 +379,22 @@ 
 					$cats_row = array();
 					foreach ($categories as $cat_id)
 					{
-						$cats_row [$cat_id] = ceil($cats_data[$cat_id]['amount']?
+						$cats_row [$cat_id] = ceil($cats_data[$cat_id]['amount'] ?
 								($cats_data[$cat_id]['amount'] - $events_log['reductions'][$user_id][$cat_id]) /
-								$cats_data[$cat_id]['unit']: 0);
+								$cats_data[$cat_id]['unit'] : 0);
 						if ($cats_data[$cat_id]['unit'] == 86400) $cats_row [$cat_id] = $cats_data[$cat_id]['days'];
 					}
 					// first name
-					$n_given =  array('n_given' => Api\Accounts::id2name($user_id, 'account_firstname')) ?
+					$n_given = array('n_given' => Api\Accounts::id2name($user_id, 'account_firstname')) ?
 							array('n_given' => Api\Accounts::id2name($user_id, 'account_firstname')) : array();
 					// last name
 					$n_family = array('n_family' => Api\Accounts::id2name($user_id, 'account_lastname')) ?
 							array('n_family' => Api\Accounts::id2name($user_id, 'account_lastname')) : array();
-					$raw_csv[] = $n_family + $n_given+ $cats_row;
+					$raw_csv[] = $n_family + $n_given + $cats_row;
 				}
 				// comparision function for usort
-				function compareByFamily ($key='n_family') {
-					return function ($a, $b) use ($key){
+				function compareByFamily($key = 'n_family') {
+					return function($a, $b) use ($key){
 						return strcasecmp($a[$key], $b[$key]);
 					};
 				}
@@ -420,14 +420,14 @@ 
 		}
 
 		// unit selectbox options
-		$sel_options['unit'] = array (
+		$sel_options['unit'] = array(
 			86400 => array('label' => lang('day'), 'title'=>'Output value in day'),
 			3600 => array('label' => lang('hour'), 'title'=>'Output value in hour'),
 			60 => array('label' => lang('minute'), 'title'=>'Output value in minute'),
 			1  => array('label' => lang('second'), 'title'=>'Output value in second')
 		);
 		// Add an extra row for the grid header
-		array_unshift($content['grid'],array(''=> ''));
+		array_unshift($content['grid'], array(''=> ''));
 		$preserv = $content;
 		$this->tmpl->exec('calendar.calendar_category_report.index', $content, $sel_options, array(), $preserv, 2);
 	}

calendar/holidays.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 $etag = '"'.md5($holidays).'"';
 
 // headers to allow caching, egw_framework specifies etag on url to force reload, even with Expires header
-Api\Session::cache_control(86400);	// cache for one day
+Api\Session::cache_control(86400); // cache for one day
 Header('Content-Type: application/json; charset=utf-8');
 Header('ETag: '.$etag);
 

timesheet/setup/tables_update.inc.php

Spacing +16 added lines, -16 removed lines

@@ -15,7 +15,7 @@ 
 
 function timesheet_upgrade0_1_001()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_timesheet','pl_id',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_timesheet', 'pl_id', array(
 		'type' => 'int',
 		'precision' => '4',
 		'default' => '0'
@@ -27,13 +27,13 @@ 
 
 function timesheet_upgrade0_2_001()
 {
-	$GLOBALS['egw_setup']->oProc->CreateTable('egw_timesheet_extra',array(
+	$GLOBALS['egw_setup']->oProc->CreateTable('egw_timesheet_extra', array(
 		'fd' => array(
-			'ts_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'ts_extra_name' => array('type' => 'varchar','precision' => '32','nullable' => False),
-			'ts_extra_value' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '')
+			'ts_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'ts_extra_name' => array('type' => 'varchar', 'precision' => '32', 'nullable' => False),
+			'ts_extra_value' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'default' => '')
 		),
-		'pk' => array('ts_id','ts_extra_name'),
+		'pk' => array('ts_id', 'ts_extra_name'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
@@ -52,7 +52,7 @@ 
 function timesheet_upgrade1_4()
 {
 	// delete empty cf's generated by 1.4
-	$GLOBALS['egw_setup']->db->delete('egw_timesheet_extra',"ts_extra_value=''",__LINE__,__FILE__,'timesheet');
+	$GLOBALS['egw_setup']->db->delete('egw_timesheet_extra', "ts_extra_value=''", __LINE__, __FILE__, 'timesheet');
 
 	return $GLOBALS['setup_info']['timesheet']['currentver'] = '1.6';
 }
@@ -60,12 +60,12 @@ 
 
 function timesheet_upgrade1_6()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_timesheet','ts_status',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_timesheet', 'ts_status', array(
 		'type' => 'int',
 		'precision' => '4'
 	));
 
-	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_timesheet','ts_status');
+	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_timesheet', 'ts_status');
 
 	return $GLOBALS['setup_info']['timesheet']['currentver'] = '1.7.001';
 }
@@ -92,12 +92,12 @@ 
  */
 function timesheet_upgrade1_9_001()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_timesheet','ts_project',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_timesheet', 'ts_project', array(
 		'type' => 'varchar',
 		'precision' => '255',
 		'comment' => 'project title'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_timesheet','ts_title',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_timesheet', 'ts_title', array(
 		'type' => 'varchar',
 		'precision' => '255',
 		'nullable' => False,
@@ -108,7 +108,7 @@ 
 	// returns NULL, if there are no rows!
 	if ((int)$max_description_length <= 16384 && $GLOBALS['egw_setup']->oProc->max_varchar_length >= 16384)
 	{
-		$GLOBALS['egw_setup']->oProc->AlterColumn('egw_timesheet','ts_description',array(
+		$GLOBALS['egw_setup']->oProc->AlterColumn('egw_timesheet', 'ts_description', array(
 			'type' => 'varchar',
 			'precision' => '16384',
 			'comment' => 'description of the timesheet entry'
@@ -134,7 +134,7 @@ 
 
 function timesheet_upgrade16_1()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_timesheet','ts_created',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_timesheet', 'ts_created', array(
 		'type' => 'int',
 		'meta' => 'timestamp',
 		'precision' => '8',
@@ -143,7 +143,7 @@ 
 	// Initialize to start
 	$GLOBALS['egw']->db->query('UPDATE egw_timesheet set ts_created = ts_start');
 
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_timesheet','ts_created',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_timesheet', 'ts_created', array(
 		'type' => 'int',
 		'meta' => 'timestamp',
 		'precision' => '8',
@@ -155,13 +155,13 @@ 
 
 function timesheet_upgrade17_1()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_timesheet_extra','ts_extra_name',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_timesheet_extra', 'ts_extra_name', array(
 		'type' => 'varchar',
 		'meta' => 'cfname',
 		'precision' => '64',
 		'nullable' => False
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_timesheet_extra','ts_extra_value',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_timesheet_extra', 'ts_extra_value', array(
 		'type' => 'varchar',
 		'meta' => 'cfvalue',
 		'precision' => '16384',

timesheet/setup/tables_current.inc.php

Spacing +20 added lines, -20 removed lines

@@ -14,34 +14,34 @@
 $phpgw_baseline = array(
 	'egw_timesheet' => array(
 		'fd' => array(
-			'ts_id' => array('type' => 'auto','nullable' => False,'comment' => 'id of the timesheet entry'),
-			'ts_project' => array('type' => 'varchar','precision' => '255','comment' => 'project title'),
-			'ts_title' => array('type' => 'varchar','precision' => '255','nullable' => False,'comment' => 'title of the timesheet entry'),
-			'ts_description' => array('type' => 'varchar','precision' => '16384','comment' => 'description of the timesheet entry'),
-			'ts_start' => array('type' => 'int','meta' => 'timestamp','precision' => '8','nullable' => False,'comment' => 'timestamp of the startdate'),
-			'ts_duration' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0','comment' => 'duration of the timesheet-entry'),
-			'ts_quantity' => array('type' => 'float','precision' => '8','nullable' => False,'comment' => 'quantity'),
-			'ts_unitprice' => array('type' => 'float','precision' => '4','comment' => 'unitprice'),
-			'cat_id' => array('type' => 'int','meta' => 'category','precision' => '4','default' => '0','comment' => 'category'),
-			'ts_owner' => array('type' => 'int','meta' => 'user','precision' => '4','nullable' => False,'comment' => 'owner of the timesheet'),
-			'ts_modified' => array('type' => 'int','meta' => 'timestamp','precision' => '8','nullable' => False,'comment' => 'date modified ot the timesheet'),
-			'ts_modifier' => array('type' => 'int','meta' => 'user','precision' => '4','nullable' => False,'comment' => 'account id of the last modifier'),
-			'pl_id' => array('type' => 'int','precision' => '4','default' => '0','comment' => 'id of the linked project'),
-			'ts_status' => array('type' => 'int','precision' => '4','comment' => 'status of the timesheet-entry'),
-			'ts_created' => array('type' => 'int','meta' => 'timestamp','precision' => '8','nullable' => False,'comment' => 'Creation date of the timesheet')
+			'ts_id' => array('type' => 'auto', 'nullable' => False, 'comment' => 'id of the timesheet entry'),
+			'ts_project' => array('type' => 'varchar', 'precision' => '255', 'comment' => 'project title'),
+			'ts_title' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'comment' => 'title of the timesheet entry'),
+			'ts_description' => array('type' => 'varchar', 'precision' => '16384', 'comment' => 'description of the timesheet entry'),
+			'ts_start' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'nullable' => False, 'comment' => 'timestamp of the startdate'),
+			'ts_duration' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0', 'comment' => 'duration of the timesheet-entry'),
+			'ts_quantity' => array('type' => 'float', 'precision' => '8', 'nullable' => False, 'comment' => 'quantity'),
+			'ts_unitprice' => array('type' => 'float', 'precision' => '4', 'comment' => 'unitprice'),
+			'cat_id' => array('type' => 'int', 'meta' => 'category', 'precision' => '4', 'default' => '0', 'comment' => 'category'),
+			'ts_owner' => array('type' => 'int', 'meta' => 'user', 'precision' => '4', 'nullable' => False, 'comment' => 'owner of the timesheet'),
+			'ts_modified' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'nullable' => False, 'comment' => 'date modified ot the timesheet'),
+			'ts_modifier' => array('type' => 'int', 'meta' => 'user', 'precision' => '4', 'nullable' => False, 'comment' => 'account id of the last modifier'),
+			'pl_id' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'comment' => 'id of the linked project'),
+			'ts_status' => array('type' => 'int', 'precision' => '4', 'comment' => 'status of the timesheet-entry'),
+			'ts_created' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'nullable' => False, 'comment' => 'Creation date of the timesheet')
 		),
 		'pk' => array('ts_id'),
 		'fk' => array(),
-		'ix' => array('ts_project','ts_owner','ts_status'),
+		'ix' => array('ts_project', 'ts_owner', 'ts_status'),
 		'uc' => array()
 	),
 	'egw_timesheet_extra' => array(
 		'fd' => array(
-			'ts_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'ts_extra_name' => array('type' => 'varchar','meta' => 'cfname','precision' => '64','nullable' => False),
-			'ts_extra_value' => array('type' => 'varchar','meta' => 'cfvalue','precision' => '16384','nullable' => False,'default' => '')
+			'ts_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'ts_extra_name' => array('type' => 'varchar', 'meta' => 'cfname', 'precision' => '64', 'nullable' => False),
+			'ts_extra_value' => array('type' => 'varchar', 'meta' => 'cfvalue', 'precision' => '16384', 'nullable' => False, 'default' => '')
 		),
-		'pk' => array('ts_id','ts_extra_name'),
+		'pk' => array('ts_id', 'ts_extra_name'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()

infolog/inc/class.infolog_import_ical.inc.php

Doc Comments +1 added lines, -2 removed lines

@@ -101,8 +101,7 @@
 	/**
 	 * imports entries according to given definition object.
 	 * @param resource $_stream
-	 * @param string $_charset
-	 * @param definition $_definition
+	 * @param importexport_definition $_definition
 	 */
 	public function import( $_stream, importexport_definition $_definition ) {
 

Spacing +6 added lines, -6 removed lines

@@ -15,10 +15,10 @@ 
  * import ical for infolog
  * Not a lot of options for this, just uses the ical class
  */
-class infolog_import_ical implements importexport_iface_import_plugin  {
+class infolog_import_ical implements importexport_iface_import_plugin {
 
 	private static $plugin_options = array(
-		'conditions',		/* => array containing condition arrays:
+		'conditions', /* => array containing condition arrays:
 				'type' => exists, // exists
 				'string' => '#kundennummer',
 				'true' => array(
@@ -79,19 +79,19 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function import( $_stream, importexport_definition $_definition ) {
+	public function import($_stream, importexport_definition $_definition) {
 
 		$this->definition = $_definition;
 
 		// dry run?
-		$this->dry_run = isset( $_definition->plugin_options['dry_run'] ) ? $_definition->plugin_options['dry_run'] :  false;
+		$this->dry_run = isset($_definition->plugin_options['dry_run']) ? $_definition->plugin_options['dry_run'] : false;
 
 		$success = 0;
 
 		// Failures
 		$this->errors = array();
 
-		@set_time_limit(0);     // try switching execution time limit off
+		@set_time_limit(0); // try switching execution time limit off
 
 		$infolog_ical = new infolog_ical();
 		if (!$infolog_ical->importVTODO(stream_get_contents($_stream)))
@@ -147,7 +147,7 @@ 
 	 * 		preserv		=> array,
 	 * )
 	 */
-	public function get_options_etpl(importexport_definition &$definition=null)
+	public function get_options_etpl(importexport_definition &$definition = null)
 	{
 		// lets do it!
 	}

Braces +18 added lines, -9 removed lines

@@ -15,7 +15,8 @@ 
  * import ical for infolog
  * Not a lot of options for this, just uses the ical class
  */
-class infolog_import_ical implements importexport_iface_import_plugin  {
+class infolog_import_ical implements importexport_iface_import_plugin
+{
 
 	private static $plugin_options = array(
 		'conditions',		/* => array containing condition arrays:
@@ -79,7 +80,8 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function import( $_stream, importexport_definition $_definition ) {
+	public function import( $_stream, importexport_definition $_definition )
+	{
 
 		$this->definition = $_definition;
 
@@ -113,7 +115,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Infolog iCal import');
 	}
 
@@ -122,7 +125,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Imports TODOs into Infolog from an iCal File.");
 	}
 
@@ -131,7 +135,8 @@ 
 	 *
 	 * @return string suffix (comma seperated)
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'ics';
 	}
 
@@ -157,7 +162,8 @@ 
 	 *
 	 * @return string etemplate name
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		// lets do it!
 	}
 
@@ -169,7 +175,8 @@ 
 	 *       record_# => warning message
 	 *       )
 	 */
-	public function get_warnings() {
+	public function get_warnings()
+	{
 		return $this->warnings;
 	}
 
@@ -181,7 +188,8 @@ 
 	 *       record_# => error message
 	 *       )
 	 */
-	public function get_errors() {
+	public function get_errors()
+	{
 		return $this->errors;
 	}
 
@@ -193,7 +201,8 @@ 
 	 *       action => record count
 	 * )
 	 */
-	public function get_results() {
+	public function get_results()
+	{
 		return $this->results;
 	}
 }