EGroupware / egroupware

admin/inc/class.admin_account.inc.php

Spacing +37 added lines, -40 removed lines

@@ -30,9 +30,9 @@ 
 
 	// Copying account uses addressbook fields, but we explicitly clear these
 	protected static $copy_clear_fields = array(
-		'account_firstname','account_lastname','account_fullname', 'person_id',
-		'account_id','account_lid',
-		'account_lastlogin','accountlastloginfrom','account_lastpwd_change'
+		'account_firstname', 'account_lastname', 'account_fullname', 'person_id',
+		'account_id', 'account_lid',
+		'account_lastlogin', 'accountlastloginfrom', 'account_lastpwd_change'
 	);
 
 	/**
@@ -46,11 +46,10 @@ 
 	{
 		if ((string)$content['owner'] === '0' && $GLOBALS['egw_info']['user']['apps']['admin'])
 		{
-			$deny_edit = $content['account_id'] ? $GLOBALS['egw']->acl->check('account_access', 16, 'admin') :
-				$GLOBALS['egw']->acl->check('account_access', 4, 'admin');
+			$deny_edit = $content['account_id'] ? $GLOBALS['egw']->acl->check('account_access', 16, 'admin') : $GLOBALS['egw']->acl->check('account_access', 4, 'admin');
 			//error_log(__METHOD__."() contact_id=$content[contact_id], account_id=$content[account_id], deny_edit=".array2string($deny_edit));
 
-			if (!$content['account_id'] && $deny_edit) return;	// no right to add new accounts, should not happen by AB ACL
+			if (!$content['account_id'] && $deny_edit) return; // no right to add new accounts, should not happen by AB ACL
 
 			// load our translations
 			Api\Translation::add_app('admin');
@@ -64,7 +63,7 @@ 
 					throw new Api\Exception\NotFound('Account data NOT found!');
 				}
 				if ($account['account_expires'] == -1) $account['account_expires'] = '';
-				unset($account['account_pwd']);	// do NOT send to client
+				unset($account['account_pwd']); // do NOT send to client
 				$account['account_groups'] = array_keys($account['memberships']);
 				$acl = new Acl($content['account_id']);
 				$acl->read_repository();
@@ -84,7 +83,7 @@ 
 					'account_status' => 'A',
 					'account_groups' => array(),
 					'anonymous' => false,
-					'changepassword' => true,	//old default: (bool)$GLOBALS['egw_info']['server']['change_pwd_every_x_days'],
+					'changepassword' => true, //old default: (bool)$GLOBALS['egw_info']['server']['change_pwd_every_x_days'],
 					'mustchangepassword' => false,
 					'account_primary_group' => $GLOBALS['egw']->accounts->name2id('Default'),
 					'homedirectory' => $GLOBALS['egw_info']['server']['ldap_account_home'],
@@ -105,21 +104,20 @@ 
 
 			if ($deny_edit)
 			{
-				foreach(array_keys($account) as $key)
+				foreach (array_keys($account) as $key)
 				{
 					$readonlys[$key] = true;
 				}
 				$readonlys['account_passwd'] = $readonlys['account_passwd2'] = true;
 			}
 			// save old values to only trigger save, if one of the following values change (contact data get saved anyway)
-			$preserve = empty($content['id']) ? array() :
-				array('old_account' => array_intersect_key($account, array_flip(array(
+			$preserve = empty($content['id']) ? array() : array('old_account' => array_intersect_key($account, array_flip(array(
 						'account_lid', 'account_status', 'account_groups', 'anonymous', 'changepassword',
 						'mustchangepassword', 'account_primary_group', 'homedirectory', 'loginshell',
 						'account_expires', 'account_firstname', 'account_lastname', 'account_email'))),
 						'deny_edit' => $deny_edit);
 
-			if($content && $_GET['copy'])
+			if ($content && $_GET['copy'])
 			{
 				$this->copy($content, $account, $preserve);
 			}
@@ -146,12 +144,12 @@ 
 	{
 		if (!isset($content['mustchangepassword']))
 		{
-			$content['mustchangepassword'] = true;	// was readonly because already set
+			$content['mustchangepassword'] = true; // was readonly because already set
 		}
 		$content['account_firstname'] = $content['n_given'];
 		$content['account_lastname'] = $content['n_family'];
 		$content['account_email'] = $content['email'];
-		if($content['account_passwd'] && $content['account_passwd'] !== $content['account_passwd_2'])
+		if ($content['account_passwd'] && $content['account_passwd'] !== $content['account_passwd_2'])
 		{
 			throw new Api\Exception\WrongUserinput('Passwords are not the same');
 		}
@@ -163,7 +161,7 @@ 
 			{
 				$old['account_groups'] = $content['old_account']['account_groups'];
 			}
-			if($content['account_passwd'])
+			if ($content['account_passwd'])
 			{
 				// Don't put password into history
 				$old['account_passwd'] = '';
@@ -171,11 +169,11 @@ 
 		}
 		if ($content['deny_edit'] || $old === array())
 		{
-			return '';	// no need to save account data, if nothing changed
+			return ''; // no need to save account data, if nothing changed
 		}
 		//error_log(__METHOD__."(".array2string($content).")");
 		$account = array();
-		foreach(array(
+		foreach (array(
 			// need to copy/rename some fields named different in account and contact
 			'n_given' => 'account_firstname',
 			'n_family' => 'account_lastname',
@@ -188,7 +186,7 @@ 
 			'account_primary_group',
 			'account_expires', 'account_status',
 			'homedirectory', 'loginshell',
-			'requested', 'requested_email', 'comment',	// admin_cmd documentation (EPL)
+			'requested', 'requested_email', 'comment', // admin_cmd documentation (EPL)
 		) as $c_name => $a_name)
 		{
 			if (is_int($c_name)) $c_name = $a_name;
@@ -200,15 +198,14 @@ 
 				(!isset($content[$c_name]) && $c_name !== 'account_expires' || // account_expires is not set when empty!
 				$content['old_account'][$a_name] == $content[$c_name]))
 			{
-				continue;	// no change --> no need to log setting it to identical value
+				continue; // no change --> no need to log setting it to identical value
 			}
 
-			switch($a_name)
+			switch ($a_name)
 			{
 				case 'account_expires':
 				case 'account_status':
-					$account['account_expires'] = $content['account_expires'] ? $content['account_expires'] :
-						($content['account_status'] ? 'never' : 'already');
+					$account['account_expires'] = $content['account_expires'] ? $content['account_expires'] : ($content['account_status'] ? 'never' : 'already');
 					break;
 
 				case 'changepassword':	// boolean values: admin_cmd_edit_user understands '' as NOT set
@@ -233,7 +230,7 @@ 
 			'account' => (int)$content['account_id'],
 			'set' => $account,
 			'old' => $old,
-		)+(array)$content['admin_cmd']);
+		) + (array)$content['admin_cmd']);
 		$cmd->run();
 
 		Api\Json\Response::get()->call('egw.refresh', '', 'admin', $cmd->account, $content['account_id'] ? 'edit' : 'add');
@@ -267,19 +264,19 @@ 
 
 		// Explicitly, always clear these
 		static $clear_content = Array(
-			'n_family','n_given','n_middle','n_suffix','n_fn','n_fileas',
-			'account_id','contact_id','id','etag','carddav_name','uid'
+			'n_family', 'n_given', 'n_middle', 'n_suffix', 'n_fn', 'n_fileas',
+			'account_id', 'contact_id', 'id', 'etag', 'carddav_name', 'uid'
 		);
-		foreach($clear_content as $field)
+		foreach ($clear_content as $field)
 		{
-			$account[$field] ='';
+			$account[$field] = '';
 			$preserve[$field] = '';
 		}
 		$account['link_to']['to_id'] = 0;
 		unset($preserve['old_account']);
 
 		// Never copy these on an account
-		foreach(static::$copy_clear_fields as $field)
+		foreach (static::$copy_clear_fields as $field)
 		{
 			unset($account[$field]);
 		}
@@ -290,7 +287,7 @@ 
 	 *
 	 * @param array $content =null
 	 */
-	public static function delete(array $content=null)
+	public static function delete(array $content = null)
 	{
 		if (!is_array($content))
 		{
@@ -307,7 +304,7 @@ 
 			}
 			//error_log(__METHOD__."() \$_GET[account_id]=$_GET[account_id], \$_GET[contact_id]=$_GET[contact_id] content=".array2string($content));
 		}
-		if ($GLOBALS['egw']->acl->check('account_access',32,'admin') ||
+		if ($GLOBALS['egw']->acl->check('account_access', 32, 'admin') ||
 			$GLOBALS['egw_info']['user']['account_id'] == $content['account_id'])
 		{
 			Framework::window_close(lang('Permission denied!!!'));
@@ -319,7 +316,7 @@ 
 				'new_user' => $content['new_owner'],
 				'is_user' => $content['account_id'] > 0,
 				'change_apps' => $content['delete_apps']
-			) +  (array)$content['admin_cmd']);
+			) + (array)$content['admin_cmd']);
 			$msg = $cmd->run();
 			if ($content['contact_id'])
 			{
@@ -337,19 +334,19 @@ 
 
 		// Get a count of entries owned by the user
 		$counts = $GLOBALS['egw']->accounts->get_account_entry_counts($content['account_id']);
-		foreach($counts as $app => $counts)
+		foreach ($counts as $app => $counts)
 		{
 			$entry = Api\Link::get_registry($app, 'entries');
-			if(!$entry)
+			if (!$entry)
 			{
 				$entry = lang('Entries');
 			}
-			if($counts['total'] && Api\Hooks::exists('deleteaccount', $app))
+			if ($counts['total'] && Api\Hooks::exists('deleteaccount', $app))
 			{
 				$content['delete_apps'][] = $app;
 				$sel_options['delete_apps'][] = array(
 					'value' => $app,
-					'label' => lang($app) . ': ' . $counts['total'] . ' '.$entry
+					'label' => lang($app).': '.$counts['total'].' '.$entry
 				);
 			}
 			else if ($counts['total'])
@@ -357,17 +354,17 @@ 
 				// These ones don't support the needed hook
 				$content['counts'][] = array(
 					'app' => $app,
-					'count' => $counts['total'] . ' '.$entry
+					'count' => $counts['total'].' '.$entry
 				);
 			}
 		}
 		// Add filemanager home directory in as special case, hook is in the API
-		if(Api\Vfs::file_exists('/home/'.$GLOBALS['egw']->accounts->id2name($content['account_id'])))
+		if (Api\Vfs::file_exists('/home/'.$GLOBALS['egw']->accounts->id2name($content['account_id'])))
 		{
 			$app = 'filemanager';
 			$sel_options['delete_apps'][] = array(
 				'value' => $app,
-				'label' => lang($app) . ': /home'
+				'label' => lang($app).': /home'
 			);
 			$content['delete_apps'][] = $app;
 		}
@@ -429,7 +426,7 @@ 
 			}
 		}
 
-		if (!$data['account_lid'] && !$data['account_id']) return;	// makes no sense to check before
+		if (!$data['account_lid'] && !$data['account_id']) return; // makes no sense to check before
 
 		// set home-directory when account_lid is entered, but only for new Api\Accounts
 		if ($changed == 'account_lid' && !$data['account_id'] &&
@@ -448,7 +445,7 @@ 
 			$cmd = new admin_cmd_edit_user($data['account_id'], $data);
 			$cmd->run(null, false, false, true);
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			Api\Json\Response::get()->data($e->getMessage());
 		}

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

@@ -266,7 +266,7 @@
 		$content['owner'] = '0';
 
 		// Explicitly, always clear these
-		static $clear_content = Array(
+		static $clear_content = array(
 			'n_family','n_given','n_middle','n_suffix','n_fn','n_fileas',
 			'account_id','contact_id','id','etag','carddav_name','uid'
 		);