EGroupware / egroupware

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

filemanager/inc/class.filemanager_hooks.inc.php

Indentation +2 added lines, -2 removed lines

@@ -103,7 +103,7 @@ 
 		);
 		if ($location == 'admin')
 		{
-        	display_section(self::$appname,$file);
+			display_section(self::$appname,$file);
 		}
 		else
 		{
@@ -123,7 +123,7 @@ 
 			'yes' => lang('Yes')
 		);
 
-        $settings = array(
+		$settings = array(
 			'sections.1' => array(
 				'type'  => 'section',
 				'title' => lang('General settings'),

infolog/inc/class.infolog_export_csv.inc.php

Indentation +4 added lines, -4 removed lines

@@ -288,10 +288,10 @@
 	}
 
 	/**
-	* Convert some internal data to something with more meaning
-	*
-	* This is for something specific to Infolog, in addition to the normal conversions.
-	*/
+	 * Convert some internal data to something with more meaning
+	 *
+	 * This is for something specific to Infolog, in addition to the normal conversions.
+	 */
 	public static function convert(infolog_egw_record &$record)
 	{
 		// Stub, for now

infolog/inc/class.infolog_so.inc.php

Indentation +1 added lines, -1 removed lines

@@ -270,7 +270,7 @@
 				$filtermethod .= " OR (".$this->responsible_filter($this->user, $deleted_too).
 					($filter == 'own' && count($public_user_list) ?	// offer's should show up in own, eg. startpage, but need read-access
 						" OR info_status = 'offer' AND $public_access" : '').")".
-				                 " AND (info_access='public'".($has_private_access?" OR $has_private_access":'').')';
+								 " AND (info_access='public'".($has_private_access?" OR $has_private_access":'').')';
 			}
 			elseif ($filter != 'my' && $filter != 'responsible')	// none --> all entrys user has rights to see
 			{

api/src/Db.php

Indentation +241 added lines, -241 removed lines

@@ -67,38 +67,38 @@ 
 	 */
 	const FETCH_BOTH = ADODB_FETCH_BOTH;
 	/**
-	* @var string $type translated database type: mysqlt+mysqli ==> mysql, same for odbc-types
-	*/
+	 * @var string $type translated database type: mysqlt+mysqli ==> mysql, same for odbc-types
+	 */
 	var $Type     = '';
 
 	/**
-	* @var string $type database type as defined in the header.inc.php, eg. mysqlt
-	*/
+	 * @var string $type database type as defined in the header.inc.php, eg. mysqlt
+	 */
 	var $setupType     = '';
 
 	/**
-	* @var string $Host database host to connect to
-	*/
+	 * @var string $Host database host to connect to
+	 */
 	var $Host     = '';
 
 	/**
-	* @var string $Port port number of database to connect to
-	*/
+	 * @var string $Port port number of database to connect to
+	 */
 	var $Port     = '';
 
 	/**
-	* @var string $Database name of database to use
-	*/
+	 * @var string $Database name of database to use
+	 */
 	var $Database = '';
 
 	/**
-	* @var string $User name of database user
-	*/
+	 * @var string $User name of database user
+	 */
 	var $User     = '';
 
 	/**
-	* @var string $Password password for database user
-	*/
+	 * @var string $Password password for database user
+	 */
 	var $Password = '';
 
 	/**
@@ -107,8 +107,8 @@ 
 	var $readonly = false;
 
 	/**
-	* @var int $Debug enable debuging - 0 no, 1 yes
-	*/
+	 * @var int $Debug enable debuging - 0 no, 1 yes
+	 */
 	var $Debug         = 0;
 
 	/**
@@ -119,23 +119,23 @@ 
 	var $log_updates = false;
 
 	/**
-	* @var array $Record current record
-	*/
+	 * @var array $Record current record
+	 */
 	var $Record   = array();
 
 	/**
-	* @var int row number for current record
-	*/
+	 * @var int row number for current record
+	 */
 	var $Row;
 
 	/**
-	* @var int $Errno internal rdms error number for last error
-	*/
+	 * @var int $Errno internal rdms error number for last error
+	 */
 	var $Errno    = 0;
 
 	/**
-	* @var string descriptive text from last error
-	*/
+	 * @var string descriptive text from last error
+	 */
 	var $Error    = '';
 
 	/**
@@ -276,8 +276,8 @@ 
 	}
 
 	/**
-	* @param string $query query to be executed (optional)
-	*/
+	 * @param string $query query to be executed (optional)
+	 */
 
 	function db($query = '')
 	{
@@ -285,8 +285,8 @@ 
 	}
 
 	/**
-	* @return int current connection id
-	*/
+	 * @return int current connection id
+	 */
 	function link_id()
 	{
 		return $this->Link_ID;
@@ -663,8 +663,8 @@ 
 	}
 
 	/**
-	* Close a connection to a database
-	*/
+	 * Close a connection to a database
+	 */
 	function disconnect()
 	{
 		if (!$this->privat_Link_ID)
@@ -678,11 +678,11 @@ 
 	}
 
 	/**
-	* Convert a unix timestamp to a rdms specific timestamp
-	*
-	* @param int unix timestamp
-	* @return string rdms specific timestamp
-	*/
+	 * Convert a unix timestamp to a rdms specific timestamp
+	 *
+	 * @param int unix timestamp
+	 * @return string rdms specific timestamp
+	 */
 	function to_timestamp($epoch)
 	{
 		if (!$this->Link_ID && !$this->connect())
@@ -694,11 +694,11 @@ 
 	}
 
 	/**
-	* Convert a rdms specific timestamp to a unix timestamp
-	*
-	* @param string rdms specific timestamp
-	* @return int unix timestamp
-	*/
+	 * Convert a rdms specific timestamp to a unix timestamp
+	 *
+	 * @param string rdms specific timestamp
+	 * @return int unix timestamp
+	 */
 	function from_timestamp($timestamp)
 	{
 		if (!$this->Link_ID && !$this->connect())
@@ -720,19 +720,19 @@ 
 	}
 
 	/**
-	* Execute a query
-	*
-	* @param string $Query_String the query to be executed
-	* @param int $line the line method was called from - use __LINE__
-	* @param string $file the file method was called from - use __FILE__
-	* @param int $offset row to start from, default 0
-	* @param int $num_rows number of rows to return (optional), default -1 = all, 0 will use $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']
-	* @param array|boolean $inputarr array for binding variables to parameters or false (default)
-	* @param int $fetchmode =self::FETCH_BOTH self::FETCH_BOTH (default), self::FETCH_ASSOC or self::FETCH_NUM
-	* @param boolean $reconnect =true true: try reconnecting if server closes connection, false: dont (mysql only!)
-	* @return ADORecordSet or false, if the query fails
-	* @throws Db\Exception\InvalidSql with $this->Link_ID->ErrorNo() as code
-	*/
+	 * Execute a query
+	 *
+	 * @param string $Query_String the query to be executed
+	 * @param int $line the line method was called from - use __LINE__
+	 * @param string $file the file method was called from - use __FILE__
+	 * @param int $offset row to start from, default 0
+	 * @param int $num_rows number of rows to return (optional), default -1 = all, 0 will use $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']
+	 * @param array|boolean $inputarr array for binding variables to parameters or false (default)
+	 * @param int $fetchmode =self::FETCH_BOTH self::FETCH_BOTH (default), self::FETCH_ASSOC or self::FETCH_NUM
+	 * @param boolean $reconnect =true true: try reconnecting if server closes connection, false: dont (mysql only!)
+	 * @return ADORecordSet or false, if the query fails
+	 * @throws Db\Exception\InvalidSql with $this->Link_ID->ErrorNo() as code
+	 */
 	function query($Query_String, $line = '', $file = '', $offset=0, $num_rows=-1, $inputarr=false, $fetchmode=self::FETCH_BOTH, $reconnect=true)
 	{
 		unset($line, $file);	// not used anymore
@@ -797,26 +797,26 @@ 
 	}
 
 	/**
-	* Execute a query with limited result set
-	*
-	* @param string $Query_String the query to be executed
-	* @param int $offset row to start from, default 0
-	* @param int $line the line method was called from - use __LINE__
-	* @param string $file the file method was called from - use __FILE__
-	* @param int $num_rows number of rows to return (optional), default -1 = all, 0 will use $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']
-	* @param array|boolean $inputarr array for binding variables to parameters or false (default)
-	* @return ADORecordSet or false, if the query fails
-	*/
+	 * Execute a query with limited result set
+	 *
+	 * @param string $Query_String the query to be executed
+	 * @param int $offset row to start from, default 0
+	 * @param int $line the line method was called from - use __LINE__
+	 * @param string $file the file method was called from - use __FILE__
+	 * @param int $num_rows number of rows to return (optional), default -1 = all, 0 will use $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']
+	 * @param array|boolean $inputarr array for binding variables to parameters or false (default)
+	 * @return ADORecordSet or false, if the query fails
+	 */
 	function limit_query($Query_String, $offset, $line = '', $file = '', $num_rows = '',$inputarr=false)
 	{
 		return $this->query($Query_String,$line,$file,$offset,$num_rows,$inputarr);
 	}
 
 	/**
-	* Begin Transaction
-	*
-	* @return int/boolean current transaction-id, of false if no connection
-	*/
+	 * Begin Transaction
+	 *
+	 * @return int/boolean current transaction-id, of false if no connection
+	 */
 	function transaction_begin()
 	{
 		if (!$this->Link_ID && !$this->connect())
@@ -828,10 +828,10 @@ 
 	}
 
 	/**
-	* Complete the transaction
-	*
-	* @return bool True if sucessful, False if fails
-	*/
+	 * Complete the transaction
+	 *
+	 * @return bool True if sucessful, False if fails
+	 */
 	function transaction_commit()
 	{
 		if (!$this->Link_ID && !$this->connect())
@@ -843,10 +843,10 @@ 
 	}
 
 	/**
-	* Rollback the current transaction
-	*
-	* @return bool True if sucessful, False if fails
-	*/
+	 * Rollback the current transaction
+	 *
+	 * @return bool True if sucessful, False if fails
+	 */
 	function transaction_abort()
 	{
 		if (!$this->Link_ID && !$this->connect())
@@ -922,12 +922,12 @@ 
 	}
 
 	/**
-	* Find the primary key of the last insertion on the current db connection
-	*
-	* @param string $table name of table the insert was performed on
-	* @param string $field the autoincrement primary key of the table
-	* @return int the id, -1 if fails
-	*/
+	 * Find the primary key of the last insertion on the current db connection
+	 *
+	 * @param string $table name of table the insert was performed on
+	 * @param string $field the autoincrement primary key of the table
+	 * @return int the id, -1 if fails
+	 */
 	function get_last_insert_id($table, $field)
 	{
 		if (!$this->Link_ID && !$this->connect())
@@ -950,10 +950,10 @@ 
 	}
 
 	/**
-	* Get the number of rows affected by last update or delete
-	*
-	* @return int number of rows
-	*/
+	 * Get the number of rows affected by last update or delete
+	 *
+	 * @return int number of rows
+	 */
 	function affected_rows()
 	{
 		if ($this->log_updates) return 0;
@@ -966,14 +966,14 @@ 
 	}
 
 	/**
-	* Get description of a table
-	*
-	* Beside the column-name all other data depends on the db-type !!!
-	*
-	* @param string $table name of table to describe
-	* @param bool $full optional, default False summary information, True full information
-	* @return array table meta data
-	*/
+	 * Get description of a table
+	 *
+	 * Beside the column-name all other data depends on the db-type !!!
+	 *
+	 * @param string $table name of table to describe
+	 * @param bool $full optional, default False summary information, True full information
+	 * @return array table meta data
+	 */
 	function metadata($table='',$full=false)
 	{
 		if (!$this->Link_ID && !$this->connect())
@@ -1055,10 +1055,10 @@ 
 	}
 
 	/**
-	* Return a list of indexes in current database
-	*
-	* @return array list of indexes
-	*/
+	 * Return a list of indexes in current database
+	 *
+	 * @return array list of indexes
+	 */
 	function index_names()
 	{
 		$indices = array();
@@ -1079,10 +1079,10 @@ 
 	}
 
 	/**
-	* Returns an array containing column names that are the primary keys of $tablename.
-	*
-	* @return array of columns
-	*/
+	 * Returns an array containing column names that are the primary keys of $tablename.
+	 *
+	 * @return array of columns
+	 */
 	function pkey_columns($tablename)
 	{
 		if (!$this->Link_ID && !$this->connect())
@@ -1093,13 +1093,13 @@ 
 	}
 
 	/**
-	* Create a new database
-	*
-	* @param string $adminname name of database administrator user (optional)
-	* @param string $adminpasswd password for the database administrator user (optional)
-	* @param string $charset default charset for the database
-	* @param string $grant_host ='localhost' host/ip of the webserver
-	*/
+	 * Create a new database
+	 *
+	 * @param string $adminname name of database administrator user (optional)
+	 * @param string $adminpasswd password for the database administrator user (optional)
+	 * @param string $charset default charset for the database
+	 * @param string $grant_host ='localhost' host/ip of the webserver
+	 */
 	function create_database($adminname = '', $adminpasswd = '', $charset='', $grant_host='localhost')
 	{
 		$currentUser = $this->User;
@@ -1356,12 +1356,12 @@ 
 	}
 
 	/**
-	* Correctly Quote Identifiers like table- or colmnnames for use in SQL-statements
-	*
-	* This is mostly copy & paste from adodb's datadict class
-	* @param string $_name
-	* @return string quoted string
-	*/
+	 * Correctly Quote Identifiers like table- or colmnnames for use in SQL-statements
+	 *
+	 * This is mostly copy & paste from adodb's datadict class
+	 * @param string $_name
+	 * @return string quoted string
+	 */
 	function name_quote($_name = NULL)
 	{
 		if (!is_string($_name))
@@ -1400,19 +1400,19 @@ 
 	}
 
 	/**
-	* Escape values before sending them to the database - prevents SQL injection and SQL errors ;-)
-	*
-	* Please note that the quote function already returns necessary quotes: quote('Hello') === "'Hello'".
-	* Int and Auto types are casted to int: quote('1','int') === 1, quote('','int') === 0, quote('Hello','int') === 0
-	* Arrays of id's stored in strings: quote(array(1,2,3),'string') === "'1,2,3'"
-	*
-	* @param mixed $value the value to be escaped
-	* @param string|boolean $type =false string the type of the db-column, default False === varchar
-	* @param boolean $not_null =true is column NOT NULL, default true, else php null values are written as SQL NULL
-	* @param int $length =null length of the varchar column, to truncate it if the database requires it (eg. Postgres)
-	* @param string $glue =',' used to glue array values together for the string type
-	* @return string escaped sting
-	*/
+	 * Escape values before sending them to the database - prevents SQL injection and SQL errors ;-)
+	 *
+	 * Please note that the quote function already returns necessary quotes: quote('Hello') === "'Hello'".
+	 * Int and Auto types are casted to int: quote('1','int') === 1, quote('','int') === 0, quote('Hello','int') === 0
+	 * Arrays of id's stored in strings: quote(array(1,2,3),'string') === "'1,2,3'"
+	 *
+	 * @param mixed $value the value to be escaped
+	 * @param string|boolean $type =false string the type of the db-column, default False === varchar
+	 * @param boolean $not_null =true is column NOT NULL, default true, else php null values are written as SQL NULL
+	 * @param int $length =null length of the varchar column, to truncate it if the database requires it (eg. Postgres)
+	 * @param string $glue =',' used to glue array values together for the string type
+	 * @return string escaped sting
+	 */
 	function quote($value,$type=False,$not_null=true,$length=null,$glue=',')
 	{
 		if ($this->Debug) echo "<p>db::quote(".(is_null($value)?'NULL':"'$value'").",'$type','$not_null')</p>\n";
@@ -1493,27 +1493,27 @@ 
 	}
 
 	/**
-	* Implodes an array of column-value pairs for the use in sql-querys.
-	* All data is run through quote (does either addslashes() or (int)) - prevents SQL injunction and SQL errors ;-).
-	*
-	* @author RalfBecker<at>outdoor-training.de
-	*
-	* @param string $glue in most cases this will be either ',' or ' AND ', depending you your query
-	* @param array $array column-name / value pairs, if the value is an array all its array-values will be quoted
-	*	according to the type of the column, and the whole array with be formatted like (val1,val2,...)
-	*	If $use_key == True, an ' IN ' instead a '=' is used. Good for category- or user-lists.
-	*	If the key is numerical (no key given in the array-definition) the value is used as is, eg.
-	*	array('visits=visits+1') gives just "visits=visits+1" (no quoting at all !!!)
-	* @param boolean|string $use_key If $use_key===True a "$key=" prefix each value (default), typically set to False
-	*	or 'VALUES' for insert querys, on 'VALUES' "(key1,key2,...) VALUES (val1,val2,...)" is returned
-	* @param array|boolean $only if set to an array only colums which are set (as data !!!) are written
-	*	typicaly used to form a WHERE-clause from the primary keys.
-	*	If set to True, only columns from the colum_definitons are written.
-	* @param array|boolean $column_definitions this can be set to the column-definitions-array
-	*	of your table ($tables_baseline[$table]['fd'] of the setup/tables_current.inc.php file).
-	*	If its set, the column-type-data determinates if (int) or addslashes is used.
-	* @return string SQL
-	*/
+	 * Implodes an array of column-value pairs for the use in sql-querys.
+	 * All data is run through quote (does either addslashes() or (int)) - prevents SQL injunction and SQL errors ;-).
+	 *
+	 * @author RalfBecker<at>outdoor-training.de
+	 *
+	 * @param string $glue in most cases this will be either ',' or ' AND ', depending you your query
+	 * @param array $array column-name / value pairs, if the value is an array all its array-values will be quoted
+	 *	according to the type of the column, and the whole array with be formatted like (val1,val2,...)
+	 *	If $use_key == True, an ' IN ' instead a '=' is used. Good for category- or user-lists.
+	 *	If the key is numerical (no key given in the array-definition) the value is used as is, eg.
+	 *	array('visits=visits+1') gives just "visits=visits+1" (no quoting at all !!!)
+	 * @param boolean|string $use_key If $use_key===True a "$key=" prefix each value (default), typically set to False
+	 *	or 'VALUES' for insert querys, on 'VALUES' "(key1,key2,...) VALUES (val1,val2,...)" is returned
+	 * @param array|boolean $only if set to an array only colums which are set (as data !!!) are written
+	 *	typicaly used to form a WHERE-clause from the primary keys.
+	 *	If set to True, only columns from the colum_definitons are written.
+	 * @param array|boolean $column_definitions this can be set to the column-definitions-array
+	 *	of your table ($tables_baseline[$table]['fd'] of the setup/tables_current.inc.php file).
+	 *	If its set, the column-type-data determinates if (int) or addslashes is used.
+	 * @return string SQL
+	 */
 	function column_data_implode($glue,$array,$use_key=True,$only=False,$column_definitions=False)
 	{
 		if (!is_array($array))	// this allows to give an SQL-string for delete or update
@@ -1599,14 +1599,14 @@ 
 	}
 
 	/**
-	* Sets the default column-definitions for use with column_data_implode()
-	*
-	* @author RalfBecker<at>outdoor-training.de
-	*
-	* @param array|boolean $column_definitions this can be set to the column-definitions-array
-	*	of your table ($tables_baseline[$table]['fd'] of the setup/tables_current.inc.php file).
-	*	If its set, the column-type-data determinates if (int) or addslashes is used.
-	*/
+	 * Sets the default column-definitions for use with column_data_implode()
+	 *
+	 * @author RalfBecker<at>outdoor-training.de
+	 *
+	 * @param array|boolean $column_definitions this can be set to the column-definitions-array
+	 *	of your table ($tables_baseline[$table]['fd'] of the setup/tables_current.inc.php file).
+	 *	If its set, the column-type-data determinates if (int) or addslashes is used.
+	 */
 	function set_column_definitions($column_definitions=False)
 	{
 		$this->column_definitions=$column_definitions;
@@ -1668,17 +1668,17 @@ 
 	}
 
 	/**
-	* reads the table-definitions from the app's setup/tables_current.inc.php file
-	*
-	* The already read table-definitions are shared between all db-instances via a static var.
-	*
-	* @author RalfBecker<at>outdoor-training.de
-	*
-	* @param bool|string $app name of the app or default False to use the app set by db::set_app or the current app,
-	*	true to search the already loaded table-definitions for $table and then search all existing apps for it
-	* @param bool|string $table if set return only defintions of that table, else return all defintions
-	* @return mixed array with table-defintions or False if file not found
-	*/
+	 * reads the table-definitions from the app's setup/tables_current.inc.php file
+	 *
+	 * The already read table-definitions are shared between all db-instances via a static var.
+	 *
+	 * @author RalfBecker<at>outdoor-training.de
+	 *
+	 * @param bool|string $app name of the app or default False to use the app set by db::set_app or the current app,
+	 *	true to search the already loaded table-definitions for $table and then search all existing apps for it
+	 * @param bool|string $table if set return only defintions of that table, else return all defintions
+	 * @return mixed array with table-defintions or False if file not found
+	 */
 	function get_table_definitions($app=False,$table=False)
 	{
 		// ease the transition to api
@@ -1773,21 +1773,21 @@ 
 	}
 
 	/**
-	* Insert a row of data into a table or updates it if $where is given, all data is quoted according to it's type
-	*
-	* @author RalfBecker<at>outdoor-training.de
-	*
-	* @param string $table name of the table
-	* @param array $data with column-name / value pairs
-	* @param mixed $where string with where clause or array with column-name / values pairs to check if a row with that keys already exists, or false for an unconditional insert
-	*	if the row exists db::update is called else a new row with $date merged with $where gets inserted (data has precedence)
-	* @param int $line line-number to pass to query
-	* @param string $file file-name to pass to query
-	* @param string|boolean $app string with name of app or False to use the current-app
-	* @param bool $use_prepared_statement use a prepared statement
-	* @param array|bool $table_def use this table definition. If False, the table definition will be read from tables_baseline
-	* @return ADORecordSet or false, if the query fails
-	*/
+	 * Insert a row of data into a table or updates it if $where is given, all data is quoted according to it's type
+	 *
+	 * @author RalfBecker<at>outdoor-training.de
+	 *
+	 * @param string $table name of the table
+	 * @param array $data with column-name / value pairs
+	 * @param mixed $where string with where clause or array with column-name / values pairs to check if a row with that keys already exists, or false for an unconditional insert
+	 *	if the row exists db::update is called else a new row with $date merged with $where gets inserted (data has precedence)
+	 * @param int $line line-number to pass to query
+	 * @param string $file file-name to pass to query
+	 * @param string|boolean $app string with name of app or False to use the current-app
+	 * @param bool $use_prepared_statement use a prepared statement
+	 * @param array|bool $table_def use this table definition. If False, the table definition will be read from tables_baseline
+	 * @return ADORecordSet or false, if the query fails
+	 */
 	function insert($table,$data,$where,$line,$file,$app=False,$use_prepared_statement=false,$table_def=False)
 	{
 		if ($this->Debug) echo "<p>db::insert('$table',".print_r($data,True).",".print_r($where,True).",$line,$file,'$app')</p>\n";
@@ -1883,20 +1883,20 @@ 
 	}
 
 	/**
-	* Updates the data of one or more rows in a table, all data is quoted according to it's type
-	*
-	* @author RalfBecker<at>outdoor-training.de
-	*
-	* @param string $table name of the table
-	* @param array $data with column-name / value pairs
-	* @param array $where column-name / values pairs and'ed together for the where clause
-	* @param int $line line-number to pass to query
-	* @param string $file file-name to pass to query
-	* @param string|boolean $app string with name of app or False to use the current-app
-	* @param bool $use_prepared_statement use a prepared statement
-	* @param array|bool $table_def use this table definition. If False, the table definition will be read from tables_baseline
-	* @return ADORecordSet or false, if the query fails
-	*/
+	 * Updates the data of one or more rows in a table, all data is quoted according to it's type
+	 *
+	 * @author RalfBecker<at>outdoor-training.de
+	 *
+	 * @param string $table name of the table
+	 * @param array $data with column-name / value pairs
+	 * @param array $where column-name / values pairs and'ed together for the where clause
+	 * @param int $line line-number to pass to query
+	 * @param string $file file-name to pass to query
+	 * @param string|boolean $app string with name of app or False to use the current-app
+	 * @param bool $use_prepared_statement use a prepared statement
+	 * @param array|bool $table_def use this table definition. If False, the table definition will be read from tables_baseline
+	 * @return ADORecordSet or false, if the query fails
+	 */
 	function update($table,$data,$where,$line,$file,$app=False,$use_prepared_statement=false,$table_def=False)
 	{
 		if ($this->Debug) echo "<p>db::update('$table',".print_r($data,true).','.print_r($where,true).",$line,$file,'$app')</p>\n";
@@ -1973,18 +1973,18 @@ 
 	}
 
 	/**
-	* Deletes one or more rows in table, all data is quoted according to it's type
-	*
-	* @author RalfBecker<at>outdoor-training.de
-	*
-	* @param string $table name of the table
-	* @param array $where column-name / values pairs and'ed together for the where clause
-	* @param int $line line-number to pass to query
-	* @param string $file file-name to pass to query
-	* @param string|boolean $app string with name of app or False to use the current-app
-	* @param array|bool $table_def use this table definition. If False, the table definition will be read from tables_baseline
-	* @return ADORecordSet or false, if the query fails
-	*/
+	 * Deletes one or more rows in table, all data is quoted according to it's type
+	 *
+	 * @author RalfBecker<at>outdoor-training.de
+	 *
+	 * @param string $table name of the table
+	 * @param array $where column-name / values pairs and'ed together for the where clause
+	 * @param int $line line-number to pass to query
+	 * @param string $file file-name to pass to query
+	 * @param string|boolean $app string with name of app or False to use the current-app
+	 * @param array|bool $table_def use this table definition. If False, the table definition will be read from tables_baseline
+	 * @return ADORecordSet or false, if the query fails
+	 */
 	function delete($table,$where,$line,$file,$app=False,$table_def=False)
 	{
 		if (!$table_def) $table_def = $this->get_table_definitions($app,$table);
@@ -2050,25 +2050,25 @@ 
 	}
 
 	/**
-	* Selects one or more rows in table depending on where, all data is quoted according to it's type
-	*
-	* @author RalfBecker<at>outdoor-training.de
-	*
-	* @param string $table name of the table
-	* @param array|string $cols string or array of column-names / select-expressions
-	* @param array|string $where string or array with column-name / values pairs AND'ed together for the where clause
-	* @param int $line line-number to pass to query
-	* @param string $file file-name to pass to query
-	* @param int|bool $offset offset for a limited query or False (default)
-	* @param string $append string to append to the end of the query, eg. ORDER BY ...
-	* @param string|boolean $app string with name of app or False to use the current-app
-	* @param int $num_rows number of rows to return if offset set, default 0 = use default in user prefs
-	* @param string $join =null sql to do a join, added as is after the table-name, eg. ", table2 WHERE x=y" or
-	*	"LEFT JOIN table2 ON (x=y)", Note: there's no quoting done on $join!
-	* @param array|bool $table_def use this table definition. If False, the table definition will be read from tables_baseline
-	* @param int $fetchmode =self::FETCH_ASSOC self::FETCH_ASSOC (default), self::FETCH_BOTH or self::FETCH_NUM
-	* @return ADORecordSet or false, if the query fails
-	*/
+	 * Selects one or more rows in table depending on where, all data is quoted according to it's type
+	 *
+	 * @author RalfBecker<at>outdoor-training.de
+	 *
+	 * @param string $table name of the table
+	 * @param array|string $cols string or array of column-names / select-expressions
+	 * @param array|string $where string or array with column-name / values pairs AND'ed together for the where clause
+	 * @param int $line line-number to pass to query
+	 * @param string $file file-name to pass to query
+	 * @param int|bool $offset offset for a limited query or False (default)
+	 * @param string $append string to append to the end of the query, eg. ORDER BY ...
+	 * @param string|boolean $app string with name of app or False to use the current-app
+	 * @param int $num_rows number of rows to return if offset set, default 0 = use default in user prefs
+	 * @param string $join =null sql to do a join, added as is after the table-name, eg. ", table2 WHERE x=y" or
+	 *	"LEFT JOIN table2 ON (x=y)", Note: there's no quoting done on $join!
+	 * @param array|bool $table_def use this table definition. If False, the table definition will be read from tables_baseline
+	 * @param int $fetchmode =self::FETCH_ASSOC self::FETCH_ASSOC (default), self::FETCH_BOTH or self::FETCH_NUM
+	 * @return ADORecordSet or false, if the query fails
+	 */
 	function select($table,$cols,$where,$line,$file,$offset=False,$append='',$app=False,$num_rows=0,$join='',$table_def=False,$fetchmode=self::FETCH_ASSOC)
 	{
 		if ($this->Debug) echo "<p>db::select('$table',".print_r($cols,True).",".print_r($where,True).",$line,$file,$offset,'$app',$num_rows,'$join')</p>\n";
@@ -2103,20 +2103,20 @@ 
 	}
 
 	/**
-	* Does a union over multiple selects
-	*
-	* @author RalfBecker<at>outdoor-training.de
-	*
-	* @param array $selects array of selects, each select is an array with the possible keys/parameters: table, cols, where, append, app, join, table_def
-	*	For further info about parameters see the definition of the select function, beside table, cols and where all other params are optional
-	* @param int $line line-number to pass to query
-	* @param string $file file-name to pass to query
-	* @param string $order_by ORDER BY statement for the union
-	* @param int|bool $offset offset for a limited query or False (default)
-	* @param int $num_rows number of rows to return if offset set, default 0 = use default in user prefs
-	* @param int $fetchmode =self::FETCH_ASSOC self::FETCH_ASSOC (default), self::FETCH_BOTH or self::FETCH_NUM
-	* @return ADORecordSet or false, if the query fails
-	*/
+	 * Does a union over multiple selects
+	 *
+	 * @author RalfBecker<at>outdoor-training.de
+	 *
+	 * @param array $selects array of selects, each select is an array with the possible keys/parameters: table, cols, where, append, app, join, table_def
+	 *	For further info about parameters see the definition of the select function, beside table, cols and where all other params are optional
+	 * @param int $line line-number to pass to query
+	 * @param string $file file-name to pass to query
+	 * @param string $order_by ORDER BY statement for the union
+	 * @param int|bool $offset offset for a limited query or False (default)
+	 * @param int $num_rows number of rows to return if offset set, default 0 = use default in user prefs
+	 * @param int $fetchmode =self::FETCH_ASSOC self::FETCH_ASSOC (default), self::FETCH_BOTH or self::FETCH_NUM
+	 * @return ADORecordSet or false, if the query fails
+	 */
 	function union($selects,$line,$file,$order_by='',$offset=false,$num_rows=0,$fetchmode=self::FETCH_ASSOC)
 	{
 		if ($this->Debug) echo "<p>db::union(".print_r($selects,True).",$line,$file,$order_by,$offset,$num_rows)</p>\n";

api/src/Etemplate/Widget/Vfs.php

Indentation +7 added lines, -7 removed lines

@@ -243,13 +243,13 @@
 	}
 
 	/**
-	* Ajax callback to receive an incoming file
-	*
-	* The incoming file is automatically placed into the appropriate VFS location.
-	* If the entry is not yet created, the file information is stored into the widget's value.
-	* When the form is submitted, the information for all files uploaded is available in the returned
-	* $content array and the application should deal with the file.
-	*/
+	 * Ajax callback to receive an incoming file
+	 *
+	 * The incoming file is automatically placed into the appropriate VFS location.
+	 * If the entry is not yet created, the file information is stored into the widget's value.
+	 * When the form is submitted, the information for all files uploaded is available in the returned
+	 * $content array and the application should deal with the file.
+	 */
 	public static function store_file($path, &$file)
 	{
 		$name = $_REQUEST['widget_id'];

api/src/Storage.php

Indentation +6 added lines, -6 removed lines

@@ -210,12 +210,12 @@
 	}
 
 	/**
-	* saves custom field data
-	*
-	* @param array $data data to save (cf's have to be prefixed with self::CF_PREFIX = #)
-	* @param array $extra_cols =array() extra-data to be saved
-	* @return bool false on success, errornumber on failure
-	*/
+	 * saves custom field data
+	 *
+	 * @param array $data data to save (cf's have to be prefixed with self::CF_PREFIX = #)
+	 * @param array $extra_cols =array() extra-data to be saved
+	 * @return bool false on success, errornumber on failure
+	 */
 	function save_customfields(&$data, array $extra_cols=array())
 	{
 		$id = isset($data[$this->autoinc_id]) ? $data[$this->autoinc_id] : $data[$this->db_key_cols[$this->autoinc_id]];

doc/phpunit_bootstrap.php

Indentation +2 added lines, -2 removed lines

@@ -18,8 +18,8 @@
 // backward compatibility with PHPunit 5.7
 if (!class_exists('\PHPUnit\Framework\TestCase') && class_exists('\PHPUnit_Framework_TestCase'))
 {
-    class_alias('\PHPUnit_Framework_TestCase', '\PHPUnit\Framework\TestCase');
-    class_alias('\PHPUnit_Framework_ExpectationFailedException', '\PHPUnit\Framework\ExpectationFailedException');
+	class_alias('\PHPUnit_Framework_TestCase', '\PHPUnit\Framework\TestCase');
+	class_alias('\PHPUnit_Framework_ExpectationFailedException', '\PHPUnit\Framework\ExpectationFailedException');
 }
 
 // Needed to let Cache work

api/src/Mailer.php

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