EGroupware / egroupware

api/src/Json/Msg.php

Doc Comments +5 added lines, -3 removed lines

@@ -82,8 +82,7 @@ 
 	/**
 	 * Allows to call a global javascript function with given parameters: window[$func].call(window[, $param1[, ...]])
 	 *
-	 * @param string $func name of the global (window) javascript function to call
-	 * @param mixed $parameters variable number of parameters
+	 * @param string $function
 	 */
 	public function call($function)
 	{
@@ -108,7 +107,7 @@ 
 	 *
 	 * @param string $selector jquery selector
 	 * @param string $method name of the jquery to call
-	 * @param array $parameters =array()
+	 * @param string[] $parameters =array()
 	 */
 	public function jquery($selector,$method,array $parameters=array())
 	{
@@ -126,6 +125,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $type
+	 */
 	public function generic($type, array $parameters = array())
 	{
 		if (is_string($type))

Spacing +4 added lines, -4 removed lines

@@ -64,7 +64,7 @@ 
 	 * @param string $function name of the global (window) javascript function to call
 	 * @param array $parameters =array()
 	 */
-	public function apply($function,array $parameters=array())
+	public function apply($function, array $parameters = array())
 	{
 		if (is_string($function))
 		{
@@ -88,7 +88,7 @@ 
 	public function call($function)
 	{
 		$parameters = func_get_args();
-		array_shift($parameters);	// shift off $function
+		array_shift($parameters); // shift off $function
 
 		if (is_string($function))
 		{
@@ -110,7 +110,7 @@ 
 	 * @param string $method name of the jquery to call
 	 * @param array $parameters =array()
 	 */
-	public function jquery($selector,$method,array $parameters=array())
+	public function jquery($selector, $method, array $parameters = array())
 	{
 		if (is_string($selector) && is_string($method))
 		{
@@ -169,7 +169,7 @@ 
 	 * @param string $app =null default current app from flags
 	 * or only the current application
 	 */
-	public function redirect($url, $global = false, $app=null)
+	public function redirect($url, $global = false, $app = null)
 	{
 		if (is_string($url) && is_bool($global))
 		{

api/src/Json/Response.php

Doc Comments +1 added lines, -2 removed lines

@@ -180,7 +180,6 @@ 
 	/**
 	 * Init responseArray
 	 *
-	 * @param array $arr
 	 * @return array previous content
 	 */
 	public function initResponseArray()
@@ -264,7 +263,7 @@ 
 	 *
 	 * @param midex $var
 	 * @param string $prefix =''
-	 * @return mixed
+	 * @return midex|null
 	 */
 	public static function fix_content($var, $prefix='')
 	{

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

Braces +4 added lines, -1 removed lines

@@ -268,7 +268,10 @@
 	 */
 	public static function fix_content($var, $prefix='')
 	{
-		if (json_encode($var) !== false) return $var;
+		if (json_encode($var) !== false)
+		{
+			return $var;
+		}
 
 		if (is_scalar($var))
 		{

Spacing +4 added lines, -4 removed lines

@@ -226,9 +226,9 @@ 
 		// Wrap the result array into a parent "response" Object
 		$res = array(
 			'response' => $inst->responseArray,
-		)+Api\Framework::get_page_generation_time();
+		) + Api\Framework::get_page_generation_time();
 
-		return self::json_encode($res);	//PHP5.3+, JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_AMP);
+		return self::json_encode($res); //PHP5.3+, JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_AMP);
 	}
 
 	/**
@@ -268,7 +268,7 @@ 
 	 * @param string $prefix =''
 	 * @return mixed
 	 */
-	public static function fix_content($var, $prefix='')
+	public static function fix_content($var, $prefix = '')
 	{
 		if (json_encode($var) !== false) return $var;
 
@@ -279,7 +279,7 @@ 
 		}
 		else
 		{
-			foreach($var as $name => &$value)
+			foreach ($var as $name => &$value)
 			{
 				$value = self::fix_content($value, $prefix ? $prefix.'['.$name.']' : $name);
 			}

api/src/Ldap/ServerInfo.php

Doc Comments +2 added lines, -2 removed lines

@@ -81,7 +81,7 @@ 
 	/**
 	* gets the version
 	*
-	* @return integer the supported ldap version
+	* @return string the supported ldap version
 	*/
 	function getVersion()
 	{
@@ -159,7 +159,7 @@ 
 	 * @param resource $ds
 	 * @param string $host
 	 * @param int $version 2 or 3
-	 * @return ldapserverinfo
+	 * @return ServerInfo
 	 */
 	public static function get($ds, $host, $version=3)
 	{

Indentation +40 added lines, -40 removed lines

@@ -32,33 +32,33 @@ 
 	const SAMBA4 = 2;
 
 	/**
-	* @var array $namingContext holds the supported namingcontexts
-	*/
+	 * @var array $namingContext holds the supported namingcontexts
+	 */
 	var $namingContext = array();
 
 	/**
-	* @var string $version holds the LDAP server version
-	*/
+	 * @var string $version holds the LDAP server version
+	 */
 	var $version = 2;
 
 	/**
-	* @var integer $serverType holds the type of LDAP server(OpenLDAP, ADS, NDS, ...)
-	*/
+	 * @var integer $serverType holds the type of LDAP server(OpenLDAP, ADS, NDS, ...)
+	 */
 	var $serverType = 0;
 
 	/**
-	* @var string $_subSchemaEntry the subschema entry DN
-	*/
+	 * @var string $_subSchemaEntry the subschema entry DN
+	 */
 	var $subSchemaEntry = '';
 
 	/**
-	* @var array $supportedObjectClasses the supported objectclasses
-	*/
+	 * @var array $supportedObjectClasses the supported objectclasses
+	 */
 	var $supportedObjectClasses = array();
 
 	/**
-	* @var array $supportedOIDs the supported OIDs
-	*/
+	 * @var array $supportedOIDs the supported OIDs
+	 */
 	var $supportedOIDs = array();
 
 	/**
@@ -79,50 +79,50 @@ 
 	}
 
 	/**
-	* gets the version
-	*
-	* @return integer the supported ldap version
-	*/
+	 * gets the version
+	 *
+	 * @return integer the supported ldap version
+	 */
 	function getVersion()
 	{
 		return $this->version;
 	}
 
 	/**
-	* sets the namingcontexts
-	*
-	* @param array $_namingContext the supported namingcontexts
-	*/
+	 * sets the namingcontexts
+	 *
+	 * @param array $_namingContext the supported namingcontexts
+	 */
 	function setNamingContexts($_namingContext)
 	{
 		$this->namingContext = $_namingContext;
 	}
 
 	/**
-	* sets the type of the ldap server(OpenLDAP, ADS, NDS, ...)
-	*
-	* @param integer $_serverType the type of ldap server
-	*/
+	 * sets the type of the ldap server(OpenLDAP, ADS, NDS, ...)
+	 *
+	 * @param integer $_serverType the type of ldap server
+	 */
 	function setServerType($_serverType)
 	{
 		$this->serverType = $_serverType;
 	}
 
 	/**
-	* sets the DN for the subschema entry
-	*
-	* @param string $_subSchemaEntry the subschema entry DN
-	*/
+	 * sets the DN for the subschema entry
+	 *
+	 * @param string $_subSchemaEntry the subschema entry DN
+	 */
 	function setSubSchemaEntry($_subSchemaEntry)
 	{
 		$this->subSchemaEntry = $_subSchemaEntry;
 	}
 
 	/**
-	* sets the supported objectclasses
-	*
-	* @param array $_supportedObjectClasses the supported objectclasses
-	*/
+	 * sets the supported objectclasses
+	 *
+	 * @param array $_supportedObjectClasses the supported objectclasses
+	 */
 	function setSupportedObjectClasses($_supportedObjectClasses)
 	{
 		$this->supportedOIDs = $_supportedObjectClasses;
@@ -130,20 +130,20 @@ 
 	}
 
 	/**
-	* sets the version
-	*
-	* @param integer $_version the supported ldap version
-	*/
+	 * sets the version
+	 *
+	 * @param integer $_version the supported ldap version
+	 */
 	function setVersion($_version)
 	{
 		$this->version = $_version;
 	}
 
 	/**
-	* checks for supported objectclasses
-	*
-	* @return bool returns true if the ldap server supports this objectclass
-	*/
+	 * checks for supported objectclasses
+	 *
+	 * @return bool returns true if the ldap server supports this objectclass
+	 */
 	function supportsObjectClass($_objectClass)
 	{
 		if($this->supportedObjectClasses[strtolower($_objectClass)])

Spacing +19 added lines, -19 removed lines

@@ -146,7 +146,7 @@ 
 	*/
 	function supportsObjectClass($_objectClass)
 	{
-		if($this->supportedObjectClasses[strtolower($_objectClass)])
+		if ($this->supportedObjectClasses[strtolower($_objectClass)])
 		{
 			return true;
 		}
@@ -161,21 +161,21 @@ 
 	 * @param int $version 2 or 3
 	 * @return ldapserverinfo
 	 */
-	public static function get($ds, $host, $version=3)
+	public static function get($ds, $host, $version = 3)
 	{
-		$filter='(objectclass=*)';
-		$justthese = array('structuralObjectClass','namingContexts','supportedLDAPVersion','subschemaSubentry','vendorname');
-		if(($sr = @ldap_read($ds, '', $filter, $justthese)))
+		$filter = '(objectclass=*)';
+		$justthese = array('structuralObjectClass', 'namingContexts', 'supportedLDAPVersion', 'subschemaSubentry', 'vendorname');
+		if (($sr = @ldap_read($ds, '', $filter, $justthese)))
 		{
-			if(($info = ldap_get_entries($ds, $sr)))
+			if (($info = ldap_get_entries($ds, $sr)))
 			{
 				$ldapServerInfo = new ServerInfo($host);
 				$ldapServerInfo->setVersion($version);
 
 				// check for naming contexts
-				if($info[0]['namingcontexts'])
+				if ($info[0]['namingcontexts'])
 				{
-					for($i=0; $i<$info[0]['namingcontexts']['count']; $i++)
+					for ($i = 0; $i < $info[0]['namingcontexts']['count']; $i++)
 					{
 						$namingcontexts[] = $info[0]['namingcontexts'][$i];
 					}
@@ -183,9 +183,9 @@ 
 				}
 
 				// check for ldap server type
-				if($info[0]['structuralobjectclass'])
+				if ($info[0]['structuralobjectclass'])
 				{
-					switch($info[0]['structuralobjectclass'][0])
+					switch ($info[0]['structuralobjectclass'][0])
 					{
 						case 'OpenLDAProotDSE':
 							$ldapServerType = OPENLDAP_LDAPSERVER;
@@ -202,30 +202,30 @@ 
 				}
 
 				// check for subschema entry dn
-				if($info[0]['subschemasubentry'])
+				if ($info[0]['subschemasubentry'])
 				{
 					$subschemasubentry = $info[0]['subschemasubentry'][0];
 					$ldapServerInfo->setSubSchemaEntry($subschemasubentry);
 				}
 
 				// create list of supported objetclasses
-				if(!empty($subschemasubentry))
+				if (!empty($subschemasubentry))
 				{
-					$filter='(objectclass=*)';
+					$filter = '(objectclass=*)';
 					$justthese = array('objectClasses');
 
-					if(($sr = ldap_read($ds, $subschemasubentry, $filter, $justthese)))
+					if (($sr = ldap_read($ds, $subschemasubentry, $filter, $justthese)))
 					{
-						if(($info = ldap_get_entries($ds, $sr)))
+						if (($info = ldap_get_entries($ds, $sr)))
 						{
-							if($info[0]['objectclasses']) {
-								for($i=0; $i<$info[0]['objectclasses']['count']; $i++)
+							if ($info[0]['objectclasses']) {
+								for ($i = 0; $i < $info[0]['objectclasses']['count']; $i++)
 								{
 									$matches = null;
-									if(preg_match('/^\( (.*) NAME \'(\w*)\' /', $info[0]['objectclasses'][$i], $matches))
+									if (preg_match('/^\( (.*) NAME \'(\w*)\' /', $info[0]['objectclasses'][$i], $matches))
 									{
 										#_debug_array($matches);
-										if(count($matches) == 3)
+										if (count($matches) == 3)
 										{
 											$supportedObjectClasses[$matches[1]] = strtolower($matches[2]);
 										}

Braces +2 added lines, -1 removed lines

@@ -218,7 +218,8 @@
 					{
 						if(($info = ldap_get_entries($ds, $sr)))
 						{
-							if($info[0]['objectclasses']) {
+							if($info[0]['objectclasses'])
+							{
 								for($i=0; $i<$info[0]['objectclasses']['count']; $i++)
 								{
 									$matches = null;

api/src/Link/Storage.php

Doc Comments +6 added lines, -1 removed lines

@@ -176,6 +176,11 @@ 
 		return is_array($id) ? $links : ($links[$id] ? $links[$id] : array());
 	}
 
+	/**
+	 * @param boolean $left
+	 * @param string $only_app
+	 * @param boolean $not_only
+	 */
 	private static function _add2links($row,$left,$only_app,$not_only,array &$links)
 	{
 		$linked_app = $left ? $row['link_app2'] : $row['link_app1'];
@@ -206,7 +211,7 @@ 
 	 * @param string $id ='' id in $app, if no integer link_id given in $app_link_id
 	 * @param string $app2 ='' appname of 2. endpoint of the link, if no integer link_id given in $app_link_id
 	 * @param string $id2 ='' id in $app2, if no integer link_id given in $app_link_id
-	 * @return array with link-data or False
+	 * @return string with link-data or False
 	 */
 	static function get_link($app_link_id,$id='',$app2='',$id2='')
 	{

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",
 			),

Spacing +58 added lines, -58 removed lines

@@ -59,7 +59,7 @@ 
 	 * @param int $lastmod =0 timestamp of last modification (defaults to now=time())
 	 * @return int/boolean False (for db or param-error) or on success link_id (Please not the return-value of $id1)
 	 */
-	static function link( $app1,&$id1,$app2,$id2='',$remark='',$owner=0,$lastmod=0 )
+	static function link($app1, &$id1, $app2, $id2 = '', $remark = '', $owner = 0, $lastmod = 0)
 	{
 		if (self::DEBUG)
 		{
@@ -68,21 +68,21 @@ 
 		if ($app1 == $app2 && $id1 == $id2 ||
 		    $id1 == '' || $id2 == '' || $app1 == '' || $app2 == '')
 		{
-			return False;	// dont link to self or other nosense
+			return False; // dont link to self or other nosense
 		}
-		if (($link = self::get_link($app1,$id1,$app2,$id2)))
+		if (($link = self::get_link($app1, $id1, $app2, $id2)))
 		{
 			if ($link['link_remark'] != $remark)
 			{
-				self::update_remark($link['link_id'],$remark);
+				self::update_remark($link['link_id'], $remark);
 			}
-			return $link['link_id'];	// link alread exist
+			return $link['link_id']; // link alread exist
 		}
 		if (!$owner)
 		{
 			$owner = $GLOBALS['egw_info']['user']['account_id'];
 		}
-		return self::$db->insert(self::TABLE,array(
+		return self::$db->insert(self::TABLE, array(
 				'link_app1'		=> $app1,
 				'link_id1'		=> $id1,
 				'link_app2'		=> $app2,
@@ -90,7 +90,7 @@ 
 				'link_remark'	=> $remark,
 				'link_lastmod'	=> $lastmod ? $lastmod : time(),
 				'link_owner'	=> $owner,
-			),False,__LINE__,__FILE__) ? self::$db->get_last_insert_id(self::TABLE,'link_id') : false;
+			), False, __LINE__, __FILE__) ? self::$db->get_last_insert_id(self::TABLE, 'link_id') : false;
 	}
 
 	/**
@@ -100,14 +100,14 @@ 
 	 * @param string $remark new text for the remark
 	 * @return boolean true on success, else false
 	 */
-	static function update_remark($link_id,$remark)
+	static function update_remark($link_id, $remark)
 	{
-		return self::$db->update(self::TABLE,array(
+		return self::$db->update(self::TABLE, array(
 				'link_remark'	=> $remark,
 				'link_lastmod'	=> time(),
-			),array(
+			), array(
 				'link_id'	=> $link_id,
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 	}
 
 	/**
@@ -121,15 +121,15 @@ 
 	 * @param int|array $limit =null number of entries to return, default null = all or array(offset, num_rows) to return num_rows starting from offset
 	 * @return array id => links pairs if $id is an array or just the links (only_app: ids) or empty array if no matching links found
 	 */
-	static function get_links($app, $id, $only_app='', $order='link_lastmod DESC', $deleted=false, $limit=null)
+	static function get_links($app, $id, $only_app = '', $order = 'link_lastmod DESC', $deleted = false, $limit = null)
 	{
 		if (self::DEBUG)
 		{
-			echo "<p>solink.get_links($app,".print_r($id,true).",$only_app,$order,$deleted)</p>\n";
+			echo "<p>solink.get_links($app,".print_r($id, true).",$only_app,$order,$deleted)</p>\n";
 		}
 		if (($not_only = $only_app[0] == '!'))
 		{
-			$only_app = substr($only_app,1);
+			$only_app = substr($only_app, 1);
 		}
 
 		$offset = false;
@@ -137,32 +137,32 @@ 
 		{
 			list($offset, $limit) = $limit;
 		}
-		elseif($limit)
+		elseif ($limit)
 		{
 			$offset = 0;
 		}
 
 		$links = array();
 		try {
-			foreach(self::$db->select(self::TABLE, '*', self::$db->expression(self::TABLE, '((', array(
+			foreach (self::$db->select(self::TABLE, '*', self::$db->expression(self::TABLE, '((', array(
 						'link_app1'	=> $app,
 						'link_id1'	=> $id,
-					),') OR (',array(
+					), ') OR (', array(
 						'link_app2'	=> $app,
 						'link_id2'	=> $id,
-					),'))',
+					), '))',
 					$deleted ? '' : ' AND deleted IS NULL'
 				), __LINE__, __FILE__, $offset, $order ? " ORDER BY $order" : '', 'phpgwapi', $limit) as $row)
 			{
 				// check if left side (1) is one of our targets --> add it
-				if ($row['link_app1'] == $app && in_array($row['link_id1'],(array)$id))
+				if ($row['link_app1'] == $app && in_array($row['link_id1'], (array)$id))
 				{
-					self::_add2links($row,true,$only_app,$not_only,$links);
+					self::_add2links($row, true, $only_app, $not_only, $links);
 				}
 				// check if right side (2) is one of our targets --> add it (both can be true for multiple targets!)
-				if ($row['link_app2'] == $app && in_array($row['link_id2'],(array)$id))
+				if ($row['link_app2'] == $app && in_array($row['link_id2'], (array)$id))
 				{
-					self::_add2links($row,false,$only_app,$not_only,$links);
+					self::_add2links($row, false, $only_app, $not_only, $links);
 				}
 			}
 			// if query returns exactly limit rows, we assume there are more and therefore set self::$limit_exceeded
@@ -170,18 +170,18 @@ 
 		}
 		// catch Illegal mix of collations (ascii_general_ci,IMPLICIT) and (utf8_general_ci,COERCIBLE) for operation '=' (1267)
 		// caused by non-ascii chars compared with ascii field uid
-		catch(Api\Db\Exception $e) {
+		catch (Api\Db\Exception $e) {
 			_egw_log_exception($e);
 		}
 		return is_array($id) ? $links : ($links[$id] ? $links[$id] : array());
 	}
 
-	private static function _add2links($row,$left,$only_app,$not_only,array &$links)
+	private static function _add2links($row, $left, $only_app, $not_only, array &$links)
 	{
 		$linked_app = $left ? $row['link_app2'] : $row['link_app1'];
 		$linked_id  = $left ? $row['link_id2'] : $row['link_id1'];
 		$app_id = $left ? $row['link_id1'] : $row['link_id2'];
-		list($app) = explode('-',$linked_app);
+		list($app) = explode('-', $linked_app);
 		if ($only_app && $not_only == ($linked_app == $only_app) || !$GLOBALS['egw_info']['user']['apps'][$app])
 		{
 			#echo "$linked_app == $only_app, ";var_dump($linked_app == $only_app);echo "	->dont return a link<br>";
@@ -208,13 +208,13 @@ 
 	 * @param string $id2 ='' id in $app2, if no integer link_id given in $app_link_id
 	 * @return array with link-data or False
 	 */
-	static function get_link($app_link_id,$id='',$app2='',$id2='')
+	static function get_link($app_link_id, $id = '', $app2 = '', $id2 = '')
 	{
 		if (self::DEBUG)
 		{
 			echo "<p>solink.get_link('$app_link_id',$id,'$app2','$id2')</p>\n";
 		}
-		if ((int) $app_link_id > 0)
+		if ((int)$app_link_id > 0)
 		{
 			$where = array('link_id' => $app_link_id);
 		}
@@ -224,24 +224,24 @@ 
 			{
 				return False;
 			}
-			$where = self::$db->expression(self::TABLE,'(',array(
+			$where = self::$db->expression(self::TABLE, '(', array(
 					'link_app1'	=> $app_link_id,
 					'link_id1'	=> $id,
 					'link_app2'	=> $app2,
 					'link_id2'	=> $id2,
-				),') OR (',array(
+				), ') OR (', array(
 					'link_app2'	=> $app_link_id,
 					'link_id2'	=> $id,
 					'link_app1'	=> $app2,
 					'link_id1'	=> $id2,
-				),')');
+				), ')');
 		}
 		try {
-			return self::$db->select(self::TABLE,'*',$where,__LINE__,__FILE__)->fetch(ADODB_FETCH_ASSOC);
+			return self::$db->select(self::TABLE, '*', $where, __LINE__, __FILE__)->fetch(ADODB_FETCH_ASSOC);
 		}
 		// catch Illegal mix of collations (ascii_general_ci,IMPLICIT) and (utf8_general_ci,COERCIBLE) for operation '=' (1267)
 		// caused by non-ascii chars compared with ascii field uid
-		catch(Api\Db\Exception $e) {
+		catch (Api\Db\Exception $e) {
 			_egw_log_exception($e);
 		}
 		return false;
@@ -259,7 +259,7 @@ 
 	 * @param boolean $hold_for_purge Don't really delete the link, just mark it as deleted and wait for final delete of linked entry
 	 * @return array with deleted links
 	 */
-	static function unlink($link_id,$app='',$id='',$owner=0,$app2='',$id2='',$hold_for_purge=false)
+	static function unlink($link_id, $app = '', $id = '', $owner = 0, $app2 = '', $id2 = '', $hold_for_purge = false)
 	{
 		if (self::DEBUG)
 		{
@@ -284,21 +284,21 @@ 
 					$check1['link_id1'] = $id;
 					$check2['link_id2'] = $id;
 				}
-				$where = self::$db->expression(self::TABLE,'((',$check1,') OR (',$check2,'))');
+				$where = self::$db->expression(self::TABLE, '((', $check1, ') OR (', $check2, '))');
 			}
 			elseif ($app != '' && $app2 != '')
 			{
-				$where = self::$db->expression(self::TABLE,'(',array(
+				$where = self::$db->expression(self::TABLE, '(', array(
 						'link_app1'	=> $app,
 						'link_id1'	=> $id,
 						'link_app2'	=> $app2,
 						'link_id2'	=> $id2,
-					),') OR (',array(
+					), ') OR (', array(
 						'link_app1'	=> $app2,
 						'link_id1'	=> $id2,
 						'link_app2'	=> $app,
 						'link_id2'	=> $id,
-					),')');
+					), ')');
 			}
 			if ($owner)
 			{
@@ -308,25 +308,25 @@ 
 		}
 		$deleted = array();
 		try {
-			foreach(self::$db->select(self::TABLE,'*',$where,__LINE__,__FILE__) as $row)
+			foreach (self::$db->select(self::TABLE, '*', $where, __LINE__, __FILE__) as $row)
 			{
 				$deleted[] = $row;
 			}
-			if($hold_for_purge)
+			if ($hold_for_purge)
 			{
-				self::$db->update(self::TABLE,array(
+				self::$db->update(self::TABLE, array(
 					'deleted' => time(),
 					'link_lastmod' => time(),
-				), $where, __LINE__,__FILE__);
+				), $where, __LINE__, __FILE__);
 			}
 			else
 			{
-				self::$db->delete(self::TABLE,$where,__LINE__,__FILE__);
+				self::$db->delete(self::TABLE, $where, __LINE__, __FILE__);
 			}
 		}
 		// catch Illegal mix of collations (ascii_general_ci,IMPLICIT) and (utf8_general_ci,COERCIBLE) for operation '=' (1267)
 		// caused by non-ascii chars compared with ascii field uid
-		catch(Api\Db\Exception $e) {
+		catch (Api\Db\Exception $e) {
 			_egw_log_exception($e);
 		}
 
@@ -357,8 +357,8 @@ 
 			$check1['link_id1'] = $id;
 			$check2['link_id2'] = $id;
 		}
-		$where = self::$db->expression(self::TABLE,'((',$check1,') OR (',$check2,'))');
-		self::$db->update(self::TABLE,array('deleted'=> null), $where, __LINE__,__FILE__);
+		$where = self::$db->expression(self::TABLE, '((', $check1, ') OR (', $check2, '))');
+		self::$db->update(self::TABLE, array('deleted'=> null), $where, __LINE__, __FILE__);
 	}
 
 	/**
@@ -371,13 +371,13 @@ 
 	 * @param int $new_owner account_id of new owner
 	 * @return int number of links changed
 	 */
-	static function chown($owner,$new_owner)
+	static function chown($owner, $new_owner)
 	{
-		if ((int)$owner <= 0 || (int) $new_owner <= 0)
+		if ((int)$owner <= 0 || (int)$new_owner <= 0)
 		{
 			return 0;
 		}
-		self::$db->update(self::TABLE,array('owner'=>$new_owner),array('owner'=>$owner),__LINE__,__FILE__);
+		self::$db->update(self::TABLE, array('owner'=>$new_owner), array('owner'=>$owner), __LINE__, __FILE__);
 
 		return self::$db->affected_rows();
 	}
@@ -404,15 +404,15 @@ 
 	 * @param int|array $limit =null number of entries to return, default null = all or array(offset, num_rows) to return num_rows starting from offset
 	 * @return array with links from entries from $app to $target_app/$target_id plus the other (b) link_id/app/id in the keys 'link3'/'app3'/'id3'
 	 */
-	static function get_3links($app, $target_app, $target_id=null, $just_app_ids=false, $order='link_lastmod DESC', $limit=null)
+	static function get_3links($app, $target_app, $target_id = null, $just_app_ids = false, $order = 'link_lastmod DESC', $limit = null)
 	{
 		$table = self::TABLE;
-		$arrayofselects=array(
+		$arrayofselects = array(
 			// retrieve the type of links, where the relation is realized as timesheet->infolog/tracker via infolog->projectmanager to timesheet->projectmanager
 			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))),
+                        		(!$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",
@@ -421,7 +421,7 @@ 
 			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))),
+                        		(!$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",
@@ -430,7 +430,7 @@ 
 			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))),
+                        		(!$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",
@@ -442,17 +442,17 @@ 
 		{
 			list($offset, $limit) = $limit;
 		}
-		elseif($limit)
+		elseif ($limit)
 		{
 			$offset = 0;
 		}
 
 		$links = array();
-		foreach(self::$db->union($arrayofselects, __LINE__, __FILE__, $order, $offset, $limit) as $row)
+		foreach (self::$db->union($arrayofselects, __LINE__, __FILE__, $order, $offset, $limit) as $row)
 		{
 			if ($just_app_ids)
 			{
-				if ($row['link_app1'] == $target_app && (is_null($target_id) || in_array($row['link_id1'],(array)$target_id)))
+				if ($row['link_app1'] == $target_app && (is_null($target_id) || in_array($row['link_id1'], (array)$target_id)))
 				{
 					$links[$row['link_id']] = $row['link_id2'];
 				}
@@ -463,7 +463,7 @@ 
 			}
 			else
 			{
-				$links[] = Api\Db::strip_array_keys($row,'link_');
+				$links[] = Api\Db::strip_array_keys($row, 'link_');
 			}
 		}
 		// if query returns exactly limit rows, we assume there are more and therefore set self::$limit_exceeded
@@ -477,7 +477,7 @@ 
 	 */
 	static function init_static( )
 	{
-		self::$db     = $GLOBALS['egw']->db;
+		self::$db = $GLOBALS['egw']->db;
 	}
 }
 Storage::init_static();

Braces +4 added lines, -1 removed lines

@@ -302,7 +302,10 @@
 			}
 			if ($owner)
 			{
-				if ($app) $where = array($where);
+				if ($app)
+				{
+					$where = array($where);
+				}
 				$where['link_owner'] = $owner;
 			}
 		}

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

@@ -269,7 +269,7 @@
 		{
 			$where = array('link_id' => $link_id);
 		}
-		elseif ($app == '' AND $owner == '')
+		elseif ($app == '' and $owner == '')
 		{
 			return 0;
 		}

api/src/Mail/Account.php

Doc Comments +6 added lines, -6 removed lines

@@ -486,7 +486,7 @@ 
 	 * @param boolean $replace_placeholders =false should placeholders like {{n_fn}} be replaced
 	 * @param string $field ='name' what to return as value: "ident_(realname|org|email|signature)" or default "name"=result from identity_name
 	 * @param int $user =null account_id to use if not current user
-	 * @return Iterator ident_id => identity_name of identity
+	 * @return Api\Db\CallbackIterator ident_id => identity_name of identity
 	 */
 	public static function identities($account, $replace_placeholders=true, $field='name', $user=null)
 	{
@@ -795,7 +795,7 @@ 
 	 *
 	 * To get $this->params you need to call getUserData before! It is never automatically loaded.
 	 *
-	 * @param type $name
+	 * @param string $name
 	 * @return mixed
 	 */
 	public function __get($name)
@@ -819,8 +819,8 @@ 
 	/**
 	 * Give read access to protected parameters in $this->params
 	 *
-	 * @param type $name
-	 * @return mixed
+	 * @param string $name
+	 * @return boolean
 	 */
 	public function __isset($name)
 	{
@@ -1340,10 +1340,10 @@ 
 	 * @param boolean|string $just_name =true true: return self::identity_name, false: return Account objects,
 	 *	string with attribute-name: return that attribute, eg. acc_imap_host or 'params' to return all attributes as array
 	 * @param string $order_by ='acc_name ASC'
-	 * @param int|boolean $offset =false offset or false to return all
+	 * @param boolean $offset =false offset or false to return all
 	 * @param int $num_rows =0 number of rows to return, 0=default from prefs (if $offset !== false)
 	 * @param boolean $replace_placeholders =true should placeholders like {{n_fn}} be replaced
-	 * @return Iterator with acc_id => acc_name or Account objects
+	 * @return Api\Db\CallbackIterator with acc_id => acc_name or Account objects
 	 */
 	public static function search($only_current_user=true, $just_name=true, $order_by=null, $offset=false, $num_rows=0, $replace_placeholders=true)
 	{

Braces +95 added lines, -24 removed lines

@@ -360,8 +360,14 @@ 
 		{
 			// make sure mbstring.func_overload=0
 			static $func_overload = null;
-			if (is_null($func_overload)) $func_overload = extension_loaded('mbstring') ? ini_get('mbstring.func_overload') : 0;
-			if ($func_overload) throw new Api\Exception\AssertionFailed('Fatal Error: EGroupware requires mbstring.func_overload=0 set in your php.ini!');
+			if (is_null($func_overload))
+			{
+				$func_overload = extension_loaded('mbstring') ? ini_get('mbstring.func_overload') : 0;
+			}
+			if ($func_overload)
+			{
+				throw new Api\Exception\AssertionFailed('Fatal Error: EGroupware requires mbstring.func_overload=0 set in your php.ini!');
+			}
 
 			$class = $this->params['acc_imap_type'];
 			$this->imapServer = new $class($this->params, $_adminConnection, $_timeout);
@@ -490,7 +496,10 @@ 
 	 */
 	public static function identities($account, $replace_placeholders=true, $field='name', $user=null)
 	{
-		if (!isset($user)) $user = $GLOBALS['egw_info']['user']['account_id'];
+		if (!isset($user))
+		{
+			$user = $GLOBALS['egw_info']['user']['account_id'];
+		}
 		$acc_id = is_scalar($account) ? $account : $account['acc_id'];
 
 		$cols = array('ident_id', 'ident_name', 'ident_realname', 'ident_org', 'ident_email', 'ident_signature', 'acc_id', 'acc_imap_username', 'acc_imap_logintype', 'acc_domain');
@@ -528,8 +537,14 @@ 
 				// fill an empty ident_realname or ident_email of current user with data from user account
 				if ($replace_placeholders && (!isset($user) || $user == $GLOBALS['egw_info']['user']['acount_id']))
 				{
-					if (empty($row['ident_realname'])) $row['ident_realname'] = $GLOBALS['egw_info']['user']['account_fullname'];
-					if (empty($row['ident_email'])) $row['ident_email'] = $GLOBALS['egw_info']['user']['account_email'];
+					if (empty($row['ident_realname']))
+					{
+						$row['ident_realname'] = $GLOBALS['egw_info']['user']['account_fullname'];
+					}
+					if (empty($row['ident_email']))
+					{
+						$row['ident_email'] = $GLOBALS['egw_info']['user']['account_email'];
+					}
 				}
 				if ($field != 'name')
 				{
@@ -538,7 +553,9 @@ 
 				}
 				return self::identity_name($row, $replace_placeholders);
 			}, array(),
-			function($row) { return $row['ident_id'];});
+			function($row)
+			{
+return $row['ident_id'];});
 	}
 
 	/**
@@ -554,10 +571,13 @@ 
 		{
 			$address .= ($address && $identity['ident_org'] ? ' ' : '').$identity['ident_org'];
 		}
-		if (strpos($address, ',') !== false)	// need to quote comma
+		if (strpos($address, ',') !== false)
+		{
+			// need to quote comma
 		{
 			$address = '"'.str_replace('"', '\\"', $address).'"';
 		}
+		}
 		if (!strpos($identity['ident_email'], '@'))
 		{
 			$address = null;
@@ -661,8 +681,14 @@ 
 		if ($to_replace)
 		{
 			static $merge=null;
-			if (!isset($merge)) $merge = new Api\Contacts\Merge();
-			if (!isset($account_id)) $account_id = $GLOBALS['egw_info']['user']['account_id'];
+			if (!isset($merge))
+			{
+				$merge = new Api\Contacts\Merge();
+			}
+			if (!isset($account_id))
+			{
+				$account_id = $GLOBALS['egw_info']['user']['account_id'];
+			}
 			foreach($to_replace as $name => &$value)
 			{
 				$err = null;
@@ -1083,7 +1109,10 @@ 
 				}
 
 				// fetch the IMAP / incomming server data
-				if (!class_exists($data['acc_smtp_type'])) $data['acc_smtp_type'] = __NAMESPACE__.'\\Smtp';
+				if (!class_exists($data['acc_smtp_type']))
+				{
+					$data['acc_smtp_type'] = __NAMESPACE__.'\\Smtp';
+				}
 			}
 		}
 		return $data;
@@ -1115,7 +1144,10 @@ 
 		}
 
 		// fetch the IMAP / incomming server data
-		if (!class_exists($imap_type)) $imap_type = __NAMESPACE__.'\\Imap';
+		if (!class_exists($imap_type))
+		{
+			$imap_type = __NAMESPACE__.'\\Imap';
+		}
 
 		return $imap_type;
 	}
@@ -1168,7 +1200,10 @@ 
 			$data['acc_id'] = self::$db->get_last_insert_id(self::TABLE, 'acc_id');
 		}
 		// restore namespace in class-names
-		if ($backup) $data = array_merge($data, $backup);
+		if ($backup)
+		{
+			$data = array_merge($data, $backup);
+		}
 
 		// store identity
 		$new_ident_id = self::save_identity($data);
@@ -1279,7 +1314,10 @@ 
 	 */
 	protected static function credentials_valid_for($account, $account_id=null)
 	{
-		if (!isset($account_id)) $account_id = $GLOBALS['egw_info']['user']['account_id'];
+		if (!isset($account_id))
+		{
+			$account_id = $GLOBALS['egw_info']['user']['account_id'];
+		}
 
 		// if account valid for multiple users
 		if (self::is_multiple($account))
@@ -1398,9 +1436,12 @@ 
 				$cols[] = $valid_account_id_sql.' AS account_id';
 				$join .= ' '.self::ALL_VALID_JOIN;
 			}
-			if ($just_name == 'params')	// join in acc_imap_admin_username
+			if ($just_name == 'params')
+			{
+				// join in acc_imap_admin_username
 			{
 				$cols[] = self::ADMIN_COL;
+			}
 				$join .= ' '.self::ADMIN_JOIN;
 			}
 			$rs = self::$db->select(self::TABLE, $cols,	$where, __LINE__, __FILE__,
@@ -1434,7 +1475,10 @@ 
 				}
 			}
 		}
-		if (is_null(self::$search_cache[$cache_key])) self::$search_cache[$cache_key]=array();
+		if (is_null(self::$search_cache[$cache_key]))
+		{
+			self::$search_cache[$cache_key]=array();
+		}
 		return new Api\Db\CallbackIterator(new \ArrayIterator(self::$search_cache[$cache_key]),
 			// process each row
 			function($row) use ($just_name, $replace_placeholders, $account_id)
@@ -1476,12 +1520,18 @@ 
 			{
 				if ($smtp)
 				{
-					if (!$params['acc_smtp_host'] || !$params['acc_smtp_port']) continue;
+					if (!$params['acc_smtp_host'] || !$params['acc_smtp_port'])
+					{
+						continue;
+					}
 					// check requirement of session, which is not available in async service!
 					if (isset($GLOBALS['egw_info']['flags']['async-service']) ||
-						empty($GLOBALS['egw_info']['user']['account_id']))	// happens during login when notifying about blocked accounts
+						empty($GLOBALS['egw_info']['user']['account_id']))
+					{
+						// happens during login when notifying about blocked accounts
 					{
 						if ($params['acc_smtp_auth_session']) continue;
+					}
 						// may fail because of smtp only profile, or no session password, etc
 						try
 						{
@@ -1492,15 +1542,24 @@ 
 							unset($x);
 							continue;
 						}
-						if (Credentials::isUser($account->acc_smtp_pw_enc)) continue;
+						if (Credentials::isUser($account->acc_smtp_pw_enc))
+						{
+							continue;
+						}
 					}
 				}
 				else
 				{
-					if (!$params['acc_imap_host'] || !$params['acc_imap_port']) continue;
+					if (!$params['acc_imap_host'] || !$params['acc_imap_port'])
+					{
+						continue;
+					}
 					$account = new Account($params);
 					// continue if we have either no imap username or password
-					if (!$account->is_imap()) continue;
+					if (!$account->is_imap())
+					{
+						continue;
+					}
 				}
 				return $return_id ? $acc_id : (isset($account) && $account->acc_id == $acc_id ?
 					$account : new Account($params));
@@ -1508,7 +1567,10 @@ 
 		}
 		catch (\Exception $e)
 		{
-			if ($log_no_default) error_log(__METHOD__.__LINE__.' Error no Default available.'.$e->getMessage());
+			if ($log_no_default)
+			{
+				error_log(__METHOD__.__LINE__.' Error no Default available.'.$e->getMessage());
+			}
 		}
 		return null;
 	}
@@ -1570,8 +1632,14 @@ 
 				// fill an empty ident_realname or ident_email of current user with data from user account
 				if ($replace_placeholders && (!isset($account_id) || $account_id == $GLOBALS['egw_info']['user']['acount_id']))
 				{
-					if (empty($account['ident_realname'])) $account['ident_realname'] = $GLOBALS['egw_info']['user']['account_fullname'];
-					if (empty($account['ident_email'])) $account['ident_email'] = $GLOBALS['egw_info']['user']['account_email'];
+					if (empty($account['ident_realname']))
+					{
+						$account['ident_realname'] = $GLOBALS['egw_info']['user']['account_fullname'];
+					}
+					if (empty($account['ident_email']))
+					{
+						$account['ident_email'] = $GLOBALS['egw_info']['user']['account_email'];
+					}
 				}
 				if (empty($account['ident_email']) && !empty($account['acc_imap_username']) && strpos($account['acc_imap_username'], '@') !== false)
 				{
@@ -1642,7 +1710,10 @@ 
 	 */
 	protected static function memberships($user=null)
 	{
-		if (!$user) $user = $GLOBALS['egw_info']['user']['account_id'];
+		if (!$user)
+		{
+			$user = $GLOBALS['egw_info']['user']['account_id'];
+		}
 
 		$memberships = $GLOBALS['egw']->accounts->memberships($user, true);
 		$memberships[] = $user;

Spacing +67 added lines, -70 removed lines

@@ -197,7 +197,7 @@ 
 	/**
 	 * Path to log smtp comunication to or null to not log
 	 */
-	const SMTP_DEBUG_LOG = null;//'/tmp/smtp.log';
+	const SMTP_DEBUG_LOG = null; //'/tmp/smtp.log';
 
 	/**
 	 * Instanciated account object by acc_id, read acts as singelton
@@ -252,7 +252,7 @@ 
 	 * @param int $called_for=null if set access to given user (without smtp credentials!),
 	 *	default current user AND read username/password from current users session
 	 */
-	/*protected*/ function __construct(array $params, $called_for=null)
+	/*protected*/ function __construct(array $params, $called_for = null)
 	{
 		// read credentials from database
 		$params += Credentials::read($params['acc_id'], null, $called_for ? array(0, $called_for) : $called_for, $this->on_login);
@@ -281,16 +281,16 @@ 
 	public static function ssl2secure($ssl)
 	{
 		$secure = false;
-		switch($ssl & ~self::SSL_VERIFY)
+		switch ($ssl&~self::SSL_VERIFY)
 		{
 			case self::SSL_STARTTLS:
-				$secure = 'tls';	// Horde uses 'tls' for STARTTLS, not ssl connection with tls version >= 1 and no sslv2/3
+				$secure = 'tls'; // Horde uses 'tls' for STARTTLS, not ssl connection with tls version >= 1 and no sslv2/3
 				break;
 			case self::SSL_SSL:
 				$secure = 'ssl';
 				break;
 			case self::SSL_TLS:
-				$secure = 'tlsv1';	// since Horde_Imap_Client-1.16.0 requiring Horde_Socket_Client-1.1.0
+				$secure = 'tlsv1'; // since Horde_Imap_Client-1.16.0 requiring Horde_Socket_Client-1.1.0
 				break;
 		}
 		return $secure;
@@ -319,15 +319,15 @@ 
 				$this->params = array_merge($this->params, $data);
 			}
 		}
-		catch(Horde_Imap_Client_Exception $e) {
+		catch (Horde_Imap_Client_Exception $e) {
 			unset($e);
 			// ignore eg. connection errors
 		}
-		catch(\InvalidArgumentException $e) {
+		catch (\InvalidArgumentException $e) {
 			unset($e);
 			// ignore eg. missing admin user
 		}
-		$this->params += array_fill_keys(self::$user_data, null);	// make sure all keys exist now
+		$this->params += array_fill_keys(self::$user_data, null); // make sure all keys exist now
 
 		return (array)$data + (array)$smtp_data;
 	}
@@ -339,7 +339,7 @@ 
 	 */
 	public function saveUserData($user, array $data)
 	{
-		$data += $this->params;	// in case only user-data has been specified
+		$data += $this->params; // in case only user-data has been specified
 
 		// store account-information of managed mail server
 		if ($user > 0 && $data['acc_smtp_type'] && $data['acc_smtp_type'] != __NAMESPACE__.'\\Smtp')
@@ -363,7 +363,7 @@ 
 	 * @param int $_timeout =null timeout in secs, if none given fmail pref or default of 20 is used
 	 * @return Imap
 	 */
-	public function imapServer($_adminConnection=false, $_timeout=null)
+	public function imapServer($_adminConnection = false, $_timeout = null)
 	{
 		if (!isset($this->imapServer) || $this->imapServer->isAdminConnection !== $_adminConnection)
 		{
@@ -395,11 +395,11 @@ 
 	 *	(matters only for imap servers managed by EGroupware!)
 	 * @return boolean
 	 */
-	public function is_imap($try_connect=true)
+	public function is_imap($try_connect = true)
 	{
 		if (empty($this->acc_imap_host) || empty($this->acc_imap_username) || empty($this->acc_imap_password))
 		{
-			return false;	// no imap host or credentials
+			return false; // no imap host or credentials
 		}
 		// if we are not managing the mail-server, we do NOT need to check deliveryMode and accountStatus
 		if ($this->acc_smtp_type == __NAMESPACE__.'\\Smtp')
@@ -436,7 +436,7 @@ 
 			$this->smtpServer->editForwardingAddress = false;
 			$this->smtpServer->host = $this->params['acc_smtp_host'];
 			$this->smtpServer->port = $this->params['acc_smtp_port'];
-			switch($this->params['acc_smtp_ssl'])
+			switch ($this->params['acc_smtp_ssl'])
 			{
 				case self::SSL_TLS:
 					$this->smtpServer->host = 'tlsv1://'.$this->smtpServer->host;
@@ -466,16 +466,16 @@ 
 		if (!isset($this->smtpTransport))
 		{
 			$secure = false;
-			switch($this->acc_smtp_ssl & ~self::SSL_VERIFY)
+			switch ($this->acc_smtp_ssl&~self::SSL_VERIFY)
 			{
 				case self::SSL_STARTTLS:
-					$secure = 'tls';	// Horde uses 'tls' for STARTTLS, not ssl connection with tls version >= 1 and no sslv2/3
+					$secure = 'tls'; // Horde uses 'tls' for STARTTLS, not ssl connection with tls version >= 1 and no sslv2/3
 					break;
 				case self::SSL_SSL:
 					$secure = 'ssl';
 					break;
 				case self::SSL_TLS:
-					$secure = 'tlsv1';	// since Horde_Smtp-1.3.0 requiring Horde_Socket_Client-1.1.0
+					$secure = 'tlsv1'; // since Horde_Smtp-1.3.0 requiring Horde_Socket_Client-1.1.0
 					break;
 			}
 			// Horde use locale for translation of error messages
@@ -505,7 +505,7 @@ 
 	 * @param int $user =null account_id to use if not current user
 	 * @return Iterator ident_id => identity_name of identity
 	 */
-	public static function identities($account, $replace_placeholders=true, $field='name', $user=null)
+	public static function identities($account, $replace_placeholders = true, $field = 'name', $user = null)
 	{
 		if (!isset($user)) $user = $GLOBALS['egw_info']['user']['account_id'];
 		$acc_id = is_scalar($account) ? $account : $account['acc_id'];
@@ -555,7 +555,7 @@ 
 				}
 				return self::identity_name($row, $replace_placeholders);
 			}, array(),
-			function($row) { return $row['ident_id'];});
+			function($row) { return $row['ident_id']; });
 	}
 
 	/**
@@ -598,17 +598,17 @@ 
 	 * @return array acc_id:ident_id:email => rfc822 address pairs, eg. '1:1:rb@stylite.de' => 'Ralf Becker Stylite AG <rb@stylite.de>'
 	 * @todo add aliases for manged mail servers
 	 */
-	public static function rfc822_addresses($formatter=null)
+	public static function rfc822_addresses($formatter = null)
 	{
 		if (!$formatter || !is_callable($formatter))
 		{
 			$formatter = 'self::rfc822';
 		}
 		$addresses = array();
-		foreach(self::search(true, false) as $acc_id => $account)
+		foreach (self::search(true, false) as $acc_id => $account)
 		{
-			$added = false;	// make sure each account get's at least added once, even if it uses an identical email address
-			foreach(self::identities($account, true, 'params') as $identity)
+			$added = false; // make sure each account get's at least added once, even if it uses an identical email address
+			foreach (self::identities($account, true, 'params') as $identity)
 			{
 				if (($address = call_user_func($formatter, $identity)) && (!$added || !in_array($address, $addresses)))
 				{
@@ -642,7 +642,7 @@ 
 			}
 			return $cmp;
 		});
-		foreach($identities as &$identity)
+		foreach ($identities as &$identity)
 		{
 			$identity = self::identity_name($identity);
 		}
@@ -659,16 +659,16 @@ 
 	 * @param int $account_id =null account_id of user, or current user
 	 * @return array with modified fields
 	 */
-	public static function replace_placeholders($identity, $account_id=null)
+	public static function replace_placeholders($identity, $account_id = null)
 	{
-		static $fields = array('ident_name','ident_realname','ident_org','ident_email','ident_signature');
+		static $fields = array('ident_name', 'ident_realname', 'ident_org', 'ident_email', 'ident_signature');
 
 		if (!is_array($identity) && !is_a($identity, 'Account'))
 		{
 			throw new Api\Exception\WrongParameter(__METHOD__."() requires an identity or account as first parameter!");
 		}
 		$to_replace = array();
-		foreach($fields as $name)
+		foreach ($fields as $name)
 		{
 			if (strpos($identity[$name], '{{') !== false || strpos($identity[$name], '$$') !== false)
 			{
@@ -677,10 +677,10 @@ 
 		}
 		if ($to_replace)
 		{
-			static $merge=null;
+			static $merge = null;
 			if (!isset($merge)) $merge = new Api\Contacts\Merge();
 			if (!isset($account_id)) $account_id = $GLOBALS['egw_info']['user']['account_id'];
-			foreach($to_replace as $name => &$value)
+			foreach ($to_replace as $name => &$value)
 			{
 				$err = null;
 				$value = $merge->merge_string($value,
@@ -702,7 +702,7 @@ 
 	 * @return array
 	 * @throws Api\Exception\NotFound
 	 */
-	public static function read_identity($ident_id, $replace_placeholders=false, $user=null, $account=null)
+	public static function read_identity($ident_id, $replace_placeholders = false, $user = null, $account = null)
 	{
 		if (($account && $account['ident_id'] == $ident_id))
 		{
@@ -772,8 +772,7 @@ 
 			'ident_org' => $identity['ident_org'],
 			'ident_email' => $identity['ident_email'],
 			'ident_signature' => $identity['ident_signature'],
-			'account_id' => self::is_multiple($identity) ? 0 :
-				(is_array($identity['account_id']) ? $identity['account_id'][0] : $identity['account_id']),
+			'account_id' => self::is_multiple($identity) ? 0 : (is_array($identity['account_id']) ? $identity['account_id'][0] : $identity['account_id']),
 		);
 		if ($identity['ident_id'] > 0)
 		{
@@ -817,7 +816,7 @@ 
 	 */
 	public function __get($name)
 	{
-		switch($name)
+		switch ($name)
 		{
 			case 'acc_imap_administration':	// no longer stored in database
 				return !empty($this->params['acc_imap_admin_username']);
@@ -841,7 +840,7 @@ 
 	 */
 	public function __isset($name)
 	{
-		switch($name)
+		switch ($name)
 		{
 			case 'acc_imap_administration':	// no longer stored in database
 				return true;
@@ -931,11 +930,11 @@ 
 		{
 			// check if account is for current user, if not deny access
 			$memberships = self::memberships();
-			$memberships[] = '';	// edit uses '' for everyone
+			$memberships[] = ''; // edit uses '' for everyone
 
 			if (array_intersect((array)$account['account_id'], $memberships))
 			{
-				switch($rights)
+				switch ($rights)
 				{
 					case Api\Acl::READ:
 						$access = true;
@@ -980,7 +979,7 @@ 
 	 * @return email_account
 	 * @throws Api\Exception\NotFound if account was not found (or not valid for current user)
 	 */
-	public static function read($acc_id, $called_for=null)
+	public static function read($acc_id, $called_for = null)
 	{
 		//error_log(__METHOD__."($acc_id, ".array2string($called_for).")");
 		// some caching, but only for regular usage/users
@@ -998,7 +997,7 @@ 
 				//error_log(__METHOD__."($acc_id) created instance from cached data");
 				return self::$instances[$acc_id] = new Account(self::$cache[$acc_id]);
 			}
-			$data =& self::$cache[$acc_id];
+			$data = & self::$cache[$acc_id];
 		}
 		$where = array(self::TABLE.'.acc_id='.(int)$acc_id);
 		if (!isset($called_for) || $called_for !== '0')
@@ -1022,7 +1021,7 @@ 
 		if (!$valid_account_id_sql)
 		{
 			$data['account_id'] = array();
-			foreach(self::$db->select(self::VALID_TABLE, 'account_id', array('acc_id' => $acc_id),
+			foreach (self::$db->select(self::VALID_TABLE, 'account_id', array('acc_id' => $acc_id),
 				__LINE__, __FILE__, false, '', self::APP) as $row)
 			{
 				$data['account_id'][] = $row['account_id'];
@@ -1034,7 +1033,7 @@ 
 		if (!isset($called_for))
 		{
 			//error_log(__METHOD__."($acc_id) creating instance and caching data read from db");
-			$ret =& self::$instances[$acc_id];
+			$ret = & self::$instances[$acc_id];
 		}
 		return $ret = new Account($data, $called_for);
 	}
@@ -1047,7 +1046,7 @@ 
 	 */
 	protected static function db2data(array $data)
 	{
-		foreach(array('acc_sieve_enabled','acc_user_editable','acc_smtp_auth_session','acc_user_forward') as $name)
+		foreach (array('acc_sieve_enabled', 'acc_user_editable', 'acc_smtp_auth_session', 'acc_user_forward') as $name)
 		{
 			if (isset($data[$name]))
 			{
@@ -1146,16 +1145,16 @@ 
 	 * @throws Api\Exception\WrongParameter if called static without data-array
 	 * @throws Api\Db\Exception
 	 */
-	public static function write(array $data, $user=null)
+	public static function write(array $data, $user = null)
 	{
 		//error_log(__METHOD__."(".array2string($data).")");
 		$data['acc_modifier'] = $GLOBALS['egw_info']['user']['account_id'];
 		$data['acc_modified'] = time();
 
 		// remove redundant namespace to fit into column
-		$ns_len = strlen(__NAMESPACE__)+1;
+		$ns_len = strlen(__NAMESPACE__) + 1;
 		$backup = array();
-		foreach(array('acc_smtp_type', 'acc_imap_type') as $attr)
+		foreach (array('acc_smtp_type', 'acc_imap_type') as $attr)
 		{
 			if (substr($data[$attr], 0, $ns_len) == __NAMESPACE__.'\\')
 			{
@@ -1169,7 +1168,7 @@ 
 		{
 			// set not set values which, are NOT NULL and therefore would give an SQL error
 			$td = self::$db->get_table_definitions('api', self::TABLE);
-			foreach($td['fd'] as $col => $def)
+			foreach ($td['fd'] as $col => $def)
 			{
 				if (!isset($data[$col]) && $def['nullable'] === false && !isset($def['default']))
 				{
@@ -1206,19 +1205,19 @@ 
 		$old_account_ids = array();
 		if ($where)
 		{
-			foreach(self::$db->select(self::VALID_TABLE, 'account_id', $where,
+			foreach (self::$db->select(self::VALID_TABLE, 'account_id', $where,
 				__LINE__, __FILE__, false, '', self::APP) as $row)
 			{
 				$old_account_ids[] = $row['account_id'];
 			}
 			if (($ids_to_remove = array_diff($old_account_ids, (array)$data['account_id'])))
 			{
-				self::$db->delete(self::VALID_TABLE, $where+array(
+				self::$db->delete(self::VALID_TABLE, $where + array(
 					'account_id' => $ids_to_remove,
 				), __LINE__, __FILE__, self::APP);
 			}
 		}
-		foreach((array)$data['account_id'] as $account_id)
+		foreach ((array)$data['account_id'] as $account_id)
 		{
 			if (!in_array($account_id, $old_account_ids))
 			{
@@ -1267,8 +1266,7 @@ 
 		}
 
 		// store notification folders
-		Notifications::write($data['acc_id'], $data['notify_save_default'] ? 0 :
-			($data['called_for'] ? $data['called_for'] : $GLOBALS['egw_info']['user']['account_id']),
+		Notifications::write($data['acc_id'], $data['notify_save_default'] ? 0 : ($data['called_for'] ? $data['called_for'] : $GLOBALS['egw_info']['user']['account_id']),
 			(array)$data['notify_folders']);
 
 		// store domain of an account for all user like before as "mail_suffix" config
@@ -1294,7 +1292,7 @@ 
 	 * @param int $account_id =null
 	 * @return int account_id for whom credentials are valid or 0 for all
 	 */
-	protected static function credentials_valid_for($account, $account_id=null)
+	protected static function credentials_valid_for($account, $account_id = null)
 	{
 		if (!isset($account_id)) $account_id = $GLOBALS['egw_info']['user']['account_id'];
 
@@ -1320,7 +1318,7 @@ 
 	 * @param int $account_id =null user or group
 	 * @return int number of deleted mail accounts or null if only user-data was deleted and no full mail accounts
 	 */
-	public static function delete($acc_id, $account_id=null)
+	public static function delete($acc_id, $account_id = null)
 	{
 		if (is_array($acc_id) || $acc_id > 0)
 		{
@@ -1331,7 +1329,7 @@ 
 			self::$db->delete(self::TABLE, array('acc_id' => $acc_id), __LINE__, __FILE__, self::APP);
 
 			// invalidate caches
-			foreach((array)$acc_id as $acc_id)
+			foreach ((array)$acc_id as $acc_id)
 			{
 				self::cache_invalidate($acc_id);
 			}
@@ -1350,7 +1348,7 @@ 
 		self::$db->delete(self::IDENTITIES_TABLE, array('account_id' => $account_id), __LINE__, __FILE__, self::APP);
 		// find profiles not belonging to anyone else and delete them
 		$acc_ids = array();
-		foreach(self::$db->select(self::TABLE, self::TABLE.'.acc_id', 'account_id IS NULL', __LINE__, __FILE__,
+		foreach (self::$db->select(self::TABLE, self::TABLE.'.acc_id', 'account_id IS NULL', __LINE__, __FILE__,
 			false, 'GROUP BY '.self::TABLE.'.acc_id', self::APP, 0, 'LEFT '.self::VALID_JOIN) as $row)
 		{
 			$acc_ids[] = $row['acc_id'];
@@ -1374,7 +1372,7 @@ 
 	 * @param boolean $replace_placeholders =true should placeholders like {{n_fn}} be replaced
 	 * @return Iterator with acc_id => acc_name or Account objects
 	 */
-	public static function search($only_current_user=true, $just_name=true, $order_by=null, $offset=false, $num_rows=0, $replace_placeholders=true)
+	public static function search($only_current_user = true, $just_name = true, $order_by = null, $offset = false, $num_rows = 0, $replace_placeholders = true)
 	{
 		//error_log(__METHOD__."($only_current_user, $just_name, '$order_by', $offset, $num_rows)");
 		$where = array();
@@ -1420,19 +1418,19 @@ 
 				$cols[] = self::ADMIN_COL;
 				$join .= ' '.self::ADMIN_JOIN;
 			}
-			$rs = self::$db->select(self::TABLE, $cols,	$where, __LINE__, __FILE__,
+			$rs = self::$db->select(self::TABLE, $cols, $where, __LINE__, __FILE__,
 				$offset, Api\Storage::fix_group_by_columns($group_by, $cols, self::TABLE, 'acc_id').' ORDER BY '.$order_by,
 				self::APP, $num_rows, $join);
 
 			$ids = array();
-			foreach($rs as $row)
+			foreach ($rs as $row)
 			{
 				$row = self::db2data($row);
 
 				if ($only_current_user === true)
 				{
 					//error_log(__METHOD__."(TRUE, $just_name) caching data for acc_id=$row[acc_id]");
-					self::$search_cache[$cache_key][$row['acc_id']] =& self::$cache[$row['acc_id']];
+					self::$search_cache[$cache_key][$row['acc_id']] = & self::$cache[$row['acc_id']];
 					self::$cache[$row['acc_id']] = $row;
 				}
 				else
@@ -1444,14 +1442,14 @@ 
 			// fetch valid_id, if not yet fetched
 			if (!$valid_account_id_sql && $ids)
 			{
-				foreach(self::$db->select(self::VALID_TABLE, 'account_id', array('acc_id' => $ids),
+				foreach (self::$db->select(self::VALID_TABLE, 'account_id', array('acc_id' => $ids),
 					__LINE__, __FILE__, false, '', self::APP) as $row)
 				{
 					self::$cache[$row['acc_id']]['account_id'][] = $row['account_id'];
 				}
 			}
 		}
-		if (is_null(self::$search_cache[$cache_key])) self::$search_cache[$cache_key]=array();
+		if (is_null(self::$search_cache[$cache_key])) self::$search_cache[$cache_key] = array();
 		return new Api\Db\CallbackIterator(new \ArrayIterator(self::$search_cache[$cache_key]),
 			// process each row
 			function($row) use ($just_name, $replace_placeholders, $account_id)
@@ -1485,11 +1483,11 @@ 
 	 * @param boolean $log_no_default =true true: error_log if no default found, false be silent
 	 * @return Account|null
 	 */
-	static function get_default($smtp=false, $return_id=false, $log_no_default=true)
+	static function get_default($smtp = false, $return_id = false, $log_no_default = true)
 	{
 		try
 		{
-			foreach(self::search(true, 'params') as $acc_id => $params)
+			foreach (self::search(true, 'params') as $acc_id => $params)
 			{
 				if ($smtp)
 				{
@@ -1536,7 +1534,7 @@ 
 	 * @param boolean $smtp =false false: usable for IMAP, true: usable for SMTP
 	 * @return int
 	 */
-	static function get_default_acc_id($smtp=false)
+	static function get_default_acc_id($smtp = false)
 	{
 		return self::get_default($smtp, true);
 	}
@@ -1549,7 +1547,7 @@ 
 	 * @param int $account_id =null account_id of user we are called for
 	 * @return string with htmlencoded angle brackets
 	 */
-	public static function identity_name($account, $replace_placeholders=true, $account_id=null)
+	public static function identity_name($account, $replace_placeholders = true, $account_id = null)
 	{
 		if ($replace_placeholders)
 		{
@@ -1576,7 +1574,7 @@ 
 				{
 					if (!isset($account['acc_imap_username']))
 					{
-						$account += Credentials::read($account['acc_id'], null, ($account_id?array($account_id, 0):null));
+						$account += Credentials::read($account['acc_id'], null, ($account_id ? array($account_id, 0) : null));
 					}
 					if (empty($account['acc_imap_username']) && $account['acc_imap_logintype'] &&
 						(!isset($account_id) || $account_id == $GLOBALS['egw_info']['user']['account_id']))
@@ -1595,7 +1593,7 @@ 
 					$account['ident_email'] = $account['acc_imap_username'];
 				}
 			}
-			catch(\Exception $e) {
+			catch (\Exception $e) {
 				_egw_log_exception($e);
 			}
 		}
@@ -1611,7 +1609,7 @@ 
 		{
 			$name .= ' <'.$account['ident_email'].'>';
 		}
-		elseif(!empty(trim($account['acc_imap_username'])))
+		elseif (!empty(trim($account['acc_imap_username'])))
 		{
 			$name .= ' <'.$account['acc_imap_username'].'>';
 		}
@@ -1634,8 +1632,7 @@ 
 	 */
 	public static function is_multiple($account)
 	{
-		$is_multiple = !is_array($account['account_id']) ? $account['account_id'] <= 0 :
-			(count($account['account_id']) > 1 || $account['account_id'][0] <= 0);
+		$is_multiple = !is_array($account['account_id']) ? $account['account_id'] <= 0 : (count($account['account_id']) > 1 || $account['account_id'][0] <= 0);
 		//error_log(__METHOD__."(account_id=".array2string($account['account_id']).") returning ".array2string($is_multiple));
 		return $is_multiple;
 	}
@@ -1656,13 +1653,13 @@ 
 	 * @param type $user
 	 * @return array
 	 */
-	protected static function memberships($user=null)
+	protected static function memberships($user = null)
 	{
 		if (!$user) $user = $GLOBALS['egw_info']['user']['account_id'];
 
 		$memberships = $GLOBALS['egw']->accounts->memberships($user, true);
 		$memberships[] = $user;
-		$memberships[] = 0;	// marks accounts valid for everyone
+		$memberships[] = 0; // marks accounts valid for everyone
 
 		return $memberships;
 	}

api/src/Mail/Hooks.php

Doc Comments -8 removed lines

@@ -36,9 +36,6 @@ 
      * Hook called before an account get deleted
      *
      * @param array $data
-     * @param int $data['account_id'] numerical id
-     * @param string $data['account_lid'] account-name
-     * @param int $data['new_owner'] account-id of new owner, or false if data should get deleted
      */
 	static function deleteaccount(array $data)
 	{
@@ -52,8 +49,6 @@ 
      * Hook called before a group get deleted
      *
      * @param array $data
-     * @param int $data['account_id'] numerical id
-     * @param string $data['account_name'] account-name
      */
 	static function deletegroup(array $data)
 	{
@@ -64,9 +59,6 @@ 
      * Hook called when an account get added or edited
      *
      * @param array $data
-     * @param int $data['account_id'] numerical id
-     * @param string $data['account_lid'] account-name
-     * @param string $data['account_email'] email
 	 */
 	static function addaccount(array $data)
 	{

Indentation +21 added lines, -21 removed lines

@@ -32,14 +32,14 @@ 
 		}
 	}
 
-    /**
-     * Hook called before an account get deleted
-     *
-     * @param array $data
-     * @param int $data['account_id'] numerical id
-     * @param string $data['account_lid'] account-name
-     * @param int $data['new_owner'] account-id of new owner, or false if data should get deleted
-     */
+	/**
+	 * Hook called before an account get deleted
+	 *
+	 * @param array $data
+	 * @param int $data['account_id'] numerical id
+	 * @param string $data['account_lid'] account-name
+	 * @param int $data['new_owner'] account-id of new owner, or false if data should get deleted
+	 */
 	static function deleteaccount(array $data)
 	{
 		self::run_plugin_hooks('deleteAccount', $data);
@@ -48,25 +48,25 @@ 
 		Account::delete(0, $data['account_id']);
 	}
 
-    /**
-     * Hook called before a group get deleted
-     *
-     * @param array $data
-     * @param int $data['account_id'] numerical id
-     * @param string $data['account_name'] account-name
-     */
+	/**
+	 * Hook called before a group get deleted
+	 *
+	 * @param array $data
+	 * @param int $data['account_id'] numerical id
+	 * @param string $data['account_name'] account-name
+	 */
 	static function deletegroup(array $data)
 	{
 		Account::delete(0, $data['account_id']);
 	}
 
 	/**
-     * Hook called when an account get added or edited
-     *
-     * @param array $data
-     * @param int $data['account_id'] numerical id
-     * @param string $data['account_lid'] account-name
-     * @param string $data['account_email'] email
+	 * Hook called when an account get added or edited
+	 *
+	 * @param array $data
+	 * @param int $data['account_id'] numerical id
+	 * @param string $data['account_lid'] account-name
+	 * @param string $data['account_email'] email
 	 */
 	static function addaccount(array $data)
 	{

Spacing +3 added lines, -3 removed lines

@@ -82,9 +82,9 @@ 
 	 */
 	protected static function run_plugin_hooks($method, array $data)
 	{
-		foreach(Account::search((int)$data['account_id'], 'params') as $params)
+		foreach (Account::search((int)$data['account_id'], 'params') as $params)
 		{
-			if (!Account::is_multiple($params)) continue;	// no need to waste time on personal accounts
+			if (!Account::is_multiple($params)) continue; // no need to waste time on personal accounts
 
 			try {
 				$account = new Account($params);
@@ -100,7 +100,7 @@ 
 					$imap->$method($data);
 				}
 			}
-			catch(\Exception $e) {
+			catch (\Exception $e) {
 				_egw_log_exception($e);
 				// ignore exception, without stalling other hooks
 			}

Braces +5 added lines, -1 removed lines

@@ -84,7 +84,11 @@
 	{
 		foreach(Account::search((int)$data['account_id'], 'params') as $params)
 		{
-			if (!Account::is_multiple($params)) continue;	// no need to waste time on personal accounts
+			if (!Account::is_multiple($params))
+			{
+				continue;
+			}
+			// no need to waste time on personal accounts
 
 			try {
 				$account = new Account($params);

api/src/Mail/Html.php

Doc Comments +1 added lines, -1 removed lines

@@ -227,7 +227,7 @@
 	 * @param string $displayCharset : charset to use; should be a valid charset
 	 * @param bool $stripcrl :  flag to indicate for the removal of all crlf \r\n
 	 * @param bool $stripalltags : flag to indicate wether or not to strip $_html from all remaining tags
-	 * @return text $_html : the modified text.
+	 * @return string $_html : the modified text.
 	 */
 	static function convertHTMLToText($_html,$displayCharset=false,$stripcrl=false,$stripalltags=true)
 	{

Spacing +126 added lines, -126 removed lines

@@ -28,17 +28,17 @@ 
 	 * @param integer $reclevel param to control recursive calls (to prevent endless recursion)
 	 * @return string
 	 */
-	static function decodeMailHeader($_string, $displayCharset='utf-8', $reclevel=0)
+	static function decodeMailHeader($_string, $displayCharset = 'utf-8', $reclevel = 0)
 	{
-		$maxreclevel=25;
+		$maxreclevel = 25;
 		if ($reclevel > $maxreclevel) {
-			error_log( __METHOD__.__LINE__." Recursion Level Exeeded ($reclevel) while decoding $_string ");
+			error_log(__METHOD__.__LINE__." Recursion Level Exeeded ($reclevel) while decoding $_string ");
 			return $_string;
 		}
 		$reclevel++;
 
 		//error_log(__FILE__.','.__METHOD__.':'."called with $_string and CHARSET $displayCharset");
-		if(function_exists('imap_mime_header_decode'))
+		if (function_exists('imap_mime_header_decode'))
 		{
 			// some characterreplacements, as they fail to translate
 			$sar = array(
@@ -60,23 +60,23 @@ 
 
 			$string = preg_replace('/\?=\s+=\?/', '?= =?', $_string);
 
-			$elements=imap_mime_header_decode($string);
+			$elements = imap_mime_header_decode($string);
 
 			$convertAtEnd = false;
-			foreach((array)$elements as $element)
+			foreach ((array)$elements as $element)
 			{
 				if ($element->charset == 'default') $element->charset = Api\Translation::detect_encoding($element->text);
 				if ($element->charset != 'x-unknown')
 				{
-					if( strtoupper($element->charset) != 'UTF-8') $element->text = preg_replace($sar,$rar,$element->text);
+					if (strtoupper($element->charset) != 'UTF-8') $element->text = preg_replace($sar, $rar, $element->text);
 					// check if there is a possible nested encoding; make sure that the inputstring and the decoded result are different to avoid loops
-					$openTags = substr_count($element->text,'?=');
-					if(preg_match('/\?=.+=\?/', $element->text) && $openTags>0 && $openTags==substr_count($element->text,'=?') && $element->text != $_string)
+					$openTags = substr_count($element->text, '?=');
+					if (preg_match('/\?=.+=\?/', $element->text) && $openTags > 0 && $openTags == substr_count($element->text, '=?') && $element->text != $_string)
 					{
 						$element->text = self::decodeMailHeader($element->text, $element->charset, $reclevel);
 						$element->charset = $displayCharset;
 					}
-					$newString .= Api\Translation::convert($element->text,$element->charset);
+					$newString .= Api\Translation::convert($element->text, $element->charset);
 				}
 				else
 				{
@@ -84,34 +84,34 @@ 
 					$convertAtEnd = true;
 				}
 			}
-			if ($convertAtEnd) $newString = self::decodeMailHeader($newString,$displayCharset,$reclevel);
-			return preg_replace('/([\000-\012\015\016\020-\037\075])/','',$newString);
+			if ($convertAtEnd) $newString = self::decodeMailHeader($newString, $displayCharset, $reclevel);
+			return preg_replace('/([\000-\012\015\016\020-\037\075])/', '', $newString);
 		}
-		elseif(function_exists(mb_decode_mimeheader))
+		elseif (function_exists(mb_decode_mimeheader))
 		{
 			$matches = null;
-			if(preg_match_all('/=\?.*\?Q\?.*\?=/iU', $string=$_string, $matches))
+			if (preg_match_all('/=\?.*\?Q\?.*\?=/iU', $string = $_string, $matches))
 			{
-				foreach($matches[0] as $match)
+				foreach ($matches[0] as $match)
 				{
 					$fixedMatch = str_replace('_', ' ', $match);
 					$string = str_replace($match, $fixedMatch, $string);
 				}
-				$string = str_replace('=?ISO8859-','=?ISO-8859-',
-					str_replace('=?windows-1258','=?ISO-8859-1',$string));
+				$string = str_replace('=?ISO8859-', '=?ISO-8859-',
+					str_replace('=?windows-1258', '=?ISO-8859-1', $string));
 			}
 			$string = mb_decode_mimeheader($string);
-			return preg_replace('/([\000-\012\015\016\020-\037\075])/','',$string);
+			return preg_replace('/([\000-\012\015\016\020-\037\075])/', '', $string);
 		}
-		elseif(function_exists(iconv_mime_decode))
+		elseif (function_exists(iconv_mime_decode))
 		{
 			// continue decoding also if an error occurs
 			$string = @iconv_mime_decode($_string, 2, $displayCharset);
-			return preg_replace('/([\000-\012\015\016\020-\037\075])/','',$string);
+			return preg_replace('/([\000-\012\015\016\020-\037\075])/', '', $string);
 		}
 
 		// no decoding function available
-		return preg_replace('/([\000-\012\015\016\020-\037\075])/','',$_string);
+		return preg_replace('/([\000-\012\015\016\020-\037\075])/', '', $_string);
 	}
 
 	/**
@@ -124,15 +124,15 @@ 
 	{
 		//error_log($text);
 		//replace CRLF with something other to be preserved via preg_replace as CRLF seems to vanish
-		$text2 = str_replace("\r\n",'<#cr-lf#>',$text);
+		$text2 = str_replace("\r\n", '<#cr-lf#>', $text);
 			// replace emailaddresses eclosed in <> (eg.: <me@you.de>) with the emailaddress only (e.g: me@you.de)
-		$text3 = preg_replace("/(<|&lt;a href=\")*(mailto:([\w\.,-.,_.,0-9.]+)(@)([\w\.,-.,_.,0-9.]+))(>|&gt;)*/i","$2 ", $text2);
+		$text3 = preg_replace("/(<|&lt;a href=\")*(mailto:([\w\.,-.,_.,0-9.]+)(@)([\w\.,-.,_.,0-9.]+))(>|&gt;)*/i", "$2 ", $text2);
 		//$text = preg_replace_callback("/(<|&lt;a href=\")*(mailto:([\w\.,-.,_.,0-9.]+)(@)([\w\.,-.,_.,0-9.]+))(>|&gt;)*/i",'self::transform_mailto2text',$text);
 		//$text = preg_replace('~<a[^>]+href=\"(mailto:)+([^"]+)\"[^>]*>~si','$2 ',$text);
-		$text4 = preg_replace_callback('~<a[^>]+href=\"(mailto:)+([^"]+)\"[^>]*>([ @\w\.,-.,_.,0-9.]+)<\/a>~si','self::transform_mailto2text',$text3);
-		$text5 = preg_replace("/(([\w\.,-.,_.,0-9.]+)(@)([\w\.,-.,_.,0-9.]+))( |\s)*(<\/a>)*( |\s)*(>|&gt;)*/i","$1 ", $text4);
-		$text6 = preg_replace("/(<|&lt;)*(([\w\.,-.,_.,0-9.]+)@([\w\.,-.,_.,0-9.]+))(>|&gt;)*/i","$2 ", $text5);
-		$text = str_replace('<#cr-lf#>',"\r\n",$text6);
+		$text4 = preg_replace_callback('~<a[^>]+href=\"(mailto:)+([^"]+)\"[^>]*>([ @\w\.,-.,_.,0-9.]+)<\/a>~si', 'self::transform_mailto2text', $text3);
+		$text5 = preg_replace("/(([\w\.,-.,_.,0-9.]+)(@)([\w\.,-.,_.,0-9.]+))( |\s)*(<\/a>)*( |\s)*(>|&gt;)*/i", "$1 ", $text4);
+		$text6 = preg_replace("/(<|&lt;)*(([\w\.,-.,_.,0-9.]+)@([\w\.,-.,_.,0-9.]+))(>|&gt;)*/i", "$2 ", $text5);
+		$text = str_replace('<#cr-lf#>', "\r\n", $text6);
 		return 1;
 	}
 
@@ -146,11 +146,11 @@ 
 	 *				or if you want the string to be matched as is
 	 * @return void the modified text is passed via reference
 	 */
-	static function replaceTagsCompletley(&$_body,$tag,$endtag='',$addbracesforendtag=true)
+	static function replaceTagsCompletley(&$_body, $tag, $endtag = '', $addbracesforendtag = true)
 	{
 		if ($tag) $tag = strtolower($tag);
 		$singleton = false;
-		if ($endtag=='/>') $singleton =true;
+		if ($endtag == '/>') $singleton = true;
 		if ($endtag == '' || empty($endtag) || !isset($endtag))
 		{
 			$endtag = $tag;
@@ -163,31 +163,31 @@ 
 			if ($singleton)
 			{
 				//$_body = preg_replace('~<'.$tag.'[^>].*? '.$endtag.'~simU','',$_body);
-				$_body = preg_replace('~<?'.$tag.'[^>].* '.$endtag.'~simU','',$_body); // we are in Ungreedy mode, so we expect * to be ungreedy without specifying ?
+				$_body = preg_replace('~<?'.$tag.'[^>].* '.$endtag.'~simU', '', $_body); // we are in Ungreedy mode, so we expect * to be ungreedy without specifying ?
 			}
 			else
 			{
-				$found=null;
-				if ($addbracesforendtag === true )
+				$found = null;
+				if ($addbracesforendtag === true)
 				{
-					if (stripos($_body,'<'.$tag)!==false)  $ct = preg_match_all('#<'.$tag.'(?:\s.*)?>(.+)</'.$endtag.'>#isU', $_body, $found);
-					if ($ct>0)
+					if (stripos($_body, '<'.$tag) !== false)  $ct = preg_match_all('#<'.$tag.'(?:\s.*)?>(.+)</'.$endtag.'>#isU', $_body, $found);
+					if ($ct > 0)
 					{
 						//error_log(__METHOD__.__LINE__.array2string($found[0]));
 						// only replace what we have found
-						$_body = str_ireplace($found[0],'',$_body);
+						$_body = str_ireplace($found[0], '', $_body);
 					}
 					// remove left over tags, unfinished ones, and so on
-					$_body = preg_replace('~<'.$tag.'[^>]*?>~si','',$_body);
+					$_body = preg_replace('~<'.$tag.'[^>]*?>~si', '', $_body);
 				}
-				if ($addbracesforendtag === false )
+				if ($addbracesforendtag === false)
 				{
-					if (stripos($_body,'<'.$tag)!==false)  $ct = preg_match_all('#<'.$tag.'(?:\s.*)?>(.+)'.$endtag.'#isU', $_body, $found);
-					if ($ct>0)
+					if (stripos($_body, '<'.$tag) !== false)  $ct = preg_match_all('#<'.$tag.'(?:\s.*)?>(.+)'.$endtag.'#isU', $_body, $found);
+					if ($ct > 0)
 					{
 						//error_log(__METHOD__.__LINE__.array2string($found[0]));
 						// only replace what we have found
-						$_body = str_ireplace($found[0],'',$_body);
+						$_body = str_ireplace($found[0], '', $_body);
 					}
 /*
 					$_body = preg_replace('~<'.$tag.'[^>]*?>(.*?)'.$endtag.'~simU','',$_body);
@@ -205,9 +205,9 @@ 
 		// this is the actual url
 		$matches[2] = trim(strip_tags($matches[2]));
 		$matches[3] = trim(strip_tags($matches[3]));
-		$matches[2] = str_replace(array('%40','%20'),array('@',' '),$matches[2]);
-		$matches[3] = str_replace(array('%40','%20'),array('@',' '),$matches[3]);
-		return $matches[1].$matches[2].($matches[2]==$matches[3]?' ':' -> '.$matches[3].' ');
+		$matches[2] = str_replace(array('%40', '%20'), array('@', ' '), $matches[2]);
+		$matches[3] = str_replace(array('%40', '%20'), array('@', ' '), $matches[3]);
+		return $matches[1].$matches[2].($matches[2] == $matches[3] ? ' ' : ' -> '.$matches[3].' ');
 	}
 
 	static function transform_url2text($matches)
@@ -216,9 +216,9 @@ 
 		$linkTextislink = false;
 		// this is the actual url
 		$matches[2] = trim(strip_tags($matches[2]));
-		if ($matches[2]==$matches[1]) $linkTextislink = true;
-		$matches[1] = str_replace(' ','%20',$matches[1]);
-		return ($linkTextislink?' ':'[ ').$matches[1].($linkTextislink?'':' -> '.$matches[2]).($linkTextislink?' ':' ]');
+		if ($matches[2] == $matches[1]) $linkTextislink = true;
+		$matches[1] = str_replace(' ', '%20', $matches[1]);
+		return ($linkTextislink ? ' ' : '[ ').$matches[1].($linkTextislink ? '' : ' -> '.$matches[2]).($linkTextislink ? ' ' : ' ]');
 	}
 
 	/**
@@ -229,7 +229,7 @@ 
 	 * @param bool $stripalltags : flag to indicate wether or not to strip $_html from all remaining tags
 	 * @return text $_html : the modified text.
 	 */
-	static function convertHTMLToText($_html,$displayCharset=false,$stripcrl=false,$stripalltags=true)
+	static function convertHTMLToText($_html, $displayCharset = false, $stripcrl = false, $stripalltags = true)
 	{
 		// assume input isHTML, but test the input anyway, because,
 		// if it is not, we may not want to strip whitespace
@@ -245,27 +245,27 @@ 
 		#print "<pre>"; print htmlspecialchars($_html);
 		#print "</pre>";
 		#print "<hr>";
-		if (stripos($_html,'style')!==false) self::replaceTagsCompletley($_html,'style'); // clean out empty or pagewide style definitions / left over tags
-		if (stripos($_html,'head')!==false) self::replaceTagsCompletley($_html,'head'); // Strip out stuff in head
-		if (stripos($_html,'![if')!==false && stripos($_html,'<![endif]>')!==false) self::replaceTagsCompletley($_html,'!\[if','<!\[endif\]>',false); // Strip out stuff in ifs
-		if (stripos($_html,'!--[if')!==false && stripos($_html,'<![endif]-->')!==false) self::replaceTagsCompletley($_html,'!--\[if','<!\[endif\]-->',false); // Strip out stuff in ifs
-		$Rules = array ('@<script[^>]*?>.*?</script>@siU', // Strip out javascript
-			'@&(quot|#34);@i',                // Replace HTML entities
-			'@&(amp|#38);@i',                 //   Ampersand &
-			'@&(lt|#60);@i',                  //   Less Than <
-			'@&(gt|#62);@i',                  //   Greater Than >
-			'@&(nbsp|#160);@i',               //   Non Breaking Space
-			'@&(iexcl|#161);@i',              //   Inverted Exclamation point
-			'@&(cent|#162);@i',               //   Cent
-			'@&(pound|#163);@i',              //   Pound
-			'@&(copy|#169);@i',               //   Copyright
-			'@&(reg|#174);@i',                //   Registered
-			'@&(trade|#8482);@i',             //   trade
-			'@&#39;@i',                       //   singleQuote
-			'@(\xc2\xa0)@',                   //   nbsp or tab (encoded windows-style)
-			'@(\xe2\x80\x8b)@',               //   ZERO WIDTH SPACE
+		if (stripos($_html, 'style') !== false) self::replaceTagsCompletley($_html, 'style'); // clean out empty or pagewide style definitions / left over tags
+		if (stripos($_html, 'head') !== false) self::replaceTagsCompletley($_html, 'head'); // Strip out stuff in head
+		if (stripos($_html, '![if') !== false && stripos($_html, '<![endif]>') !== false) self::replaceTagsCompletley($_html, '!\[if', '<!\[endif\]>', false); // Strip out stuff in ifs
+		if (stripos($_html, '!--[if') !== false && stripos($_html, '<![endif]-->') !== false) self::replaceTagsCompletley($_html, '!--\[if', '<!\[endif\]-->', false); // Strip out stuff in ifs
+		$Rules = array('@<script[^>]*?>.*?</script>@siU', // Strip out javascript
+			'@&(quot|#34);@i', // Replace HTML entities
+			'@&(amp|#38);@i', //   Ampersand &
+			'@&(lt|#60);@i', //   Less Than <
+			'@&(gt|#62);@i', //   Greater Than >
+			'@&(nbsp|#160);@i', //   Non Breaking Space
+			'@&(iexcl|#161);@i', //   Inverted Exclamation point
+			'@&(cent|#162);@i', //   Cent
+			'@&(pound|#163);@i', //   Pound
+			'@&(copy|#169);@i', //   Copyright
+			'@&(reg|#174);@i', //   Registered
+			'@&(trade|#8482);@i', //   trade
+			'@&#39;@i', //   singleQuote
+			'@(\xc2\xa0)@', //   nbsp or tab (encoded windows-style)
+			'@(\xe2\x80\x8b)@', //   ZERO WIDTH SPACE
 		);
-		$Replace = array ('',
+		$Replace = array('',
 			'"',
 			'#amper#sand#',
 			'<',
@@ -274,9 +274,9 @@ 
 			chr(161),
 			chr(162),
 			chr(163),
-			'(C)',//chr(169),// copyrighgt
-			'(R)',//chr(174),// registered
-			'(TM)',// trade
+			'(C)', //chr(169),// copyrighgt
+			'(R)', //chr(174),// registered
+			'(TM)', // trade
 			"'",
 			' ',
 			'',
@@ -284,27 +284,27 @@ 
 		$_html = preg_replace($Rules, $Replace, $_html);
 
 		//   removing carriage return linefeeds, preserve those enclosed in <pre> </pre> tags
-		if ($stripcrl === true )
+		if ($stripcrl === true)
 		{
-			if (stripos($_html,'<pre ')!==false || stripos($_html,'<pre>')!==false)
+			if (stripos($_html, '<pre ') !== false || stripos($_html, '<pre>') !== false)
 			{
 				$contentArr = self::splithtmlByPRE($_html);
 				foreach ($contentArr as $k =>&$elem)
 				{
-					if (stripos($elem,'<pre ')===false && stripos($elem,'<pre>')===false)
+					if (stripos($elem, '<pre ') === false && stripos($elem, '<pre>') === false)
 					{
 						//$elem = str_replace('@(\r\n)@i',' ',$elem);
-						$elem = str_replace(array("\r\n","\n"),($isHTML?'':' '),$elem);
+						$elem = str_replace(array("\r\n", "\n"), ($isHTML ? '' : ' '), $elem);
 					}
 				}
-				$_html = implode('',$contentArr);
+				$_html = implode('', $contentArr);
 			}
 			else
 			{
-				$_html = str_replace(array("\r\n","\n"),($isHTML?'':' '),$_html);
+				$_html = str_replace(array("\r\n", "\n"), ($isHTML ? '' : ' '), $_html);
 			}
 		}
-		$tags = array (
+		$tags = array(
 			0 => '~<h[123][^>]*>\r*\n*~si',
 			1 => '~<h[456][^>]*>\r*\n*~si',
 			2 => '~<table[^>]*>\r*\n*~si',
@@ -325,7 +325,7 @@ 
 			17 => '/<([1234567890])/',
 			18 => '/>([1234567890])/',
 		);
-		$Replace = array (
+		$Replace = array(
 			0 => "\r\n",
 			1 => "\r\n",
 			2 => "\r\n",
@@ -346,112 +346,112 @@ 
 			17 => '#lower#than#$1',
 			18 => '#greater#than#$1',
 		);
-		$_html = preg_replace($tags,$Replace,$_html);
-		$_html = preg_replace('~</t(d|h)>\s*<t(d|h)[^>]*>~si',' - ',$_html);
-		$_html = preg_replace('~<img[^>]+>~s','',$_html);
+		$_html = preg_replace($tags, $Replace, $_html);
+		$_html = preg_replace('~</t(d|h)>\s*<t(d|h)[^>]*>~si', ' - ', $_html);
+		$_html = preg_replace('~<img[^>]+>~s', '', $_html);
 		// replace emailaddresses eclosed in <> (eg.: <me@you.de>) with the emailaddress only (e.g: me@you.de)
 		self::replaceEmailAdresses($_html);
 		//convert hrefs to description -> URL
 		//$_html = preg_replace('~<a[^>]+href=\"([^"]+)\"[^>]*>(.*)</a>~si','[$2 -> $1]',$_html);
-		$_html = preg_replace_callback('~<a[^>]+href=\"([^"]+)\"[^>]*>(.*?)</a>~si','self::transform_url2text',$_html);
+		$_html = preg_replace_callback('~<a[^>]+href=\"([^"]+)\"[^>]*>(.*?)</a>~si', 'self::transform_url2text', $_html);
 
 		// reducing double \r\n to single ones, dont mess with pre sections
 		if ($stripcrl === true && $isHTML)
 		{
-			if (stripos($_html,'<pre ')!==false || stripos($_html,'<pre>')!==false)
+			if (stripos($_html, '<pre ') !== false || stripos($_html, '<pre>') !== false)
 			{
 				$contentArr = self::splithtmlByPRE($_html);
 				foreach ($contentArr as $k =>&$elem)
 				{
-					if (stripos($elem,'<pre ')===false && stripos($elem,'<pre>')===false)
+					if (stripos($elem, '<pre ') === false && stripos($elem, '<pre>') === false)
 					{
 						//this is supposed to strip out all remaining stuff in tags, this is sometimes taking out whole sections off content
-						if ( $stripalltags ) {
-							$_html = preg_replace('~<[^>^@]+>~s','',$_html);
+						if ($stripalltags) {
+							$_html = preg_replace('~<[^>^@]+>~s', '', $_html);
 						}
 						// strip out whitespace inbetween CR/LF
 						$elem = preg_replace('~\r\n\s+\r\n~si', "\r\n\r\n", $elem);
 						// strip out / reduce exess CR/LF
-						$elem = preg_replace('~\r\n{3,}~si',"\r\n\r\n",$elem);
+						$elem = preg_replace('~\r\n{3,}~si', "\r\n\r\n", $elem);
 					}
 				}
-				$_html = implode('',$contentArr);
+				$_html = implode('', $contentArr);
 			}
 			else
 			{
 				//this is supposed to strip out all remaining stuff in tags, this is sometimes taking out whole sections off content
-				if ( $stripalltags ) {
-					$_html = preg_replace('~<[^>^@]+>~s','',$_html);
+				if ($stripalltags) {
+					$_html = preg_replace('~<[^>^@]+>~s', '', $_html);
 				}
 				// strip out whitespace inbetween CR/LF
 				$_html = preg_replace('~\r\n\s+\r\n~si', "\r\n\r\n", $_html);
 				// strip out / reduce exess CR/LF
-				$_html = preg_replace('~(\r\n){3,}~si',"\r\n\r\n",$_html);
+				$_html = preg_replace('~(\r\n){3,}~si', "\r\n\r\n", $_html);
 			}
 		}
 		//this is supposed to strip out all remaining stuff in tags, this is sometimes taking out whole sections off content
-		if ( $stripalltags ) {
-			$_html = preg_replace('~<[^>^@]+>~s','',$_html);
+		if ($stripalltags) {
+			$_html = preg_replace('~<[^>^@]+>~s', '', $_html);
 			//$_html = strip_tags($_html, '<a>');
 		}
 		// reducing spaces (not for input that was plain text from the beginning)
-		if ($isHTML) $_html = preg_replace('~ +~s',' ',$_html);
+		if ($isHTML) $_html = preg_replace('~ +~s', ' ', $_html);
 		// restoring ampersands
-		$_html = str_replace('#amper#sand#','&',$_html);
+		$_html = str_replace('#amper#sand#', '&', $_html);
 		// restoring lower|greater[or equal] than
-		$_html = str_replace('#lowerorequal#than#','<=',$_html);
-		$_html = str_replace('#greaterorequal#than#','>=',$_html);
-		$_html = str_replace('#lower#than#','<',$_html);
-		$_html = str_replace('#greater#than#','>',$_html);
+		$_html = str_replace('#lowerorequal#than#', '<=', $_html);
+		$_html = str_replace('#greaterorequal#than#', '>=', $_html);
+		$_html = str_replace('#lower#than#', '<', $_html);
+		$_html = str_replace('#greater#than#', '>', $_html);
 		//error_log(__METHOD__.__LINE__.' Charset:'.$displayCharset.' -> '.$_html);
 		$_html = html_entity_decode($_html, ENT_COMPAT, $displayCharset);
 		//error_log(__METHOD__.__LINE__.' Charset:'.$displayCharset.' After html_entity_decode: -> '.$_html);
 		//self::replaceEmailAdresses($_html);
 		$pos = strpos($_html, 'blockquote');
 		//error_log("convert HTML2Text: $_html");
-		if($pos === false) {
+		if ($pos === false) {
 			return $_html;
 		} else {
 			$indent = 0;
 			$indentString = '';
 
 			$quoteParts = preg_split('/#blockquote#type#cite#/', $_html, -1, PREG_SPLIT_OFFSET_CAPTURE);
-			foreach($quoteParts as $quotePart) {
-				if($quotePart[1] > 0) {
+			foreach ($quoteParts as $quotePart) {
+				if ($quotePart[1] > 0) {
 					$indent++;
 					$indentString .= '>';
 				}
 				$quoteParts2 = preg_split('/#blockquote#end#cite#/', $quotePart[0], -1, PREG_SPLIT_OFFSET_CAPTURE);
 
-				foreach($quoteParts2 as $quotePart2) {
-					if($quotePart2[1] > 0) {
+				foreach ($quoteParts2 as $quotePart2) {
+					if ($quotePart2[1] > 0) {
 						$indent--;
 						$indentString = substr($indentString, 0, $indent);
 					}
 
 					$quoteParts3 = explode("\r\n", $quotePart2[0]);
 
-					foreach($quoteParts3 as $quotePart3) {
+					foreach ($quoteParts3 as $quotePart3) {
 						//error_log(__METHOD__.__LINE__.'Line:'.$quotePart3);
-						$allowedLength = 76-strlen("\r\n$indentString");
+						$allowedLength = 76 - strlen("\r\n$indentString");
 						// only break lines, if not already indented
-						if (substr($quotePart3,0,strlen($indentString)) != $indentString)
+						if (substr($quotePart3, 0, strlen($indentString)) != $indentString)
 						{
 							if (strlen($quotePart3) > $allowedLength) {
-								$s=explode(" ", $quotePart3);
+								$s = explode(" ", $quotePart3);
 								$quotePart3 = "";
 								$linecnt = 0;
 								foreach ($s as $k=>$v) {
 									$cnt = strlen($v);
 									// only break long words within the wordboundaries,
 									// but it may destroy links, so we check for href and dont do it if we find it
-									if($cnt > $allowedLength && stripos($v,'href=')===false) {
+									if ($cnt > $allowedLength && stripos($v, 'href=') === false) {
 										//error_log(__METHOD__.__LINE__.'LongWordFound:'.$v);
-										$v=wordwrap($v, $allowedLength, "\r\n$indentString", true);
+										$v = wordwrap($v, $allowedLength, "\r\n$indentString", true);
 									}
 									// the rest should be broken at the start of the new word that exceeds the limit
-									if ($linecnt+$cnt > $allowedLength) {
-										$v="\r\n$indentString$v";
+									if ($linecnt + $cnt > $allowedLength) {
+										$v = "\r\n$indentString$v";
 										//error_log(__METHOD__.__LINE__.'breaking here:'.$v);
 										$linecnt = 0;
 									} else {
@@ -462,11 +462,11 @@ 
 							}
 						}
 						//error_log(__METHOD__.__LINE__.'partString to return:'.$indentString . $quotePart3);
-						$asciiTextBuff[] = $indentString . $quotePart3 ;
+						$asciiTextBuff[] = $indentString.$quotePart3;
 					}
 				}
 			}
-			return implode("\r\n",$asciiTextBuff);
+			return implode("\r\n", $asciiTextBuff);
 		}
 	}
 
@@ -479,30 +479,30 @@ 
 	static function splithtmlByPRE($html)
 	{
 		$searchFor = '<pre ';
-		$pos = stripos($html,$searchFor);
-		if ($pos===false)
+		$pos = stripos($html, $searchFor);
+		if ($pos === false)
 		{
 			$searchFor = '<pre>';
-			$pos = stripos($html,$searchFor);
+			$pos = stripos($html, $searchFor);
 		}
 		if ($pos === false)
 		{
 			return $html;
 		}
-		$html2ret[] = substr($html,0,$pos);
-		while ($pos!==false)
+		$html2ret[] = substr($html, 0, $pos);
+		while ($pos !== false)
 		{
-			$endofpre = stripos($html,'</pre>',$pos);
-			$length = $endofpre-$pos+6;
-			$html2ret[] = substr($html,$pos,$length);
+			$endofpre = stripos($html, '</pre>', $pos);
+			$length = $endofpre - $pos + 6;
+			$html2ret[] = substr($html, $pos, $length);
 			$searchFor = '<pre ';
-			$pos = stripos($html,$searchFor, $endofpre+6);
-			if ($pos===false)
+			$pos = stripos($html, $searchFor, $endofpre + 6);
+			if ($pos === false)
 			{
 				$searchFor = '<pre>';
-				$pos = stripos($html,$searchFor, $endofpre+6);
+				$pos = stripos($html, $searchFor, $endofpre + 6);
 			}
-			$html2ret[] = ($pos ? substr($html,$endofpre+6,$pos-($endofpre+6)): substr($html,$endofpre+6));
+			$html2ret[] = ($pos ? substr($html, $endofpre + 6, $pos - ($endofpre + 6)) : substr($html, $endofpre + 6));
 			//$pos=false;
 		}
 		//error_log(__METHOD__.__LINE__.array2string($html2ret));

Braces +103 added lines, -33 removed lines

@@ -31,7 +31,8 @@ 
 	static function decodeMailHeader($_string, $displayCharset='utf-8', $reclevel=0)
 	{
 		$maxreclevel=25;
-		if ($reclevel > $maxreclevel) {
+		if ($reclevel > $maxreclevel)
+		{
 			error_log( __METHOD__.__LINE__." Recursion Level Exeeded ($reclevel) while decoding $_string ");
 			return $_string;
 		}
@@ -65,10 +66,16 @@ 
 			$convertAtEnd = false;
 			foreach((array)$elements as $element)
 			{
-				if ($element->charset == 'default') $element->charset = Api\Translation::detect_encoding($element->text);
+				if ($element->charset == 'default')
+				{
+					$element->charset = Api\Translation::detect_encoding($element->text);
+				}
 				if ($element->charset != 'x-unknown')
 				{
-					if( strtoupper($element->charset) != 'UTF-8') $element->text = preg_replace($sar,$rar,$element->text);
+					if( strtoupper($element->charset) != 'UTF-8')
+					{
+						$element->text = preg_replace($sar,$rar,$element->text);
+					}
 					// check if there is a possible nested encoding; make sure that the inputstring and the decoded result are different to avoid loops
 					$openTags = substr_count($element->text,'?=');
 					if(preg_match('/\?=.+=\?/', $element->text) && $openTags>0 && $openTags==substr_count($element->text,'=?') && $element->text != $_string)
@@ -84,7 +91,10 @@ 
 					$convertAtEnd = true;
 				}
 			}
-			if ($convertAtEnd) $newString = self::decodeMailHeader($newString,$displayCharset,$reclevel);
+			if ($convertAtEnd)
+			{
+				$newString = self::decodeMailHeader($newString,$displayCharset,$reclevel);
+			}
 			return preg_replace('/([\000-\012\015\016\020-\037\075])/','',$newString);
 		}
 		elseif(function_exists(mb_decode_mimeheader))
@@ -148,18 +158,27 @@ 
 	 */
 	static function replaceTagsCompletley(&$_body,$tag,$endtag='',$addbracesforendtag=true)
 	{
-		if ($tag) $tag = strtolower($tag);
+		if ($tag)
+		{
+			$tag = strtolower($tag);
+		}
 		$singleton = false;
-		if ($endtag=='/>') $singleton =true;
+		if ($endtag=='/>')
+		{
+			$singleton =true;
+		}
 		if ($endtag == '' || empty($endtag) || !isset($endtag))
 		{
 			$endtag = $tag;
-		} else {
+		}
+		else
+		{
 			$endtag = strtolower($endtag);
 			//error_log(__METHOD__.' Using EndTag:'.$endtag);
 		}
 		// strip tags out of the message completely with their content
-		if ($_body) {
+		if ($_body)
+		{
 			if ($singleton)
 			{
 				//$_body = preg_replace('~<'.$tag.'[^>].*? '.$endtag.'~simU','',$_body);
@@ -170,7 +189,10 @@ 
 				$found=null;
 				if ($addbracesforendtag === true )
 				{
-					if (stripos($_body,'<'.$tag)!==false)  $ct = preg_match_all('#<'.$tag.'(?:\s.*)?>(.+)</'.$endtag.'>#isU', $_body, $found);
+					if (stripos($_body,'<'.$tag)!==false)
+					{
+						$ct = preg_match_all('#<'.$tag.'(?:\s.*)?>(.+)</'.$endtag.'>#isU', $_body, $found);
+					}
 					if ($ct>0)
 					{
 						//error_log(__METHOD__.__LINE__.array2string($found[0]));
@@ -182,7 +204,10 @@ 
 				}
 				if ($addbracesforendtag === false )
 				{
-					if (stripos($_body,'<'.$tag)!==false)  $ct = preg_match_all('#<'.$tag.'(?:\s.*)?>(.+)'.$endtag.'#isU', $_body, $found);
+					if (stripos($_body,'<'.$tag)!==false)
+					{
+						$ct = preg_match_all('#<'.$tag.'(?:\s.*)?>(.+)'.$endtag.'#isU', $_body, $found);
+					}
 					if ($ct>0)
 					{
 						//error_log(__METHOD__.__LINE__.array2string($found[0]));
@@ -216,7 +241,10 @@ 
 		$linkTextislink = false;
 		// this is the actual url
 		$matches[2] = trim(strip_tags($matches[2]));
-		if ($matches[2]==$matches[1]) $linkTextislink = true;
+		if ($matches[2]==$matches[1])
+		{
+			$linkTextislink = true;
+		}
 		$matches[1] = str_replace(' ','%20',$matches[1]);
 		return ($linkTextislink?' ':'[ ').$matches[1].($linkTextislink?'':' -> '.$matches[2]).($linkTextislink?' ':' ]');
 	}
@@ -239,16 +267,35 @@ 
 			$isHTML = false;
 			// return $_html; // maybe we should not proceed at all
 		}
-		if ($displayCharset === false) $displayCharset = Api\Translation::charset();
+		if ($displayCharset === false)
+		{
+			$displayCharset = Api\Translation::charset();
+		}
 		//error_log(__METHOD__.$_html);
 		#print '<hr>';
 		#print "<pre>"; print htmlspecialchars($_html);
 		#print "</pre>";
 		#print "<hr>";
-		if (stripos($_html,'style')!==false) self::replaceTagsCompletley($_html,'style'); // clean out empty or pagewide style definitions / left over tags
-		if (stripos($_html,'head')!==false) self::replaceTagsCompletley($_html,'head'); // Strip out stuff in head
-		if (stripos($_html,'![if')!==false && stripos($_html,'<![endif]>')!==false) self::replaceTagsCompletley($_html,'!\[if','<!\[endif\]>',false); // Strip out stuff in ifs
-		if (stripos($_html,'!--[if')!==false && stripos($_html,'<![endif]-->')!==false) self::replaceTagsCompletley($_html,'!--\[if','<!\[endif\]-->',false); // Strip out stuff in ifs
+		if (stripos($_html,'style')!==false)
+		{
+			self::replaceTagsCompletley($_html,'style');
+		}
+		// clean out empty or pagewide style definitions / left over tags
+		if (stripos($_html,'head')!==false)
+		{
+			self::replaceTagsCompletley($_html,'head');
+		}
+		// Strip out stuff in head
+		if (stripos($_html,'![if')!==false && stripos($_html,'<![endif]>')!==false)
+		{
+			self::replaceTagsCompletley($_html,'!\[if','<!\[endif\]>',false);
+		}
+		// Strip out stuff in ifs
+		if (stripos($_html,'!--[if')!==false && stripos($_html,'<![endif]-->')!==false)
+		{
+			self::replaceTagsCompletley($_html,'!--\[if','<!\[endif\]-->',false);
+		}
+		// Strip out stuff in ifs
 		$Rules = array ('@<script[^>]*?>.*?</script>@siU', // Strip out javascript
 			'@&(quot|#34);@i',                // Replace HTML entities
 			'@&(amp|#38);@i',                 //   Ampersand &
@@ -366,7 +413,8 @@ 
 					if (stripos($elem,'<pre ')===false && stripos($elem,'<pre>')===false)
 					{
 						//this is supposed to strip out all remaining stuff in tags, this is sometimes taking out whole sections off content
-						if ( $stripalltags ) {
+						if ( $stripalltags )
+						{
 							$_html = preg_replace('~<[^>^@]+>~s','',$_html);
 						}
 						// strip out whitespace inbetween CR/LF
@@ -380,7 +428,8 @@ 
 			else
 			{
 				//this is supposed to strip out all remaining stuff in tags, this is sometimes taking out whole sections off content
-				if ( $stripalltags ) {
+				if ( $stripalltags )
+				{
 					$_html = preg_replace('~<[^>^@]+>~s','',$_html);
 				}
 				// strip out whitespace inbetween CR/LF
@@ -390,12 +439,16 @@ 
 			}
 		}
 		//this is supposed to strip out all remaining stuff in tags, this is sometimes taking out whole sections off content
-		if ( $stripalltags ) {
+		if ( $stripalltags )
+		{
 			$_html = preg_replace('~<[^>^@]+>~s','',$_html);
 			//$_html = strip_tags($_html, '<a>');
 		}
 		// reducing spaces (not for input that was plain text from the beginning)
-		if ($isHTML) $_html = preg_replace('~ +~s',' ',$_html);
+		if ($isHTML)
+		{
+			$_html = preg_replace('~ +~s',' ',$_html);
+		}
 		// restoring ampersands
 		$_html = str_replace('#amper#sand#','&',$_html);
 		// restoring lower|greater[or equal] than
@@ -409,55 +462,72 @@ 
 		//self::replaceEmailAdresses($_html);
 		$pos = strpos($_html, 'blockquote');
 		//error_log("convert HTML2Text: $_html");
-		if($pos === false) {
+		if($pos === false)
+		{
 			return $_html;
-		} else {
+		}
+		else
+		{
 			$indent = 0;
 			$indentString = '';
 
 			$quoteParts = preg_split('/#blockquote#type#cite#/', $_html, -1, PREG_SPLIT_OFFSET_CAPTURE);
-			foreach($quoteParts as $quotePart) {
-				if($quotePart[1] > 0) {
+			foreach($quoteParts as $quotePart)
+			{
+				if($quotePart[1] > 0)
+				{
 					$indent++;
 					$indentString .= '>';
 				}
 				$quoteParts2 = preg_split('/#blockquote#end#cite#/', $quotePart[0], -1, PREG_SPLIT_OFFSET_CAPTURE);
 
-				foreach($quoteParts2 as $quotePart2) {
-					if($quotePart2[1] > 0) {
+				foreach($quoteParts2 as $quotePart2)
+				{
+					if($quotePart2[1] > 0)
+					{
 						$indent--;
 						$indentString = substr($indentString, 0, $indent);
 					}
 
 					$quoteParts3 = explode("\r\n", $quotePart2[0]);
 
-					foreach($quoteParts3 as $quotePart3) {
+					foreach($quoteParts3 as $quotePart3)
+					{
 						//error_log(__METHOD__.__LINE__.'Line:'.$quotePart3);
 						$allowedLength = 76-strlen("\r\n$indentString");
 						// only break lines, if not already indented
 						if (substr($quotePart3,0,strlen($indentString)) != $indentString)
 						{
-							if (strlen($quotePart3) > $allowedLength) {
+							if (strlen($quotePart3) > $allowedLength)
+							{
 								$s=explode(" ", $quotePart3);
 								$quotePart3 = "";
 								$linecnt = 0;
-								foreach ($s as $k=>$v) {
+								foreach ($s as $k=>$v)
+								{
 									$cnt = strlen($v);
 									// only break long words within the wordboundaries,
 									// but it may destroy links, so we check for href and dont do it if we find it
-									if($cnt > $allowedLength && stripos($v,'href=')===false) {
+									if($cnt > $allowedLength && stripos($v,'href=')===false)
+									{
 										//error_log(__METHOD__.__LINE__.'LongWordFound:'.$v);
 										$v=wordwrap($v, $allowedLength, "\r\n$indentString", true);
 									}
 									// the rest should be broken at the start of the new word that exceeds the limit
-									if ($linecnt+$cnt > $allowedLength) {
+									if ($linecnt+$cnt > $allowedLength)
+									{
 										$v="\r\n$indentString$v";
 										//error_log(__METHOD__.__LINE__.'breaking here:'.$v);
 										$linecnt = 0;
-									} else {
+									}
+									else
+									{
 										$linecnt += $cnt;
 									}
-									if (strlen($v))  $quotePart3 .= (strlen($quotePart3) ? " " : "").$v;
+									if (strlen($v))
+									{
+										$quotePart3 .= (strlen($quotePart3) ? " " : "").$v;
+									}
 								}
 							}
 						}

api/src/Mail/Imap.php

Doc Comments +7 added lines, -6 removed lines

@@ -140,7 +140,7 @@ 
 	 * Construtor
 	 *
 	 * @param array
-	 * @param bool|int|string $_adminConnection create admin connection if true or account_id or imap username
+	 * @param boolean|string $_adminConnection create admin connection if true or account_id or imap username
 	 * @param int $_timeout =null timeout in secs, if none given fmail pref or default of 20 is used
 	 * @return void
 	 */
@@ -564,7 +564,7 @@ 
 	 * Returns an array containing the names of the selected mailboxes
 	 *
 	 * @param   string  $reference          base mailbox to start the search (default is current mailbox)
-	 * @param   string  $restriction_search false or 0 means return all mailboxes
+	 * @param   integer  $restriction_search false or 0 means return all mailboxes
 	 *                                      true or 1 return only the mailbox that contains that exact name
 	 *                                      2 return all mailboxes in that hierarchy level
 	 * @param   string  $returnAttributes   true means return an assoc array containing mailbox names and mailbox attributes
@@ -648,7 +648,7 @@ 
 	 * Returns an array containing the names of the subscribed selected mailboxes
 	 *
 	 * @param   string  $reference          base mailbox to start the search
-	 * @param   string  $restriction_search false or 0 means return all mailboxes
+	 * @param   integer  $restriction_search false or 0 means return all mailboxes
 	 *                                      true or 1 return only the mailbox that contains that exact name
 	 *                                      2 return all mailboxes in that hierarchy level
 	 * @param   string  $returnAttributes   true means return an assoc array containing mailbox names and mailbox attributes
@@ -716,7 +716,7 @@ 
 	 * Returns an array containing the names of the selected unsubscribed mailboxes
 	 *
 	 * @param   string  $reference          base mailbox to start the search
-	 * @param   string  $restriction_search false or 0 means return all mailboxes
+	 * @param   integer  $restriction_search false or 0 means return all mailboxes
 	 *                                      true or 1 return only the mailbox that contains that exact name
 	 *                                      2 return all mailboxes in that hierarchy level
 	 *
@@ -894,6 +894,7 @@ 
 	 *
 	 * @var array $_nameSpace
 	 * @var string $_folderName
+	 * @param string $_folderName
 	 * @return string the prefix (may be an empty string)
 	 */
 	static function getFolderPrefixFromNamespace($_nameSpace, $_folderName)
@@ -912,7 +913,7 @@ 
 	 * @param string $_mailbox
 	 * @param string $delimiter
 	 * @param string $prefix
-	 * @param string $reclevel = 0, counter to keep track of the current recursionlevel
+	 * @param integer $reclevel = 0, counter to keep track of the current recursionlevel
 	 * @return array of mailboxes
 	 */
 	function getMailBoxesRecursive($_mailbox, $delimiter, $prefix, $reclevel=0)
@@ -1344,7 +1345,7 @@ 
 	/**
 	 * Get vacation message for given user
 	 *
-	 * @param int|string $_euser nummeric account_id or imap username
+	 * @param string|null $_euser nummeric account_id or imap username
 	 * @param string $_scriptName =null
 	 * @throws Exception on connection error or authentication failure
 	 * @return array

Switch Indentation +30 added lines, -30 removed lines

@@ -580,16 +580,16 @@ 
 		$mailbox = '';
 		if ( is_int( $restriction_search ) ){
 			switch ( $restriction_search ) {
-			case 0:
-				$searchstring = $reference."*";
-				break;
-			case 1:
-				$mailbox = $searchstring = $reference;
-				//$reference = '%';
-				break;
-			case 2:
-				$searchstring = $reference."%";
-				break;
+				case 0:
+					$searchstring = $reference."*";
+					break;
+				case 1:
+					$mailbox = $searchstring = $reference;
+					//$reference = '%';
+					break;
+				case 2:
+					$searchstring = $reference."%";
+					break;
 			}
 		}else{
 			if ( is_string( $restriction_search ) ){
@@ -664,16 +664,16 @@ 
 		$mailbox = '';
 		if ( is_int( $restriction_search ) ){
 			switch ( $restriction_search ) {
-			case 0:
-				$searchstring = $reference."*";
-				break;
-			case 1:
-				$mailbox = $searchstring = $reference;
-				//$reference = '%';
-				break;
-			case 2:
-				$searchstring = $reference."%";
-				break;
+				case 0:
+					$searchstring = $reference."*";
+					break;
+				case 1:
+					$mailbox = $searchstring = $reference;
+					//$reference = '%';
+					break;
+				case 2:
+					$searchstring = $reference."%";
+					break;
 			}
 		}else{
 			if ( is_string( $restriction_search ) ){
@@ -730,16 +730,16 @@ 
 
 		if ( is_int( $restriction_search ) ){
 			switch ( $restriction_search ) {
-			case 0:
-				$mailbox = $reference."*";
-				break;
-			case 1:
-				$mailbox = $reference;
-				$reference = '%';
-				break;
-			case 2:
-				$mailbox = "%";
-				break;
+				case 0:
+					$mailbox = $reference."*";
+					break;
+				case 1:
+					$mailbox = $reference;
+					$reference = '%';
+					break;
+				case 2:
+					$mailbox = "%";
+					break;
 			}
 		}else{
 			if ( is_string( $restriction_search ) ){

Braces +130 added lines, -42 removed lines

@@ -156,7 +156,10 @@ 
 		$this->loginType = $this->params['acc_imap_logintype'];
 		$this->domainName = $this->params['acc_domain'];
 
-		if (is_null($_timeout)) $_timeout = $this->params['acc_imap_timeout']?$this->params['acc_imap_timeout']:self::getTimeOut ();
+		if (is_null($_timeout))
+		{
+			$_timeout = $this->params['acc_imap_timeout']?$this->params['acc_imap_timeout']:self::getTimeOut ();
+		}
 
 		// Horde use locale for translation of error messages
 		Api\Preferences::setlocale(LC_MESSAGES);
@@ -167,7 +170,10 @@ 
 		{
 			$username = $this->getMailBoxUserName($username);
 		}
-		if ($_adminConnection) $this->adminConnection($username);
+		if ($_adminConnection)
+		{
+			$this->adminConnection($username);
+		}
 		$parent_params = array(
 			'username' => $this->params[$_adminConnection ? 'acc_imap_admin_username' : 'acc_imap_username'],
 			'password' => $this->params[$_adminConnection ? 'acc_imap_admin_password' : 'acc_imap_password'],
@@ -303,7 +309,11 @@ 
 	static function getTimeOut($_use='IMAP')
 	{
 		$timeout = $GLOBALS['egw_info']['user']['preferences']['mail']['connectionTimeout'];
-		if (empty($timeout) || !($timeout > 0)) $timeout = $_use == 'SIEVE' ? 10 : 20; // this is the default value
+		if (empty($timeout) || !($timeout > 0))
+		{
+			$timeout = $_use == 'SIEVE' ? 10 : 20;
+		}
+		// this is the default value
 		return $timeout;
 	}
 
@@ -366,7 +376,8 @@ 
 	 */
 	function encodeFolderName($_folderName)
 	{
-		if($this->mbAvailable) {
+		if($this->mbAvailable)
+		{
 			return mb_convert_encoding($_folderName, "UTF7-IMAP", Api\Translation::charset());
 		}
 
@@ -384,14 +395,21 @@ 
 	function getMailbox($mailbox)
 	{
 		$mailboxes = $this->listMailboxes($mailbox,Horde_Imap_Client::MBOX_ALL);
-		if (empty($mailboxes)) $mailboxes = $this->listMailboxes($mailbox,Horde_Imap_Client::MBOX_UNSUBSCRIBED);
+		if (empty($mailboxes))
+		{
+			$mailboxes = $this->listMailboxes($mailbox,Horde_Imap_Client::MBOX_UNSUBSCRIBED);
+		}
 		//error_log(__METHOD__.__LINE__.'->'.$mailbox.'/'.array2string($mailboxes));
 		$mboxes = new Horde_Imap_Client_Mailbox_List($mailboxes);
 		//_debug_array($mboxes->count());
 		foreach ($mboxes->getIterator() as $k =>$box)
 		{
 			//error_log(__METHOD__.__LINE__.'->'.$k);
-			if ($k!='user' && $k != '' && $k==$mailbox) return $box['mailbox']; //_debug_array(array($k => $client->status($k)));
+			if ($k!='user' && $k != '' && $k==$mailbox)
+			{
+				return $box['mailbox'];
+			}
+			//_debug_array(array($k => $client->status($k)));
 		}
 		return ($this->mailboxExist($mailbox)?$mailbox:false);
 	}
@@ -460,8 +478,14 @@ 
 			//throw new egw_exception(__METHOD__.' ('.__LINE__.") failed to ".__METHOD__." :".$e->getMessage());
 			unset($e);
 		}
-		if (!empty($mailbox)) return $mailbox['mailbox'];
-		if (empty($mailbox) && $this->mailboxExist('INBOX')) return 'INBOX';
+		if (!empty($mailbox))
+		{
+			return $mailbox['mailbox'];
+		}
+		if (empty($mailbox) && $this->mailboxExist('INBOX'))
+		{
+			return 'INBOX';
+		}
 		return null;
 	}
 
@@ -531,7 +555,10 @@ 
 			));
 
 		$flags = Horde_Imap_Client::STATUS_ALL;
-		if ($ignoreStatusCache) $flags |= Horde_Imap_Client::STATUS_FORCE_REFRESH;
+		if ($ignoreStatusCache)
+		{
+			$flags |= Horde_Imap_Client::STATUS_FORCE_REFRESH;
+		}
 
 		$mboxes = new Horde_Imap_Client_Mailbox_List($mailboxes);
 		//error_log(__METHOD__.__LINE__.array2string($mboxes->count()));
@@ -574,12 +601,15 @@ 
 	 */
 	function getMailboxes($reference = ''  , $restriction_search = 0, $returnAttributes = false)
 	{
-		if ( is_bool($restriction_search) ){
+		if ( is_bool($restriction_search) )
+		{
 			$restriction_search = (int) $restriction_search;
 		}
 		$mailbox = '';
-		if ( is_int( $restriction_search ) ){
-			switch ( $restriction_search ) {
+		if ( is_int( $restriction_search ) )
+		{
+			switch ( $restriction_search )
+			{
 			case 0:
 				$searchstring = $reference."*";
 				break;
@@ -591,8 +621,11 @@ 
 				$searchstring = $reference."%";
 				break;
 			}
-		}else{
-			if ( is_string( $restriction_search ) ){
+		}
+		else
+		{
+			if ( is_string( $restriction_search ) )
+			{
 				$mailbox = $searchstring = $restriction_search;
 			}
 		}
@@ -658,12 +691,15 @@ 
 	 */
 	function listSubscribedMailboxes($reference = ''  , $restriction_search = 0, $returnAttributes = false)
 	{
-		if ( is_bool($restriction_search) ){
+		if ( is_bool($restriction_search) )
+		{
 			$restriction_search = (int) $restriction_search;
 		}
 		$mailbox = '';
-		if ( is_int( $restriction_search ) ){
-			switch ( $restriction_search ) {
+		if ( is_int( $restriction_search ) )
+		{
+			switch ( $restriction_search )
+			{
 			case 0:
 				$searchstring = $reference."*";
 				break;
@@ -675,8 +711,11 @@ 
 				$searchstring = $reference."%";
 				break;
 			}
-		}else{
-			if ( is_string( $restriction_search ) ){
+		}
+		else
+		{
+			if ( is_string( $restriction_search ) )
+			{
 				$mailbox = $searchstring = $restriction_search;
 			}
 		}
@@ -724,12 +763,15 @@ 
 	 */
 	function listUnSubscribedMailboxes($reference = ''  , $restriction_search = 0)
 	{
-		if ( is_bool($restriction_search) ){
+		if ( is_bool($restriction_search) )
+		{
 			$restriction_search = (int) $restriction_search;
 		}
 
-		if ( is_int( $restriction_search ) ){
-			switch ( $restriction_search ) {
+		if ( is_int( $restriction_search ) )
+		{
+			switch ( $restriction_search )
+			{
 			case 0:
 				$mailbox = $reference."*";
 				break;
@@ -741,8 +783,11 @@ 
 				$mailbox = "%";
 				break;
 			}
-		}else{
-			if ( is_string( $restriction_search ) ){
+		}
+		else
+		{
+			if ( is_string( $restriction_search ) )
+			{
 				$mailbox = $restriction_search;
 			}
 		}
@@ -761,7 +806,10 @@ 
 		foreach ($unsubscribed as $box)
 		{
 			//error_log(__METHOD__.__LINE__.' Box:'.$k.'->'.array2string($box['mailbox']->utf8));
-			if (!in_array($box['mailbox']->utf8,$sret) && $box['mailbox']->utf8!='INBOX') $ret[]=$box['mailbox']->utf8;
+			if (!in_array($box['mailbox']->utf8,$sret) && $box['mailbox']->utf8!='INBOX')
+			{
+				$ret[]=$box['mailbox']->utf8;
+			}
 		}
 		return $ret;
 	}
@@ -775,10 +823,16 @@ 
 	 */
 	function examineMailbox($mailbox, $flags=null)
 	{
-		if ($mailbox=='') return false;
+		if ($mailbox=='')
+		{
+			return false;
+		}
 		$mailboxes = $this->listMailboxes($mailbox);
 
-		if (is_null($flags)) $flags = Horde_Imap_Client::STATUS_ALL | Horde_Imap_Client::STATUS_FLAGS | Horde_Imap_Client::STATUS_PERMFLAGS;
+		if (is_null($flags))
+		{
+			$flags = Horde_Imap_Client::STATUS_ALL | Horde_Imap_Client::STATUS_FLAGS | Horde_Imap_Client::STATUS_PERMFLAGS;
+		}
 
 		$mboxes = new Horde_Imap_Client_Mailbox_List($mailboxes);
 		//_debug_array($mboxes->count());
@@ -860,7 +914,10 @@ 
 		}
 		catch (\Exception $e)
 		{
-			if ($this->debug) error_log(__METHOD__.__LINE__.' error querying for capability:'.$capability.' ->'.$e->getMessage());
+			if ($this->debug)
+			{
+				error_log(__METHOD__.__LINE__.' error querying for capability:'.$capability.' ->'.$e->getMessage());
+			}
 			return false;
 		}
 		if (!is_array($cap))
@@ -900,7 +957,10 @@ 
 	{
 		foreach($_nameSpace as &$singleNameSpace)
 		{
-			if (substr($_folderName,0,strlen($singleNameSpace['prefix'])) == $singleNameSpace['prefix']) return $singleNameSpace['prefix'];
+			if (substr($_folderName,0,strlen($singleNameSpace['prefix'])) == $singleNameSpace['prefix'])
+			{
+				return $singleNameSpace['prefix'];
+			}
 		}
 		return "";
 	}
@@ -917,7 +977,8 @@ 
 	 */
 	function getMailBoxesRecursive($_mailbox, $delimiter, $prefix, $reclevel=0)
 	{
-		if ($reclevel > 25) {
+		if ($reclevel > 25)
+		{
 			error_log( __METHOD__." Recursion Level Exeeded ($reclevel) while looking up $_mailbox$delimiter ");
 			return array();
 		}
@@ -933,7 +994,8 @@ 
 		{
 			$buff = $this->getMailboxes($mbx[$mbxkeys[0]]['MAILBOX'].($mbx[$mbxkeys[0]]['MAILBOX'] == $prefix ? '':$delimiter),2,false);
 			$allMailboxes = array();
-			foreach ($buff as $mbxname) {
+			foreach ($buff as $mbxname)
+			{
 				$mbxname = preg_replace('~'.($delimiter == '.' ? "\\".$delimiter:$delimiter).'+~s',$delimiter,$mbxname['MAILBOX']);
 				#echo "About to recur in level $reclevel:".$mbxname."<br>";
 				if ( $mbxname != $mbx[$mbxkeys[0]]['MAILBOX'] && $mbxname != $prefix  && $mbxname != $mbx[$mbxkeys[0]]['MAILBOX'].$delimiter)
@@ -941,7 +1003,10 @@ 
 					$allMailboxes = array_merge($allMailboxes, self::getMailBoxesRecursive($mbxname, $delimiter, $prefix, $reclevel));
 				}
 			}
-			if (!(in_array('\NoSelect',$mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\Noselect',$mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\noselect',$mbx[$mbxkeys[0]]["ATTRIBUTES"]))) $allMailboxes[] = $mbx[$mbxkeys[0]]['MAILBOX'];
+			if (!(in_array('\NoSelect',$mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\Noselect',$mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\noselect',$mbx[$mbxkeys[0]]["ATTRIBUTES"])))
+			{
+				$allMailboxes[] = $mbx[$mbxkeys[0]]['MAILBOX'];
+			}
 			return $allMailboxes;
 		}
 		else
@@ -963,9 +1028,16 @@ 
 		static $nameSpace=null;
 		$foldersNameSpace = array();
 		$delimiter = $this->getDelimiter();
-		if (empty($delimiter)) $delimiter='/';
-		if (is_null($nameSpace)) $nameSpace = $this->getNameSpaceArray();
-		if (is_array($nameSpace)) {
+		if (empty($delimiter))
+		{
+			$delimiter='/';
+		}
+		if (is_null($nameSpace))
+		{
+			$nameSpace = $this->getNameSpaceArray();
+		}
+		if (is_array($nameSpace))
+		{
 			foreach($nameSpace as $type => $singleNameSpaceArray)
 			{
 				foreach ($singleNameSpaceArray as $singleNameSpace)
@@ -982,7 +1054,9 @@ 
 						$_foldersNameSpace['prefix_present'] = 'forced';
 						// uw-imap server with mailbox prefix or dovecot maybe
 						$_foldersNameSpace['prefix'] = 'mail';
-					} else {
+					}
+					else
+					{
 						$_foldersNameSpace['prefix_present'] = !empty($singleNameSpace['name']);
 						$_foldersNameSpace['prefix'] = $singleNameSpace['name'];
 					}
@@ -1022,7 +1096,10 @@ 
 		$namespaces = $this->getNamespaces();
 		foreach ($namespaces as $nsp)
 		{
-			if ($nsp['type']==$type && $nsp['delimiter']) return $nsp['delimiter'];
+			if ($nsp['type']==$type && $nsp['delimiter'])
+			{
+				return $nsp['delimiter'];
+			}
 		}
 		return "/";
 	}
@@ -1131,12 +1208,14 @@ 
 	{
 		$nameSpaces = $this->getNameSpaceArray();
 
-		if(!isset($nameSpaces['others'])) {
+		if(!isset($nameSpaces['others']))
+		{
 			return false;
 		}
 
 		$username = $this->getMailBoxUserName($_username);
-		if($this->loginType == 'vmailmgr' || $this->loginType == 'email' || $this->loginType == 'uidNumber') {
+		if($this->loginType == 'vmailmgr' || $this->loginType == 'email' || $this->loginType == 'uidNumber')
+		{
 			$username .= '@'. $this->domainName;
 		}
 
@@ -1288,7 +1367,10 @@ 
 	 */
 	public function __call($name,array $params=null)
 	{
-		if ($this->debug) error_log(__METHOD__.'->'.$name.' with params:'.array2string($params));
+		if ($this->debug)
+		{
+			error_log(__METHOD__.'->'.$name.' with params:'.array2string($params));
+		}
 		switch($name)
 		{
 			case 'installScript':
@@ -1323,7 +1405,10 @@ 
 	 */
 	public function setVacationUser($_euser, array $_vacation, $_scriptName=null)
 	{
-		if ($this->debug) error_log(__METHOD__.' User:'.array2string($_euser).' Scriptname:'.array2string($_scriptName).' VacationMessage:'.array2string($_vacation));
+		if ($this->debug)
+		{
+			error_log(__METHOD__.' User:'.array2string($_euser).' Scriptname:'.array2string($_scriptName).' VacationMessage:'.array2string($_vacation));
+		}
 
 		if (is_numeric($_euser))
 		{
@@ -1351,7 +1436,10 @@ 
 	 */
 	public function getVacationUser($_euser, $_scriptName=null)
 	{
-		if ($this->debug) error_log(__METHOD__.' User:'.array2string($_euser));
+		if ($this->debug)
+		{
+			error_log(__METHOD__.' User:'.array2string($_euser));
+		}
 
 		if (is_numeric($_euser))
 		{

Spacing +135 added lines, -135 removed lines

@@ -66,7 +66,7 @@ 
 	static public $default_params = array(
 		//'debug' => '/tmp/imap.log', // uncomment to log communitcation with IMAP server
 		//'debug_literal' => true,    // uncomment to log mail contents returned by IMAP server
-		'cache' => true,              // default caching via Cache / Api\Cache
+		'cache' => true, // default caching via Cache / Api\Cache
 	);
 
 	/**
@@ -144,7 +144,7 @@ 
 	 * @param int $_timeout =null timeout in secs, if none given fmail pref or default of 20 is used
 	 * @return void
 	 */
-	function __construct(array $params, $_adminConnection=false, $_timeout=null)
+	function __construct(array $params, $_adminConnection = false, $_timeout = null)
 	{
 		if (function_exists('mb_convert_encoding'))
 		{
@@ -156,7 +156,7 @@ 
 		$this->loginType = $this->params['acc_imap_logintype'];
 		$this->domainName = $this->params['acc_domain'];
 
-		if (is_null($_timeout)) $_timeout = $this->params['acc_imap_timeout']?$this->params['acc_imap_timeout']:self::getTimeOut ();
+		if (is_null($_timeout)) $_timeout = $this->params['acc_imap_timeout'] ? $this->params['acc_imap_timeout'] : self::getTimeOut();
 
 		// Horde use locale for translation of error messages
 		Api\Preferences::setlocale(LC_MESSAGES);
@@ -175,7 +175,7 @@ 
 			'port' => $this->params['acc_imap_port'],
 			'secure' => Account::ssl2secure($this->params['acc_imap_ssl']),
 			'timeout' => $_timeout,
-		)+self::$default_params;
+		) + self::$default_params;
 
 		if ($parent_params['cache'] === true)
 		{
@@ -199,7 +199,7 @@ 
 				// as we have no way to tell this apart we ignore BINARY this affects
 				// Horde_Imap_Client_Fetch_Query::bodyPart for its fetch parameter decode=true is ignored
 				// (other functionality depending on BINARY is, of cause, affected too)
-				$parent_params['capability_ignore']= array_merge((array)$parent_params['capability_ignore'],array('BINARY'));
+				$parent_params['capability_ignore'] = array_merge((array)$parent_params['capability_ignore'], array('BINARY'));
 				break;
 		}
 		parent::__construct($parent_params);
@@ -212,7 +212,7 @@ 
 	 *
 	 * @param string $_username =true create an admin connection for given user or $this->acc_imap_username
 	 */
-	function adminConnection($_username=true)
+	function adminConnection($_username = true)
 	{
 		if ($this->isAdminConnection !== $_username)
 		{
@@ -229,7 +229,7 @@ 
 	 * @param string $_username =null create an admin connection for given user or $this->acc_imap_username
 	 * @throws Horde_IMAP_Client_Exception
 	 */
-	public function checkAdminConnection($_username=true)
+	public function checkAdminConnection($_username = true)
 	{
 		if ($this->acc_imap_administration)
 		{
@@ -246,7 +246,7 @@ 
 	 */
 	public function __get($name)
 	{
-		switch($name)
+		switch ($name)
 		{
 			case 'acc_imap_administration':
 				return !empty($this->params['acc_imap_admin_username']);
@@ -264,7 +264,7 @@ 
 				{
 					return $this->$name;
 				}
-				if (array_key_exists($name,$this->params))
+				if (array_key_exists($name, $this->params))
 				{
 					return $this->params[$name];
 				}
@@ -285,9 +285,9 @@ 
 	 * @deprecated allready called by constructor automatic, parameters must be passed to constructor!
 	 * @throws Api\Exception\WrongParameter
 	 */
-	function openConnection($_adminConnection=false, $_timeout=null)
+	function openConnection($_adminConnection = false, $_timeout = null)
 	{
-		unset($_timeout);	// not used
+		unset($_timeout); // not used
 		if ($_adminConnection !== $this->params['adminConnection'])
 		{
 			throw new Api\Exception\WrongParameter('need to set parameters on calling Account->imapServer()!');
@@ -300,7 +300,7 @@ 
 	 * @param string _use decide if the use is for IMAP or SIEVE, by now only the default differs
 	 * @return int - timeout (either set or default 20/10)
 	 */
-	static function getTimeOut($_use='IMAP')
+	static function getTimeOut($_use = 'IMAP')
 	{
 		$timeout = $GLOBALS['egw_info']['user']['preferences']['mail']['connectionTimeout'];
 		if (empty($timeout) || !($timeout > 0)) $timeout = $_use == 'SIEVE' ? 10 : 20; // this is the default value
@@ -325,7 +325,7 @@ 
 	 */
 	function addAccount($_hookValues)
 	{
-		unset($_hookValues);	// not used
+		unset($_hookValues); // not used
 		return true;
 	}
 
@@ -337,7 +337,7 @@ 
 	 */
 	function updateAccount($_hookValues)
 	{
-		unset($_hookValues);	// not used
+		unset($_hookValues); // not used
 		return true;
 	}
 
@@ -349,7 +349,7 @@ 
 	 */
 	function deleteAccount($_hookValues)
 	{
-		unset($_hookValues);	// not used
+		unset($_hookValues); // not used
 		return true;
 	}
 
@@ -366,7 +366,7 @@ 
 	 */
 	function encodeFolderName($_folderName)
 	{
-		if($this->mbAvailable) {
+		if ($this->mbAvailable) {
 			return mb_convert_encoding($_folderName, "UTF7-IMAP", Api\Translation::charset());
 		}
 
@@ -383,17 +383,17 @@ 
 	 */
 	function getMailbox($mailbox)
 	{
-		$mailboxes = $this->listMailboxes($mailbox,Horde_Imap_Client::MBOX_ALL);
-		if (empty($mailboxes)) $mailboxes = $this->listMailboxes($mailbox,Horde_Imap_Client::MBOX_UNSUBSCRIBED);
+		$mailboxes = $this->listMailboxes($mailbox, Horde_Imap_Client::MBOX_ALL);
+		if (empty($mailboxes)) $mailboxes = $this->listMailboxes($mailbox, Horde_Imap_Client::MBOX_UNSUBSCRIBED);
 		//error_log(__METHOD__.__LINE__.'->'.$mailbox.'/'.array2string($mailboxes));
 		$mboxes = new Horde_Imap_Client_Mailbox_List($mailboxes);
 		//_debug_array($mboxes->count());
 		foreach ($mboxes->getIterator() as $k =>$box)
 		{
 			//error_log(__METHOD__.__LINE__.'->'.$k);
-			if ($k!='user' && $k != '' && $k==$mailbox) return $box['mailbox']; //_debug_array(array($k => $client->status($k)));
+			if ($k != 'user' && $k != '' && $k == $mailbox) return $box['mailbox']; //_debug_array(array($k => $client->status($k)));
 		}
-		return ($this->mailboxExist($mailbox)?$mailbox:false);
+		return ($this->mailboxExist($mailbox) ? $mailbox : false);
 	}
 
 	/**
@@ -409,23 +409,23 @@ 
 			//error_log(__METHOD__.__LINE__.':'.$mailbox);
 			$currentMailbox = $this->currentMailbox();
 		}
-		catch(\Exception $e)
+		catch (\Exception $e)
 		{
 			//error_log(__METHOD__.__LINE__.' failed detecting currentMailbox:'.$currentMailbox.':'.$e->getMessage());
-			$currentMailbox=null;
+			$currentMailbox = null;
 			unset($e);
 		}
 		try
 		{
 			//error_log(__METHOD__.__LINE__.':'.$mailbox);
 			$this->openMailbox($mailbox);
-			$returnvalue=true;
+			$returnvalue = true;
 		}
-		catch(\Exception $e)
+		catch (\Exception $e)
 		{
 			//error_log(__METHOD__.__LINE__.' failed opening:'.$mailbox.':'.$e->getMessage().' Called by:'.function_backtrace());
 			unset($e);
-			$returnvalue=false;
+			$returnvalue = false;
 		}
 		if (!empty($currentMailbox) && $currentMailbox['mailbox'] != $mailbox)
 		{
@@ -434,7 +434,7 @@ 
 				//error_log(__METHOD__.__LINE__.':'.$currentMailbox .'<->'.$mailbox);
 				$this->openMailbox($currentMailbox['mailbox']);
 			}
-			catch(\Exception $e)
+			catch (\Exception $e)
 			{
 				//error_log(__METHOD__.__LINE__.' failed reopening:'.$currentMailbox.':'.$e->getMessage());
 				unset($e);
@@ -454,7 +454,7 @@ 
 		{
 			$mailbox = $this->currentMailbox();
 		}
-		catch(\Exception $e)
+		catch (\Exception $e)
 		{
 			error_log(__METHOD__.' ('.__LINE__.') failed fetching currentMailbox:'.$e->getMessage());
 			//throw new egw_exception(__METHOD__.' ('.__LINE__.") failed to ".__METHOD__." :".$e->getMessage());
@@ -472,16 +472,16 @@ 
 	 */
 	function getSpecialUseFolders()
 	{
-		$mailboxes = $this->getMailboxes('',0,true);
+		$mailboxes = $this->getMailboxes('', 0, true);
 		$suF = array();
 		foreach ($mailboxes as $box)
 		{
-			if ($box['MAILBOX']!='user' && $box['MAILBOX'] != '')
+			if ($box['MAILBOX'] != 'user' && $box['MAILBOX'] != '')
 			{
 				//error_log(__METHOD__.__LINE__.$k.'->'.array2string($box));
-				if (isset($box['ATTRIBUTES'])&&!empty($box['ATTRIBUTES'])&&
-					stripos(strtolower(array2string($box['ATTRIBUTES'])),'\noselect')=== false&&
-					stripos(strtolower(array2string($box['ATTRIBUTES'])),'\nonexistent')=== false)
+				if (isset($box['ATTRIBUTES']) && !empty($box['ATTRIBUTES']) &&
+					stripos(strtolower(array2string($box['ATTRIBUTES'])), '\noselect') === false &&
+					stripos(strtolower(array2string($box['ATTRIBUTES'])), '\nonexistent') === false)
 				{
 					$suF[$box['MAILBOX']] = $box;
 				}
@@ -503,7 +503,7 @@ 
 			$status = $this->status($mailbox);
 			foreach ($status as $key => $v)
 			{
-				$_status[strtoupper($key)]=$v;
+				$_status[strtoupper($key)] = $v;
 			}
 			return $_status;
 		}
@@ -521,9 +521,9 @@ 
 	 * @param ignoreStatusCache bool ignore the cache used for counters
 	 * @return array with counters
 	 */
-	function getStatus($mailbox, $ignoreStatusCache=false)
+	function getStatus($mailbox, $ignoreStatusCache = false)
 	{
-		$mailboxes = $this->listMailboxes($mailbox,Horde_Imap_Client::MBOX_ALL,array(
+		$mailboxes = $this->listMailboxes($mailbox, Horde_Imap_Client::MBOX_ALL, array(
 				'attributes'=>true,
 				'children'=>true, //child info
 				'delimiter'=>true,
@@ -537,16 +537,16 @@ 
 		//error_log(__METHOD__.__LINE__.array2string($mboxes->count()));
 		foreach ($mboxes->getIterator() as $k =>$box)
 		{
-			if ($k!='user' && $k != '' && $k==$mailbox)
+			if ($k != 'user' && $k != '' && $k == $mailbox)
 			{
-				if (stripos(array2string($box['attributes']),'\noselect')=== false)
+				if (stripos(array2string($box['attributes']), '\noselect') === false)
 				{
 					$status = $this->status($k, $flags);
 					foreach ($status as $key => $v)
 					{
-						$_status[strtoupper($key)]=$v;
+						$_status[strtoupper($key)] = $v;
 					}
-					$_status['HIERACHY_DELIMITER'] = $_status['delimiter'] = ($box['delimiter']?$box['delimiter']:$this->getDelimiter('personal'));
+					$_status['HIERACHY_DELIMITER'] = $_status['delimiter'] = ($box['delimiter'] ? $box['delimiter'] : $this->getDelimiter('personal'));
 					$_status['ATTRIBUTES'] = $box['attributes'];
 					//error_log(__METHOD__.__LINE__.$k.'->'.array2string($_status));
 					return $_status;
@@ -572,14 +572,14 @@ 
 	 *
 	 * @return  mixed   array of mailboxes
 	 */
-	function getMailboxes($reference = ''  , $restriction_search = 0, $returnAttributes = false)
+	function getMailboxes($reference = '', $restriction_search = 0, $returnAttributes = false)
 	{
-		if ( is_bool($restriction_search) ){
-			$restriction_search = (int) $restriction_search;
+		if (is_bool($restriction_search)) {
+			$restriction_search = (int)$restriction_search;
 		}
 		$mailbox = '';
-		if ( is_int( $restriction_search ) ){
-			switch ( $restriction_search ) {
+		if (is_int($restriction_search)) {
+			switch ($restriction_search) {
 			case 0:
 				$searchstring = $reference."*";
 				break;
@@ -591,8 +591,8 @@ 
 				$searchstring = $reference."%";
 				break;
 			}
-		}else{
-			if ( is_string( $restriction_search ) ){
+		} else {
+			if (is_string($restriction_search)) {
 				$mailbox = $searchstring = $restriction_search;
 			}
 		}
@@ -605,35 +605,35 @@ 
 				'special_use'=>true,
 				'sort'=>true,
 			);
-		if ($returnAttributes==false)
+		if ($returnAttributes == false)
 		{
 			unset($options['attributes']);
 			unset($options['children']);
 			unset($options['special_use']);
 		}
-		$mailboxes = $this->listMailboxes($searchstring,Horde_Imap_Client::MBOX_ALL, $options);
+		$mailboxes = $this->listMailboxes($searchstring, Horde_Imap_Client::MBOX_ALL, $options);
 		//$mboxes = new Horde_Imap_Client_Mailbox_List($mailboxes);
 		//_debug_array($mboxes->count());
 		foreach ((array)$mailboxes as $k =>$box)
 		{
 			//error_log(__METHOD__.__LINE__.' Box:'.$k.'->'.array2string($box));
-			$ret[$k]=array('MAILBOX'=>$k,'ATTRIBUTES'=>$box['attributes'],'delimiter'=>($box['delimiter']?$box['delimiter']:$this->getDelimiter('personal')),'SUBSCRIBED'=>true);
+			$ret[$k] = array('MAILBOX'=>$k, 'ATTRIBUTES'=>$box['attributes'], 'delimiter'=>($box['delimiter'] ? $box['delimiter'] : $this->getDelimiter('personal')), 'SUBSCRIBED'=>true);
 		}
 		// for unknown reasons on ALL, UNSUBSCRIBED are not returned
 		//always fetch unsubscribed, think about only fetching it when $options['attributes'] is set
 		//but then allMailboxes are not all, ....
 		//if (!empty($mailbox) && !isset($ret[$mailbox]))
 		{
-			$unsub_mailboxes = $this->listMailboxes($searchstring,Horde_Imap_Client::MBOX_UNSUBSCRIBED, $options);
+			$unsub_mailboxes = $this->listMailboxes($searchstring, Horde_Imap_Client::MBOX_UNSUBSCRIBED, $options);
 			//$mboxes = new Horde_Imap_Client_Mailbox_List($mailboxes);
 			//_debug_array($mboxes->count());
 			//error_log(__METHOD__.__LINE__.' '.$mailbox.':'.count((array)$mailboxes).'->'.function_backtrace());
 			foreach ((array)$unsub_mailboxes as $k =>$box)
 			{
 				//error_log(__METHOD__.__LINE__.' Box:'.$k.' already In?'.array_key_exists($k,$boxexists).'->'.array2string($box));
-				if(!array_key_exists($k,$ret))
+				if (!array_key_exists($k, $ret))
 				{
-					$ret[$k]=array('MAILBOX'=>$k,'ATTRIBUTES'=>$box['attributes'],'delimiter'=>($box['delimiter']?$box['delimiter']:$this->getDelimiter('personal')),'SUBSCRIBED'=>false);
+					$ret[$k] = array('MAILBOX'=>$k, 'ATTRIBUTES'=>$box['attributes'], 'delimiter'=>($box['delimiter'] ? $box['delimiter'] : $this->getDelimiter('personal')), 'SUBSCRIBED'=>false);
 				}
 				else
 				{
@@ -656,14 +656,14 @@ 
 	 *
 	 * @return  mixed   array of mailboxes
 	 */
-	function listSubscribedMailboxes($reference = ''  , $restriction_search = 0, $returnAttributes = false)
+	function listSubscribedMailboxes($reference = '', $restriction_search = 0, $returnAttributes = false)
 	{
-		if ( is_bool($restriction_search) ){
-			$restriction_search = (int) $restriction_search;
+		if (is_bool($restriction_search)) {
+			$restriction_search = (int)$restriction_search;
 		}
 		$mailbox = '';
-		if ( is_int( $restriction_search ) ){
-			switch ( $restriction_search ) {
+		if (is_int($restriction_search)) {
+			switch ($restriction_search) {
 			case 0:
 				$searchstring = $reference."*";
 				break;
@@ -675,8 +675,8 @@ 
 				$searchstring = $reference."%";
 				break;
 			}
-		}else{
-			if ( is_string( $restriction_search ) ){
+		} else {
+			if (is_string($restriction_search)) {
 				$mailbox = $searchstring = $restriction_search;
 			}
 		}
@@ -688,25 +688,25 @@ 
 				'special_use'=>true,
 				'sort'=>true,
 			);
-		if ($returnAttributes==false)
+		if ($returnAttributes == false)
 		{
 			unset($options['attributes']);
 			unset($options['children']);
 			unset($options['special_use']);
 		}
-		$mailboxes = $this->listMailboxes($searchstring,Horde_Imap_Client::MBOX_SUBSCRIBED_EXISTS, $options);
+		$mailboxes = $this->listMailboxes($searchstring, Horde_Imap_Client::MBOX_SUBSCRIBED_EXISTS, $options);
 		//$mboxes = new Horde_Imap_Client_Mailbox_List($mailboxes);
 		//_debug_array($mboxes->count());
 		foreach ((array)$mailboxes as $k =>$box)
 		{
 			//error_log(__METHOD__.__LINE__.' Searched for:'.$mailbox.' got Box:'.$k.'->'.array2string($box).function_backtrace());
-			if ($returnAttributes==false)
+			if ($returnAttributes == false)
 			{
-				$ret[]=$k;
+				$ret[] = $k;
 			}
 			else
 			{
-				$ret[$k]=array('MAILBOX'=>$k,'ATTRIBUTES'=>$box['attributes'],'delimiter'=>($box['delimiter']?$box['delimiter']:$this->getDelimiter('personal')),'SUBSCRIBED'=>true);
+				$ret[$k] = array('MAILBOX'=>$k, 'ATTRIBUTES'=>$box['attributes'], 'delimiter'=>($box['delimiter'] ? $box['delimiter'] : $this->getDelimiter('personal')), 'SUBSCRIBED'=>true);
 			}
 		}
 		return $ret;
@@ -722,14 +722,14 @@ 
 	 *
 	 * @return  mixed   array of mailboxes
 	 */
-	function listUnSubscribedMailboxes($reference = ''  , $restriction_search = 0)
+	function listUnSubscribedMailboxes($reference = '', $restriction_search = 0)
 	{
-		if ( is_bool($restriction_search) ){
-			$restriction_search = (int) $restriction_search;
+		if (is_bool($restriction_search)) {
+			$restriction_search = (int)$restriction_search;
 		}
 
-		if ( is_int( $restriction_search ) ){
-			switch ( $restriction_search ) {
+		if (is_int($restriction_search)) {
+			switch ($restriction_search) {
 			case 0:
 				$mailbox = $reference."*";
 				break;
@@ -741,8 +741,8 @@ 
 				$mailbox = "%";
 				break;
 			}
-		}else{
-			if ( is_string( $restriction_search ) ){
+		} else {
+			if (is_string($restriction_search)) {
 				$mailbox = $restriction_search;
 			}
 		}
@@ -751,17 +751,17 @@ 
 			'sort'=>true,
 			//'flat'=>true,
 		);
-		$mailboxes = $this->listMailboxes($mailbox,Horde_Imap_Client::MBOX_SUBSCRIBED_EXISTS, $options);
+		$mailboxes = $this->listMailboxes($mailbox, Horde_Imap_Client::MBOX_SUBSCRIBED_EXISTS, $options);
 		foreach ($mailboxes as $box)
 		{
 			//error_log(__METHOD__.__LINE__.' Box:'.$k.'->'.array2string($box['mailbox']->utf8));
-			$sret[]=$box['mailbox']->utf8;
+			$sret[] = $box['mailbox']->utf8;
 		}
-		$unsubscribed = $this->listMailboxes($mailbox,Horde_Imap_Client::MBOX_UNSUBSCRIBED, $options);
+		$unsubscribed = $this->listMailboxes($mailbox, Horde_Imap_Client::MBOX_UNSUBSCRIBED, $options);
 		foreach ($unsubscribed as $box)
 		{
 			//error_log(__METHOD__.__LINE__.' Box:'.$k.'->'.array2string($box['mailbox']->utf8));
-			if (!in_array($box['mailbox']->utf8,$sret) && $box['mailbox']->utf8!='INBOX') $ret[]=$box['mailbox']->utf8;
+			if (!in_array($box['mailbox']->utf8, $sret) && $box['mailbox']->utf8 != 'INBOX') $ret[] = $box['mailbox']->utf8;
 		}
 		return $ret;
 	}
@@ -773,12 +773,12 @@ 
 	 * @param int $flags =null default Horde_Imap_Client::STATUS_ALL | Horde_Imap_Client::STATUS_FLAGS | Horde_Imap_Client::STATUS_PERMFLAGS
 	 * @return array of counters for mailbox
 	 */
-	function examineMailbox($mailbox, $flags=null)
+	function examineMailbox($mailbox, $flags = null)
 	{
-		if ($mailbox=='') return false;
+		if ($mailbox == '') return false;
 		$mailboxes = $this->listMailboxes($mailbox);
 
-		if (is_null($flags)) $flags = Horde_Imap_Client::STATUS_ALL | Horde_Imap_Client::STATUS_FLAGS | Horde_Imap_Client::STATUS_PERMFLAGS;
+		if (is_null($flags)) $flags = Horde_Imap_Client::STATUS_ALL|Horde_Imap_Client::STATUS_FLAGS|Horde_Imap_Client::STATUS_PERMFLAGS;
 
 		$mboxes = new Horde_Imap_Client_Mailbox_List($mailboxes);
 		//_debug_array($mboxes->count());
@@ -786,18 +786,18 @@ 
 		{
 			//error_log(__METHOD__.__LINE__.array2string($box));
 			unset($box);
-			if ($k!='user' && $k != '' && $k==$mailbox)
+			if ($k != 'user' && $k != '' && $k == $mailbox)
 			{
 				$status = $this->status($k, $flags);
 				//error_log(__METHOD__.__LINE__.array2string($status));
 				foreach ($status as $key => $v)
 				{
-					$_status[strtoupper($key)]=$v;
+					$_status[strtoupper($key)] = $v;
 				}
-				if ($flags & (Horde_Imap_Client::STATUS_FLAGS|Horde_Imap_Client::STATUS_PERMFLAGS))
+				if ($flags&(Horde_Imap_Client::STATUS_FLAGS|Horde_Imap_Client::STATUS_PERMFLAGS))
 				{
 					self::$supports_keywords[$this->ImapServerId] = stripos(implode('', $status['flags']), '$label') !== false ||
-						in_array('\\*', $status['permflags']);	// arbitrary keyswords also allow keywords
+						in_array('\\*', $status['permflags']); // arbitrary keyswords also allow keywords
 				}
 				return $_status;
 			}
@@ -836,7 +836,7 @@ 
 	 */
 	function hasCapability($capability)
 	{
-		if ($capability=='SUPPORTS_KEYWORDS')
+		if ($capability == 'SUPPORTS_KEYWORDS')
 		{
 			// if pseudo-flag is not set, call examineMailbox now to set it (no STATUS_ALL = counters necessary)
 			if (!isset(self::$supports_keywords[$this->ImapServerId]))
@@ -848,7 +848,7 @@ 
 				catch (\Exception $e)
 				{
 					error_log(__METHOD__.__LINE__.' (examineServer for detection) '.$capability.'->'.array2string(self::$supports_keywords).' failed '.function_backtrace());
-					self::$supports_keywords[$this->ImapServerId]=false;
+					self::$supports_keywords[$this->ImapServerId] = false;
 				}
 			}
 			//error_log(__METHOD__.__LINE__.' '.$capability.'->'.array2string(self::$supports_keywords).' '.function_backtrace());
@@ -898,9 +898,9 @@ 
 	 */
 	static function getFolderPrefixFromNamespace($_nameSpace, $_folderName)
 	{
-		foreach($_nameSpace as &$singleNameSpace)
+		foreach ($_nameSpace as &$singleNameSpace)
 		{
-			if (substr($_folderName,0,strlen($singleNameSpace['prefix'])) == $singleNameSpace['prefix']) return $singleNameSpace['prefix'];
+			if (substr($_folderName, 0, strlen($singleNameSpace['prefix'])) == $singleNameSpace['prefix']) return $singleNameSpace['prefix'];
 		}
 		return "";
 	}
@@ -915,33 +915,33 @@ 
 	 * @param string $reclevel = 0, counter to keep track of the current recursionlevel
 	 * @return array of mailboxes
 	 */
-	function getMailBoxesRecursive($_mailbox, $delimiter, $prefix, $reclevel=0)
+	function getMailBoxesRecursive($_mailbox, $delimiter, $prefix, $reclevel = 0)
 	{
 		if ($reclevel > 25) {
-			error_log( __METHOD__." Recursion Level Exeeded ($reclevel) while looking up $_mailbox$delimiter ");
+			error_log(__METHOD__." Recursion Level Exeeded ($reclevel) while looking up $_mailbox$delimiter ");
 			return array();
 		}
 		$reclevel++;
 		// clean up double delimiters
-		$mailbox = preg_replace('~'.($delimiter == '.' ? "\\".$delimiter:$delimiter).'+~s',$delimiter,$_mailbox);
+		$mailbox = preg_replace('~'.($delimiter == '.' ? "\\".$delimiter : $delimiter).'+~s', $delimiter, $_mailbox);
 		//get that mailbox in question
-		$mbx = $this->getMailboxes($mailbox,1,true);
+		$mbx = $this->getMailboxes($mailbox, 1, true);
 		$mbxkeys = array_keys($mbx);
 
 		// Example: Array([INBOX/GaGa] => Array([MAILBOX] => INBOX/GaGa[ATTRIBUTES] => Array([0] => \\unmarked)[delimiter] => /))
-		if (is_array($mbx[$mbxkeys[0]]["ATTRIBUTES"]) && (in_array('\HasChildren',$mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\Haschildren',$mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\haschildren',$mbx[$mbxkeys[0]]["ATTRIBUTES"])))
+		if (is_array($mbx[$mbxkeys[0]]["ATTRIBUTES"]) && (in_array('\HasChildren', $mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\Haschildren', $mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\haschildren', $mbx[$mbxkeys[0]]["ATTRIBUTES"])))
 		{
-			$buff = $this->getMailboxes($mbx[$mbxkeys[0]]['MAILBOX'].($mbx[$mbxkeys[0]]['MAILBOX'] == $prefix ? '':$delimiter),2,false);
+			$buff = $this->getMailboxes($mbx[$mbxkeys[0]]['MAILBOX'].($mbx[$mbxkeys[0]]['MAILBOX'] == $prefix ? '' : $delimiter), 2, false);
 			$allMailboxes = array();
 			foreach ($buff as $mbxname) {
-				$mbxname = preg_replace('~'.($delimiter == '.' ? "\\".$delimiter:$delimiter).'+~s',$delimiter,$mbxname['MAILBOX']);
+				$mbxname = preg_replace('~'.($delimiter == '.' ? "\\".$delimiter : $delimiter).'+~s', $delimiter, $mbxname['MAILBOX']);
 				#echo "About to recur in level $reclevel:".$mbxname."<br>";
-				if ( $mbxname != $mbx[$mbxkeys[0]]['MAILBOX'] && $mbxname != $prefix  && $mbxname != $mbx[$mbxkeys[0]]['MAILBOX'].$delimiter)
+				if ($mbxname != $mbx[$mbxkeys[0]]['MAILBOX'] && $mbxname != $prefix && $mbxname != $mbx[$mbxkeys[0]]['MAILBOX'].$delimiter)
 				{
 					$allMailboxes = array_merge($allMailboxes, self::getMailBoxesRecursive($mbxname, $delimiter, $prefix, $reclevel));
 				}
 			}
-			if (!(in_array('\NoSelect',$mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\Noselect',$mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\noselect',$mbx[$mbxkeys[0]]["ATTRIBUTES"]))) $allMailboxes[] = $mbx[$mbxkeys[0]]['MAILBOX'];
+			if (!(in_array('\NoSelect', $mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\Noselect', $mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\noselect', $mbx[$mbxkeys[0]]["ATTRIBUTES"]))) $allMailboxes[] = $mbx[$mbxkeys[0]]['MAILBOX'];
 			return $allMailboxes;
 		}
 		else
@@ -960,24 +960,24 @@ 
 	 */
 	function getNameSpace()
 	{
-		static $nameSpace=null;
+		static $nameSpace = null;
 		$foldersNameSpace = array();
 		$delimiter = $this->getDelimiter();
-		if (empty($delimiter)) $delimiter='/';
+		if (empty($delimiter)) $delimiter = '/';
 		if (is_null($nameSpace)) $nameSpace = $this->getNameSpaceArray();
 		if (is_array($nameSpace)) {
-			foreach($nameSpace as $type => $singleNameSpaceArray)
+			foreach ($nameSpace as $type => $singleNameSpaceArray)
 			{
 				foreach ($singleNameSpaceArray as $singleNameSpace)
 				{
 					$_foldersNameSpace = array();
-					if($type == 'personal' && $singleNameSpace['name'] == '#mh/' && ($this->folderExists('Mail')||$this->folderExists('INBOX')))
+					if ($type == 'personal' && $singleNameSpace['name'] == '#mh/' && ($this->folderExists('Mail') || $this->folderExists('INBOX')))
 					{
 						$_foldersNameSpace['prefix_present'] = 'forced';
 						// uw-imap server with mailbox prefix or dovecot maybe
-						$_foldersNameSpace['prefix'] = ($this->folderExists('Mail')?'Mail':(!empty($singleNameSpace['name'])?$singleNameSpace['name']:''));
+						$_foldersNameSpace['prefix'] = ($this->folderExists('Mail') ? 'Mail' : (!empty($singleNameSpace['name']) ? $singleNameSpace['name'] : ''));
 					}
-					elseif($type == 'personal' && ($singleNameSpace['name'] == '#mh/') && $this->folderExists('mail'))
+					elseif ($type == 'personal' && ($singleNameSpace['name'] == '#mh/') && $this->folderExists('mail'))
 					{
 						$_foldersNameSpace['prefix_present'] = 'forced';
 						// uw-imap server with mailbox prefix or dovecot maybe
@@ -986,9 +986,9 @@ 
 						$_foldersNameSpace['prefix_present'] = !empty($singleNameSpace['name']);
 						$_foldersNameSpace['prefix'] = $singleNameSpace['name'];
 					}
-					$_foldersNameSpace['delimiter'] = ($singleNameSpace['delimiter']?$singleNameSpace['delimiter']:$delimiter);
+					$_foldersNameSpace['delimiter'] = ($singleNameSpace['delimiter'] ? $singleNameSpace['delimiter'] : $delimiter);
 					$_foldersNameSpace['type'] = $type;
-					$foldersNameSpace[] =$_foldersNameSpace;
+					$foldersNameSpace[] = $_foldersNameSpace;
 				}
 			}
 		}
@@ -1000,29 +1000,29 @@ 
 	 * @param mixed _type (1=personal, 2=user/other, 3=shared)
 	 * @return string the delimimiter
 	 */
-	function getDelimiter($_type=1)
+	function getDelimiter($_type = 1)
 	{
 		switch ($_type)
 		{
 			case 'user':
 			case 'other':
 			case 2:
-				$type=2;
+				$type = 2;
 				break;
 			case 'shared':
 			case '':
 			case 3:
-				$type=3;
+				$type = 3;
 				break;
 			case 'personal':
 			case 1:
 			default:
-				$type=1;
+				$type = 1;
 		}
 		$namespaces = $this->getNamespaces();
 		foreach ($namespaces as $nsp)
 		{
-			if ($nsp['type']==$type && $nsp['delimiter']) return $nsp['delimiter'];
+			if ($nsp['type'] == $type && $nsp['delimiter']) return $nsp['delimiter'];
 		}
 		return "/";
 	}
@@ -1050,7 +1050,7 @@ 
 	{
 		if (is_numeric($_username))
 		{
-			$_username = $GLOBALS['egw']->accounts->id2name($accountID=$_username);
+			$_username = $GLOBALS['egw']->accounts->id2name($accountID = $_username);
 		}
 		else
 		{
@@ -1059,7 +1059,7 @@ 
 		switch ($this->loginType)
 		{
 			case 'email':
-				$_username = $GLOBALS['egw']->accounts->id2name($accountID,'account_email');
+				$_username = $GLOBALS['egw']->accounts->id2name($accountID, 'account_email');
 				break;
 
 			case 'vmailmgr':
@@ -1074,8 +1074,8 @@ 
 				if (empty($this->loginType))
 				{
 					// try to figure out by params['acc_imap_username']
-					list($lusername,$domain) = explode('@',$this->params['acc_imap_username'],2);
-					if (strpos($_username,'@')===false && !empty($domain) && !empty($lusername))
+					list($lusername, $domain) = explode('@', $this->params['acc_imap_username'], 2);
+					if (strpos($_username, '@') === false && !empty($domain) && !empty($lusername))
 					{
 						$_username = $_username.'@'.$domain;
 					}
@@ -1114,20 +1114,20 @@ 
 	 * @param string $_folderName=''
 	 * @return string utf-7 encoded (done in getMailboxName)
 	 */
-	function getUserMailboxString($_username, $_folderName='')
+	function getUserMailboxString($_username, $_folderName = '')
 	{
 		$nameSpaces = $this->getNameSpaceArray();
 
-		if(!isset($nameSpaces['others'])) {
+		if (!isset($nameSpaces['others'])) {
 			return false;
 		}
 
 		$username = $this->getMailBoxUserName($_username);
-		if($this->loginType == 'vmailmgr' || $this->loginType == 'email' || $this->loginType == 'uidNumber') {
-			$username .= '@'. $this->domainName;
+		if ($this->loginType == 'vmailmgr' || $this->loginType == 'email' || $this->loginType == 'uidNumber') {
+			$username .= '@'.$this->domainName;
 		}
 
-		$mailboxString = $nameSpaces['others'][0]['name'] . $username . (!empty($_folderName) ? ($nameSpaces['others'][0]['delimiter']?$nameSpaces['others'][0]['delimiter']:'/') . $_folderName : '');
+		$mailboxString = $nameSpaces['others'][0]['name'].$username.(!empty($_folderName) ? ($nameSpaces['others'][0]['delimiter'] ? $nameSpaces['others'][0]['delimiter'] : '/').$_folderName : '');
 
 		return $mailboxString;
 	}
@@ -1146,7 +1146,7 @@ 
 		);
 		//error_log(__METHOD__.__LINE__.array2string($types));
 		$result = array();
-		foreach($this->getNamespaces() as $data)
+		foreach ($this->getNamespaces() as $data)
 		{
 			//error_log(__METHOD__.__LINE__.array2string($data));
 			if (isset($types[$data['type']]))
@@ -1156,7 +1156,7 @@ 
 					'name' => $data['name'],
 					'prefix' => $data['name'],
 					'prefix_present' => !empty($data['name']),
-					'delimiter' => ($data['delimiter']?$data['delimiter']:'/'),
+					'delimiter' => ($data['delimiter'] ? $data['delimiter'] : '/'),
 				);
 			}
 		}
@@ -1177,7 +1177,7 @@ 
 		{
 			if ($qInfo['storage'])
 			{
-				return array('USED'=>$qInfo['storage']['usage'],'QMAX'=>$qInfo['storage']['limit']);
+				return array('USED'=>$qInfo['storage']['usage'], 'QMAX'=>$qInfo['storage']['limit']);
 			}
 		}
 		return false;
@@ -1191,7 +1191,7 @@ 
 	 * @param string $_what - what to retrieve either limit/QMAX, usage/USED or ALL is supported
 	 * @return int|array|boolean the quota for specified user (by what) or array with values for "limit" and "usage", or false
 	 */
-	function getQuotaByUser($_username, $_what='QMAX')
+	function getQuotaByUser($_username, $_what = 'QMAX')
 	{
 		$mailboxName = $this->getUserMailboxString($_username);
 		$storageQuota = $this->getQuotaRoot($mailboxName);
@@ -1200,7 +1200,7 @@ 
 		if (is_array($storageQuota) && isset($storageQuota[$mailboxName]) && is_array($storageQuota[$mailboxName]) &&
 			isset($storageQuota[$mailboxName]['storage']) && is_array($storageQuota[$mailboxName]['storage']))
 		{
-			switch($_what)
+			switch ($_what)
 			{
 				case 'QMAX':
 					$_what = 'limit';
@@ -1226,7 +1226,7 @@ 
 	 */
 	function getUserData($_username)
 	{
-		unset($_username);	// not used
+		unset($_username); // not used
 		return array();
 	}
 
@@ -1239,7 +1239,7 @@ 
 	 */
 	function setUserData($_username, $_quota)
 	{
-		unset($_username, $_quota);	// not used
+		unset($_username, $_quota); // not used
 		return true;
 	}
 
@@ -1273,10 +1273,10 @@ 
 	 * @param array $params
 	 * @throws Api\Exception\WrongParameter
 	 */
-	public function __call($name,array $params=null)
+	public function __call($name, array $params = null)
 	{
 		if ($this->debug) error_log(__METHOD__.'->'.$name.' with params:'.array2string($params));
-		switch($name)
+		switch ($name)
 		{
 			case 'installScript':
 			case 'getScript':
@@ -1291,9 +1291,9 @@ 
 				if (is_null($this->sieve))
 				{
 					$this->sieve = new Sieve($this);
-					$this->error =& $this->sieve->error;
+					$this->error = & $this->sieve->error;
 				}
-				$ret = call_user_func_array(array($this->sieve,$name),$params);
+				$ret = call_user_func_array(array($this->sieve, $name), $params);
 				//error_log(__CLASS__.'->'.$name.'('.array2string($params).') returns '.array2string($ret));
 				return $ret;
 		}
@@ -1308,7 +1308,7 @@ 
 	 * @param string $_scriptName =null
 	 * @return boolean
 	 */
-	public function setVacationUser($_euser, array $_vacation, $_scriptName=null)
+	public function setVacationUser($_euser, array $_vacation, $_scriptName = null)
 	{
 		if ($this->debug) error_log(__METHOD__.' User:'.array2string($_euser).' Scriptname:'.array2string($_scriptName).' VacationMessage:'.array2string($_vacation));
 
@@ -1320,8 +1320,8 @@ 
 		{
 			$this->adminConnection($_euser);
 			$this->sieve = new Sieve($this, $_euser, $_scriptName);
-			$this->scriptName =& $this->sieve->scriptName;
-			$this->error =& $this->sieve->error;
+			$this->scriptName = & $this->sieve->scriptName;
+			$this->error = & $this->sieve->error;
 		}
 		$ret = $this->setVacation($_vacation, $_scriptName);
 
@@ -1336,7 +1336,7 @@ 
 	 * @throws Exception on connection error or authentication failure
 	 * @return array
 	 */
-	public function getVacationUser($_euser, $_scriptName=null)
+	public function getVacationUser($_euser, $_scriptName = null)
 	{
 		if ($this->debug) error_log(__METHOD__.' User:'.array2string($_euser));
 
@@ -1348,8 +1348,8 @@ 
 		{
 			$this->adminConnection($_euser);
 			$this->sieve = new Sieve($this, $_euser, $_scriptName);
-			$this->error =& $this->sieve->error;
-			$this->scriptName =& $this->sieve->scriptName;
+			$this->error = & $this->sieve->error;
+			$this->scriptName = & $this->sieve->scriptName;
 		}
 		return $this->sieve->getVacation();
 	}
@@ -1369,7 +1369,7 @@ 
 	 */
 	public static function init_static()
 	{
-		self::$supports_keywords =& Api\Cache::getSession (__CLASS__, 'supports_keywords');
+		self::$supports_keywords = & Api\Cache::getSession(__CLASS__, 'supports_keywords');
 	}
 }
 Imap::init_static();

api/src/Mail/Imap/Iface.php

Doc Comments +1 added lines

@@ -121,6 +121,7 @@
 	 * @param bool $_adminConnection create admin connection if true
 	 * @param int $_timeout =null timeout in secs, if none given fmail pref or default of 20 is used
 	 * @throws Exception on error
+	 * @return void
 	 */
 	function openConnection($_adminConnection=false, $_timeout=null);
 

Spacing +8 added lines, -8 removed lines

@@ -14,9 +14,9 @@ 
 namespace EGroupware\Api\Mail\Imap;
 
 define('IMAP_NAMESPACE_PERSONAL', 'personal');
-define('IMAP_NAMESPACE_OTHERS'	, 'others');
-define('IMAP_NAMESPACE_SHARED'	, 'shared');
-define('IMAP_NAMESPACE_ALL'	, 'all');
+define('IMAP_NAMESPACE_OTHERS', 'others');
+define('IMAP_NAMESPACE_SHARED', 'shared');
+define('IMAP_NAMESPACE_ALL', 'all');
 
 /**
  * This class holds all information about the imap connection.
@@ -87,7 +87,7 @@ 
 	 * @param string $_folderName=''
 	 * @return string utf-7 encoded (done in getMailboxName)
 	 */
-	function getUserMailboxString($_username, $_folderName='');
+	function getUserMailboxString($_username, $_folderName = '');
 
 	/**
 	 * get list of namespaces
@@ -103,7 +103,7 @@ 
 	 * @param string $_what - what to retrieve either QMAX, USED or ALL is supported
 	 * @return mixed the quota for specified user (by what) or array with all available Quota Information, or false
 	 */
-	function getQuotaByUser($_username, $_what='QMAX');
+	function getQuotaByUser($_username, $_what = 'QMAX');
 
 	/**
 	 * returns information about a user
@@ -122,7 +122,7 @@ 
 	 * @param int $_timeout =null timeout in secs, if none given fmail pref or default of 20 is used
 	 * @throws Exception on error
 	 */
-	function openConnection($_adminConnection=false, $_timeout=null);
+	function openConnection($_adminConnection = false, $_timeout = null);
 
 	/**
 	 * set userdata
@@ -149,7 +149,7 @@ 
 	 * @param string $_scriptName =null
 	 * @return boolean
 	 */
-	public function setVacationUser($_euser, array $_vacation, $_scriptName=null);
+	public function setVacationUser($_euser, array $_vacation, $_scriptName = null);
 
 	/**
 	 * Get vacation message for given user
@@ -159,5 +159,5 @@ 
 	 * @throws Exception on connection error or authentication failure
 	 * @return array
 	 */
-	public function getVacationUser($_euser, $_scriptName=null);
+	public function getVacationUser($_euser, $_scriptName = null);
 }