EGroupware / egroupware

api/src/Auth/Nis.php

Spacing +8 added lines, -8 removed lines

@@ -26,22 +26,22 @@ 
 	 * @param string $passwd_type ='text' 'text' for cleartext passwords (default)
 	 * @return boolean true if successful authenticated, false otherwise
 	 */
-	function authenticate($username, $passwd, $passwd_type='text')
+	function authenticate($username, $passwd, $passwd_type = 'text')
 	{
-		unset($passwd_type);	// not used but required by interface
+		unset($passwd_type); // not used but required by interface
 
 		$domain = yp_get_default_domain();
-		if(!empty($GLOBALS['egw_info']['server']['nis_domain']))
+		if (!empty($GLOBALS['egw_info']['server']['nis_domain']))
 		{
 			$domain = $GLOBALS['egw_info']['server']['nis_domain'];
 		}
 
 		$map = "passwd.byname";
-		if(!empty($GLOBALS['egw_info']['server']['nis_map']))
+		if (!empty($GLOBALS['egw_info']['server']['nis_map']))
 		{
 			$map = $GLOBALS['egw_info']['server']['nis_map'];
 		}
-		$entry = yp_match( $domain, $map, $username );
+		$entry = yp_match($domain, $map, $username);
 
 		/*
 		 * we assume that the map is structured in the usual
@@ -63,11 +63,11 @@ 
 	 * @param int $account_id =0 account id of user whose passwd should be changed
 	 * @return boolean true if password successful changed, false otherwise
 	 */
-	function change_password($old_passwd, $new_passwd, $account_id=0)
+	function change_password($old_passwd, $new_passwd, $account_id = 0)
 	{
-		unset($old_passwd, $new_passwd, $account_id);	// not used but required by interface
+		unset($old_passwd, $new_passwd, $account_id); // not used but required by interface
 
 		// can't change passwords unless server runs as root (bad idea)
-		return( False );
+		return(False);
 	}
 }

api/src/Auth/Sqlssl.php

Spacing +8 added lines, -8 removed lines

@@ -29,21 +29,21 @@ 
 	 * @param string $passwd_type ='text' 'text' for cleartext passwords (default)
 	 * @return boolean true if successful authenticated, false otherwise
 	 */
-	function authenticate($username, $passwd, $passwd_type='text')
+	function authenticate($username, $passwd, $passwd_type = 'text')
 	{
-		unset($passwd_type);	// not used but required by interface
+		unset($passwd_type); // not used but required by interface
 
 		$local_debug = False;
 
-		if($local_debug)
+		if ($local_debug)
 		{
 			echo "<b>Debug SQL: uid - $username passwd - $passwd</b>";
 		}
-		if (!($row = $this->db->select($this->table,'account_lid,account_pwd',array(
+		if (!($row = $this->db->select($this->table, 'account_lid,account_pwd', array(
 			'account_lid' => $username,
 			'account_status' => 'A',
 			'account_type'   => 'u',
-		),__LINE__,__FILE__)->fetch()) || $GLOBALS['egw_info']['server']['case_sensitive_username'] && $row['account_lid'] != $username)
+		), __LINE__, __FILE__)->fetch()) || $GLOBALS['egw_info']['server']['case_sensitive_username'] && $row['account_lid'] != $username)
 		{
 			return false;
 		}
@@ -51,7 +51,7 @@ 
 		# Apache + mod_ssl provide the data in the environment
 		# Certificate (chain) verification occurs inside mod_ssl
 		# see http://www.modssl.org/docs/2.8/ssl_howto.html#ToC6
-		if(!isset($_SERVER['SSL_CLIENT_S_DN']))
+		if (!isset($_SERVER['SSL_CLIENT_S_DN']))
 		{
 			# if we're not doing SSL authentication, behave like auth_sql
 			return Api\Auth::compare_password($passwd, $row['account_pwd'], 'md5', strtolower($username));
@@ -67,9 +67,9 @@ 
 	 * @param int $account_id =0 account id of user whose passwd should be changed
 	 * @return boolean true if password successful changed, false otherwise
 	 */
-	function change_password($old_passwd, $new_passwd, $account_id=0)
+	function change_password($old_passwd, $new_passwd, $account_id = 0)
 	{
-		unset($old_passwd, $new_passwd, $account_id);	// not used but required by interface
+		unset($old_passwd, $new_passwd, $account_id); // not used but required by interface
 
 		// deny password changes.
 		return False;

api/src/Auth/Pam.php

Spacing +7 added lines, -7 removed lines

@@ -30,9 +30,9 @@ 
 	 * @param string $passwd_type ='text' 'text' for cleartext passwords (default)
 	 * @return boolean true if successful authenticated, false otherwise
 	 */
-	function authenticate($username, $passwd, $passwd_type='text')
+	function authenticate($username, $passwd, $passwd_type = 'text')
 	{
-		unset($passwd_type);	// not used but required by interface
+		unset($passwd_type); // not used but required by interface
 
 		if (pam_auth($username, get_magic_quotes_gpc() ? stripslashes($passwd) : $passwd))
 		{
@@ -40,12 +40,12 @@ 
 			if (!$GLOBALS['egw']->accounts->name2id($username) &&
 				function_exists('posix_getpwnam') && ($data = posix_getpwnam($username)))
 			{
-				list($fullname) = explode(',',$data['gecos']);
-				$parts = explode(' ',$fullname);
+				list($fullname) = explode(',', $data['gecos']);
+				$parts = explode(' ', $fullname);
 				if (count($parts) > 1)
 				{
 					$lastname = array_pop($parts);
-					$firstname = implode(' ',$parts);
+					$firstname = implode(' ', $parts);
 					$email = Api\Accounts::email($firstname, $lastname, $username);
 
 					$GLOBALS['auto_create_acct'] = array(
@@ -69,9 +69,9 @@ 
 	 * @param int $account_id =0 account id of user whose passwd should be changed
 	 * @return boolean true if password successful changed, false otherwise
 	 */
-	function change_password($old_passwd, $new_passwd, $account_id=0)
+	function change_password($old_passwd, $new_passwd, $account_id = 0)
 	{
-		unset($old_passwd, $new_passwd, $account_id);	// not used but required by interface
+		unset($old_passwd, $new_passwd, $account_id); // not used but required by interface
 
 		// deny password changes.
 		return False;

api/src/Auth/Mail.php

Spacing +10 added lines, -10 removed lines

@@ -34,14 +34,14 @@ 
 	 * @param string $passwd_type ='text' 'text' for cleartext passwords (default)
 	 * @return boolean true if successful authenticated, false otherwise
 	 */
-	function authenticate($username, $passwd, $passwd_type='text')
+	function authenticate($username, $passwd, $passwd_type = 'text')
 	{
-		unset($passwd_type);	// not used but required by function signature
+		unset($passwd_type); // not used but required by function signature
 
 		switch ($GLOBALS['egw_info']['server']['mail_login_type'])
 		{
 			case 'vmailmgr':
-				$username = $username . '@' . $GLOBALS['egw_info']['server']['mail_suffix'];
+				$username = $username.'@'.$GLOBALS['egw_info']['server']['mail_suffix'];
 				break;
 			case 'email':
 				$username = $GLOBALS['egw']->accounts->id2name($username, 'account_email');
@@ -68,7 +68,7 @@ 
 				$mailauth = true;
 				$imap->logout();
 			}
-			catch(Horde_Imap_Client_Exception $e) {
+			catch (Horde_Imap_Client_Exception $e) {
 				// throw everything but authentication failed as exception
 				if ($e->getCode() != Horde_Imap_Client_Exception::LOGIN_AUTHENTICATIONFAILED) throw $e;
 
@@ -85,19 +85,19 @@ 
 				case 'imap':
 				default:
 					if (!isset($port)) $port = 143;
-					$mailauth = imap_open('{'.$host.':'.$port.'/imap/novalidate-cert}INBOX', $username , $passwd);
+					$mailauth = imap_open('{'.$host.':'.$port.'/imap/novalidate-cert}INBOX', $username, $passwd);
 					break;
 				case 'imaps':
 					if (!isset($port)) $port = 993;
-					$mailauth = imap_open('{'.$host.'/imap/ssl/novalidate-cert:'.$port.'}INBOX', $username , $passwd);
+					$mailauth = imap_open('{'.$host.'/imap/ssl/novalidate-cert:'.$port.'}INBOX', $username, $passwd);
 					break;
 				case 'pop3':
 					if (!isset($port)) $port = 110;
-					$mailauth = imap_open('{'.$host.'/pop3/novalidate-cert:'.$port.'}INBOX', $username , $passwd);
+					$mailauth = imap_open('{'.$host.'/pop3/novalidate-cert:'.$port.'}INBOX', $username, $passwd);
 					break;
 				case 'pop3s':
 					if (!isset($port)) $port = 995;
-					$mailauth = imap_open('{'.$host.'/pop3/ssl/novalidate-cert:'.$port.'}INBOX', $username , $passwd);
+					$mailauth = imap_open('{'.$host.'/pop3/ssl/novalidate-cert:'.$port.'}INBOX', $username, $passwd);
 					break;
 			}
 			if ($mailauth) imap_close($mailauth);
@@ -113,9 +113,9 @@ 
 	 * @param int $account_id =0 account id of user whose passwd should be changed
 	 * @return boolean true if password successful changed, false otherwise
 	 */
-	function change_password($old_passwd, $new_passwd, $account_id=0)
+	function change_password($old_passwd, $new_passwd, $account_id = 0)
 	{
-		unset($old_passwd, $new_passwd, $account_id);	// not used but required by function sigature
+		unset($old_passwd, $new_passwd, $account_id); // not used but required by function sigature
 
 		return False;
 	}

Braces +24 added lines, -6 removed lines

@@ -70,7 +70,10 @@ 
 			}
 			catch(Horde_Imap_Client_Exception $e) {
 				// throw everything but authentication failed as exception
-				if ($e->getCode() != Horde_Imap_Client_Exception::LOGIN_AUTHENTICATIONFAILED) throw $e;
+				if ($e->getCode() != Horde_Imap_Client_Exception::LOGIN_AUTHENTICATIONFAILED)
+				{
+					throw $e;
+				}
 
 				$mailauth = false;
 			}
@@ -84,23 +87,38 @@ 
 			{
 				case 'imap':
 				default:
-					if (!isset($port)) $port = 143;
+					if (!isset($port))
+					{
+						$port = 143;
+					}
 					$mailauth = imap_open('{'.$host.':'.$port.'/imap/novalidate-cert}INBOX', $username , $passwd);
 					break;
 				case 'imaps':
-					if (!isset($port)) $port = 993;
+					if (!isset($port))
+					{
+						$port = 993;
+					}
 					$mailauth = imap_open('{'.$host.'/imap/ssl/novalidate-cert:'.$port.'}INBOX', $username , $passwd);
 					break;
 				case 'pop3':
-					if (!isset($port)) $port = 110;
+					if (!isset($port))
+					{
+						$port = 110;
+					}
 					$mailauth = imap_open('{'.$host.'/pop3/novalidate-cert:'.$port.'}INBOX', $username , $passwd);
 					break;
 				case 'pop3s':
-					if (!isset($port)) $port = 995;
+					if (!isset($port))
+					{
+						$port = 995;
+					}
 					$mailauth = imap_open('{'.$host.'/pop3/ssl/novalidate-cert:'.$port.'}INBOX', $username , $passwd);
 					break;
 			}
-			if ($mailauth) imap_close($mailauth);
+			if ($mailauth)
+			{
+				imap_close($mailauth);
+			}
 		}
 		return !!$mailauth;
 	}

api/src/Auth/Backend.php

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
 	 * @param string $passwd_type ='text' 'text' for cleartext passwords (default)
 	 * @return boolean true if successful authenticated, false otherwise
 	 */
-	function authenticate($username, $passwd, $passwd_type='text');
+	function authenticate($username, $passwd, $passwd_type = 'text');
 
 	/**
 	 * changes password in sql datababse
@@ -36,5 +36,5 @@ 
 	 * @throws Exception to give a verbose error, why changing password failed
 	 * @return boolean true if password successful changed, false otherwise
 	 */
-	function change_password($old_passwd, $new_passwd, $account_id=0);
+	function change_password($old_passwd, $new_passwd, $account_id = 0);
 }

api/src/Auth/Cas.php

Spacing +6 added lines, -6 removed lines

@@ -29,18 +29,18 @@ 
 	 * @param string $passwd_type ='text' 'text' for cleartext passwords (default)
 	 * @return boolean true if successful authenticated, false otherwise
 	 */
-	function authenticate($username, $passwd, $passwd_type='text')
+	function authenticate($username, $passwd, $passwd_type = 'text')
 	{
 		/* if program goes here, authenticate is, normaly, already verified by CAS */
 		if ($GLOBALS['egw_info']['server']['account_repository'] != 'ldap' &&
 			$GLOBALS['egw_info']['server']['account_repository'] != 'ldsq') /* For anonymous LDAP connection */
 		{
-			if (!($id = $GLOBALS['egw']->accounts->name2id($username,'account_lid','u')) &&
+			if (!($id = $GLOBALS['egw']->accounts->name2id($username, 'account_lid', 'u')) &&
 				$GLOBALS['egw_info']['server']['auto_create_acct'])
 			{
 				// create a global array with all availible info about that account
 				$GLOBALS['auto_create_acct'] = array();
-				foreach(array(
+				foreach (array(
 					'givenname' => 'firstname',
 					'sn'        => 'lastname',
 					'uidnumber' => 'id',
@@ -48,11 +48,11 @@ 
 					'gidnumber' => 'primary_group',
 					) as $ldap_name => $acct_name)
 				{
-					$GLOBALS['auto_create_acct'][$acct_name] = Api\Translation::convert($allValues[0][$ldap_name][0],'utf-8');
+					$GLOBALS['auto_create_acct'][$acct_name] = Api\Translation::convert($allValues[0][$ldap_name][0], 'utf-8');
 				}
 				return True;
 			}
-			return $id && $GLOBALS['egw']->accounts->id2name($id,'account_status') == 'A' && phpCAS::checkAuthentication();
+			return $id && $GLOBALS['egw']->accounts->id2name($id, 'account_status') == 'A' && phpCAS::checkAuthentication();
 		}
 		return phpCAS::checkAuthentication();
 	}
@@ -65,7 +65,7 @@ 
 	 * @param int $account_id =0 account id of user whose passwd should be changed
 	 * @return boolean true if password successful changed, false otherwise
 	 */
-	function change_password($old_passwd, $new_passwd, $account_id=0)
+	function change_password($old_passwd, $new_passwd, $account_id = 0)
 	{
 		/* Not allowed */
 		return false;

Braces +4 added lines, -1 removed lines

@@ -33,13 +33,16 @@
 	{
 		/* if program goes here, authenticate is, normaly, already verified by CAS */
 		if ($GLOBALS['egw_info']['server']['account_repository'] != 'ldap' &&
-			$GLOBALS['egw_info']['server']['account_repository'] != 'ldsq') /* For anonymous LDAP connection */
+			$GLOBALS['egw_info']['server']['account_repository'] != 'ldsq')
+		{
+			/* For anonymous LDAP connection */
 		{
 			if (!($id = $GLOBALS['egw']->accounts->name2id($username,'account_lid','u')) &&
 				$GLOBALS['egw_info']['server']['auto_create_acct'])
 			{
 				// create a global array with all availible info about that account
 				$GLOBALS['auto_create_acct'] = array();
+		}
 				foreach(array(
 					'givenname' => 'firstname',
 					'sn'        => 'lastname',

api/src/Csrf.php

Spacing +3 added lines, -4 removed lines

@@ -32,7 +32,7 @@ 
 	 * @param mixed $_purpose =true if given it need to be used in validate too! (It must NOT be NULL)
 	 * @return string CSRF token
 	 */
-	public static function token($_purpose=true)
+	public static function token($_purpose = true)
 	{
 		if (is_null($_purpose))
 		{
@@ -40,8 +40,7 @@ 
 		}
 		// generate random token (using oppenssl if available otherwise mt_rand based Auth::randomstring)
 		$token = function_exists('openssl_random_pseudo_bytes') ?
-			base64_encode(openssl_random_pseudo_bytes(64)) :
-			Auth::randomstring(64);
+			base64_encode(openssl_random_pseudo_bytes(64)) : Auth::randomstring(64);
 
 		// store it in session for later validation
 		Cache::setSession(__CLASS__, $token, $_purpose);
@@ -56,7 +55,7 @@ 
 	 * @param string $_purpose =true optional purpose string passed to token method
 	 * @param boolean $_delete_token =true true if token should be deleted after validation, it will validate no second time
 	 */
-	public static function validate($_token, $_purpose=true, $_delete_token=true)
+	public static function validate($_token, $_purpose = true, $_delete_token = true)
 	{
 		$stored_purpose = Cache::getSession(__CLASS__, $_token);
 

Braces +8 added lines, -2 removed lines

@@ -64,10 +64,16 @@
 		if (!isset($stored_purpose) || $stored_purpose !== $_purpose)
 		{
 			error_log('CSRF detected from IP '.$_SERVER['REMOTE_ADDR'].' to '.$_SERVER['REQUEST_METHOD'].' '.$_SERVER['REQUEST_URI']);
-			if ($_POST) error_log(array2string($_POST));
+			if ($_POST)
+			{
+				error_log(array2string($_POST));
+			}
 			// we are not throwing an exception here, but die, to not allow catching it!
 			die("CSRF detected, request terminated!");
 		}
-		if ($_delete_token) Cache::unsetSession(__CLASS__, $_token);
+		if ($_delete_token)
+		{
+			Cache::unsetSession(__CLASS__, $_token);
+		}
 	}
 }
\ No newline at end of file

api/src/Mail/Imap.php

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

Spacing +138 added lines, -138 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
 		// need to set LC_CTYPE for charachter classification (eg. Umlauts)
@@ -177,7 +177,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)
 		{
@@ -204,7 +204,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);
@@ -217,7 +217,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)
 		{
@@ -234,7 +234,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)
 		{
@@ -248,7 +248,7 @@ 
 	 *
 	 * @var array
 	 */
-	protected $run_on_login=array();
+	protected $run_on_login = array();
 
 	/**
 	 * Run given function on successful login
@@ -256,7 +256,7 @@ 
 	 * @param callable $func
 	 * @param array $params =array()
 	 */
-	public function runOnLogin($func, array $params=array())
+	public function runOnLogin($func, array $params = array())
 	{
 		$this->run_on_login[] = array($func, $params);
 	}
@@ -270,7 +270,7 @@ 
 	{
 		parent::login();
 
-		foreach($this->run_on_login as $key => $data)
+		foreach ($this->run_on_login as $key => $data)
 		{
 			call_user_func_array($data[0], $data[1]);
 
@@ -286,7 +286,7 @@ 
 	 */
 	public function __get($name)
 	{
-		switch($name)
+		switch ($name)
 		{
 			case 'acc_imap_administration':
 				return !empty($this->params['acc_imap_admin_username']);
@@ -304,7 +304,7 @@ 
 				{
 					return $this->$name;
 				}
-				if (array_key_exists($name,$this->params))
+				if (array_key_exists($name, $this->params))
 				{
 					return $this->params[$name];
 				}
@@ -325,9 +325,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()!');
@@ -340,7 +340,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
@@ -365,7 +365,7 @@ 
 	 */
 	function addAccount($_hookValues)
 	{
-		unset($_hookValues);	// not used
+		unset($_hookValues); // not used
 		return true;
 	}
 
@@ -377,7 +377,7 @@ 
 	 */
 	function updateAccount($_hookValues)
 	{
-		unset($_hookValues);	// not used
+		unset($_hookValues); // not used
 		return true;
 	}
 
@@ -389,7 +389,7 @@ 
 	 */
 	function deleteAccount($_hookValues)
 	{
-		unset($_hookValues);	// not used
+		unset($_hookValues); // not used
 		return true;
 	}
 
@@ -406,7 +406,7 @@ 
 	 */
 	function encodeFolderName($_folderName)
 	{
-		if($this->mbAvailable) {
+		if ($this->mbAvailable) {
 			return mb_convert_encoding($_folderName, "UTF7-IMAP", Api\Translation::charset());
 		}
 
@@ -423,17 +423,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);
 	}
 
 	/**
@@ -449,23 +449,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)
 		{
@@ -474,7 +474,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);
@@ -494,7 +494,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());
@@ -512,16 +512,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;
 				}
@@ -543,7 +543,7 @@ 
 			$status = $this->status($mailbox);
 			foreach ($status as $key => $v)
 			{
-				$_status[strtoupper($key)]=$v;
+				$_status[strtoupper($key)] = $v;
 			}
 			return $_status;
 		}
@@ -561,9 +561,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,
@@ -577,16 +577,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;
@@ -612,14 +612,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;
@@ -631,8 +631,8 @@ 
 				$searchstring = $reference."%";
 				break;
 			}
-		}else{
-			if ( is_string( $restriction_search ) ){
+		} else {
+			if (is_string($restriction_search)) {
 				$mailbox = $searchstring = $restriction_search;
 			}
 		}
@@ -645,35 +645,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
 				{
@@ -696,14 +696,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;
@@ -715,8 +715,8 @@ 
 				$searchstring = $reference."%";
 				break;
 			}
-		}else{
-			if ( is_string( $restriction_search ) ){
+		} else {
+			if (is_string($restriction_search)) {
 				$mailbox = $searchstring = $restriction_search;
 			}
 		}
@@ -728,25 +728,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;
@@ -762,14 +762,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;
@@ -781,8 +781,8 @@ 
 				$mailbox = "%";
 				break;
 			}
-		}else{
-			if ( is_string( $restriction_search ) ){
+		} else {
+			if (is_string($restriction_search)) {
 				$mailbox = $restriction_search;
 			}
 		}
@@ -791,17 +791,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;
 	}
@@ -813,12 +813,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());
@@ -826,18 +826,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;
 			}
@@ -876,7 +876,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]))
@@ -888,7 +888,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());
@@ -938,9 +938,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 "";
 	}
@@ -955,33 +955,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
@@ -1000,24 +1000,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
@@ -1026,9 +1026,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;
 				}
 			}
 		}
@@ -1040,29 +1040,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 "/";
 	}
@@ -1090,7 +1090,7 @@ 
 	{
 		if (is_numeric($_username))
 		{
-			$_username = $GLOBALS['egw']->accounts->id2name($accountID=$_username);
+			$_username = $GLOBALS['egw']->accounts->id2name($accountID = $_username);
 		}
 		else
 		{
@@ -1099,7 +1099,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':
@@ -1114,8 +1114,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;
 					}
@@ -1154,20 +1154,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 == 'uidNumber') {
-			$username .= '@'. $this->domainName;
+		if ($this->loginType == 'vmailmgr' || $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;
 	}
@@ -1186,7 +1186,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']]))
@@ -1196,7 +1196,7 @@ 
 					'name' => $data['name'],
 					'prefix' => $data['name'],
 					'prefix_present' => !empty($data['name']),
-					'delimiter' => ($data['delimiter']?$data['delimiter']:'/'),
+					'delimiter' => ($data['delimiter'] ? $data['delimiter'] : '/'),
 				);
 			}
 		}
@@ -1217,7 +1217,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;
@@ -1231,7 +1231,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);
@@ -1240,7 +1240,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';
@@ -1266,7 +1266,7 @@ 
 	 */
 	function getUserData($_username)
 	{
-		unset($_username);	// not used
+		unset($_username); // not used
 		return array();
 	}
 
@@ -1279,7 +1279,7 @@ 
 	 */
 	function setUserData($_username, $_quota)
 	{
-		unset($_username, $_quota);	// not used
+		unset($_username, $_quota); // not used
 		return true;
 	}
 
@@ -1313,10 +1313,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':
@@ -1331,9 +1331,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;
 		}
@@ -1348,7 +1348,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));
 
@@ -1360,8 +1360,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);
 
@@ -1376,7 +1376,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));
 
@@ -1388,8 +1388,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();
 	}
@@ -1409,7 +1409,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();

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
 		// need to set LC_CTYPE for charachter classification (eg. Umlauts)
@@ -169,7 +172,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'],
@@ -343,7 +349,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;
 	}
 
@@ -406,7 +416,8 @@ 
 	 */
 	function encodeFolderName($_folderName)
 	{
-		if($this->mbAvailable) {
+		if($this->mbAvailable)
+		{
 			return mb_convert_encoding($_folderName, "UTF7-IMAP", Api\Translation::charset());
 		}
 
@@ -424,14 +435,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);
 	}
@@ -500,8 +518,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;
 	}
 
@@ -571,7 +595,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()));
@@ -614,12 +641,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;
@@ -631,8 +661,11 @@ 
 				$searchstring = $reference."%";
 				break;
 			}
-		}else{
-			if ( is_string( $restriction_search ) ){
+		}
+		else
+		{
+			if ( is_string( $restriction_search ) )
+			{
 				$mailbox = $searchstring = $restriction_search;
 			}
 		}
@@ -698,12 +731,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;
@@ -715,8 +751,11 @@ 
 				$searchstring = $reference."%";
 				break;
 			}
-		}else{
-			if ( is_string( $restriction_search ) ){
+		}
+		else
+		{
+			if ( is_string( $restriction_search ) )
+			{
 				$mailbox = $searchstring = $restriction_search;
 			}
 		}
@@ -764,12 +803,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;
@@ -781,8 +823,11 @@ 
 				$mailbox = "%";
 				break;
 			}
-		}else{
-			if ( is_string( $restriction_search ) ){
+		}
+		else
+		{
+			if ( is_string( $restriction_search ) )
+			{
 				$mailbox = $restriction_search;
 			}
 		}
@@ -801,7 +846,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;
 	}
@@ -815,10 +863,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());
@@ -900,7 +954,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))
@@ -940,7 +997,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 "";
 	}
@@ -957,7 +1017,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();
 		}
@@ -973,7 +1034,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)
@@ -981,7 +1043,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
@@ -1003,9 +1068,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)
@@ -1022,7 +1094,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'];
 					}
@@ -1062,7 +1136,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 "/";
 	}
@@ -1158,12 +1235,14 @@ 
 	{
 		$nameSpaces = $this->getNameSpaceArray();
 
-		if(!isset($nameSpaces['others'])) {
+		if(!isset($nameSpaces['others']))
+		{
 			return false;
 		}
 
 		$username = $this->getMailBoxUserName($_username);
-		if($this->loginType == 'vmailmgr' || $this->loginType == 'uidNumber') {
+		if($this->loginType == 'vmailmgr' || $this->loginType == 'uidNumber')
+		{
 			$username .= '@'. $this->domainName;
 		}
 
@@ -1315,7 +1394,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':
@@ -1350,7 +1432,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))
 		{
@@ -1378,7 +1463,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))
 		{

Doc Comments +8 added lines, -7 removed lines

@@ -132,7 +132,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
 	 */
@@ -450,7 +450,7 @@ 
 	/**
 	 * getSpecialUseFolders
 	 *
-	 * @return current mailbox, or if none check on INBOX, and return upon existance
+	 * @return string mailbox, or if none check on INBOX, and return upon existance
 	 */
 	function getCurrentMailbox()
 	{
@@ -568,7 +568,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
@@ -652,7 +652,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
@@ -720,7 +720,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
 	 *
@@ -898,6 +898,7 @@ 
 	 *
 	 * @var array $_nameSpace
 	 * @var string $_folderName
+	 * @param string $_folderName
 	 * @return string the prefix (may be an empty string)
 	 */
 	static function getFolderPrefixFromNamespace($_nameSpace, $_folderName)
@@ -916,7 +917,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)
@@ -1355,7 +1356,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

api/src/Mail/Imap/Cyrus.php

Spacing +15 added lines, -15 removed lines

@@ -62,8 +62,8 @@ 
 	function deleteAccount($_hookValues)
 	{
 		// some precausion to really delete just _one_ account
-		if (strpos($_hookValues['account_lid'],'%') !== false ||
-			strpos($_hookValues['account_lid'],'*') !== false)
+		if (strpos($_hookValues['account_lid'], '%') !== false ||
+			strpos($_hookValues['account_lid'], '*') !== false)
 		{
 			return false;
 		}
@@ -78,9 +78,9 @@ 
 	 * @return string $username='%' username containing wildcards, default '%' for all users of a domain
 	 * @return int|boolean number of deleted mailboxes on success or false on error
 	 */
-	function deleteUsers($username='%')
+	function deleteUsers($username = '%')
 	{
-		if(!$this->acc_imap_administration || empty($username))
+		if (!$this->acc_imap_administration || empty($username))
 		{
 			return false;
 		}
@@ -94,14 +94,14 @@ 
 			$mboxes = (array)$this->getMailboxes($mailboxName, 1);
 			//error_log(__METHOD__."('$username') getMailboxes('$reference','$username$restriction') = ".array2string($mboxes));
 
-			foreach(array_keys($mboxes) as $mbox)
+			foreach (array_keys($mboxes) as $mbox)
 			{
 				// give the admin account the rights to delete this mailbox
 				$this->setACL($mbox, $this->acc_imap_admin_username, array('rights' => 'aeiklprstwx'));
 				$this->deleteMailbox($mbox);
 			}
 		}
-		catch(Horde_Imap_Client_Exception $e) {
+		catch (Horde_Imap_Client_Exception $e) {
 			_egw_log_exception($e);
 			$this->disconnect();
 			return false;
@@ -124,7 +124,7 @@ 
 		if ($_username !== $GLOBALS['egw_info']['user']['account_lid']) $this->adminConnection();
 		$userData = array();
 
-		if(($quota = $this->getQuotaByUser($_username,'ALL')))
+		if (($quota = $this->getQuotaByUser($_username, 'ALL')))
 		{
 			$userData['quotaLimit'] = (int)($quota['limit'] / 1024);
 			$userData['quotaUsed'] = (int)($quota['usage'] / 1024);
@@ -145,7 +145,7 @@ 
 	 */
 	function setUserData($_username, $_quota)
 	{
-		if(!$this->acc_imap_administration)
+		if (!$this->acc_imap_administration)
 		{
 			return false;
 		}
@@ -155,7 +155,7 @@ 
 
 		$mailboxName = $this->getUserMailboxString($_username);
 
-		$this->setQuota($mailboxName, array('STORAGE' => (int)$_quota > 0 ? (int)$_quota*1024 : -1));
+		$this->setQuota($mailboxName, array('STORAGE' => (int)$_quota > 0 ? (int)$_quota * 1024 : -1));
 
 		$this->disconnect();
 
@@ -169,7 +169,7 @@ 
 	 */
 	function updateAccount($_hookValues)
 	{
-		if(!$this->acc_imap_administration)
+		if (!$this->acc_imap_administration)
 		{
 			return false;
 		}
@@ -182,14 +182,14 @@ 
 		// make sure we use the correct username here.
 		$username = $this->getMailBoxUserName($_hookValues['account_lid']);
 		$folderInfo = $this->getMailboxes('', $mailboxName, true);
-		if(empty($folderInfo))
+		if (empty($folderInfo))
 		{
 			try {
 				$this->createMailbox($mailboxName);
 				$this->setACL($mailboxName, $username, array('rights' => 'aeiklprstwx'));
 				// create defined folders and subscribe them (have to use user-credentials to subscribe!)
 				$userimap = null;
-				foreach($this->params as $name => $value)
+				foreach ($this->params as $name => $value)
 				{
 					if (substr($name, 0, 11) == 'acc_folder_' && !empty($value))
 					{
@@ -206,7 +206,7 @@ 
 				}
 				if (isset($userimap)) $userimap->logout();
 			}
-			catch(Horde_Imap_Client_Exception $e) {
+			catch (Horde_Imap_Client_Exception $e) {
 				_egw_log_exception($e);
 			}
 		}
@@ -220,9 +220,9 @@ 
 	 * @param array $params
 	 * @throws Exception
 	 */
-	public function __call($name,array $params=null)
+	public function __call($name, array $params = null)
 	{
-		switch($name)
+		switch ($name)
 		{
 			case 'setRules':	// call setRules with 3. param of true, to enable utf7imap fileinto for Cyrus
 				$params += array(null, null, true);

Braces +12 added lines, -3 removed lines

@@ -121,7 +121,10 @@ 
 	function getUserData($_username)
 	{
 		// no need to switch to admin-connection for reading quota of current user
-		if ($_username !== $GLOBALS['egw_info']['user']['account_lid']) $this->adminConnection();
+		if ($_username !== $GLOBALS['egw_info']['user']['account_lid'])
+		{
+			$this->adminConnection();
+		}
 		$userData = array();
 
 		if(($quota = $this->getQuotaByUser($_username,'ALL')))
@@ -131,7 +134,10 @@ 
 		}
 		//error_log(__LINE__.': '.__METHOD__."('$_username') quota=".array2string($quota).' returning '.array2string($userData));
 
-		if ($_username !== $GLOBALS['egw_info']['user']['account_lid']) $this->disconnect();
+		if ($_username !== $GLOBALS['egw_info']['user']['account_lid'])
+		{
+			$this->disconnect();
+		}
 
 		return $userData;
 	}
@@ -204,7 +210,10 @@ 
 						$userimap->subscribeMailbox($value);
 					}
 				}
-				if (isset($userimap)) $userimap->logout();
+				if (isset($userimap))
+				{
+					$userimap->logout();
+				}
 			}
 			catch(Horde_Imap_Client_Exception $e) {
 				_egw_log_exception($e);