EGroupware / egroupware

phpgwapi/inc/class.solink.inc.php

Indentation +9 added lines, -9 removed lines

@@ -66,7 +66,7 @@ 
 			echo "<p>solink.link('$app1',$id1,'$app2',$id2,'$remark',$owner)</p>\n";
 		}
 		if ($app1 == $app2 && $id1 == $id2 ||
-		    $id1 == '' || $id2 == '' || $app1 == '' || $app2 == '')
+			$id1 == '' || $id2 == '' || $app1 == '' || $app2 == '')
 		{
 			return False;	// dont link to self or other nosense
 		}
@@ -412,26 +412,26 @@ 
 			array('table'=>self::TABLE,
 				'cols'=>'c.*,b.link_app1 AS app3,b.link_id1 AS id3,b.link_id AS link3',
 				'where'=>'a.link_app1='.self::$db->quote($app).' AND c.link_app2='.self::$db->quote($target_app).
-                        		(!$target_id ? '' : self::$db->expression(self::TABLE,' AND c.',array('link_id2' => $target_id))),
-                        	'join'=>" a
+								(!$target_id ? '' : self::$db->expression(self::TABLE,' AND c.',array('link_id2' => $target_id))),
+							'join'=>" a
                         		JOIN $table b ON a.link_id2=b.link_id1 AND a.link_app2=b.link_app1
                        			JOIN $table c ON a.link_id1=c.link_id1 AND a.link_app1=c.link_app1 AND a.link_id!=c.link_id AND c.link_app2=b.link_app2 AND c.link_id2=b.link_id2",
 			),
 			// retrieve the type of links, where the relation is realized as timesheet->infolog/tracker and projectmanager->timesheet
 			array('table'=>self::TABLE,
 				'cols'=>'b.link_id, b.link_app2 as app1, b.link_id2 as id1, b.link_app1 as app2, b.link_id1 as id2, b.link_remark,b.link_lastmod,b.link_owner,b.deleted,c.link_app1 AS app3,c.link_id1 AS id3,c.link_id AS link3',
-                       		'where'=>'a.link_app1='.self::$db->quote($app).' AND b.link_app1='.self::$db->quote($target_app).
-                        		(!$target_id ? '' : self::$db->expression(self::TABLE,' AND b.',array('link_id1' => $target_id))),
-                        	'join'=>" a
+					   		'where'=>'a.link_app1='.self::$db->quote($app).' AND b.link_app1='.self::$db->quote($target_app).
+								(!$target_id ? '' : self::$db->expression(self::TABLE,' AND b.',array('link_id1' => $target_id))),
+							'join'=>" a
                         		JOIN $table b ON a.link_id1=b.link_id2 AND a.link_app1=b.link_app2
                         		JOIN $table c ON a.link_id2=c.link_id1 AND a.link_app2=c.link_app1 AND a.link_id!=c.link_id AND c.link_app2=b.link_app1 AND c.link_id2=b.link_id1",
 			),
 			// retrieve the type of links, where the relation is realized as timesheet->projectmanager and infolog->timesheet
 			array('table'=>self::TABLE,
 				'cols'=>'a.*,c.link_app1 AS app3,c.link_id1 AS id3,c.link_id AS link3',
-                     		'where'=>'a.link_app1='.self::$db->quote($app).' AND a.link_app2='.self::$db->quote($target_app).
-                        		(!$target_id ? '' : self::$db->expression(self::TABLE,' AND a.',array('link_id2' => $target_id))),
-                       		'join'=>" a
+					 		'where'=>'a.link_app1='.self::$db->quote($app).' AND a.link_app2='.self::$db->quote($target_app).
+								(!$target_id ? '' : self::$db->expression(self::TABLE,' AND a.',array('link_id2' => $target_id))),
+					   		'join'=>" a
                        			JOIN $table b ON a.link_id1=b.link_id2 AND a.link_app1=b.link_app2
                         		JOIN $table c ON a.link_id2=c.link_id2 AND a.link_app2=c.link_app2 AND a.link_id!=c.link_id AND c.link_app1=b.link_app1 AND c.link_id1=b.link_id1",
 			),

phpgwapi/inc/class.contacts.inc.php

Indentation +7 added lines, -7 removed lines

@@ -38,13 +38,13 @@
 	}
 
 	/**
-	* reads contacts matched by key and puts all cols in the data array
-	*
-	* reimplemented from bocontacts to call the old read function, if more then one param
-	*
-	* @param int/string $contact_id
-	* @return array/boolean contact data or false on error
-	*/
+	 * reads contacts matched by key and puts all cols in the data array
+	 *
+	 * reimplemented from bocontacts to call the old read function, if more then one param
+	 *
+	 * @param int/string $contact_id
+	 * @return array/boolean contact data or false on error
+	 */
 	function read($contact_id)
 	{
 		if (func_num_args() > 1)	// calling the old / depricated read function

phpgwapi/inc/class.egw_digest_auth.inc.php

Indentation +12 added lines, -12 removed lines

@@ -255,20 +255,20 @@
 	 */
 	static public function parse_digest($txt)
 	{
-	    // protect against missing data
-	    $needed_parts = array('nonce'=>1, 'nc'=>1, 'cnonce'=>1, 'qop'=>1, 'username'=>1, 'uri'=>1, 'response'=>1);
-	    $data = array();
-	    $keys = implode('|', array_keys($needed_parts));
+		// protect against missing data
+		$needed_parts = array('nonce'=>1, 'nc'=>1, 'cnonce'=>1, 'qop'=>1, 'username'=>1, 'uri'=>1, 'response'=>1);
+		$data = array();
+		$keys = implode('|', array_keys($needed_parts));
 
 		$matches = null;
-	    preg_match_all('@(' . $keys . ')=(?:([\'"])([^\2]+?)\2|([^\s,]+))@', $txt, $matches, PREG_SET_ORDER);
+		preg_match_all('@(' . $keys . ')=(?:([\'"])([^\2]+?)\2|([^\s,]+))@', $txt, $matches, PREG_SET_ORDER);
 
-	    foreach ($matches as $m)
-	    {
-	        $data[$m[1]] = $m[3] ? $m[3] : $m[4];
-	        unset($needed_parts[$m[1]]);
-	    }
-	    //error_log(__METHOD__."('$txt') returning ".array2string($needed_parts ? false : $data));
-	    return $needed_parts ? false : $data;
+		foreach ($matches as $m)
+		{
+			$data[$m[1]] = $m[3] ? $m[3] : $m[4];
+			unset($needed_parts[$m[1]]);
+		}
+		//error_log(__METHOD__."('$txt') returning ".array2string($needed_parts ? false : $data));
+		return $needed_parts ? false : $data;
 	}
 }

phpgwapi/inc/class.egw_db.inc.php

Indentation +308 added lines, -308 removed lines

@@ -68,43 +68,43 @@ 
 	 */
 	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 = '';
 
 	/**
-	* @var int $Debug enable debuging - 0 no, 1 yes
-	*/
+	 * @var int $Debug enable debuging - 0 no, 1 yes
+	 */
 	var $Debug         = 0;
 
 	/**
@@ -115,23 +115,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    = '';
 
 	/**
@@ -277,8 +277,8 @@ 
 	}
 
 	/**
-	* @param string $query query to be executed (optional)
-	*/
+	 * @param string $query query to be executed (optional)
+	 */
 
 	function db($query = '')
 	{
@@ -286,8 +286,8 @@ 
 	}
 
 	/**
-	* @return int current connection id
-	*/
+	 * @return int current connection id
+	 */
 	function link_id()
 	{
 		return $this->Link_ID;
@@ -654,8 +654,8 @@ 
 	}
 
 	/**
-	* Close a connection to a database
-	*/
+	 * Close a connection to a database
+	 */
 	function disconnect()
 	{
 		if (!$this->privat_Link_ID)
@@ -669,12 +669,12 @@ 
 	}
 
 	/**
-	* Escape strings before sending them to the database
-	*
-	* @deprecated use quote($value,$type='') instead
-	* @param string $str the string to be escaped
-	* @return string escaped sting
-	*/
+	 * Escape strings before sending them to the database
+	 *
+	 * @deprecated use quote($value,$type='') instead
+	 * @param string $str the string to be escaped
+	 * @return string escaped sting
+	 */
 	function db_addslashes($str)
 	{
 		if (!isset($str) || $str == '')
@@ -689,11 +689,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())
@@ -705,11 +705,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())
@@ -742,19 +742,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 =egw_db::FETCH_BOTH egw_db::FETCH_BOTH (default), egw_db::FETCH_ASSOC or egw_db::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 egw_exception_db_invalid_sql 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 =egw_db::FETCH_BOTH egw_db::FETCH_BOTH (default), egw_db::FETCH_ASSOC or egw_db::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 egw_exception_db_invalid_sql with $this->Link_ID->ErrorNo() as code
+	 */
 	function query($Query_String, $line = '', $file = '', $offset=0, $num_rows=-1, $inputarr=false, $fetchmode=egw_db::FETCH_BOTH, $reconnect=true)
 	{
 		unset($line, $file);	// not used anymore
@@ -824,30 +824,30 @@ 
 	}
 
 	/**
-	* 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);
 	}
 
 	/**
-	* Move to the next row in the results set
-	*
-	* Specifying a fetch_mode only works for newly fetched rows, the first row always gets fetched by query!!!
-	*
-	* @deprecated use foreach(query() or foreach(select() to loop over the query using the global db object
-	* @param int $fetch_mode egw_db::FETCH_BOTH = numerical+assoc keys (eGW default), egw_db::FETCH_ASSOC or egw_db::FETCH_NUM
-	* @return bool was another row found?
-	*/
+	 * Move to the next row in the results set
+	 *
+	 * Specifying a fetch_mode only works for newly fetched rows, the first row always gets fetched by query!!!
+	 *
+	 * @deprecated use foreach(query() or foreach(select() to loop over the query using the global db object
+	 * @param int $fetch_mode egw_db::FETCH_BOTH = numerical+assoc keys (eGW default), egw_db::FETCH_ASSOC or egw_db::FETCH_NUM
+	 * @return bool was another row found?
+	 */
 	function next_record($fetch_mode=egw_db::FETCH_BOTH)
 	{
 		if (!$this->Query_ID)
@@ -897,12 +897,12 @@ 
 	}
 
 	/**
-	* Move to position in result set
-	*
-	* @deprecated use the result-object returned by query() or select() direct, so you can use the global db-object and not a clone
-	* @param int $pos required row (optional), default first row
-	* @return boolean true if sucessful or false if not found
-	*/
+	 * Move to position in result set
+	 *
+	 * @deprecated use the result-object returned by query() or select() direct, so you can use the global db-object and not a clone
+	 * @param int $pos required row (optional), default first row
+	 * @return boolean true if sucessful or false if not found
+	 */
 	function seek($pos = 0)
 	{
 		if (!$this->Query_ID  || !$this->Query_ID->Move($this->Row = $pos))
@@ -913,10 +913,10 @@ 
 	}
 
 	/**
-	* 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())
@@ -928,10 +928,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())
@@ -943,10 +943,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())
@@ -958,12 +958,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())
@@ -986,32 +986,32 @@ 
 	}
 
 	/**
-	* Lock a table
-	*
-	* @deprecated not used anymore as it costs to much performance, use transactions if needed
-	* @param string $table name of table to lock
-	* @param string $mode type of lock required (optional), default write
-	* @return bool True if sucessful, False if fails
-	*/
+	 * Lock a table
+	 *
+	 * @deprecated not used anymore as it costs to much performance, use transactions if needed
+	 * @param string $table name of table to lock
+	 * @param string $mode type of lock required (optional), default write
+	 * @return bool True if sucessful, False if fails
+	 */
 	function lock($table, $mode='write')
 	{
 		unset($table, $mode);	// not used anymore
 	}
 
 	/**
-	* Unlock a table
-	*
-	* @deprecated not used anymore as it costs to much performance, use transactions if needed
-	* @return bool True if sucessful, False if fails
-	*/
+	 * Unlock a table
+	 *
+	 * @deprecated not used anymore as it costs to much performance, use transactions if needed
+	 * @return bool True if sucessful, False if fails
+	 */
 	function unlock()
 	{}
 
 	/**
-	* 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;
@@ -1024,52 +1024,52 @@ 
 	}
 
 	/**
-	* Number of rows in current result set
-	*
-	* @deprecated use the result-object returned by query/select()->NumRows(), so you can use the global db-object and not a clone
-	* @return int number of rows
-	*/
+	 * Number of rows in current result set
+	 *
+	 * @deprecated use the result-object returned by query/select()->NumRows(), so you can use the global db-object and not a clone
+	 * @return int number of rows
+	 */
 	function num_rows()
 	{
 		return $this->Query_ID ? $this->Query_ID->RecordCount() : False;
 	}
 
 	/**
-	* Number of fields in current row
-	*
-	* @deprecated use the result-object returned by query() or select() direct, so you can use the global db-object and not a clone
-	* @return int number of fields
-	*/
+	 * Number of fields in current row
+	 *
+	 * @deprecated use the result-object returned by query() or select() direct, so you can use the global db-object and not a clone
+	 * @return int number of fields
+	 */
 	function num_fields()
 	{
 		return $this->Query_ID ? $this->Query_ID->FieldCount() : False;
 	}
 
 	/**
-	* @deprecated use num_rows()
-	*/
+	 * @deprecated use num_rows()
+	 */
 	function nf()
 	{
 		return $this->num_rows();
 	}
 
 	/**
-	* @deprecated use print num_rows()
-	*/
+	 * @deprecated use print num_rows()
+	 */
 	function np()
 	{
 		print $this->num_rows();
 	}
 
 	/**
-	* Return the value of a column
-	*
-	* @deprecated use the result-object returned by query() or select() direct, so you can use the global db-object and not a clone
-	* @param string|integer $Name name of field or positional index starting from 0
-	* @param bool $strip_slashes string escape chars from field(optional), default false
-	*	depricated param, as correctly quoted values dont need any stripslashes!
-	* @return string the field value
-	*/
+	 * Return the value of a column
+	 *
+	 * @deprecated use the result-object returned by query() or select() direct, so you can use the global db-object and not a clone
+	 * @param string|integer $Name name of field or positional index starting from 0
+	 * @param bool $strip_slashes string escape chars from field(optional), default false
+	 *	depricated param, as correctly quoted values dont need any stripslashes!
+	 * @return string the field value
+	 */
 	function f($Name, $strip_slashes = False)
 	{
 		if ($strip_slashes)
@@ -1080,25 +1080,25 @@ 
 	}
 
 	/**
-	* Print the value of a field
-	*
-	* @param string $Name name of field to print
-	* @param bool $strip_slashes string escape chars from field(optional), default false
-	*	depricated param, as correctly quoted values dont need any stripslashes!
-	*/
+	 * Print the value of a field
+	 *
+	 * @param string $Name name of field to print
+	 * @param bool $strip_slashes string escape chars from field(optional), default false
+	 *	depricated param, as correctly quoted values dont need any stripslashes!
+	 */
 	function p($Name, $strip_slashes = True)
 	{
 		print $this->f($Name, $strip_slashes);
 	}
 
 	/**
-	* Returns a query-result-row as an associative array (no numerical keys !!!)
-	*
-	* @deprecated use foreach(query() or foreach(select() to loop over the query using the global db object
-	* @param bool $do_next_record should next_record() be called or not (default not)
-	* @param string $strip ='' string to strip of the column-name, default ''
-	* @return array/bool the associative array or False if no (more) result-row is availible
-	*/
+	 * Returns a query-result-row as an associative array (no numerical keys !!!)
+	 *
+	 * @deprecated use foreach(query() or foreach(select() to loop over the query using the global db object
+	 * @param bool $do_next_record should next_record() be called or not (default not)
+	 * @param string $strip ='' string to strip of the column-name, default ''
+	 * @return array/bool the associative array or False if no (more) result-row is availible
+	 */
 	function row($do_next_record=False,$strip='')
 	{
 		if ($do_next_record && !$this->next_record(egw_db::FETCH_ASSOC) || !is_array($this->Record))
@@ -1119,14 +1119,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())
@@ -1208,10 +1208,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();
@@ -1233,10 +1233,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())
@@ -1247,13 +1247,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;
@@ -1509,12 +1509,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))
@@ -1553,19 +1553,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";
@@ -1645,27 +1645,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
@@ -1751,14 +1751,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;
@@ -1795,17 +1795,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)
 	{
 		static $all_app_data = array();
@@ -1898,21 +1898,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";
@@ -2009,20 +2009,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";
@@ -2099,18 +2099,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);
@@ -2176,25 +2176,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 =egw_db::FETCH_ASSOC egw_db::FETCH_BOTH (default), egw_db::FETCH_ASSOC or egw_db::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 =egw_db::FETCH_ASSOC egw_db::FETCH_BOTH (default), egw_db::FETCH_ASSOC or egw_db::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=egw_db::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";
@@ -2229,20 +2229,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 =egw_db::FETCH_ASSOC egw_db::FETCH_BOTH (default), egw_db::FETCH_ASSOC or egw_db::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 =egw_db::FETCH_ASSOC egw_db::FETCH_BOTH (default), egw_db::FETCH_ASSOC or egw_db::FETCH_NUM
+	 * @return ADORecordSet or false, if the query fails
+	 */
 	function union($selects,$line,$file,$order_by='',$offset=false,$num_rows=0,$fetchmode=egw_db::FETCH_ASSOC)
 	{
 		if ($this->Debug) echo "<p>db::union(".print_r($selects,True).",$line,$file,$order_by,$offset,$num_rows)</p>\n";

phpgwapi/inc/common_functions.inc.php

Indentation +5 added lines, -5 removed lines

@@ -470,11 +470,11 @@
 }
 
 /**
-  * Allows for array and direct function params as well as sanatization.
-  *
-  * @author seek3r
-  * This function is used to validate param data as well as offer flexible function usage.
-  *
+ * Allows for array and direct function params as well as sanatization.
+ *
+ * @author seek3r
+ * This function is used to validate param data as well as offer flexible function usage.
+ *
 	function somefunc()
 	{
 		$expected_args[0] = Array('name'=>'fname','default'=>'joe', 'type'=>'string');

phpgwapi/inc/class.db_backup.inc.php

Indentation +5 added lines, -5 removed lines

@@ -381,7 +381,7 @@ 
 		$zip = NULL;
 		$_f = NULL;
 		if($type == 'zip')
-	    {
+		{
 			// has already been verified to be available in fopen_backup
 			$zip = new ZipArchive;
 			if(($zip->open($filename)) !== TRUE)
@@ -719,9 +719,9 @@ 
 		while($file = $list[0])
 		{
 			if(is_dir($file) && $file != '.' && $file != '..')
-			    self::remove_dir_content($dir.'/'.$file);
+				self::remove_dir_content($dir.'/'.$file);
 			if(is_file($file) && $file != '.' && $file != '..')
-			    unlink($dir.'/'.$file);
+				unlink($dir.'/'.$file);
 			array_shift($list);
 		}
 		//rmdir($dir);  // dont remove own dir
@@ -967,8 +967,8 @@ 
 				echo '<center>'.lang("Cant open %1, needs ZipArchive", $name)."<br>\n".'</center>';
 			}
 
-		    fclose($f);
-		    if (file_exists($name)) unlink($name);
+			fclose($f);
+			if (file_exists($name)) unlink($name);
 			return TRUE;
 		}
 		// save files ....

phpgwapi/inc/class.auth.inc.php

Indentation +4 added lines, -4 removed lines

@@ -407,7 +407,7 @@ 
 	 * @param string $db_val   stored value / hash (from database)
 	 * @param string &$type    detected crypt type on return
 	 * @return boolean	 True on successful comparison
-	*/
+	 */
 	static function crypt_compare($form_val, $db_val, &$type)
 	{
 		// detect type of hash by salt part of $db_val
@@ -706,7 +706,7 @@ 
 	 * @param string $form_val user input value for comparison
 	 * @param string $db_val stored value (from database)
 	 * @return boolean True on successful comparison
-	*/
+	 */
 	static function smd5_compare($form_val,$db_val)
 	{
 		/* Start with the first char after {SMD5} */
@@ -728,7 +728,7 @@ 
 	 * @param string $form_val user input value for comparison
 	 * @param string $db_val   stored value (from database)
 	 * @return boolean True on successful comparison
-	*/
+	 */
 	static function sha_compare($form_val,$db_val)
 	{
 		/* Start with the first char after {SHA} */
@@ -745,7 +745,7 @@ 
 	 * @param string $form_val user input value for comparison
 	 * @param string $db_val   stored value (from database)
 	 * @return boolean	 True on successful comparison
-	*/
+	 */
 	static function ssha_compare($form_val,$db_val)
 	{
 		/* Start with the first char after {SSHA} */

phpgwapi/inc/class.egw_json.inc.php

Indentation +7 added lines, -7 removed lines

@@ -242,13 +242,13 @@
 		if ($ret === false && ($err = json_last_error()))
 		{
 			static $json_err2str = array(
-	        	JSON_ERROR_NONE => 'No errors',
-	        	JSON_ERROR_DEPTH => 'Maximum stack depth exceeded',
-	        	JSON_ERROR_STATE_MISMATCH => 'Underflow or the modes mismatch',
-	        	JSON_ERROR_CTRL_CHAR => 'Unexpected control character found',
-	        	JSON_ERROR_SYNTAX => 'Syntax error, malformed JSON',
-	        	JSON_ERROR_UTF8 => 'Malformed UTF-8 characters, possibly incorrectly encoded',
-	        );
+				JSON_ERROR_NONE => 'No errors',
+				JSON_ERROR_DEPTH => 'Maximum stack depth exceeded',
+				JSON_ERROR_STATE_MISMATCH => 'Underflow or the modes mismatch',
+				JSON_ERROR_CTRL_CHAR => 'Unexpected control character found',
+				JSON_ERROR_SYNTAX => 'Syntax error, malformed JSON',
+				JSON_ERROR_UTF8 => 'Malformed UTF-8 characters, possibly incorrectly encoded',
+			);
 			error_log(__METHOD__.'('.array2string($var).') json_last_error()='.$err.'='.$json_err2str[$err]);
 
 			if (($var = self::fix_content($var)))

phpgwapi/inc/class.egw_mailer.inc.php

Indentation +18 added lines, -18 removed lines

@@ -615,15 +615,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 {
@@ -636,20 +636,20 @@ 
 		}
 		// 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) {
-            $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' => Horde_Mime_Part::ENCODE_7BIT | Horde_Mime_Part::ENCODE_8BIT | Horde_Mime_Part::ENCODE_BINARY))
-                )
-            );
-        }
-
-        return $this->_headers->toString(array('charset' => 'utf-8', 'canonical' => true)) .
+		if ($stream) {
+			$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' => Horde_Mime_Part::ENCODE_7BIT | Horde_Mime_Part::ENCODE_8BIT | Horde_Mime_Part::ENCODE_BINARY))
+				)
+			);
+		}
+
+		return $this->_headers->toString(array('charset' => 'utf-8', 'canonical' => true)) .
 			$this->getBasePart()->toString(array('canonical' => true));
-    }
+	}
 
 	/**
 	 * Find body: 1. part with mimetype "text/$subtype"