EGroupware / egroupware

admin/inc/class.admin_cmd_edit_group.inc.php

Spacing +20 added lines, -21 removed lines

@@ -23,7 +23,7 @@ 
 	 * @param string|int|array $account account name or id (!$account to add a new account), or array with all parameters
 	 * @param array $set =null array with all data to change
 	 */
-	function __construct($account,$set=null)
+	function __construct($account, $set = null)
 	{
 		if (!is_array($account))
 		{
@@ -43,10 +43,10 @@ 
 	 * @throws Api\Exception\NoPermission\Admin
 	 * @throws Api\Exception\WrongUserinput(lang("Unknown account: %1 !!!",$this->account),15);
 	 */
-	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('group_access',$this->account ? 16 : 4);
+		if ($this->creator) $this->_check_admin('group_access', $this->account ? 16 : 4);
 
 		admin_cmd::_instanciate_accounts();
 
@@ -54,18 +54,18 @@ 
 
 		if ($this->account)	// existing account
 		{
-			$data['account_id'] = admin_cmd::parse_account($this->account,false);
+			$data['account_id'] = admin_cmd::parse_account($this->account, false);
 		}
 		$data += array(
 			'account_type' => 'g',
-			'account_status' => 'A',	// not used, but so we do the same thing as the web-interface
+			'account_status' => 'A', // not used, but so we do the same thing as the web-interface
 			'account_expires' => -1,
 		);
 		if (!$data['account_lid'] && (!$this->account || !is_null($data['account_lid'])))
 		{
 			throw new Api\Exception\WrongUserinput(lang('You must enter a group name.'), 17);
 		}
-		if (!is_null($data['account_lid']) && ($id = admin_cmd::$accounts->name2id($data['account_lid'],'account_lid','g')) &&
+		if (!is_null($data['account_lid']) && ($id = admin_cmd::$accounts->name2id($data['account_lid'], 'account_lid', 'g')) &&
 			$id !== $data['account_id'])
 		{
 			throw new Api\Exception\WrongUserinput(lang('That loginid has already been taken'), 11);
@@ -76,7 +76,7 @@ 
 		}
 		if ($data['account_members'])
 		{
-			$data['account_members'] = admin_cmd::parse_accounts($data['account_members'],true);
+			$data['account_members'] = admin_cmd::parse_accounts($data['account_members'], true);
 		}
 		if ($check_only) return true;
 
@@ -86,10 +86,10 @@ 
 			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];
 			}
@@ -97,22 +97,21 @@ 
 		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 sure we have lid for hook even if not changed, also set deprecated name
 		$data['account_name'] = $data['account_lid'] = $data['account_lid'] ?
-				$data['account_lid'] :
-				admin_cmd::$accounts->id2name($data['account_id']);
+				$data['account_lid'] : admin_cmd::$accounts->id2name($data['account_id']);
 
-		if ($update) $data['old_name'] = $old['account_lid'];	// make old name available for hooks
-		$GLOBALS['hook_values'] =& $data;
-		Api\Hooks::process($GLOBALS['hook_values']+array(
+		if ($update) $data['old_name'] = $old['account_lid']; // make old name available for hooks
+		$GLOBALS['hook_values'] = & $data;
+		Api\Hooks::process($GLOBALS['hook_values'] + array(
 			'location' => $update ? 'editgroup' : 'addgroup'
-		),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_members'])
 		{
-			admin_cmd::$accounts->set_members($data['account_members'],$data['account_id']);
+			admin_cmd::$accounts->set_members($data['account_members'], $data['account_id']);
 		}
 		// make new account_id available to caller
 		$this->account = $data['account_id'];
@@ -128,7 +127,7 @@ 
 	 */
 	function __tostring()
 	{
-		return lang('%1 group %2',$this->account ? lang('Edit') : lang('Add'),
+		return lang('%1 group %2', $this->account ? lang('Edit') : lang('Add'),
 			admin_cmd::display_account($this->account ? $this->account : $this->set['account_lid']));
 	}
 
@@ -170,7 +169,7 @@ 
 	{
 		$widgets = parent::get_change_widgets();
 
-		$widgets['account_id'] = 'integer';	// normaly not displayed
+		$widgets['account_id'] = 'integer'; // normaly not displayed
 		$widgets['run'] = 'select-app';
 
 		return $widgets;
@@ -217,7 +216,7 @@ 
 		}
 
 		// remove values not relevant to groups
-		foreach(['old', 'set'] as $name)
+		foreach (['old', 'set'] as $name)
 		{
 			$data[$name] = array_diff_key($data[$name], array_flip([
 				'account_pwd', 'account_status', 'account_type',
@@ -229,7 +228,7 @@ 
 		}
 
 		// remove unchanged values (null == '' and arrays might not be sorted)
-		foreach($data['set'] as $name => $value)
+		foreach ($data['set'] as $name => $value)
 		{
 			if ($data['old'][$name] == $value ||
 				is_array($value) && sort($value) && sort($data['old'][$name]) && $value == $data['old'][$name])