EGroupware / egroupware

admin/setup/setup.inc.php

Spacing +3 added lines, -3 removed lines

@@ -12,9 +12,9 @@ 
 $setup_info['admin']['name']      = 'admin';
 $setup_info['admin']['version']   = '16.1';
 $setup_info['admin']['app_order'] = 1;
-$setup_info['admin']['tables']    = array('egw_admin_queue','egw_admin_remote');
+$setup_info['admin']['tables']    = array('egw_admin_queue', 'egw_admin_remote');
 $setup_info['admin']['enable']    = 1;
-$setup_info['admin']['index']   = 'admin.admin_ui.index&ajax=true';
+$setup_info['admin']['index'] = 'admin.admin_ui.index&ajax=true';
 
 $setup_info['admin']['author'][] = array(
 	'name'  => 'eGroupWare coreteam',
@@ -27,7 +27,7 @@ 
 	'url'   => 'www.egroupware.org'
 );
 
-$setup_info['admin']['license']  = 'GPL';
+$setup_info['admin']['license'] = 'GPL';
 $setup_info['admin']['description'] = 'EGroupware administration application';
 
 /* The hooks this app includes, needed for hooks registration */

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

@@ -27,5 +27,5 @@
 /* Dependencies for this app to work */
 $setup_info['home']['depends'][] = array(
 	'appname' => 'api',
-	'versions' => Array('16.1')
+	'versions' => array('16.1')
 );

admin/setup/tables_current.inc.php

Spacing +24 added lines, -24 removed lines

@@ -15,37 +15,37 @@
 $phpgw_baseline = array(
 	'egw_admin_queue' => array(
 		'fd' => array(
-			'cmd_id' => array('type' => 'auto','nullable' => False),
-			'cmd_uid' => array('type' => 'ascii','precision' => '64','nullable' => False),
-			'cmd_creator' => array('type' => 'int','meta' => 'user','precision' => '4','nullable' => False),
-			'cmd_creator_email' => array('type' => 'varchar','precision' => '128','nullable' => False),
-			'cmd_created' => array('type' => 'int','meta' => 'timestamp','precision' => '8','nullable' => False),
-			'cmd_type' => array('type' => 'ascii','precision' => '32','nullable' => False,'default' => 'admin_cmd'),
-			'cmd_status' => array('type' => 'int','precision' => '1'),
-			'cmd_scheduled' => array('type' => 'int','meta' => 'timestamp','precision' => '8'),
-			'cmd_modified' => array('type' => 'int','meta' => 'timestamp','precision' => '8'),
-			'cmd_modifier' => array('type' => 'int','meta' => 'user','precision' => '4'),
-			'cmd_modifier_email' => array('type' => 'varchar','precision' => '128'),
-			'cmd_error' => array('type' => 'varchar','precision' => '255'),
-			'cmd_errno' => array('type' => 'int','precision' => '4'),
-			'cmd_requested' => array('type' => 'int','precision' => '4'),
-			'cmd_requested_email' => array('type' => 'varchar','precision' => '128'),
-			'cmd_comment' => array('type' => 'varchar','precision' => '255'),
-			'cmd_data' => array('type' => 'ascii','precision' => '16384'),
-			'remote_id' => array('type' => 'int','precision' => '4')
+			'cmd_id' => array('type' => 'auto', 'nullable' => False),
+			'cmd_uid' => array('type' => 'ascii', 'precision' => '64', 'nullable' => False),
+			'cmd_creator' => array('type' => 'int', 'meta' => 'user', 'precision' => '4', 'nullable' => False),
+			'cmd_creator_email' => array('type' => 'varchar', 'precision' => '128', 'nullable' => False),
+			'cmd_created' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'nullable' => False),
+			'cmd_type' => array('type' => 'ascii', 'precision' => '32', 'nullable' => False, 'default' => 'admin_cmd'),
+			'cmd_status' => array('type' => 'int', 'precision' => '1'),
+			'cmd_scheduled' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8'),
+			'cmd_modified' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8'),
+			'cmd_modifier' => array('type' => 'int', 'meta' => 'user', 'precision' => '4'),
+			'cmd_modifier_email' => array('type' => 'varchar', 'precision' => '128'),
+			'cmd_error' => array('type' => 'varchar', 'precision' => '255'),
+			'cmd_errno' => array('type' => 'int', 'precision' => '4'),
+			'cmd_requested' => array('type' => 'int', 'precision' => '4'),
+			'cmd_requested_email' => array('type' => 'varchar', 'precision' => '128'),
+			'cmd_comment' => array('type' => 'varchar', 'precision' => '255'),
+			'cmd_data' => array('type' => 'ascii', 'precision' => '16384'),
+			'remote_id' => array('type' => 'int', 'precision' => '4')
 		),
 		'pk' => array('cmd_id'),
 		'fk' => array(),
-		'ix' => array('cmd_status','cmd_scheduled'),
+		'ix' => array('cmd_status', 'cmd_scheduled'),
 		'uc' => array('cmd_uid')
 	),
 	'egw_admin_remote' => array(
 		'fd' => array(
-			'remote_id' => array('type' => 'auto','nullable' => False),
-			'remote_name' => array('type' => 'varchar','precision' => '64','nullable' => False),
-			'remote_hash' => array('type' => 'ascii','precision' => '32','nullable' => False),
-			'remote_url' => array('type' => 'ascii','precision' => '128','nullable' => False),
-			'remote_domain' => array('type' => 'ascii','precision' => '64','nullable' => False)
+			'remote_id' => array('type' => 'auto', 'nullable' => False),
+			'remote_name' => array('type' => 'varchar', 'precision' => '64', 'nullable' => False),
+			'remote_hash' => array('type' => 'ascii', 'precision' => '32', 'nullable' => False),
+			'remote_url' => array('type' => 'ascii', 'precision' => '128', 'nullable' => False),
+			'remote_domain' => array('type' => 'ascii', 'precision' => '64', 'nullable' => False)
 		),
 		'pk' => array('remote_id'),
 		'fk' => array(),

admin/setup/tables_update.inc.php

Spacing +30 added lines, -30 removed lines

@@ -20,29 +20,29 @@ 
 
 function admin_upgrade1_4()
 {
-	$GLOBALS['egw_setup']->oProc->CreateTable('egw_admin_queue',array(
+	$GLOBALS['egw_setup']->oProc->CreateTable('egw_admin_queue', array(
 		'fd' => array(
 			'cmd_id' => array('type' => 'auto'),
-			'cmd_uid' => array('type' => 'varchar','precision' => '255','nullable' => False),
-			'cmd_creator' => array('type' => 'int','precision' => '4','nullable' => False),
-			'cmd_creator_email' => array('type' => 'varchar','precision' => '128','nullable' => False),
-			'cmd_created' => array('type' => 'int','precision' => '8','nullable' => False),
-			'cmd_type' => array('type' => 'varchar','precision' => '32','nullable' => False,'default' => 'admin_cmd'),
-			'cmd_status' => array('type' => 'int','precision' => '1'),
-			'cmd_scheduled' => array('type' => 'int','precision' => '8'),
-			'cmd_modified' => array('type' => 'int','precision' => '8'),
-			'cmd_modifier' => array('type' => 'int','precision' => '4'),
-			'cmd_modifier_email' => array('type' => 'varchar','precision' => '128'),
-			'cmd_error' => array('type' => 'varchar','precision' => '255'),
-			'cmd_errno' => array('type' => 'int','precision' => '4'),
-			'cmd_requested' => array('type' => 'int','precision' => '4'),
-			'cmd_requested_email' => array('type' => 'varchar','precision' => '128'),
-			'cmd_comment' => array('type' => 'varchar','precision' => '255'),
+			'cmd_uid' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False),
+			'cmd_creator' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'cmd_creator_email' => array('type' => 'varchar', 'precision' => '128', 'nullable' => False),
+			'cmd_created' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'cmd_type' => array('type' => 'varchar', 'precision' => '32', 'nullable' => False, 'default' => 'admin_cmd'),
+			'cmd_status' => array('type' => 'int', 'precision' => '1'),
+			'cmd_scheduled' => array('type' => 'int', 'precision' => '8'),
+			'cmd_modified' => array('type' => 'int', 'precision' => '8'),
+			'cmd_modifier' => array('type' => 'int', 'precision' => '4'),
+			'cmd_modifier_email' => array('type' => 'varchar', 'precision' => '128'),
+			'cmd_error' => array('type' => 'varchar', 'precision' => '255'),
+			'cmd_errno' => array('type' => 'int', 'precision' => '4'),
+			'cmd_requested' => array('type' => 'int', 'precision' => '4'),
+			'cmd_requested_email' => array('type' => 'varchar', 'precision' => '128'),
+			'cmd_comment' => array('type' => 'varchar', 'precision' => '255'),
 			'cmd_data' => array('type' => 'blob')
 		),
 		'pk' => array('cmd_id'),
 		'fk' => array(),
-		'ix' => array('cmd_status','cmd_scheduled'),
+		'ix' => array('cmd_status', 'cmd_scheduled'),
 		'uc' => array('cmd_uid')
 	));
 	return $GLOBALS['setup_info']['admin']['currentver'] = '1.5.001';
@@ -51,13 +51,13 @@ 
 
 function admin_upgrade1_5_001()
 {
-	$GLOBALS['egw_setup']->oProc->CreateTable('egw_admin_remote',array(
+	$GLOBALS['egw_setup']->oProc->CreateTable('egw_admin_remote', array(
 		'fd' => array(
 			'remote_id' => array('type' => 'auto'),
-			'remote_name' => array('type' => 'varchar','precision' => '64','nullable' => False),
-			'remote_hash' => array('type' => 'varchar','precision' => '32','nullable' => False),
-			'remote_url' => array('type' => 'varchar','precision' => '128','nullable' => False),
-			'remote_domain' => array('type' => 'varchar','precision' => '64','nullable' => False)
+			'remote_name' => array('type' => 'varchar', 'precision' => '64', 'nullable' => False),
+			'remote_hash' => array('type' => 'varchar', 'precision' => '32', 'nullable' => False),
+			'remote_url' => array('type' => 'varchar', 'precision' => '128', 'nullable' => False),
+			'remote_domain' => array('type' => 'varchar', 'precision' => '64', 'nullable' => False)
 		),
 		'pk' => array('remote_id'),
 		'fk' => array(),
@@ -71,7 +71,7 @@ 
 
 function admin_upgrade1_5_002()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_admin_queue','remote_id',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_admin_queue', 'remote_id', array(
 		'type' => 'int',
 		'precision' => '4'
 	));
@@ -110,18 +110,18 @@ 
 
 function admin_upgrade14_1()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_admin_queue','cmd_uid',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_admin_queue', 'cmd_uid', array(
 		'type' => 'ascii',
 		'precision' => '64',
 		'nullable' => False
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_admin_queue','cmd_type',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_admin_queue', 'cmd_type', array(
 		'type' => 'ascii',
 		'precision' => '32',
 		'nullable' => False,
 		'default' => 'admin_cmd'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_admin_queue','cmd_data',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_admin_queue', 'cmd_data', array(
 		'type' => 'ascii',
 		'precision' => '16384'
 	));
@@ -132,17 +132,17 @@ 
 
 function admin_upgrade14_2_001()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_admin_remote','remote_hash',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_admin_remote', 'remote_hash', array(
 		'type' => 'ascii',
 		'precision' => '32',
 		'nullable' => False
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_admin_remote','remote_url',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_admin_remote', 'remote_url', array(
 		'type' => 'ascii',
 		'precision' => '128',
 		'nullable' => False
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_admin_remote','remote_domain',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_admin_remote', 'remote_domain', array(
 		'type' => 'ascii',
 		'precision' => '64',
 		'nullable' => False
@@ -161,7 +161,7 @@ 
 	// asuming everythings not MySQL uses PostgreSQL regular expression syntax
 	$regexp = substr($GLOBALS['egw_setup']->db->Type, 0, 5) == 'mysql' ? 'REGEXP' : '~*';
 
-	foreach($GLOBALS['egw_setup']->db->select('egw_admin_queue', 'cmd_id,cmd_data',
+	foreach ($GLOBALS['egw_setup']->db->select('egw_admin_queue', 'cmd_id,cmd_data',
 		'cmd_status NOT IN ('.implode(',', admin_cmd::$require_pw_stati).") AND cmd_data $regexp '(pw|passwd\\_?\\d*|password|db\\_pass)\\?\"'",
 		__LINE__, __FILE__, false, '', 'admin') as $row)
 	{

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()));
+						$tpl->set_validation_error('acc_imap_admin_username', $msg = lang($e->getMessage()));
 						$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
 				{

Braces +214 added lines, -53 removed lines

@@ -208,7 +208,11 @@ 
 		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'] = '';
@@ -225,7 +229,10 @@ 
 			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';
+				if ($ssl_type === '')
+				{
+					$ssl_type = 'insecure';
+				}
 				$hosts[$content['acc_imap_host']] = array(
 					$ssl_type => $content['acc_imap_port'],
 				);
@@ -242,10 +249,13 @@ 
 				{
 					$hosts[$server['hostname']] = array('username' => $server['username']);
 				}
-				if (strtoupper($server['socketType']) == 'SSL')	// try TLS first
+				if (strtoupper($server['socketType']) == 'SSL')
+				{
+					// try TLS first
 				{
 					$hosts[$server['hostname']]['TLS'] = $server['port'];
 				}
+				}
 				$hosts[$server['hostname']][strtoupper($server['socketType'])] = $server['port'];
 				// make sure we prefer SSL over STARTTLS over insecure
 				if (count($hosts[$server['hostname']]) > 2)
@@ -264,11 +274,17 @@ 
 		{
 			$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);
+			if (!is_array($data))
+			{
+				$data = array('TLS' => 993, 'SSL' => 993, 'STARTTLS' => 143, 'insecure' => 143);
+			}
 
 			foreach($data as $ssl => $port)
 			{
-				if ($ssl === 'username') continue;
+				if ($ssl === 'username')
+				{
+					continue;
+				}
 
 				$content['acc_imap_ssl'] = (int)self::$ssl2type[$ssl];
 
@@ -301,25 +317,38 @@ 
 
 						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:
 							$content['output'] .= "\n".get_class($e).': '.$e->getMessage().' ('.$e->getCode().')'."\n";
 							//$content['output'] .= $e->getTraceAsString()."\n";
 					}
-					if (self::$debug) _egw_log_exception($e);
+					if (self::$debug)
+					{
+						_egw_log_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);
+					if (self::$debug)
+					{
+						_egw_log_exception($e);
+					}
 				}
 			}
 		}
-		if ($connected)	// continue with next wizard step: define folders
+		if ($connected)
+		{
+			// continue with next wizard step: define folders
 		{
 			unset($content['button']);
+		}
 			return $this->folder($content, lang('Successful connected to %1 server%2.', 'IMAP', ' '.lang('and logged in')).
 				($imap->isSecureConnection() ? '' : "\n".lang('Connection is NOT secure! Everyone can read eg. your credentials.')));
 		}
@@ -368,7 +397,10 @@ 
 			}
 		}
 		$content['msg'] = $msg;
-		if (!isset($imap)) $imap = self::imap_client ($content);
+		if (!isset($imap))
+		{
+			$imap = self::imap_client ($content);
+		}
 
 		try {
 			//_debug_array($content);
@@ -378,7 +410,10 @@ 
 		}
 		catch(Exception $e) {
 			$content['msg'] = $e->getMessage();
-			if (self::$debug) _egw_log_exception($e);
+			if (self::$debug)
+			{
+				_egw_log_exception($e);
+			}
 		}
 
 		$tpl = new Etemplate('admin.mailwizard.folder');
@@ -503,8 +538,14 @@ 
 			$readonlys['button[manual]'] = true;
 		}
 		// set default ssl and port
-		if (!isset($content['acc_sieve_ssl'])) list($content['acc_sieve_ssl']) = each(self::$ssl_types);
-		if (empty($content['acc_sieve_port'])) $content['acc_sieve_port'] = $sieve_ssl2port[$content['acc_sieve_ssl']];
+		if (!isset($content['acc_sieve_ssl']))
+		{
+			list($content['acc_sieve_ssl']) = each(self::$ssl_types);
+		}
+		if (empty($content['acc_sieve_port']))
+		{
+			$content['acc_sieve_port'] = $sieve_ssl2port[$content['acc_sieve_ssl']];
+		}
 
 		// check smtp connection
 		if ($button == 'continue')
@@ -563,7 +604,10 @@ 
 						$content['sieve_output'] .= "\n".get_class($e).': '.$e->getMessage().
 							($e->details ? ' '.$e->details : '').' ('.$e->getCode().')'."\n";
 						$content['sieve_output'] .= $e->getTraceAsString()."\n";
-						if (self::$debug) _egw_log_exception($e);
+						if (self::$debug)
+						{
+							_egw_log_exception($e);
+						}
 					}
 				}
 			}
@@ -631,11 +675,23 @@ 
 			$readonlys['button[manual]'] = true;
 		}
 		// copy username/password from imap
-		if (!isset($content['acc_smtp_username'])) $content['acc_smtp_username'] = $content['acc_imap_username'];
-		if (!isset($content['acc_smtp_password'])) $content['acc_smtp_password'] = $content['acc_imap_password'];
+		if (!isset($content['acc_smtp_username']))
+		{
+			$content['acc_smtp_username'] = $content['acc_imap_username'];
+		}
+		if (!isset($content['acc_smtp_password']))
+		{
+			$content['acc_smtp_password'] = $content['acc_imap_password'];
+		}
 		// set default ssl
-		if (!isset($content['acc_smtp_ssl'])) list($content['acc_smtp_ssl']) = each(self::$ssl_types);
-		if (empty($content['acc_smtp_port'])) $content['acc_smtp_port'] = $smtp_ssl2port[$content['acc_smtp_ssl']];
+		if (!isset($content['acc_smtp_ssl']))
+		{
+			list($content['acc_smtp_ssl']) = each(self::$ssl_types);
+		}
+		if (empty($content['acc_smtp_port']))
+		{
+			$content['acc_smtp_port'] = $smtp_ssl2port[$content['acc_smtp_ssl']];
+		}
 
 		// check smtp connection
 		if ($button == 'continue')
@@ -665,10 +721,13 @@ 
 					{
 						$hosts[$server['hostname']] = array('username' => $server['username']);
 					}
-					if (strtoupper($server['socketType']) == 'SSL')	// try TLS first
+					if (strtoupper($server['socketType']) == 'SSL')
+					{
+						// try TLS first
 					{
 						$hosts[$server['hostname']]['TLS'] = $server['port'];
 					}
+					}
 					$hosts[$server['hostname']][strtoupper($server['socketType'])] = $server['port'];
 					// make sure we prefer SSL over STARTTLS over insecure
 					if (count($hosts[$server['hostname']]) > 2)
@@ -690,7 +749,10 @@ 
 				}
 				foreach($data as $ssl => $port)
 				{
-					if ($ssl === 'username') continue;
+					if ($ssl === 'username')
+					{
+						continue;
+					}
 
 					$content['acc_smtp_ssl'] = (int)self::$ssl2type[$ssl];
 
@@ -755,19 +817,28 @@ 
 								$content['smtp_output'] .= "\n".$e->getMessage().' ('.$e->getCode().')'."\n";
 								break;
 						}
-						if (self::$debug) _egw_log_exception($e);
+						if (self::$debug)
+						{
+							_egw_log_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);
+						if (self::$debug)
+						{
+							_egw_log_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);
+						if (self::$debug)
+						{
+							_egw_log_exception($e);
+						}
 					}
 				}
 			}
@@ -814,14 +885,23 @@ 
 		// app is trying to tell something, while redirecting to wizard
 		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'])
 		{
-			if (!is_array($content)) $content = array();
+			if (!is_array($content))
+			{
+				$content = array();
+			}
 			if ($this->is_admin && isset($_GET['account_id']))
 			{
 				$content['called_for'] = (int)$_GET['account_id'];
@@ -843,14 +923,20 @@ 
 							}
 						}
 						catch(Api\Exception\NotFound $e) {
-							if (self::$debug) _egw_log_exception($e);
+							if (self::$debug)
+							{
+								_egw_log_exception($e);
+							}
 						}
 					}
 				}
-				if (!$content['accounts'])	// no email account, call wizard
+				if (!$content['accounts'])
+				{
+					// no email account, call wizard
 				{
 					return $this->add(array('account_id' => (int)$_GET['account_id']));
 				}
+				}
 				$content['accounts']['new'] = lang('Create new account');
 			}
 			if (isset($_GET['acc_id']) && (int)$_GET['acc_id'] > 0)
@@ -878,15 +964,24 @@ 
 					// change self::SSL_NONE (=0) to "no" used in sel_options
 					foreach(array('imap','smtp','sieve') as $type)
 					{
-						if (!$content['acc_'.$type.'_ssl']) $content['acc_'.$type.'_ssl'] = 'no';
+						if (!$content['acc_'.$type.'_ssl'])
+						{
+							$content['acc_'.$type.'_ssl'] = 'no';
+						}
 					}
 				}
 				catch(Api\Exception\NotFound $e) {
-					if (self::$debug) _egw_log_exception($e);
+					if (self::$debug)
+					{
+						_egw_log_exception($e);
+					}
 					Framework::window_close(lang('Account not found!'));
 				}
 				catch(Exception $e) {
-					if (self::$debug) _egw_log_exception($e);
+					if (self::$debug)
+					{
+						_egw_log_exception($e);
+					}
 					Framework::window_close($e->getMessage().' ('.get_class($e).': '.$e->getCode().')');
 				}
 			}
@@ -901,7 +996,10 @@ 
 		// some defaults for new accounts
 		if (!isset($content['account_id']) || empty($content['acc_id']) || $content['acc_id'] === 'new')
 		{
-			if (!isset($content['account_id'])) $content['account_id'] = array($GLOBALS['egw_info']['user']['account_id']);
+			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
 		}
@@ -975,7 +1073,10 @@ 
 							)+$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.');
+							if ($edit_access)
+							{
+								$msg .= ' '.lang('Switch back to standard identity to save account.');
+							}
 						}
 						elseif ($edit_access)
 						{
@@ -984,7 +1085,10 @@ 
 							if ($account->acc_imap_administration)
 							{
 								$imap = $account->imapServer(true);
-								if ($imap) $imap->checkAdminConnection();
+								if ($imap)
+								{
+									$imap->checkAdminConnection();
+								}
 							}
 							// test sieve connection, if not called for other user, enabled and credentials available
 							if (!$content['called_for'] && $account->acc_sieve_enabled && $account->acc_imap_username)
@@ -1033,10 +1137,13 @@ 
 							}
 							if (isset($content['accounts']))
 							{
-								if (!isset($content['accounts'][$content['acc_id']]))	// insert new account as top, not bottom
+								if (!isset($content['accounts'][$content['acc_id']]))
+								{
+									// insert new account as top, not bottom
 								{
 									$content['accounts'] = array($content['acc_id'] => '') + $content['accounts'];
 								}
+								}
 								$content['accounts'][$content['acc_id']] = Mail\Account::identity_name($content, false);
 							}
 						}
@@ -1094,10 +1201,19 @@ 
 						$button = 'apply';
 						$msg_type = 'error';
 					}
-					if ($content['acc_id']) Mail::unsetCachedObjects($content['acc_id']);
-					if (stripos($msg,'fatal error:')!==false) $msg_type = 'error';
+					if ($content['acc_id'])
+					{
+						Mail::unsetCachedObjects($content['acc_id']);
+					}
+					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();
+					if ($button == 'save')
+					{
+						Framework::window_close();
+					}
 					break;
 
 				case 'delete':
@@ -1108,7 +1224,10 @@ 
 					}
 					elseif (Mail\Account::delete($content['acc_id']) > 0)
 					{
-						if ($content['acc_id']) Mail::unsetCachedObjects($content['acc_id']);
+						if ($content['acc_id'])
+						{
+							Mail::unsetCachedObjects($content['acc_id']);
+						}
 						Framework::refresh_opener(lang('Account deleted.'), 'emailadmin', $content['acc_id'], 'delete');
 						Framework::window_close();
 					}
@@ -1162,7 +1281,10 @@ 
 						self::mailboxes(self::imap_client ($content));
 			}
 			catch(Exception $e) {
-				if (self::$debug) _egw_log_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';
@@ -1270,9 +1392,15 @@ 
 				'acc_id' => $content['acc_id'],
 			)) as $actions)
 			{
-				if ($actions) $admin_actions = array_merge($admin_actions, $actions);
+				if ($actions)
+				{
+					$admin_actions = array_merge($admin_actions, $actions);
+				}
+			}
+			if ($admin_actions)
+			{
+				$tpl->setElementAttribute('admin_actions', 'actions', $admin_actions);
 			}
-			if ($admin_actions) $tpl->setElementAttribute('admin_actions', 'actions', $admin_actions);
 		}
 		$content['admin_actions'] = (bool)$admin_actions;
 
@@ -1287,7 +1415,10 @@ 
 	 */
 	private static function fix_account_id_0(&$account_id=null, $back=false)
 	{
-		if (!isset($account_id)) return;
+		if (!isset($account_id))
+		{
+			return;
+		}
 
 		if (!is_array($account_id))
 		{
@@ -1330,7 +1461,10 @@ 
 		$ordered = array();
 		foreach(array_merge(array('TLS', 'SSL', 'STARTTLS'), array_keys($data)) as $key)
 		{
-			if (array_key_exists($key, $data)) $ordered[$key] = $data[$key];
+			if (array_key_exists($key, $data))
+			{
+				$ordered[$key] = $data[$key];
+			}
 		}
 		return $ordered;
 	}
@@ -1348,21 +1482,33 @@ 
 	 */
 	protected static function mozilla_ispdb($domain, $try_mx=true)
 	{
-		if (strpos($domain, '@') !== false) list(,$domain) = explode('@', $domain);
+		if (strpos($domain, '@') !== false)
+		{
+			list(,$domain) = explode('@', $domain);
+		}
 
 		$url = 'https://autoconfig.thunderbird.net/v1.1/'.$domain;
 		try {
 			$xml = @simplexml_load_file($url);
-			if (!$xml->emailProvider) throw new Api\Exception\NotFound();
+			if (!$xml->emailProvider)
+			{
+				throw new Api\Exception\NotFound();
+			}
 			$provider = array(
 				'displayName' => (string)$xml->emailProvider->displayName,
 			);
 			foreach($xml->emailProvider->children() as $tag => $server)
 			{
-				if (!in_array($tag, array('incomingServer', 'outgoingServer'))) continue;
+				if (!in_array($tag, array('incomingServer', 'outgoingServer')))
+				{
+					continue;
+				}
 				foreach($server->attributes() as $name => $value)
 				{
-					if ($name == 'type') $type = (string)$value;
+					if ($name == 'type')
+					{
+						$type = (string)$value;
+					}
 				}
 				$data = array();
 				foreach($server as $name => $value)
@@ -1371,7 +1517,10 @@ 
 					{
 						$data[$name][$tag] = (string)$val;
 					}
-					if (!isset($data[$name])) $data[$name] = (string)$value;
+					if (!isset($data[$name]))
+					{
+						$data[$name] = (string)$value;
+					}
 				}
 				$provider[$type][] = $data;
 			}
@@ -1417,7 +1566,10 @@ 
 		// try usuall names
 		$hosts[$type.'.'.$domain] = true;
 		$hosts['mail.'.$domain] = true;
-		if ($type == 'smtp') $hosts['send.'.$domain] = true;
+		if ($type == 'smtp')
+		{
+			$hosts['send.'.$domain] = true;
+		}
 
 		if (($dns = dns_get_record($domain, DNS_MX)))
 		{
@@ -1429,14 +1581,20 @@ 
 			}
 			$hosts[preg_replace('/^[^.]+/', $type, $dns[0]['target'])] = true;
 			$hosts[preg_replace('/^[^.]+/', 'mail', $dns[0]['target'])] = true;
-			if ($type == 'smtp') $hosts[preg_replace('/^[^.]+/', 'send', $dns[0]['target'])] = true;
+			if ($type == 'smtp')
+			{
+				$hosts[preg_replace('/^[^.]+/', 'send', $dns[0]['target'])] = true;
+			}
 			$hosts[$dns[0]['target']] = true;
 		}
 
 		// verify hosts in dns
 		foreach(array_keys($hosts) as $host)
 		{
-			if (!dns_get_record($host, DNS_A)) unset($hosts[$host]);
+			if (!dns_get_record($host, DNS_A))
+			{
+				unset($hosts[$host]);
+			}
 		}
 		//error_log(__METHOD__."('$email') returning ".array2string($hosts));
 		return $hosts;
@@ -1456,7 +1614,10 @@ 
 	 */
 	public function ajax_activeAccounts($_data)
 	{
-		if (!$this->is_admin) die('no rights to be here!');
+		if (!$this->is_admin)
+		{
+			die('no rights to be here!');
+		}
 		$response = Api\Json\Response::get();
 		if (($account = $GLOBALS['egw']->accounts->read($_data['id'])))
 		{

admin/inc/class.admin_cmd_edit_user.inc.php

Spacing +37 added lines, -37 removed lines

@@ -25,7 +25,7 @@ 
 	 * @param string $password =null password
 	 * @param boolean $run_addaccount_hook =null default run addaccount for new Api\Accounts and editaccount for existing ones
 	 */
-	function __construct($account,$set=null,$password=null,$run_addaccount_hook=null)
+	function __construct($account, $set = null, $password = null, $run_addaccount_hook = null)
 	{
 		if (!is_array($account))
 		{
@@ -49,10 +49,10 @@ 
 	 * @throws Api\Exception\WrongUserinput(lang("Unknown account: %1 !!!",$this->account),15);
 	 * @throws Api\Exception\WrongUserinput(lang('Error changing the password for %1 !!!',$this->account),99);
 	 */
-	protected function exec($check_only=false)
+	protected function exec($check_only = false)
 	{
 		// check creator is still admin and not explicitly forbidden to edit accounts/groups
-		if ($this->creator) $this->_check_admin('account_access',$this->account ? 16 : 4);
+		if ($this->creator) $this->_check_admin('account_access', $this->account ? 16 : 4);
 
 		admin_cmd::_instanciate_accounts();
 
@@ -68,29 +68,29 @@ 
 		}
 		if (!$data['account_lid'] && (!$this->account || !is_null($data['account_lid'])))
 		{
-			throw new Api\Exception\WrongUserinput(lang('You must enter a loginid'),9);
+			throw new Api\Exception\WrongUserinput(lang('You must enter a loginid'), 9);
 		}
 		// Check if an account already exists as system user, and if it does deny creation
 		if ($GLOBALS['egw_info']['server']['account_repository'] == 'ldap' &&
 			!$GLOBALS['egw_info']['server']['ldap_allow_systemusernames'] && !$data['account_id'] &&
 			function_exists('posix_getpwnam') && posix_getpwnam($data['account_lid']))
 		{
-			throw new Api\Exception\WrongUserinput(lang('There already is a system-user with this name. User\'s should not have the same name as a systemuser'),99);
+			throw new Api\Exception\WrongUserinput(lang('There already is a system-user with this name. User\'s should not have the same name as a systemuser'), 99);
 		}
 		if (!$data['account_lastname'] && (!$this->account || !is_null($data['account_lastname'])))
 		{
-			throw new Api\Exception\WrongUserinput(lang('You must enter a lastname'),9);
+			throw new Api\Exception\WrongUserinput(lang('You must enter a lastname'), 9);
 		}
-		if (!is_null($data['account_lid']) && ($id = admin_cmd::$accounts->name2id($data['account_lid'],'account_lid','u')) &&
+		if (!is_null($data['account_lid']) && ($id = admin_cmd::$accounts->name2id($data['account_lid'], 'account_lid', 'u')) &&
 			(string)$id !== (string)$data['account_id'])
 		{
-			throw new Api\Exception\WrongUserinput(lang('That loginid has already been taken'),999);
+			throw new Api\Exception\WrongUserinput(lang('That loginid has already been taken'), 999);
 		}
 		if (isset($data['account_passwd_2']) && $data['account_passwd'] != $data['account_passwd_2'])
 		{
-			throw new Api\Exception\WrongUserinput(lang('The two passwords are not the same'),0);
+			throw new Api\Exception\WrongUserinput(lang('The two passwords are not the same'), 0);
 		}
-		$expires = self::_parse_expired($data['account_expires'],(boolean)$this->account);
+		$expires = self::_parse_expired($data['account_expires'], (boolean)$this->account);
 		if ($expires === 0)	// deactivated
 		{
 			$data['account_expires'] = -1;
@@ -102,16 +102,16 @@ 
 			$data['account_status'] = is_null($expires) ? null : ($expires == -1 || $expires > time() ? 'A' : '');
 		}
 
-		$data['changepassword'] = admin_cmd::parse_boolean($data['changepassword'],$this->account ? null : true);
-		$data['anonymous'] = admin_cmd::parse_boolean($data['anonymous'],$this->account ? null : false);
+		$data['changepassword'] = admin_cmd::parse_boolean($data['changepassword'], $this->account ? null : true);
+		$data['anonymous'] = admin_cmd::parse_boolean($data['anonymous'], $this->account ? null : false);
 		if ($data['mustchangepassword'] && $data['changepassword'])
 		{
-			$data['account_lastpwd_change']=0;
+			$data['account_lastpwd_change'] = 0;
 		}
 
 		if (!$data['account_primary_group'] && $this->account)
 		{
-			$data['account_primary_group'] = null;	// dont change
+			$data['account_primary_group'] = null; // dont change
 		}
 		else
 		{
@@ -119,11 +119,11 @@ 
 			{
 				$data['account_primary_group'] = 'Default';
 			}
-			$data['account_primary_group'] = admin_cmd::parse_account($data['account_primary_group'],false);
+			$data['account_primary_group'] = admin_cmd::parse_account($data['account_primary_group'], false);
 		}
 		if (!$data['account_groups'] && $this->account)
 		{
-			$data['account_groups'] = null;	// dont change
+			$data['account_groups'] = null; // dont change
 		}
 		else
 		{
@@ -131,7 +131,7 @@ 
 			{
 				$data['account_groups'] = array('Default');
 			}
-			$data['account_groups'] = admin_cmd::parse_accounts($data['account_groups'],false);
+			$data['account_groups'] = admin_cmd::parse_accounts($data['account_groups'], false);
 		}
 		if ($check_only) return true;
 
@@ -141,27 +141,27 @@ 
 			Api\Accounts::cache_invalidate($data['account_id']);
 			if (!($old = admin_cmd::$accounts->read($data['account_id'])))
 			{
-				throw new Api\Exception\WrongUserinput(lang("Unknown account: %1 !!!",$this->account),15);
+				throw new Api\Exception\WrongUserinput(lang("Unknown account: %1 !!!", $this->account), 15);
 			}
 			// as the current account class always sets all values, we have to add the not specified ones
-			foreach($data as $name => &$value)
+			foreach ($data as $name => &$value)
 			{
 				if (is_null($value)) $value = $old[$name];
 			}
 		}
 		else
 		{
-			unset($data['account_id']);	// otherwise add will fail under postgres
+			unset($data['account_id']); // otherwise add will fail under postgres
 		}
 		// hook allowing apps to intercept adding/editing Api\Accounts before saving them
-		Api\Hooks::process($data+array(
+		Api\Hooks::process($data + array(
 			'location' => $this->account ? 'pre_editaccount' : 'pre_addaccount',
-		),False,True);	// called for every app now, not only enabled ones)
+		), False, True); // called for every app now, not only enabled ones)
 
 		if (!($data['account_id'] = admin_cmd::$accounts->save($data)))
 		{
 			//_debug_array($data);
-			throw new Api\Db\Exception(lang("Error saving account!"),11);
+			throw new Api\Db\Exception(lang("Error saving account!"), 11);
 		}
 		// make new account_id available to caller
 		$update = (boolean)$this->account;
@@ -169,44 +169,44 @@ 
 
 		if ($data['account_groups'])
 		{
-			admin_cmd::$accounts->set_memberships($data['account_groups'],$data['account_id']);
+			admin_cmd::$accounts->set_memberships($data['account_groups'], $data['account_id']);
 		}
 		if (!is_null($data['anonymous']))
 		{
 			admin_cmd::_instanciate_acl();
 			if ($data['anonymous'])
 			{
-				admin_cmd::$acl->add_repository('phpgwapi','anonymous',$data['account_id'],1);
+				admin_cmd::$acl->add_repository('phpgwapi', 'anonymous', $data['account_id'], 1);
 			}
 			else
 			{
-				admin_cmd::$acl->delete_repository('phpgwapi','anonymous',$data['account_id']);
+				admin_cmd::$acl->delete_repository('phpgwapi', 'anonymous', $data['account_id']);
 			}
 		}
 		if (!is_null($data['changepassword']))
 		{
 			if (!$data['changepassword'])
 			{
-				admin_cmd::$acl->add_repository('preferences','nopasswordchange',$data['account_id'],1);
+				admin_cmd::$acl->add_repository('preferences', 'nopasswordchange', $data['account_id'], 1);
 			}
 			else
 			{
-				admin_cmd::$acl->delete_repository('preferences','nopasswordchange',$data['account_id']);
+				admin_cmd::$acl->delete_repository('preferences', 'nopasswordchange', $data['account_id']);
 			}
 		}
 		// if we have a password and it's not a hash, and auth_type != account_repository
 		if (!is_null($this->password) &&
-			!preg_match('/^\\{[a-z5]{3,5}\\}.+/i',$this->password) &&
-			!preg_match('/^[0-9a-f]{32}$/',$this->password) &&	// md5 hash
+			!preg_match('/^\\{[a-z5]{3,5}\\}.+/i', $this->password) &&
+			!preg_match('/^[0-9a-f]{32}$/', $this->password) && // md5 hash
 			admin_cmd::$accounts->config['auth_type'] != admin_cmd::$accounts->config['account_repository'])
 		{
-			admin_cmd_change_pw::exec();		// calling the exec method of the admin_cmd_change_pw
+			admin_cmd_change_pw::exec(); // calling the exec method of the admin_cmd_change_pw
 		}
 		$data['account_passwd'] = $this->password;
-		$GLOBALS['hook_values'] =& $data;
-		Api\Hooks::process($GLOBALS['hook_values']+array(
+		$GLOBALS['hook_values'] = & $data;
+		Api\Hooks::process($GLOBALS['hook_values'] + array(
 			'location' => $update && $this->run_addaccount_hook !== true ? 'editaccount' : 'addaccount'
-		),False,True);	// called for every app now, not only enabled ones)
+		), False, True); // called for every app now, not only enabled ones)
 
 		return lang("Account %1 %2", $data['account_lid'] ? $data['account_lid'] : Api\Accounts::id2name($this->account),
 			$update ? lang('updated') : lang("created with id #%1", $this->account));
@@ -219,7 +219,7 @@ 
 	 */
 	function __tostring()
 	{
-		return lang('%1 user %2',$this->account ? lang('Edit') : lang('Add'),
+		return lang('%1 user %2', $this->account ? lang('Edit') : lang('Add'),
 			admin_cmd::display_account($this->account ? $this->account : $this->set['account_lid']));
 	}
 
@@ -231,9 +231,9 @@ 
 	 * @return int timestamp, 0 for already, -1 for never or null for dont change
 	 * @throws Api\Exception\WrongUserinput(lang('Invalid formated date "%1"!',$datein),6);
 	 */
-	private function _parse_expired($str,$existing)
+	private function _parse_expired($str, $existing)
 	{
-		switch($str)
+		switch ($str)
 		{
 			case '':
 				if ($existing) return null;

Braces +28 added lines, -7 removed lines

@@ -52,16 +52,22 @@ 
 	protected function exec($check_only=false)
 	{
 		// check creator is still admin and not explicitly forbidden to edit accounts/groups
-		if ($this->creator) $this->_check_admin('account_access',$this->account ? 16 : 4);
+		if ($this->creator)
+		{
+			$this->_check_admin('account_access',$this->account ? 16 : 4);
+		}
 
 		admin_cmd::_instanciate_accounts();
 
 		$data = $this->set;
 		$data['account_type'] = 'u';
 
-		if ($this->account)	// existing account
+		if ($this->account)
+		{
+			// existing account
 		{
 			$data['account_id'] = admin_cmd::parse_account($this->account);
+		}
 			//error_log(__METHOD__."($check_only) this->account=".array2string($this->account).', data[account_id]='.array2string($data['account_id']).", ...)");
 
 			$data['old_loginid'] = admin_cmd::$accounts->id2name($data['account_id']);
@@ -91,9 +97,12 @@ 
 			throw new Api\Exception\WrongUserinput(lang('The two passwords are not the same'),0);
 		}
 		$expires = self::_parse_expired($data['account_expires'],(boolean)$this->account);
-		if ($expires === 0)	// deactivated
+		if ($expires === 0)
+		{
+			// deactivated
 		{
 			$data['account_expires'] = -1;
+		}
 			$data['account_status'] = '';
 		}
 		else
@@ -133,7 +142,10 @@ 
 			}
 			$data['account_groups'] = admin_cmd::parse_accounts($data['account_groups'],false);
 		}
-		if ($check_only) return true;
+		if ($check_only)
+		{
+			return true;
+		}
 
 		if ($this->account)
 		{
@@ -146,7 +158,10 @@ 
 			// as the current account class always sets all values, we have to add the not specified ones
 			foreach($data as $name => &$value)
 			{
-				if (is_null($value)) $value = $old[$name];
+				if (is_null($value))
+				{
+					$value = $old[$name];
+				}
 			}
 		}
 		else
@@ -165,7 +180,10 @@ 
 		}
 		// make new account_id available to caller
 		$update = (boolean)$this->account;
-		if (!$this->account) $this->account = $data['account_id'];
+		if (!$this->account)
+		{
+			$this->account = $data['account_id'];
+		}
 
 		if ($data['account_groups'])
 		{
@@ -236,7 +254,10 @@ 
 		switch($str)
 		{
 			case '':
-				if ($existing) return null;
+				if ($existing)
+				{
+					return null;
+				}
 				// fall through --> default for new Api\Accounts is never
 			case 'never':
 				return -1;

admin/inc/class.uiconfig.inc.php

Spacing +52 added lines, -53 removed lines

@@ -20,7 +20,7 @@ 
 {
 	var $public_functions = array('index' => True);
 
-	function index($params=null)
+	function index($params = null)
 	{
 		// if we have a xet file, run new et2 config
 		if (file_exists(EGW_SERVER_ROOT.'/'.$_GET['appname'].'/templates/default/config.xet'))
@@ -46,7 +46,7 @@ 
 			//_debug_array($params);
 			$_appname = $_GET['appname'];
 		}
-		if ($GLOBALS['egw']->acl->check('site_config_acce',1,'admin'))
+		if ($GLOBALS['egw']->acl->check('site_config_acce', 1, 'admin'))
 		{
 			Egw::redirect_link('/index.php');
 		}
@@ -57,12 +57,12 @@ 
 			Api\Translation::add_app($_appname);
 		}
 
-		if(get_magic_quotes_gpc() && is_array($_POST['newsettings']))
+		if (get_magic_quotes_gpc() && is_array($_POST['newsettings']))
 		{
 			$_POST['newsettings'] = array_stripslashes($_POST['newsettings']);
 		}
 
-		switch($_appname)
+		switch ($_appname)
 		{
 			case 'admin':
 			case 'addressbook':
@@ -89,7 +89,7 @@ 
 		$t = new Framework\Template(Framework\Template::get_dir($appname));
 		$t->set_unknowns('keep');
 		$t->set_file(array('config' => 'config.tpl'));
-		$t->set_block('config','header','header');
+		$t->set_block('config', 'header', 'header');
 
 		// fix header templates missing essential parts like display of validation errors
 		$header = $t->get_var('header');
@@ -107,15 +107,15 @@ 
 		}
 		$t->set_var('header', $header);
 
-		$t->set_block('config','body','body');
-		$t->set_block('config','footer','footer');
+		$t->set_block('config', 'body', 'body');
+		$t->set_block('config', 'footer', 'footer');
 
 		// fix footer submit buttons to just {submit} {cancel}
 		$t->set_var('footer', preg_replace('/<input[^>]+value="{lang_(submit|cancel)}"[^>]*>/', '{$1}', $t->get_var('footer')));
 
 		$c = new Api\Config($config_appname);
 		$c->read_repository();
-		if ($_POST['cancel'] || ($_POST['submit'] || $_POST['save'] || $_POST['apply']) && $GLOBALS['egw']->acl->check('site_config_acce',2,'admin'))
+		if ($_POST['cancel'] || ($_POST['submit'] || $_POST['save'] || $_POST['apply']) && $GLOBALS['egw']->acl->check('site_config_acce', 2, 'admin'))
 		{
 			Egw::redirect_link('/admin/index.php?ajax=true');
 		}
@@ -123,9 +123,9 @@ 
 		if ($_POST['submit'] || $_POST['save'] || $_POST['apply'])
 		{
 			/* Load hook file with functions to validate each Api\Config (one/none/all) */
-			Api\Hooks::single('config_validate',$appname);
+			Api\Hooks::single('config_validate', $appname);
 
-			foreach($_POST['newsettings'] as $key => $config)
+			foreach ($_POST['newsettings'] as $key => $config)
 			{
 				if ($config)
 				{
@@ -133,26 +133,26 @@ 
 					if (in_array($key, (array)$GLOBALS['egw_info']['server']['found_validation_hook'], true) && function_exists($key))
 					{
 						call_user_func($key, $config, $c);
-						if($GLOBALS['config_error'])
+						if ($GLOBALS['config_error'])
 						{
-							$errors .= lang($GLOBALS['config_error']) . "\n";
+							$errors .= lang($GLOBALS['config_error'])."\n";
 							$GLOBALS['config_error'] = False;
 						}
 					}
 				}
 				/* don't erase passwords, since we also don't print them */
-				elseif(strpos($key,'passwd') === false && strpos($key,'password') === false && strpos($key,'root_pw') === false)
+				elseif (strpos($key, 'passwd') === false && strpos($key, 'password') === false && strpos($key, 'root_pw') === false)
 				{
 					unset($c->config_data[$key]);
 				}
 			}
-			if(in_array('final_validation', (array)$GLOBALS['egw_info']['server']['found_validation_hook']) &&
+			if (in_array('final_validation', (array)$GLOBALS['egw_info']['server']['found_validation_hook']) &&
 				function_exists('final_validation'))
 			{
 				final_validation($_POST['newsettings']);
-				if($GLOBALS['config_error'])
+				if ($GLOBALS['config_error'])
 				{
-					$errors .= lang($GLOBALS['config_error']) . "\n";
+					$errors .= lang($GLOBALS['config_error'])."\n";
 					$GLOBALS['config_error'] = False;
 				}
 				unset($GLOBALS['egw_info']['server']['found_validation_hook']);
@@ -160,7 +160,7 @@ 
 
 			$c->save_repository();
 
-			if(!$errors && !$_POST['apply'])
+			if (!$errors && !$_POST['apply'])
 			{
 				Framework::message(lang('Configuration saved.'), 'success');
 				Egw::redirect_link('/index.php', array(
@@ -170,10 +170,10 @@ 
 			}
 		}
 
-		$t->set_var('error','');
-		if($errors)
+		$t->set_var('error', '');
+		if ($errors)
 		{
-			Framework::message(lang('Error') . ': ' . $errors, 'error');
+			Framework::message(lang('Error').': '.$errors, 'error');
 			unset($errors);
 			unset($GLOBALS['config_error']);
 		}
@@ -181,41 +181,41 @@ 
 		{
 			Framework::message(lang('Configuration saved.'), 'success');
 		}
-		$t->set_var('title',lang('Site Configuration'));
-		$t->set_var('action_url',$GLOBALS['egw']->link('/index.php','menuaction=admin.uiconfig.index&appname=' . $appname));
-		$t->set_var('th_bg',     $GLOBALS['egw_info']['theme']['th_bg']);
-		$t->set_var('th_text',   $GLOBALS['egw_info']['theme']['th_text']);
-		$t->set_var('row_on',    $GLOBALS['egw_info']['theme']['row_on']);
-		$t->set_var('row_off',   $GLOBALS['egw_info']['theme']['row_off']);
+		$t->set_var('title', lang('Site Configuration'));
+		$t->set_var('action_url', $GLOBALS['egw']->link('/index.php', 'menuaction=admin.uiconfig.index&appname='.$appname));
+		$t->set_var('th_bg', $GLOBALS['egw_info']['theme']['th_bg']);
+		$t->set_var('th_text', $GLOBALS['egw_info']['theme']['th_text']);
+		$t->set_var('row_on', $GLOBALS['egw_info']['theme']['row_on']);
+		$t->set_var('row_off', $GLOBALS['egw_info']['theme']['row_off']);
 		$t->set_var('hidden_vars', Api\Html::input_hidden('csrf_token', Api\Csrf::token(__CLASS__)));
 
 		$vars = $t->get_undefined('body');
 
-		if (Api\Hooks::single('config',$appname))	// reload the config-values, they might have changed
+		if (Api\Hooks::single('config', $appname))	// reload the config-values, they might have changed
 		{
 			$c->read_repository();
 		}
-		foreach($vars as $value)
+		foreach ($vars as $value)
 		{
-			$valarray = explode('_',$value);
+			$valarray = explode('_', $value);
 			$type = array_shift($valarray);
-			$newval = implode(' ',$valarray);
+			$newval = implode(' ', $valarray);
 
 			switch ($type)
 			{
 				case 'lang':
-					$t->set_var($value,lang($newval));
+					$t->set_var($value, lang($newval));
 					break;
 				case 'value':
-					$newval = str_replace(' ','_',$newval);
+					$newval = str_replace(' ', '_', $newval);
 					/* Don't show passwords in the form */
-					if(strpos($value,'passwd') !== false || strpos($value,'password') !== false || strpos($value,'root_pw') !== false)
+					if (strpos($value, 'passwd') !== false || strpos($value, 'password') !== false || strpos($value, 'root_pw') !== false)
 					{
-						$t->set_var($value,'');
+						$t->set_var($value, '');
 					}
 					else
 					{
-						$t->set_var($value,$c->config_data[$newval]);
+						$t->set_var($value, $c->config_data[$newval]);
 					}
 					break;
 				/*
@@ -233,46 +233,45 @@ 
 				*/
 				case 'selected':
 					$configs = array();
-					$newvals = explode(' ',$newval);
+					$newvals = explode(' ', $newval);
 					$setting = end($newvals);
-					for ($i=0;$i<(count($newvals) - 1); $i++)
+					for ($i = 0; $i < (count($newvals) - 1); $i++)
 					{
 						$configs[] = $newvals[$i];
 					}
-					$config = implode('_',$configs);
+					$config = implode('_', $configs);
 					/* echo $config . '=' . $c->config_data[$config]; */
 					if ($c->config_data[$config] == $setting)
 					{
-						$t->set_var($value,' selected');
+						$t->set_var($value, ' selected');
 					}
 					else
 					{
-						$t->set_var($value,'');
+						$t->set_var($value, '');
 					}
 					break;
 				case 'hook':
-					$newval = str_replace(' ','_',$newval);
-					if(function_exists($newval))
+					$newval = str_replace(' ', '_', $newval);
+					if (function_exists($newval))
 					{
-						$t->set_var($value,$newval($c->config_data));
+						$t->set_var($value, $newval($c->config_data));
 					}
 					else
 					{
-						$t->set_var($value,'');
+						$t->set_var($value, '');
 					}
 					break;
 				case 'call':	// eg. call_class::method or call_app.class.method
-					$newval = str_replace(' ','_',$newval);
-					$t->set_var($value,ExecMethod($newval,$c->config_data));
+					$newval = str_replace(' ', '_', $newval);
+					$t->set_var($value, ExecMethod($newval, $c->config_data));
 					break;
 				default:
-					$t->set_var($value,'');
+					$t->set_var($value, '');
 					break;
 			}
 		}
 		$t->set_var('submit', '<div class="dialogFooterToolbar" style="text-align: left">'.
-			($GLOBALS['egw']->acl->check('site_config_acce',2,'admin') ? '' :
-				Api\Html::submit_button('save', 'Save')."\n".
+			($GLOBALS['egw']->acl->check('site_config_acce', 2, 'admin') ? '' : Api\Html::submit_button('save', 'Save')."\n".
 				Api\Html::submit_button('apply', 'Apply')));
 		$t->set_var('cancel', Api\Html::submit_button('cancel', 'Cancel').'</div>');
 
@@ -282,10 +281,10 @@ 
 		// render the page
 		$GLOBALS['egw']->framework->render(
 			'<div id="admin-config-'.$appname.'" class="admin-config">'.
-			$t->parse('out','header').
-			$t->fp('out','body').
-			$t->fp('out','footer').'</div>',
-			null,true
+			$t->parse('out', 'header').
+			$t->fp('out', 'body').
+			$t->fp('out', 'footer').'</div>',
+			null, true
 		);
 	}
 }

Braces +9 added lines, -2 removed lines

@@ -85,7 +85,11 @@ 
 				$config_appname = $appname;
 				break;
 		}
-		if (ob_get_contents()) ob_end_flush(); // if there is output in buffer, flush it now.
+		if (ob_get_contents())
+		{
+			ob_end_flush();
+		}
+		// if there is output in buffer, flush it now.
 		$t = new Framework\Template(Framework\Template::get_dir($appname));
 		$t->set_unknowns('keep');
 		$t->set_file(array('config' => 'config.tpl'));
@@ -191,10 +195,13 @@ 
 
 		$vars = $t->get_undefined('body');
 
-		if (Api\Hooks::single('config',$appname))	// reload the config-values, they might have changed
+		if (Api\Hooks::single('config',$appname))
+		{
+			// reload the config-values, they might have changed
 		{
 			$c->read_repository();
 		}
+		}
 		foreach($vars as $value)
 		{
 			$valarray = explode('_',$value);

admin/inc/class.admin_cmd_check_acl.inc.php

Spacing +5 added lines, -5 removed lines

@@ -20,7 +20,7 @@ 
 	 *
 	 * @param array $data =array() default parm from parent class, no real parameters
 	 */
-	function __construct($data=array())
+	function __construct($data = array())
 	{
 		admin_cmd::__construct($data);
 	}
@@ -34,7 +34,7 @@ 
 	 * @throws Exception(lang("Unknown account: %1 !!!",$this->account),15);
 	 * @throws Exception(lang("Application '%1' not found (maybe not installed or misspelled)!",$name),8);
 	 */
-	protected function exec($check_only=false)
+	protected function exec($check_only = false)
 	{
 		if ($check_only) return true;
 
@@ -43,14 +43,14 @@ 
 		if (($all_accounts = admin_cmd::$accounts->search(array('type'=>'both'))))
 		{
 			$ids = array();
-			foreach($all_accounts as $account)
+			foreach ($all_accounts as $account)
 			{
 				$ids[] = $account['account_id'];
 			}
-			$GLOBALS['egw']->db->query("DELETE FROM egw_acl WHERE acl_account NOT IN (".implode(',',$ids).") OR acl_appname='phpgw_group' AND acl_location NOT IN ('".implode("','",$ids)."')",__LINE__,__FILE__);
+			$GLOBALS['egw']->db->query("DELETE FROM egw_acl WHERE acl_account NOT IN (".implode(',', $ids).") OR acl_appname='phpgw_group' AND acl_location NOT IN ('".implode("','", $ids)."')", __LINE__, __FILE__);
 			$deleted = $GLOBALS['egw']->db->affected_rows();
 		}
-		return lang("%1 ACL records of not (longer) existing Api\Accounts deleted.",$deleted);
+		return lang("%1 ACL records of not (longer) existing Api\Accounts deleted.", $deleted);
 	}
 
 	/**

Braces +4 added lines, -1 removed lines

@@ -37,7 +37,10 @@
 	 */
 	protected function exec($check_only=false)
 	{
-		if ($check_only) return true;
+		if ($check_only)
+		{
+			return true;
+		}
 
 		admin_cmd::_instanciate_accounts();
 

admin/inc/class.admin_cmds.inc.php

Spacing +24 added lines, -25 removed lines

@@ -31,25 +31,24 @@ 
 	 * @param array &$readonlys
 	 * @return int
 	 */
-	static function get_rows(array $query,&$rows,&$readonlys)
+	static function get_rows(array $query, &$rows, &$readonlys)
 	{
 		Api\Cache::setSession('admin', 'cmds', $query);
 
-		$total = admin_cmd::get_rows($query,$rows,$readonlys);
+		$total = admin_cmd::get_rows($query, $rows, $readonlys);
 
 		if (!$rows) return array();
 
-		foreach($rows as &$row)
+		foreach ($rows as &$row)
 		{
 			try {
 				$cmd = admin_cmd::instanciate($row);
-				$row['title'] = $cmd->__tostring();	// we call __tostring explicit, as a cast to string requires php5.2+
+				$row['title'] = $cmd->__tostring(); // we call __tostring explicit, as a cast to string requires php5.2+
 			}
 			catch (Exception $e) {
 				$row['title'] = $e->getMessage();
 			}
-			$row['data'] = !($data = json_php_unserialize($row['data'])) ? '' :
-				json_encode($data, JSON_PRETTY_PRINT|JSON_UNESCAPED_UNICODE|JSON_UNESCAPED_SLASHES);
+			$row['data'] = !($data = json_php_unserialize($row['data'])) ? '' : json_encode($data, JSON_PRETTY_PRINT|JSON_UNESCAPED_UNICODE|JSON_UNESCAPED_SLASHES);
 
 			if ($row['status'] == admin_cmd::scheduled)
 			{
@@ -65,7 +64,7 @@ 
 	 *
 	 * @param array $content =null
 	 */
-	static function index(array $content=null)
+	static function index(array $content = null)
 	{
 		$tpl = new Etemplate('admin.cmds');
 
@@ -75,10 +74,10 @@ 
 			if (!is_array($content['nm']))
 			{
 				$content['nm'] = array(
-					'get_rows' => 'admin.admin_cmds.get_rows',	// I  method/callback to request the data for the rows eg. 'notes.bo.get_rows'
-					'no_filter' => true,	// I  disable the 1. filter
-					'no_filter2' => true,	// I  disable the 2. filter (params are the same as for filter)
-					'no_cat' => true,		// I  disable the cat-selectbox
+					'get_rows' => 'admin.admin_cmds.get_rows', // I  method/callback to request the data for the rows eg. 'notes.bo.get_rows'
+					'no_filter' => true, // I  disable the 1. filter
+					'no_filter2' => true, // I  disable the 2. filter (params are the same as for filter)
+					'no_cat' => true, // I  disable the cat-selectbox
 					'order' => 'cmd_created',
 					'sort' => 'DESC',
 					'row_id' => 'id',
@@ -98,10 +97,10 @@ 
 			}
 			unset($cmd);
 		}
-		$tpl->exec('admin.admin_cmds.index',$content,array(
+		$tpl->exec('admin.admin_cmds.index', $content, array(
 			'status' => admin_cmd::$stati,
 			'remote_id' => admin_cmd::remote_sites(),
-		),array(),$content);
+		), array(), $content);
 	}
 
 	/**
@@ -127,9 +126,9 @@ 
 	 * @param array &$readonlys
 	 * @return int
 	 */
-	static function get_remotes(array $query,&$rows,&$readonlys)
+	static function get_remotes(array $query, &$rows, &$readonlys)
 	{
-		return admin_cmd::get_remotes($query,$rows,$readonlys);
+		return admin_cmd::get_remotes($query, $rows, $readonlys);
 	}
 
 	/**
@@ -137,7 +136,7 @@ 
 	 *
 	 * @param array $content =null
 	 */
-	static function remotes(array $content=null)
+	static function remotes(array $content = null)
 	{
 		$tpl = new Etemplate('admin.remotes');
 
@@ -147,10 +146,10 @@ 
 			if (!is_array($content['nm']))
 			{
 				$content['nm'] = array(
-					'get_rows' => 'admin.admin_cmds.get_remotes',	// I  method/callback to request the data for the rows eg. 'notes.bo.get_rows'
-					'no_filter' => true,	// I  disable the 1. filter
-					'no_filter2' => true,	// I  disable the 2. filter (params are the same as for filter)
-					'no_cat' => true,		// I  disable the cat-selectbox
+					'get_rows' => 'admin.admin_cmds.get_remotes', // I  method/callback to request the data for the rows eg. 'notes.bo.get_rows'
+					'no_filter' => true, // I  disable the 1. filter
+					'no_filter2' => true, // I  disable the 2. filter (params are the same as for filter)
+					'no_cat' => true, // I  disable the cat-selectbox
 					'order' => 'remote_name',
 					'sort' => 'ASC',
 					'row_id' => 'remote_id',
@@ -165,7 +164,7 @@ 
 
 			if ($content['nm']['action'])
 			{
-				switch($content['nm']['action'])
+				switch ($content['nm']['action'])
 				{
 					case 'edit':
 						$content['remote'] = admin_cmd::read_remote($content['nm']['selected'][0]);
@@ -175,11 +174,11 @@ 
 				}
 				unset($content['nm']['action']);
 			}
-			elseif($content['remote']['button'])
+			elseif ($content['remote']['button'])
 			{
 				list($button) = each($content['remote']['button']);
 				unset($content['remote']['button']);
-				switch($button)
+				switch ($button)
 				{
 					case 'save':
 					case 'apply':
@@ -210,7 +209,7 @@ 
 				unset($content['nm']['add']);
 			}
 		}
-		$tpl->exec('admin.admin_cmds.remotes',$content,array(),array(),$content);
+		$tpl->exec('admin.admin_cmds.remotes', $content, array(), array(), $content);
 	}
 
 	/**
@@ -226,7 +225,7 @@ 
 				'default' => true,
 				'allowOnMultiple' => false,
 				'nm_action' => 'submit',
-				'group' => $group=0,
+				'group' => $group = 0,
 			),
 			'add' => array(
 				'caption' => 'Add',

Braces +10 added lines, -3 removed lines

@@ -37,7 +37,10 @@ 
 
 		$total = admin_cmd::get_rows($query,$rows,$readonlys);
 
-		if (!$rows) return array();
+		if (!$rows)
+		{
+			return array();
+		}
 
 		foreach($rows as &$row)
 		{
@@ -193,11 +196,15 @@ 
 						try {
 							$content['remote']['remote_id'] = admin_cmd::save_remote($content['remote']);
 							$content['msg'] = lang('Remote instance saved');
-						} catch (Exception $e) {
+						}
+						catch (Exception $e) {
 							$content['msg'] = lang('Error saving').': '.$e->getMessage().' ('.$e->getCode().')';
 							break;
 						}
-						if ($button == 'apply') break;
+						if ($button == 'apply')
+						{
+							break;
+						}
 						// fall through for save
 					case 'cancel':
 						unset($content['remote']);

admin/inc/class.admin_cmd_change_pw.inc.php

Spacing +6 added lines, -6 removed lines

@@ -23,7 +23,7 @@ 
 	 * @param string|int|array $account account name or id, or array with all parameters
 	 * @param string $password =null password
 	 */
-	function __construct($account,$password=null)
+	function __construct($account, $password = null)
 	{
 		if (!is_array($account))
 		{
@@ -44,11 +44,11 @@ 
 	 * @throws Api\Exception\WrongUserinput(lang("Unknown account: %1 !!!",$this->account),15);
 	 * @throws Api\Exception\WrongUserinput(lang('Error changing the password for %1 !!!',$this->account),99);
 	 */
-	protected function exec($check_only=false)
+	protected function exec($check_only = false)
 	{
-		$account_id = admin_cmd::parse_account($this->account,true);	// true = user, no group
+		$account_id = admin_cmd::parse_account($this->account, true); // true = user, no group
 		// check creator is still admin and not explicitly forbidden to edit Api\Accounts
-		if ($this->creator) $this->_check_admin('account_access',16);
+		if ($this->creator) $this->_check_admin('account_access', 16);
 
 		if ($check_only) return true;
 
@@ -57,7 +57,7 @@ 
 		if (!$auth->change_password(null, $this->password, $account_id))
 		{
 			// as long as the Api\Auth class is not throwing itself ...
-			throw new Exception(lang('Error changing the password for %1 !!!',$this->account),99);
+			throw new Exception(lang('Error changing the password for %1 !!!', $this->account), 99);
 		}
 		return lang('Password updated');
 	}
@@ -69,6 +69,6 @@ 
 	 */
 	function __tostring()
 	{
-		return lang('change password for %1',admin_cmd::display_account($this->account));
+		return lang('change password for %1', admin_cmd::display_account($this->account));
 	}
 }

Braces +8 added lines, -2 removed lines

@@ -48,9 +48,15 @@
 	{
 		$account_id = admin_cmd::parse_account($this->account,true);	// true = user, no group
 		// check creator is still admin and not explicitly forbidden to edit Api\Accounts
-		if ($this->creator) $this->_check_admin('account_access',16);
+		if ($this->creator)
+		{
+			$this->_check_admin('account_access',16);
+		}
 
-		if ($check_only) return true;
+		if ($check_only)
+		{
+			return true;
+		}
 
 		$auth = new Api\Auth;