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

@@ -46,5 +46,5 @@
 // Dependencies for this app to work
 $setup_info['admin']['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_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

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

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;
 

admin/inc/class.admin_import_users_csv.inc.php

Indentation +21 added lines, -21 removed lines

@@ -275,37 +275,37 @@
 	}
 
 	/**
-	* Returns warnings that were encountered during importing
-	* Maximum of one warning message per record, but you can concatenate them if you need to
-	*
-	* @return Array (
-	*       record_# => warning message
-	*       )
-	*/
+	 * Returns warnings that were encountered during importing
+	 * Maximum of one warning message per record, but you can concatenate them if you need to
+	 *
+	 * @return Array (
+	 *       record_# => warning message
+	 *       )
+	 */
 	public function get_warnings() {
 		return $this->warnings;
 	}
 
 	/**
-	* Returns errors that were encountered during importing
-	* Maximum of one error message per record, but you can append if you need to
-	*
-	* @return Array (
-	*       record_# => error message
-	*       )
-	*/
+	 * Returns errors that were encountered during importing
+	 * Maximum of one error message per record, but you can append if you need to
+	 *
+	 * @return Array (
+	 *       record_# => error message
+	 *       )
+	 */
 	public function get_errors() {
 		return $this->errors;
 	}
 
 	/**
-	* Returns a list of actions taken, and the number of records for that action.
-	* Actions are things like 'insert', 'update', 'delete', and may be different for each plugin.
-	*
-	* @return Array (
-	*       action => record count
-	* )
-	*/
+	 * Returns a list of actions taken, and the number of records for that action.
+	 * Actions are things like 'insert', 'update', 'delete', and may be different for each plugin.
+	 *
+	 * @return Array (
+	 *       action => record count
+	 * )
+	 */
 	public function get_results() {
 		return $this->results;
 	}

Braces +71 added lines, -29 removed lines

@@ -15,7 +15,8 @@ 
 /**
  * class import_csv for admin (users)
  */
-class admin_import_users_csv implements importexport_iface_import_plugin  {
+class admin_import_users_csv implements importexport_iface_import_plugin
+{
 
 	private static $plugin_options = array(
 		'fieldsep', 		// char
@@ -90,7 +91,8 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function import( $_stream, importexport_definition $_definition ) {
+	public function import( $_stream, importexport_definition $_definition )
+	{
 		$import_csv = new importexport_import_csv( $_stream, array(
 			'fieldsep' => $_definition->plugin_options['fieldsep'],
 			'charset' => $_definition->plugin_options['charset'],
@@ -112,9 +114,12 @@ 
 		$import_csv->conversion = $_definition->plugin_options['field_conversion'];
 
 		//check if file has a header lines
-		if ( isset( $_definition->plugin_options['num_header_lines'] ) && $_definition->plugin_options['num_header_lines'] > 0) {
+		if ( isset( $_definition->plugin_options['num_header_lines'] ) && $_definition->plugin_options['num_header_lines'] > 0)
+		{
 			$import_csv->skip_records($_definition->plugin_options['num_header_lines']);
-		} elseif(isset($_definition->plugin_options['has_header_line']) && $_definition->plugin_options['has_header_line']) {
+		}
+		elseif(isset($_definition->plugin_options['has_header_line']) && $_definition->plugin_options['has_header_line'])
+		{
 			// First method is preferred
 			$import_csv->skip_records(1);
 		}
@@ -130,17 +135,27 @@ 
 			'account_status'	=> array('A' => lang('Active'), '' => lang('Disabled'), 'D' => lang('Disabled')),
 		);
 
-		while ( $record = $import_csv->get_record() ) {
+		while ( $record = $import_csv->get_record() )
+		{
 			$success = false;
 			// don't import empty records
-			if( count( array_unique( $record ) ) < 2 ) continue;
+			if( count( array_unique( $record ) ) < 2 )
+			{
+				continue;
+			}
 
-			if(strtolower($record['account_expires']) == 'never') $record['account_expires'] = -1;
+			if(strtolower($record['account_expires']) == 'never')
+			{
+				$record['account_expires'] = -1;
+			}
 			importexport_import_csv::convert($record, admin_egw_user_record::$types, 'admin', $lookups);
 
-			if ( $_definition->plugin_options['conditions'] ) {
-				foreach ( $_definition->plugin_options['conditions'] as $condition ) {
-					switch ( $condition['type'] ) {
+			if ( $_definition->plugin_options['conditions'] )
+			{
+				foreach ( $_definition->plugin_options['conditions'] as $condition )
+				{
+					switch ( $condition['type'] )
+					{
 						// exists
 						case 'exists' :
 							$accounts = array();
@@ -156,16 +171,23 @@ 
 							// Search looks in the given field, but doesn't do an exact match
 							foreach ( (array)$accounts as $key => $account )
 							{
-								if($account[$condition['string']] != $record[$condition['string']]) unset($accounts[$key]);
+								if($account[$condition['string']] != $record[$condition['string']])
+								{
+									unset($accounts[$key]);
+								}
 							}
-							if ( is_array( $accounts ) && count( $accounts ) >= 1 ) {
+							if ( is_array( $accounts ) && count( $accounts ) >= 1 )
+							{
 								// apply action to all contacts matching this exists condition
 								$action = $condition['true'];
-								foreach ( (array)$accounts as $account ) {
+								foreach ( (array)$accounts as $account )
+								{
 									$record['account_id'] = $account['account_id'];
 									$success = $this->action(  $action['action'], $record, $import_csv->get_current_position() );
 								}
-							} else {
+							}
+							else
+							{
 								$action = $condition['false'];
 								$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
 							}
@@ -176,13 +198,21 @@ 
 							die('condition / action not supported!!!');
 							break;
 					}
-					if ($action['last']) break;
+					if ($action['last'])
+					{
+						break;
+					}
 				}
-			} else {
+			}
+			else
+			{
 				// unconditional insert
 				$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
 			}
-			if($success) $count++;
+			if($success)
+			{
+				$count++;
+			}
 		}
 		return $count;
 	}
@@ -194,8 +224,10 @@ 
 	 * @param array $_data contact data for the action
 	 * @return bool success or not
 	 */
-	private function action ( $_action, $_data, $record_num = 0 ) {
-		switch ($_action) {
+	private function action ( $_action, $_data, $record_num = 0 )
+	{
+		switch ($_action)
+		{
 			case 'none' :
 				return true;
 			case 'disable':
@@ -204,13 +236,15 @@ 
 			case 'create' :
 			case 'update' :
 				$command = new admin_cmd_edit_user(($_action=='create'?null:$_data['account_lid']), $_data);
-				if($this->dry_run) {
+				if($this->dry_run)
+				{
 					$this->results[$_action]++;
 					return true;
 				}
 				try {
 					$command->run();
-				} catch (Exception $e) {
+				}
+				catch (Exception $e) {
 					$this->errors[$record_num] = $e->getMessage();
 					return false;
 				}
@@ -227,7 +261,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('User CSV import');
 	}
 
@@ -236,7 +271,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Creates / updates user accounts from CSV file");
 	}
 
@@ -245,7 +281,8 @@ 
 	 *
 	 * @return string suffix (comma seperated)
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
@@ -261,7 +298,8 @@ 
 	 * 		preserv		=> array,
 	 * )
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 		// lets do it!
 	}
 
@@ -270,7 +308,8 @@ 
 	 *
 	 * @return string etemplate name
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		// lets do it!
 	}
 
@@ -282,7 +321,8 @@ 
 	*       record_# => warning message
 	*       )
 	*/
-	public function get_warnings() {
+	public function get_warnings()
+	{
 		return $this->warnings;
 	}
 
@@ -294,7 +334,8 @@ 
 	*       record_# => error message
 	*       )
 	*/
-	public function get_errors() {
+	public function get_errors()
+	{
 		return $this->errors;
 	}
 
@@ -306,7 +347,8 @@ 
 	*       action => record count
 	* )
 	*/
-	public function get_results() {
+	public function get_results()
+	{
 		return $this->results;
 	}
 }

Doc Comments +1 added lines, -2 removed lines

@@ -77,8 +77,7 @@
 	/**
 	 * imports entries according to given definition object.
 	 * @param resource $_stream
-	 * @param string $_charset
-	 * @param definition $_definition
+	 * @param importexport_definition $_definition
 	 */
 	public function import( $_stream, importexport_definition $_definition ) {
 		$import_csv = new importexport_import_csv( $_stream, array(

Spacing +31 added lines, -31 removed lines

@@ -15,15 +15,15 @@ 
 /**
  * class import_csv for admin (users)
  */
-class admin_import_users_csv implements importexport_iface_import_plugin  {
+class admin_import_users_csv implements importexport_iface_import_plugin {
 
 	private static $plugin_options = array(
-		'fieldsep', 		// char
-		'charset', 		// string
+		'fieldsep', // char
+		'charset', // string
 		'num_header_lines', // int number of header lines
 		'field_conversion', // array( $csv_col_num => conversion)
-		'field_mapping',	// array( $csv_col_num => adb_filed)
-		'conditions',		/* => array containing condition arrays:
+		'field_mapping', // array( $csv_col_num => adb_filed)
+		'conditions', /* => array containing condition arrays:
 				'type' => exists, // exists
 				'string' => '#kundennummer',
 				'true' => array(
@@ -40,14 +40,14 @@ 
 	/**
 	 * actions which could be done to data entries
 	 */
-	protected static $actions = array( 'none', 'update', 'create', 'delete', 'disable', 'enable' );
+	protected static $actions = array('none', 'update', 'create', 'delete', 'disable', 'enable');
 
 	/**
 	 * conditions for actions
 	 *
 	 * @var array
 	 */
-	protected static $conditions = array( 'exists' );
+	protected static $conditions = array('exists');
 
 	/**
 	 * @var definition
@@ -90,8 +90,8 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function import( $_stream, importexport_definition $_definition ) {
-		$import_csv = new importexport_import_csv( $_stream, array(
+	public function import($_stream, importexport_definition $_definition) {
+		$import_csv = new importexport_import_csv($_stream, array(
 			'fieldsep' => $_definition->plugin_options['fieldsep'],
 			'charset' => $_definition->plugin_options['charset'],
 		));
@@ -99,11 +99,11 @@ 
 		$this->definition = $_definition;
 
 		// user, is admin ?
-		$this->is_admin = isset( $GLOBALS['egw_info']['user']['apps']['admin'] ) && $GLOBALS['egw_info']['user']['apps']['admin'];
+		$this->is_admin = isset($GLOBALS['egw_info']['user']['apps']['admin']) && $GLOBALS['egw_info']['user']['apps']['admin'];
 		$this->user = $GLOBALS['egw_info']['user']['account_id'];
 
 		// dry run?
-		$this->dry_run = isset( $_definition->plugin_options['dry_run'] ) ? $_definition->plugin_options['dry_run'] :  false;
+		$this->dry_run = isset($_definition->plugin_options['dry_run']) ? $_definition->plugin_options['dry_run'] : false;
 
 		// set FieldMapping.
 		$import_csv->mapping = $_definition->plugin_options['field_mapping'];
@@ -112,9 +112,9 @@ 
 		$import_csv->conversion = $_definition->plugin_options['field_conversion'];
 
 		//check if file has a header lines
-		if ( isset( $_definition->plugin_options['num_header_lines'] ) && $_definition->plugin_options['num_header_lines'] > 0) {
+		if (isset($_definition->plugin_options['num_header_lines']) && $_definition->plugin_options['num_header_lines'] > 0) {
 			$import_csv->skip_records($_definition->plugin_options['num_header_lines']);
-		} elseif(isset($_definition->plugin_options['has_header_line']) && $_definition->plugin_options['has_header_line']) {
+		} elseif (isset($_definition->plugin_options['has_header_line']) && $_definition->plugin_options['has_header_line']) {
 			// First method is preferred
 			$import_csv->skip_records(1);
 		}
@@ -130,22 +130,22 @@ 
 			'account_status'	=> array('A' => lang('Active'), '' => lang('Disabled'), 'D' => lang('Disabled')),
 		);
 
-		while ( $record = $import_csv->get_record() ) {
+		while ($record = $import_csv->get_record()) {
 			$success = false;
 			// don't import empty records
-			if( count( array_unique( $record ) ) < 2 ) continue;
+			if (count(array_unique($record)) < 2) continue;
 
-			if(strtolower($record['account_expires']) == 'never') $record['account_expires'] = -1;
+			if (strtolower($record['account_expires']) == 'never') $record['account_expires'] = -1;
 			importexport_import_csv::convert($record, admin_egw_user_record::$types, 'admin', $lookups);
 
-			if ( $_definition->plugin_options['conditions'] ) {
-				foreach ( $_definition->plugin_options['conditions'] as $condition ) {
-					switch ( $condition['type'] ) {
+			if ($_definition->plugin_options['conditions']) {
+				foreach ($_definition->plugin_options['conditions'] as $condition) {
+					switch ($condition['type']) {
 						// exists
 						case 'exists' :
 							$accounts = array();
 							// Skip the search if the field is empty
-							if($record[$condition['string']] !== '')
+							if ($record[$condition['string']] !== '')
 							{
 								$accounts = $GLOBALS['egw']->accounts->search(array(
 									'type' => 'accounts',
@@ -154,20 +154,20 @@ 
 								));
 							}
 							// Search looks in the given field, but doesn't do an exact match
-							foreach ( (array)$accounts as $key => $account )
+							foreach ((array)$accounts as $key => $account)
 							{
-								if($account[$condition['string']] != $record[$condition['string']]) unset($accounts[$key]);
+								if ($account[$condition['string']] != $record[$condition['string']]) unset($accounts[$key]);
 							}
-							if ( is_array( $accounts ) && count( $accounts ) >= 1 ) {
+							if (is_array($accounts) && count($accounts) >= 1) {
 								// apply action to all contacts matching this exists condition
 								$action = $condition['true'];
-								foreach ( (array)$accounts as $account ) {
+								foreach ((array)$accounts as $account) {
 									$record['account_id'] = $account['account_id'];
-									$success = $this->action(  $action['action'], $record, $import_csv->get_current_position() );
+									$success = $this->action($action['action'], $record, $import_csv->get_current_position());
 								}
 							} else {
 								$action = $condition['false'];
-								$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
+								$success = ($this->action($action['action'], $record, $import_csv->get_current_position()));
 							}
 							break;
 
@@ -180,9 +180,9 @@ 
 				}
 			} else {
 				// unconditional insert
-				$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
+				$success = $this->action('insert', $record, $import_csv->get_current_position());
 			}
-			if($success) $count++;
+			if ($success) $count++;
 		}
 		return $count;
 	}
@@ -194,7 +194,7 @@ 
 	 * @param array $_data contact data for the action
 	 * @return bool success or not
 	 */
-	private function action ( $_action, $_data, $record_num = 0 ) {
+	private function action($_action, $_data, $record_num = 0) {
 		switch ($_action) {
 			case 'none' :
 				return true;
@@ -203,8 +203,8 @@ 
 				$_data['account_expires'] = $_action == 'disable' ? 'already' : '';
 			case 'create' :
 			case 'update' :
-				$command = new admin_cmd_edit_user(($_action=='create'?null:$_data['account_lid']), $_data);
-				if($this->dry_run) {
+				$command = new admin_cmd_edit_user(($_action == 'create' ?null:$_data['account_lid']), $_data);
+				if ($this->dry_run) {
 					$this->results[$_action]++;
 					return true;
 				}