EGroupware / egroupware

admin/inc/class.admin_mail.inc.php

Spacing +85 added lines, -85 removed lines

@@ -89,7 +89,7 @@ 
 	 * @var array
 	 */
 	public static $ssl_types = array(
-		self::SSL_TLS => 'TLS',	// SSL with minimum TLS (no SSL v.2 or v.3), requires Horde_Imap_Client-2.16.0/Horde_Socket_Client-1.1.0
+		self::SSL_TLS => 'TLS', // SSL with minimum TLS (no SSL v.2 or v.3), requires Horde_Imap_Client-2.16.0/Horde_Socket_Client-1.1.0
 		self::SSL_SSL => 'SSL',
 		self::SSL_STARTTLS => 'STARTTLS',
 		'no' => 'no',
@@ -102,7 +102,7 @@ 
 	public static $ssl2secure = array(
 		'SSL' => 'ssl',
 		'STARTTLS' => 'tls',
-		'TLS' => 'tlsv1',	// SSL with minimum TLS (no SSL v.2 or v.3), requires Horde_Imap_Client-2.16.0/Horde_Socket_Client-1.1.0
+		'TLS' => 'tlsv1', // SSL with minimum TLS (no SSL v.2 or v.3), requires Horde_Imap_Client-2.16.0/Horde_Socket_Client-1.1.0
 	);
 	/**
 	 * Convert ssl-type to eMailAdmin acc_(imap|sieve|smtp)_ssl integer value
@@ -168,7 +168,7 @@ 
 	 * @param array $content
 	 * @param type $msg
 	 */
-	public function add(array $content=array(), $msg='', $msg_type='success')
+	public function add(array $content = array(), $msg = '', $msg_type = 'success')
 	{
 		// otherwise we cant switch to ckeditor in edit
 		Api\Html\CkEditorConfig::set_csp_script_src_attrs();
@@ -208,7 +208,7 @@ 
 		if ($content['button'] && key($content['button']) == 'skip_imap')
 		{
 			unset($content['button']);
-			if (!isset($content['acc_smtp_host'])) $content['acc_smtp_host'] = '';	// do manual mode right away
+			if (!isset($content['acc_smtp_host'])) $content['acc_smtp_host'] = ''; // do manual mode right away
 			return $this->smtp($content, lang('Skipping IMAP configuration!'));
 		}
 		$content['output'] = '';
@@ -222,7 +222,7 @@ 
 		if (!empty($content['acc_imap_host']))
 		{
 			$hosts = array($content['acc_imap_host'] => true);
-			if ($content['acc_imap_port'] > 0 && !in_array($content['acc_imap_port'], array(143,993)))
+			if ($content['acc_imap_port'] > 0 && !in_array($content['acc_imap_port'], array(143, 993)))
 			{
 				$ssl_type = (string)array_search($content['acc_imap_ssl'], self::$ssl2type);
 				if ($ssl_type === '') $ssl_type = 'insecure';
@@ -236,7 +236,7 @@ 
 			$content['ispdb'] = $ispdb;
 			$content['output'] .= lang('Using data from Mozilla ISPDB for provider %1', $ispdb['displayName'])."\n";
 			$hosts = array();
-			foreach($ispdb['imap'] as $server)
+			foreach ($ispdb['imap'] as $server)
 			{
 				if (!isset($hosts[$server['hostname']]))
 				{
@@ -260,13 +260,13 @@ 
 		}
 
 		// iterate over all hosts and try to connect
-		foreach($hosts as $host => $data)
+		foreach ($hosts as $host => $data)
 		{
 			$content['acc_imap_host'] = $host;
 			// by default we check SSL, STARTTLS and at last an insecure connection
 			if (!is_array($data)) $data = array('TLS' => 993, 'SSL' => 993, 'STARTTLS' => 143, 'insecure' => 143);
 
-			foreach($data as $ssl => $port)
+			foreach ($data as $ssl => $port)
 			{
 				if ($ssl === 'username') continue;
 
@@ -291,17 +291,17 @@ 
 					$content['connected'] = $connected = true;
 					break 2;
 				}
-				catch(Horde_Imap_Client_Exception $e)
+				catch (Horde_Imap_Client_Exception $e)
 				{
-					switch($e->getCode())
+					switch ($e->getCode())
 					{
 						case Horde_Imap_Client_Exception::LOGIN_AUTHENTICATIONFAILED:
 							$content['output'] .= "\n".$e->getMessage()."\n";
-							break 3;	// no need to try other SSL or non-SSL connections, if auth failed
+							break 3; // no need to try other SSL or non-SSL connections, if auth failed
 
 						case Horde_Imap_Client_Exception::SERVER_CONNECT:
 							$content['output'] .= "\n".$e->getMessage()."\n";
-							if ($ssl == 'STARTTLS') break 2;	// no need to try insecure connection on same port
+							if ($ssl == 'STARTTLS') break 2; // no need to try insecure connection on same port
 							break;
 
 						default:
@@ -310,7 +310,7 @@ 
 					}
 					if (self::$debug) _egw_log_exception($e);
 				}
-				catch(Exception $e) {
+				catch (Exception $e) {
 					$content['output'] .= "\n".get_class($e).': '.$e->getMessage().' ('.$e->getCode().')'."\n";
 					//$content['output'] .= $e->getTraceAsString()."\n";
 					if (self::$debug) _egw_log_exception($e);
@@ -326,7 +326,7 @@ 
 		// add validation error, if we can identify a field
 		if (!$connected && $e instanceof Horde_Imap_Client_Exception)
 		{
-			switch($e->getCode())
+			switch ($e->getCode())
 			{
 				case Horde_Imap_Client_Exception::LOGIN_AUTHENTICATIONFAILED:
 					Etemplate::set_validation_error('acc_imap_username', lang($e->getMessage()));
@@ -352,13 +352,13 @@ 
 	 * @param string $msg =''
 	 * @param Horde_Imap_Client_Socket $imap =null
 	 */
-	public function folder(array $content, $msg='', Horde_Imap_Client_Socket $imap=null)
+	public function folder(array $content, $msg = '', Horde_Imap_Client_Socket $imap = null)
 	{
 		if (isset($content['button']))
 		{
 			list($button) = each($content['button']);
 			unset($content['button']);
-			switch($button)
+			switch ($button)
 			{
 				case 'back':
 					return $this->add($content);
@@ -368,7 +368,7 @@ 
 			}
 		}
 		$content['msg'] = $msg;
-		if (!isset($imap)) $imap = self::imap_client ($content);
+		if (!isset($imap)) $imap = self::imap_client($content);
 
 		try {
 			//_debug_array($content);
@@ -376,7 +376,7 @@ 
 				$sel_options['acc_folder_draft'] = $sel_options['acc_folder_template'] =
 					$sel_options['acc_folder_junk'] = $sel_options['acc_folder_archive'] = self::mailboxes($imap, $content);
 		}
-		catch(Exception $e) {
+		catch (Exception $e) {
 			$content['msg'] = $e->getMessage();
 			if (self::$debug) _egw_log_exception($e);
 		}
@@ -393,27 +393,27 @@ 
 	 * @return array with folders as key AND value
 	 * @throws Horde_Imap_Client_Exception
 	 */
-	public static function mailboxes(Horde_Imap_Client_Socket $imap, array &$content=null)
+	public static function mailboxes(Horde_Imap_Client_Socket $imap, array &$content = null)
 	{
 		// query all subscribed mailboxes
 		$mailboxes = $imap->listMailboxes('*', Horde_Imap_Client::MBOX_SUBSCRIBED, array(
 			'special_use' => true,
-			'attributes' => true,	// otherwise special_use is only queried, but not returned ;-)
+			'attributes' => true, // otherwise special_use is only queried, but not returned ;-)
 			'delimiter' => true,
 		));
 		//_debug_array($mailboxes);
 		// list mailboxes by special-use attributes
 		$folders = $attributes = $all = array();
-		foreach($mailboxes as $mailbox => $data)
+		foreach ($mailboxes as $mailbox => $data)
 		{
-			foreach($data['attributes'] as $attribute)
+			foreach ($data['attributes'] as $attribute)
 			{
 				$attributes[$attribute][] = $mailbox;
 			}
 			$folders[$mailbox] = $mailbox.': '.implode(', ', $data['attributes']);
 		}
 		// pre-select send, trash, ... folder for user, by checking special-use attributes or common name(s)
-		foreach(array(
+		foreach (array(
 			'acc_folder_sent'  => array('\\sent', 'sent'),
 			'acc_folder_trash' => array('\\trash', 'trash'),
 			'acc_folder_draft' => array('\\drafts', 'drafts'),
@@ -425,7 +425,7 @@ 
 			// first check special-use attributes
 			if (($special_use = array_shift($common_names)))
 			{
-				foreach((array)$attributes[$special_use] as $mailbox)
+				foreach ((array)$attributes[$special_use] as $mailbox)
 				{
 					if (empty($content[$name]) || strlen($mailbox) < strlen($content[$name]))
 					{
@@ -436,7 +436,7 @@ 
 			// no special use folder found, try common names
 			if (empty($content[$name]))
 			{
-				foreach($mailboxes as $mailbox => $data)
+				foreach ($mailboxes as $mailbox => $data)
 				{
 					$delimiter = !empty($data['delimiter']) ? $data['delimiter'] : '.';
 					$name_parts = explode($delimiter, strtolower($mailbox));
@@ -463,7 +463,7 @@ 
 	 * @param array $content
 	 * @param string $msg =''
 	 */
-	public function sieve(array $content, $msg='')
+	public function sieve(array $content, $msg = '')
 	{
 		static $sieve_ssl2port = array(
 			self::SSL_TLS => 5190,
@@ -477,7 +477,7 @@ 
 		{
 			list($button) = each($content['button']);
 			unset($content['button']);
-			switch($button)
+			switch ($button)
 			{
 				case 'back':
 					return $this->folder($content);
@@ -526,9 +526,9 @@ 
 			{
 				$data = $sieve_ssl2port;
 			}
-			foreach($data as $ssl => $ports)
+			foreach ($data as $ssl => $ports)
 			{
-				foreach((array)$ports as $port)
+				foreach ((array)$ports as $port)
 				{
 					$content['acc_sieve_ssl'] = $ssl;
 					$ssl_label = self::$ssl_types[$ssl];
@@ -546,7 +546,7 @@ 
 						));
 						// connect to sieve server
 						$sieve->connect();
-						$content['sieve_output'] .= "\n".lang('Successful connected to %1 server%2.', 'Sieve','');
+						$content['sieve_output'] .= "\n".lang('Successful connected to %1 server%2.', 'Sieve', '');
 						// and log in
 						$sieve->login($content['acc_imap_username'], $content['acc_imap_password']);
 						$content['sieve_output'] .= ' '.lang('and logged in')."\n";
@@ -556,10 +556,10 @@ 
 						return $this->smtp($content, lang('Successful connected to %1 server%2.', 'Sieve',
 							' '.lang('and logged in')));
 					}
-					catch(Horde\ManageSieve\Exception\ConnectionFailed $e) {
+					catch (Horde\ManageSieve\Exception\ConnectionFailed $e) {
 						$content['sieve_output'] .= "\n".$e->getMessage().' '.$e->details."\n";
 					}
-					catch(Exception $e) {
+					catch (Exception $e) {
 						$content['sieve_output'] .= "\n".get_class($e).': '.$e->getMessage().
 							($e->details ? ' '.$e->details : '').' ('.$e->getCode().')'."\n";
 						$content['sieve_output'] .= $e->getTraceAsString()."\n";
@@ -577,7 +577,7 @@ 
 		// add validation error, if we can identify a field
 		if (!$content['sieve_connected'] && $e instanceof Exception)
 		{
-			switch($e->getCode())
+			switch ($e->getCode())
 			{
 				case 61:	// connection refused
 				case 60:	// connection timed out (imap.googlemail.com returns that for none-ssl/4190/2000)
@@ -600,7 +600,7 @@ 
 	 * @param array $content
 	 * @param string $msg =''
 	 */
-	public function smtp(array $content, $msg='')
+	public function smtp(array $content, $msg = '')
 	{
 		static $smtp_ssl2port = array(
 			self::SSL_NONE => 25,
@@ -614,7 +614,7 @@ 
 		{
 			list($button) = each($content['button']);
 			unset($content['button']);
-			switch($button)
+			switch ($button)
 			{
 				case 'back':
 					return $this->sieve($content);
@@ -655,11 +655,11 @@ 
 					);
 				}
 			}
-			elseif($content['ispdb'] && !empty($content['ispdb']['smtp']))
+			elseif ($content['ispdb'] && !empty($content['ispdb']['smtp']))
 			{
 				$content['smtp_output'] .= lang('Using data from Mozilla ISPDB for provider %1', $content['ispdb']['displayName'])."\n";
 				$hosts = array();
-				foreach($content['ispdb']['smtp'] as $server)
+				foreach ($content['ispdb']['smtp'] as $server)
 				{
 					if (!isset($hosts[$server['hostname']]))
 					{
@@ -681,14 +681,14 @@ 
 			{
 				$hosts = $this->guess_hosts($content['ident_email'], 'smtp');
 			}
-			foreach($hosts as $host => $data)
+			foreach ($hosts as $host => $data)
 			{
 				$content['acc_smtp_host'] = $host;
 				if (!is_array($data))
 				{
 					$data = array('TLS' => 465, 'SSL' => 465, 'STARTTLS' => 587, '' => 25);
 				}
-				foreach($data as $ssl => $port)
+				foreach ($data as $ssl => $port)
 				{
 					if ($ssl === 'username') continue;
 
@@ -699,7 +699,7 @@ 
 						$content['smtp_output'] .= "\n".Api\DateTime::to('now', 'H:i:s').": Trying $ssl connection to $host:$port ...\n";
 						$content['acc_smtp_port'] = $port;
 
-						$mail = new Horde_Mail_Transport_Smtphorde($params=array(
+						$mail = new Horde_Mail_Transport_Smtphorde($params = array(
 							'username' => $content['acc_smtp_username'],
 							'password' => $content['acc_smtp_password'],
 							'host' => $content['acc_smtp_host'],
@@ -739,9 +739,9 @@ 
 					}
 					// unfortunately LOGIN_AUTHENTICATIONFAILED and SERVER_CONNECT are thrown as Horde_Mail_Exception
 					// while others are thrown as Horde_Smtp_Exception --> using common base Horde_Exception_Wrapped
-					catch(Horde_Exception_Wrapped $e)
+					catch (Horde_Exception_Wrapped $e)
 					{
-						switch($e->getCode())
+						switch ($e->getCode())
 						{
 							case Horde_Smtp_Exception::LOGIN_AUTHENTICATIONFAILED:
 							case Horde_Smtp_Exception::LOGIN_REQUIREAUTHENTICATION:
@@ -757,14 +757,14 @@ 
 						}
 						if (self::$debug) _egw_log_exception($e);
 					}
-					catch(Horde_Smtp_Exception $e)
+					catch (Horde_Smtp_Exception $e)
 					{
 						// prever $e->details over $e->getMessage() as it contains original message from SMTP server (eg. relay access denied)
 						$content['smtp_output'] .= "\n".(empty($e->details) ? $e->getMessage().' ('.$e->getCode().')' : $e->details)."\n";
 						//$content['smtp_output'] .= $e->getTraceAsString()."\n";
 						if (self::$debug) _egw_log_exception($e);
 					}
-					catch(Exception $e) {
+					catch (Exception $e) {
 						$content['smtp_output'] .= "\n".get_class($e).': '.$e->getMessage().' ('.$e->getCode().')'."\n";
 						//$content['smtp_output'] .= $e->getTraceAsString()."\n";
 						if (self::$debug) _egw_log_exception($e);
@@ -775,7 +775,7 @@ 
 		// add validation error, if we can identify a field
 		if (!$content['smtp_connected'] && $e instanceof Horde_Exception_Wrapped)
 		{
-			switch($e->getCode())
+			switch ($e->getCode())
 			{
 				case Horde_Smtp_Exception::LOGIN_AUTHENTICATIONFAILED:
 				case Horde_Smtp_Exception::LOGIN_REQUIREAUTHENTICATION:
@@ -809,14 +809,14 @@ 
 	 * @param string $msg =''
 	 * @param string $msg_type ='success'
 	 */
-	public function edit(array $content=null, $msg='', $msg_type='success')
+	public function edit(array $content = null, $msg = '', $msg_type = 'success')
 	{
 		// app is trying to tell something, while redirecting to wizard
-		if (empty($content) && $_GET['acc_id'] && empty($msg) && !empty( $_GET['msg']))
+		if (empty($content) && $_GET['acc_id'] && empty($msg) && !empty($_GET['msg']))
 		{
-			if (stripos($_GET['msg'],'fatal error:')!==false || $_GET['msg_type'] == 'error') $msg_type = 'error';
+			if (stripos($_GET['msg'], 'fatal error:') !== false || $_GET['msg_type'] == 'error') $msg_type = 'error';
 		}
-		if ($content['acc_id'] || (isset($_GET['acc_id']) && (int)$_GET['acc_id'] > 0) ) Mail::unsetCachedObjects($content['acc_id']?$content['acc_id']:$_GET['acc_id']);
+		if ($content['acc_id'] || (isset($_GET['acc_id']) && (int)$_GET['acc_id'] > 0)) Mail::unsetCachedObjects($content['acc_id'] ? $content['acc_id'] : $_GET['acc_id']);
 		$tpl = new Etemplate('admin.mailaccount');
 
 		if (!is_array($content) || !empty($content['acc_id']) && isset($content['old_acc_id']) && $content['acc_id'] != $content['old_acc_id'])
@@ -831,7 +831,7 @@ 
 					list($content['acc_id']) = each($content['accounts']);
 					//error_log(__METHOD__.__LINE__.'.'.array2string($content['acc_id']));
 					// test if the "to be selected" acccount is imap or not
-					if (count($content['accounts'])>1 && Mail\Account::is_multiple($content['acc_id']))
+					if (count($content['accounts']) > 1 && Mail\Account::is_multiple($content['acc_id']))
 					{
 						try {
 							$account = Mail\Account::read($content['acc_id'], $content['called_for']);
@@ -842,7 +842,7 @@ 
 								//error_log(__METHOD__.__LINE__.'.'.array2string($content['acc_id']));
 							}
 						}
-						catch(Api\Exception\NotFound $e) {
+						catch (Api\Exception\NotFound $e) {
 							if (self::$debug) _egw_log_exception($e);
 						}
 					}
@@ -865,7 +865,7 @@ 
 				try {
 					$account = Mail\Account::read($content['acc_id'], $this->is_admin && $content['called_for'] ?
 						$content['called_for'] : $GLOBALS['egw_info']['user']['account_id']);
-					$account->getUserData();	// quota, aliases, forwards etc.
+					$account->getUserData(); // quota, aliases, forwards etc.
 					$content += $account->params;
 					$content['acc_sieve_enabled'] = (string)($content['acc_sieve_enabled']);
 					$content['notify_use_default'] = !$content['notify_account_id'];
@@ -876,16 +876,16 @@ 
 					$content['std_ident_id'] = $content['ident_id'];
 					$content['identities'][$content['std_ident_id']] = lang('Standard identity');
 					// change self::SSL_NONE (=0) to "no" used in sel_options
-					foreach(array('imap','smtp','sieve') as $type)
+					foreach (array('imap', 'smtp', 'sieve') as $type)
 					{
 						if (!$content['acc_'.$type.'_ssl']) $content['acc_'.$type.'_ssl'] = 'no';
 					}
 				}
-				catch(Api\Exception\NotFound $e) {
+				catch (Api\Exception\NotFound $e) {
 					if (self::$debug) _egw_log_exception($e);
 					Framework::window_close(lang('Account not found!'));
 				}
-				catch(Exception $e) {
+				catch (Exception $e) {
 					if (self::$debug) _egw_log_exception($e);
 					Framework::window_close($e->getMessage().' ('.get_class($e).': '.$e->getCode().')');
 				}
@@ -893,7 +893,7 @@ 
 			elseif ($content['acc_id'] === 'new')
 			{
 				$content['account_id'] = $content['called_for'];
-				$content['old_acc_id'] = $content['acc_id'];	// to not call add/wizard, if we return from to
+				$content['old_acc_id'] = $content['acc_id']; // to not call add/wizard, if we return from to
 				unset($content['tabs']);
 				return $this->add($content);
 			}
@@ -903,7 +903,7 @@ 
 		{
 			if (!isset($content['account_id'])) $content['account_id'] = array($GLOBALS['egw_info']['user']['account_id']);
 			$content['acc_user_editable'] = $content['acc_further_identities'] = true;
-			$readonlys['ident_id'] = true;	// need to create standard identity first
+			$readonlys['ident_id'] = true; // need to create standard identity first
 		}
 		if (empty($content['acc_name']))
 		{
@@ -939,7 +939,7 @@ 
 		{
 			list($button) = each($content['button']);
 			unset($content['button']);
-			switch($button)
+			switch ($button)
 			{
 				case 'wizard':
 					// if we just came from wizard, go back to last page/step
@@ -972,7 +972,7 @@ 
 						{
 							$content['ident_id'] = Mail\Account::save_identity(array(
 								'account_id' => $content['called_for'] ? $content['called_for'] : $GLOBALS['egw_info']['user']['account_id'],
-							)+$content);
+							) + $content);
 							$content['identities'][$content['ident_id']] = Mail\Account::identity_name($content);
 							$msg = lang('Identity saved.');
 							if ($edit_access) $msg .= ' '.lang('Switch back to standard identity to save account.');
@@ -1076,17 +1076,17 @@ 
 					catch (Horde_Imap_Client_Exception $e)
 					{
 						_egw_log_exception($e);
-						$tpl->set_validation_error('acc_imap_admin_username', $msg=lang($e->getMessage()).($e->details?', '.lang($e->details):''));
+						$tpl->set_validation_error('acc_imap_admin_username', $msg = lang($e->getMessage()).($e->details ? ', '.lang($e->details) : ''));
 						$msg_type = 'error';
-						$content['tabs'] = 'admin.mailaccount.imap';	// should happen automatic
+						$content['tabs'] = 'admin.mailaccount.imap'; // should happen automatic
 						break;
 					}
 					catch (Horde\ManageSieve\Exception\ConnectionFailed $e)
 					{
 						_egw_log_exception($e);
-						$tpl->set_validation_error('acc_sieve_port', $msg=lang($e->getMessage()));
+						$tpl->set_validation_error('acc_sieve_port', $msg = lang($e->getMessage()));
 						$msg_type = 'error';
-						$content['tabs'] = 'admin.mailaccount.sieve';	// should happen automatic
+						$content['tabs'] = 'admin.mailaccount.sieve'; // should happen automatic
 						break;
 					}
 					catch (Exception $e) {
@@ -1095,7 +1095,7 @@ 
 						$msg_type = 'error';
 					}
 					if ($content['acc_id']) Mail::unsetCachedObjects($content['acc_id']);
-					if (stripos($msg,'fatal error:')!==false) $msg_type = 'error';
+					if (stripos($msg, 'fatal error:') !== false) $msg_type = 'error';
 					Framework::refresh_opener($msg, 'emailadmin', $content['acc_id'], $new_account ? 'add' : 'update', null, null, null, $msg_type);
 					if ($button == 'save') Framework::window_close();
 					break;
@@ -1148,7 +1148,7 @@ 
 		if ($this->is_admin && (empty($content['acc_imap_username']) || empty($content['acc_imap_host']) || $content['called_for']))
 		{
 			// cant connection to imap --> allow free entries in taglists
-			foreach(array('acc_folder_sent', 'acc_folder_trash', 'acc_folder_draft', 'acc_folder_template', 'acc_folder_junk') as $folder)
+			foreach (array('acc_folder_sent', 'acc_folder_trash', 'acc_folder_draft', 'acc_folder_template', 'acc_folder_junk') as $folder)
 			{
 				$tpl->setElementAttribute($folder, 'allowFreeEntries', true);
 			}
@@ -1159,15 +1159,15 @@ 
 				$sel_options['acc_folder_sent'] = $sel_options['acc_folder_trash'] =
 					$sel_options['acc_folder_draft'] = $sel_options['acc_folder_template'] =
 					$sel_options['acc_folder_junk'] = $sel_options['acc_folder_archive'] = $sel_options['notify_folders'] =
-						self::mailboxes(self::imap_client ($content));
+						self::mailboxes(self::imap_client($content));
 			}
-			catch(Exception $e) {
+			catch (Exception $e) {
 				if (self::$debug) _egw_log_exception($e);
 				// let user know what the problem is and that he can fix it using wizard or deleting
 				$msg = lang($e->getMessage())."\n\n".lang('You can use wizard to fix account settings or delete account.');
 				$msg_type = 'error';
 				// cant connection to imap --> allow free entries in taglists
-				foreach(array('acc_folder_sent', 'acc_folder_trash', 'acc_folder_draft', 'acc_folder_template', 'acc_folder_junk') as $folder)
+				foreach (array('acc_folder_sent', 'acc_folder_trash', 'acc_folder_draft', 'acc_folder_template', 'acc_folder_junk') as $folder)
 				{
 					$tpl->setElementAttribute($folder, 'allowFreeEntries', true);
 				}
@@ -1264,7 +1264,7 @@ 
 		if ($content['called_for'] && $content['acc_id'] > 0)
 		{
 			$admin_actions = array();
-			foreach(Api\Hooks::process(array(
+			foreach (Api\Hooks::process(array(
 				'location' => 'emailadmin_edit',
 				'account_id' => $content['called_for'],
 				'acc_id' => $content['acc_id'],
@@ -1285,7 +1285,7 @@ 
 	 * @param string|array &$account_id on return always array
 	 * @param boolean $back =false
 	 */
-	private static function fix_account_id_0(&$account_id=null, $back=false)
+	private static function fix_account_id_0(&$account_id = null, $back = false)
 	{
 		if (!isset($account_id)) return;
 
@@ -1293,7 +1293,7 @@ 
 		{
 			$account_id = explode(',', $account_id);
 		}
-		if (($k = array_search($back?'':'0', $account_id)) !== false)
+		if (($k = array_search($back ? '' : '0', $account_id)) !== false)
 		{
 			$account_id[$k] = $back ? '0' : '';
 		}
@@ -1306,7 +1306,7 @@ 
 	 * @param int $timeout =null default use value returned by Mail\Imap::getTimeOut()
 	 * @return Horde_Imap_Client_Socket
 	 */
-	protected static function imap_client(array $content, $timeout=null)
+	protected static function imap_client(array $content, $timeout = null)
 	{
 		return new Horde_Imap_Client_Socket(array(
 			'username' => $content['acc_imap_username'],
@@ -1328,7 +1328,7 @@ 
 	protected static function fix_ssl_order($data)
 	{
 		$ordered = array();
-		foreach(array_merge(array('TLS', 'SSL', 'STARTTLS'), array_keys($data)) as $key)
+		foreach (array_merge(array('TLS', 'SSL', 'STARTTLS'), array_keys($data)) as $key)
 		{
 			if (array_key_exists($key, $data)) $ordered[$key] = $data[$key];
 		}
@@ -1346,7 +1346,7 @@ 
 	 * @return array with values for keys 'displayName', 'imap', 'smtp', 'pop3', which each contain
 	 *	array of arrays with values for keys 'hostname', 'port', 'socketType'=(SSL|STARTTLS), 'username'=%EMAILADDRESS%
 	 */
-	protected static function mozilla_ispdb($domain, $try_mx=true)
+	protected static function mozilla_ispdb($domain, $try_mx = true)
 	{
 		if (strpos($domain, '@') !== false) list(,$domain) = explode('@', $domain);
 
@@ -1357,17 +1357,17 @@ 
 			$provider = array(
 				'displayName' => (string)$xml->emailProvider->displayName,
 			);
-			foreach($xml->emailProvider->children() as $tag => $server)
+			foreach ($xml->emailProvider->children() as $tag => $server)
 			{
 				if (!in_array($tag, array('incomingServer', 'outgoingServer'))) continue;
-				foreach($server->attributes() as $name => $value)
+				foreach ($server->attributes() as $name => $value)
 				{
 					if ($name == 'type') $type = (string)$value;
 				}
 				$data = array();
-				foreach($server as $name => $value)
+				foreach ($server as $name => $value)
 				{
-					foreach($value->children() as $tag => $val)
+					foreach ($value->children() as $tag => $val)
 					{
 						$data[$name][$tag] = (string)$val;
 					}
@@ -1376,7 +1376,7 @@ 
 				$provider[$type][] = $data;
 			}
 		}
-		catch(Exception $e) {
+		catch (Exception $e) {
 			// ignore own not-found exception or xml parsing execptions
 			unset($e);
 
@@ -1408,7 +1408,7 @@ 
 	 * @param string $type ='imap' 'imap' or 'smtp', used as hostname beside 'mail'
 	 * @return array of hostname => true pairs
 	 */
-	protected function guess_hosts($email, $type='imap')
+	protected function guess_hosts($email, $type = 'imap')
 	{
 		list(,$domain) = explode('@', $email);
 
@@ -1434,7 +1434,7 @@ 
 		}
 
 		// verify hosts in dns
-		foreach(array_keys($hosts) as $host)
+		foreach (array_keys($hosts) as $host)
 		{
 			if (!dns_get_record($host, DNS_A)) unset($hosts[$host]);
 		}
@@ -1471,12 +1471,12 @@ 
 				}
 
 				$ea_account = Mail\Account::read($emailadmin->acc_id, $_data['id']);
-				if (($userData = $ea_account->getUserData ()))
+				if (($userData = $ea_account->getUserData()))
 				{
 					$userData = array(
 						'acc_smtp_type' => $ea_account->acc_smtp_type,
 						'accountStatus' => $_data['status'],
-						'quotaLimit' => $_data['qouta']? $_data['qouta']: $userData['qoutaLimit'],
+						'quotaLimit' => $_data['qouta'] ? $_data['qouta'] : $userData['qoutaLimit'],
 						'mailLocalAddress' => $userData['mailLocalAddress']
 					);
 
@@ -1484,7 +1484,7 @@ 
 					{
 						$userData['mailLocalAddress'] = preg_replace('/@'.preg_quote($ea_account->acc_domain).'$/', '@'.$_data['domain'], $userData['mailLocalAddress']);
 
-						foreach($userData['mailAlternateAddress'] as &$alias)
+						foreach ($userData['mailAlternateAddress'] as &$alias)
 						{
 							$alias = preg_replace('/@'.preg_quote($ea_account->acc_domain).'$/', '@'.$_data['domain'], $alias);
 						}
@@ -1492,7 +1492,7 @@ 
 					// fullfill the saveUserData requirements
 					$userData += $ea_account->params;
 					$ea_account->saveUserData($_data['id'], $userData);
-					$msg = '#'.$_data['id'].' '.$account['account_fullname']. ' '.($userData['accountStatus'] == 'active'? lang('activated'):lang('deactivated'));
+					$msg = '#'.$_data['id'].' '.$account['account_fullname'].' '.($userData['accountStatus'] == 'active' ? lang('activated') : lang('deactivated'));
 				}
 				else
 				{