EGroupware / egroupware

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;
 				}

admin/inc/class.admin_customtranslation.inc.php

Spacing +6 added lines, -6 removed lines

@@ -34,7 +34,7 @@ 
 	 * @param array $_content =null
 	 * @param string $msg =''
 	 */
-	function index(array $_content=null, $msg='')
+	function index(array $_content = null, $msg = '')
 	{
 		if (is_array($_content))
 		{
@@ -44,17 +44,17 @@ 
 				list($action) = each($_content['button']);
 				unset($_content['button']);
 			}
-			elseif($_content['rows']['delete'])
+			elseif ($_content['rows']['delete'])
 			{
 				list($action) = each($_content['rows']['delete']);
 				unset($_content['rows']['delete']);
 			}
-			switch($action)
+			switch ($action)
 			{
 				case 'save':
 				case 'apply':
 					$saved = 0;
-					foreach($_content['rows'] as $data)
+					foreach ($_content['rows'] as $data)
 					{
 						if (!empty($data['phrase']))
 						{
@@ -79,7 +79,7 @@ 
 			}
 		}
 		$content = array('rows' => array());
-		foreach(Api\Translation::load_app('custom', 'en') as $phrase => $translation)
+		foreach (Api\Translation::load_app('custom', 'en') as $phrase => $translation)
 		{
 			$content['rows'][++$row] = array(
 				'phrase' => $phrase,
@@ -91,7 +91,7 @@ 
 			'phrase' => '',
 			'translation' => '',
 		);
-		$readonlys["delete[$row]"] = true;	// no delete for empty row
+		$readonlys["delete[$row]"] = true; // no delete for empty row
 		$content['msg'] = $msg;
 
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('Custom translation');

Braces +8 added lines, -2 removed lines

@@ -62,8 +62,14 @@
 							++$saved;
 						}
 					}
-					if ($saved) $msg = lang('%1 phrases saved.', $saved);
-					if ($action == 'apply') break;
+					if ($saved)
+					{
+						$msg = lang('%1 phrases saved.', $saved);
+					}
+					if ($action == 'apply')
+					{
+						break;
+					}
 					// fall through
 				case 'cancel':
 					Egw::redirect_link('/admin/index.php');

admin/inc/class.admin_account.inc.php

Spacing +14 added lines, -16 removed lines

@@ -40,11 +40,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 Api\Accounts, should not happen by AB ACL
+			if (!$content['account_id'] && $deny_edit) return; // no right to add new Api\Accounts, should not happen by AB ACL
 
 			// load our translations
 			Api\Translation::add_app('admin');
@@ -58,7 +57,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['memberships'] = array_keys($account['memberships']);
 				$acl = new Acl($content['account_id']);
 				$acl->read_repository();
@@ -78,7 +77,7 @@ 
 					'account_status' => 'A',
 					'memberships' => 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'],
@@ -99,7 +98,7 @@ 
 
 			if ($deny_edit)
 			{
-				foreach(array_keys($account) as $key)
+				foreach (array_keys($account) as $key)
 				{
 					$readonlys[$key] = true;
 				}
@@ -131,11 +130,11 @@ 
 	{
 		if ($content['old_account'] && $content['old_account'] == array_diff_key($content, $content['old_account']))
 		{
-			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',
@@ -152,11 +151,10 @@ 
 		{
 			if (is_int($c_name)) $c_name = $a_name;
 
-			switch($a_name)
+			switch ($a_name)
 			{
 				case 'account_expires':
-					$account[$a_name] = $content[$c_name] ? $content[$c_name] :
-						($content['account_status'] ? 'never' : 'already');
+					$account[$a_name] = $content[$c_name] ? $content[$c_name] : ($content['account_status'] ? 'never' : 'already');
 					break;
 
 				case 'changepassword':	// boolean values: admin_cmd_edit_user understands '' as NOT set
@@ -171,7 +169,7 @@ 
 			}
 		}
 		// Make sure primary group is in account groups
-		if($account['account_primary_group'] && !array_search($account['account_primary_group'], (array)$account['account_groups']))
+		if ($account['account_primary_group'] && !array_search($account['account_primary_group'], (array)$account['account_groups']))
 		{
 			$account['account_groups'][] = $account['account_primary_group'];
 		}
@@ -204,7 +202,7 @@ 
 	 *
 	 * @param array $content =null
 	 */
-	public static function delete(array $content=null)
+	public static function delete(array $content = null)
 	{
 		if (!is_array($content))
 		{
@@ -221,7 +219,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') || !($content['account_id'] > 0) ||
+		if ($GLOBALS['egw']->acl->check('account_access', 32, 'admin') || !($content['account_id'] > 0) ||
 			$GLOBALS['egw_info']['user']['account_id'] == $content['account_id'])
 		{
 			Framework::window_close(lang('Permission denied!!!'));
@@ -275,7 +273,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'] &&
@@ -294,7 +292,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());
 		}

Braces +26 added lines, -6 removed lines

@@ -44,20 +44,30 @@ 
 				$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 Api\Accounts, should not happen by AB ACL
+			if (!$content['account_id'] && $deny_edit)
+			{
+				return;
+			}
+			// no right to add new Api\Accounts, should not happen by AB ACL
 
 			// load our translations
 			Api\Translation::add_app('admin');
 
-			if ($content['id'])	// existing account
+			if ($content['id'])
+			{
+				// existing account
 			{
 				// invalidate account, before reading it, to code with changed to DB or LDAP outside EGw
 				Api\Accounts::cache_invalidate((int)$content['account_id']);
+			}
 				if (!($account = $GLOBALS['egw']->accounts->read($content['account_id'])))
 				{
 					throw new Api\Exception\NotFound('Account data NOT found!');
 				}
-				if ($account['account_expires'] == -1) $account['account_expires'] = '';
+				if ($account['account_expires'] == -1)
+				{
+					$account['account_expires'] = '';
+				}
 				unset($account['account_pwd']);	// do NOT send to client
 				$account['memberships'] = array_keys($account['memberships']);
 				$acl = new Acl($content['account_id']);
@@ -150,7 +160,10 @@ 
 			'homedirectory', 'loginshell',
 		) as $c_name => $a_name)
 		{
-			if (is_int($c_name)) $c_name = $a_name;
+			if (is_int($c_name))
+			{
+				$c_name = $a_name;
+			}
 
 			switch($a_name)
 			{
@@ -269,13 +282,20 @@ 
 		if (!$data['account_id'] && in_array($changed, array('n_given', 'n_family', 'account_lid')))
 		{
 			$email = Api\Accounts::email($data['account_firstname'], $data['account_lastname'], $data['account_lid']);
-			if ($email && $email[0] != '@' && strpos($email, '@'))	// only add valid email addresses
+			if ($email && $email[0] != '@' && strpos($email, '@'))
+			{
+				// only add valid email addresses
 			{
 				Api\Json\Response::get()->assign('addressbook-edit_email', 'value', $email);
 			}
+			}
 		}
 
-		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'] &&

admin/inc/hook_acl_manager.inc.php

Spacing +12 added lines, -12 removed lines

@@ -14,7 +14,7 @@ 
 		'List config settings'   => 1,
 		'Change config settings' => 2
 	)
-);	// added and working ralfbecker
+); // added and working ralfbecker
 
 $GLOBALS['acl_manager']['admin']['account_access'] = array(
 	'name' => 'Deny access to user accounts',
@@ -27,7 +27,7 @@ 
 		'Delete account'  => 32,
 		'change ACL Rights' => 64
 	)
-);	// was already there and seems to work ralfbecker
+); // was already there and seems to work ralfbecker
 
 $GLOBALS['acl_manager']['admin']['group_access'] = array(
 	'name' => 'Deny access to groups',
@@ -39,7 +39,7 @@ 
 		'Edit group'    => 16,
 		'Delete group'  => 32
 	)
-);	// was already there and seems to work ralfbecker
+); // was already there and seems to work ralfbecker
 
 $GLOBALS['acl_manager']['admin']['applications_acc'] = array(
 	'name' => 'Deny access to applications',
@@ -52,7 +52,7 @@ 
 */
 		'Register application hooks' => 16
 	)
-);	// added and working ralfbecker
+); // added and working ralfbecker
 
 $GLOBALS['acl_manager']['admin']['global_categorie'] = array(
 	'name' => 'Deny access to global categories',
@@ -65,7 +65,7 @@ 
 		'Delete category'   => 32,
 		'Add sub-category'  => 64
 	)
-);	// added and working ralfbecker
+); // added and working ralfbecker
 
 $GLOBALS['acl_manager']['admin']['mainscreen_messa'] = array(
 	'name' => 'Deny access to mainscreen message',
@@ -73,7 +73,7 @@ 
 		'Main screen message' => 1,
 		'Login message'       => 2
 	)
-);	// added and working ralfbecker
+); // added and working ralfbecker
 
 $GLOBALS['acl_manager']['admin']['current_sessions'] = array(
 	'name' => 'Deny access to current sessions',
@@ -83,40 +83,40 @@ 
 		'Show session IP address' => 4,
 		'Kill session'            => 8
 	)
-);	// checked and working ralfbecker
+); // checked and working ralfbecker
 
 $GLOBALS['acl_manager']['admin']['access_log_acces'] = array(
 	'name' => 'Deny access to access log',
 	'rights' => array(
 		'Show access log' => 1
 	)
-);	// added and working ralfbecker
+); // added and working ralfbecker
 
 $GLOBALS['acl_manager']['admin']['error_log_access'] = array(
 	'name' => 'Deny access to error log',
 	'rights' => array(
 		'Show error log' => 1
 	)
-);	// added and working ralfbecker
+); // added and working ralfbecker
 
 $GLOBALS['acl_manager']['admin']['asyncservice_acc'] = array(
 	'name' => 'Deny access to asynchronous timed services',
 	'rights' => array(
 		'Asynchronous timed services' => 1
 	)
-);	// added and working ralfbecker
+); // added and working ralfbecker
 
 $GLOBALS['acl_manager']['admin']['db_backup_access'] = array(
 	'name' => 'Deny access to DB backup and restore',
 	'rights' => array(
 		'DB backup and restore' => 1
 	)
-);	// added and working ralfbecker
+); // added and working ralfbecker
 
 $GLOBALS['acl_manager']['admin']['info_access'] = array(
 	'name' => 'Deny access to phpinfo',
 	'rights' => array(
 		'Show phpinfo()' => 1
 	)
-);	// added and working ralfbecker
+); // added and working ralfbecker
 

admin/inc/class.admin_wizard_export_groups_csv.inc.php

Indentation +2 added lines, -2 removed lines

@@ -18,11 +18,11 @@
 		parent::__construct();
 
 		// Field mapping
-                $this->export_fields = array(
+				$this->export_fields = array(
 			'account_id'		=> lang('Account ID'),
 			'account_lid'		=> lang('Group Name'),
 			'account_members'	=> lang('Members'),
-                );
+				);
 
 		// Custom fields - not really used in admin...
 		unset($this->export_fields['customfields']);

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 		// Custom fields - not really used in admin...
 		unset($this->export_fields['customfields']);
 		$custom = Api\Storage\Customfields::get('admin', true);
-		foreach($custom as $name => $data) {
+		foreach ($custom as $name => $data) {
 			$this->export_fields['#'.$name] = $data['label'];
 		}
 	}

Braces +4 added lines, -2 removed lines

@@ -14,7 +14,8 @@ 
 
 class admin_wizard_export_groups_csv extends importexport_wizard_basic_export_csv
 {
-	public function __construct() {
+	public function __construct()
+	{
 		parent::__construct();
 
 		// Field mapping
@@ -27,7 +28,8 @@ 
 		// Custom fields - not really used in admin...
 		unset($this->export_fields['customfields']);
 		$custom = Api\Storage\Customfields::get('admin', true);
-		foreach($custom as $name => $data) {
+		foreach($custom as $name => $data)
+		{
 			$this->export_fields['#'.$name] = $data['label'];
 		}
 	}

admin/inc/class.admin_cmd_check_cats.inc.php

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,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);
 	}
@@ -35,7 +35,7 @@ 
 	 * @param boolean $check_only =false only run the checks (and throw the exceptions), but not the command itself
 	 * @return string success message
 	 */
-	protected function exec($check_only=false)
+	protected function exec($check_only = false)
 	{
 		if ($check_only) return true;
 

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_acl.inc.php

Spacing +29 added lines, -32 removed lines

@@ -55,14 +55,14 @@ 
 		$old_apps = array_keys($this->acl->get_user_applications($content['acl_account'], false, false));
 		// add new apps
 		$added_apps = array_diff($content['apps'], $old_apps);
-		foreach($added_apps as $app)
+		foreach ($added_apps as $app)
 		{
 			$this->acl->add_repository($app, 'run', $content['acl_account'], 1);
 		}
 		// remove no longer checked apps
 		$removed_apps = array_diff($old_apps, $content['apps']);
 		$deleted_ids = array();
-		foreach($removed_apps as $app)
+		foreach ($removed_apps as $app)
 		{
 			$this->acl->delete_repository($app, 'run', $content['acl_account']);
 			$deleted_ids[] = $app.':'.$content['acl_account'].':run';
@@ -96,12 +96,11 @@ 
 	{
 		// assamble rights again
 		$rights = (int)$content['preserve_rights'];
-		foreach($content['acl'] as $right)
+		foreach ($content['acl'] as $right)
 		{
 			$rights |= $right;
 		}
-		$id = !empty($content['id']) ? $content['id'] :
-		$content['acl_appname'].':'.$content['acl_account'].':'.$content['acl_location'];
+		$id = !empty($content['id']) ? $content['id'] : $content['acl_appname'].':'.$content['acl_account'].':'.$content['acl_location'];
 		//error_log(__METHOD__."() id=$id, acl=".array2string($content['acl'])." --> rights=$rights");
 
 		if ($this->acl->get_specific_rights_for_account($content['acl_account'], $content['acl_location'], $content['acl_appname']) == $rights)
@@ -134,14 +133,14 @@ 
 	 * @param array &$rows=null
 	 * @return int total number of rows available
 	 */
-	public static function get_rows(array $query, array &$rows=null)
+	public static function get_rows(array $query, array &$rows = null)
 	{
 		$so_sql = new Api\Storage\Base('phpgwapi', Acl::TABLE, null, '', true);
 
 		// client queries destinct rows by their row-id
 		if (isset($query['col_filter']['id']))
 		{
-			$query['col_filter'][] = $GLOBALS['egw']->db->concat('acl_appname',"':'",'acl_account',"':'",'acl_location').
+			$query['col_filter'][] = $GLOBALS['egw']->db->concat('acl_appname', "':'", 'acl_account', "':'", 'acl_location').
 				' IN ('.implode(',', array_map(array($GLOBALS['egw']->db, 'quote'), (array)$query['col_filter']['id'])).')';
 			unset($query['col_filter']['id']);
 		}
@@ -159,9 +158,9 @@ 
 			if ($GLOBALS['egw_info']['user']['preferences']['admin']['acl_filter'] != $query['filter'])
 			{
 				$GLOBALS['egw']->preferences->add('admin', 'acl_filter', $query['filter']);
-				$GLOBALS['egw']->preferences->save_repository(false,'user',false);
+				$GLOBALS['egw']->preferences->save_repository(false, 'user', false);
 			}
-			switch($query['filter'])
+			switch ($query['filter'])
 			{
 				case 'run':
 					$query['col_filter']['acl_location'] = 'run';
@@ -185,7 +184,7 @@ 
 					if ($not_enum_group_acls)
 					{
 						$sql = '(CASE acl_appname';
-						foreach($not_enum_group_acls as $app => $groups)
+						foreach ($not_enum_group_acls as $app => $groups)
 						{
 							if ($groups === true)
 							{
@@ -195,7 +194,7 @@ 
 							{
 								$check = array_diff($memberships, $groups);
 								//error_log(__METHOD__."() app=$app, array_diff(memberships=".array2string($memberships).", groups=".array2string($groups).")=".array2string($check));
-								if (!$check) continue;	// would give sql error otherwise!
+								if (!$check) continue; // would give sql error otherwise!
 							}
 							$sql .= ' WHEN '.$GLOBALS['egw']->db->quote($app).' THEN '.$GLOBALS['egw']->db->expression(Acl::TABLE, array(
 								'acl_account' => $check,
@@ -225,7 +224,7 @@ 
 		$readonlys = array();
 		$total = $so_sql->get_rows($query, $rows, $readonlys);
 
-		foreach($rows as &$row)
+		foreach ($rows as &$row)
 		{
 			// generate a row-id
 			$row['id'] = $row['acl_appname'].':'.$row['acl_account'].':'.$row['acl_location'];
@@ -237,9 +236,9 @@ 
 			else
 			{
 				if ($app !== $row['acl_appname']) Api\Translation::add_app($row['app_name']);
-				foreach($query['acl_rights'][$row['acl_appname']] as $val => $label)
+				foreach ($query['acl_rights'][$row['acl_appname']] as $val => $label)
 				{
-					if ($row['acl_rights'] & $val)
+					if ($row['acl_rights']&$val)
 					{
 						$row['acl'.$val] = lang($label);
 					}
@@ -254,11 +253,11 @@ 
 		//error_log(__METHOD__."(".array2string($query).") returning ".$total);
 
 		// Get supporting or all apps for filter2 depending on filter
-		if($query['filter'] == 'run')
+		if ($query['filter'] == 'run')
 		{
 			$rows['sel_options']['filter2'] = array(
 				'' => lang('All applications'),
-			)+Etemplate\Widget\Select::app_options('enabled');
+			) + Etemplate\Widget\Select::app_options('enabled');
 		}
 		else
 		{
@@ -269,14 +268,14 @@ 
 				'location' => 'acl_rights',
 				'owner' => $query['account_id'],
 			), array(), true);
-			foreach(array_keys($apps) as $appname)
+			foreach (array_keys($apps) as $appname)
 			{
 				$rows['sel_options']['filter2'][] = array(
 					'value' => $appname,
 					'label' => lang($appname)
 				);
 			}
-			usort($rows['sel_options']['filter2'], function($a,$b) {
+			usort($rows['sel_options']['filter2'], function($a, $b) {
 				return strcasecmp($a['label'], $b['label']);
 			});
 		}
@@ -293,14 +292,14 @@ 
 	 * @return boolean true if access is granted, false if notification_bo
 	 * @throws Api\Exception\NoPermission
 	 */
-	public static function check_access($account_id, $location=null, $throw=true)
+	public static function check_access($account_id, $location = null, $throw = true)
 	{
-		static $admin_access=null;
-		static $own_access=null;
+		static $admin_access = null;
+		static $own_access = null;
 		if (is_null($admin_access))
 		{
 			$admin_access = isset($GLOBALS['egw_info']['user']['apps']['admin']) &&
-				!$GLOBALS['egw']->acl->check('account_access', 64, 'admin');	// ! because this denies access!
+				!$GLOBALS['egw']->acl->check('account_access', 64, 'admin'); // ! because this denies access!
 			$own_access = $admin_access || isset($GLOBALS['egw_info']['user']['apps']['preferences']);
 		}
 		if (!(int)$account_id || !((int)$account_id == (int)$GLOBALS['egw_info']['user']['account_id'] && $location !== 'run' ?
@@ -322,9 +321,9 @@ 
 	public static function ajax_get_app_list($account_id)
 	{
 		$list = array();
-		if(self::check_access((int)$account_id,'run',false))
+		if (self::check_access((int)$account_id, 'run', false))
 		{
-			$list = array_keys($GLOBALS['egw']->acl->get_user_applications((int)$account_id,false,false));
+			$list = array_keys($GLOBALS['egw']->acl->get_user_applications((int)$account_id, false, false));
 		}
 		Api\Json\Response::get()->data($list);
 	}
@@ -338,14 +337,14 @@ 
 	 * @param int $rights =null null to delete, or new rights
 	 * @throws Api\Exception\NoPermission
 	 */
-	public static function ajax_change_acl($ids, $rights=null)
+	public static function ajax_change_acl($ids, $rights = null)
 	{
 		try {
-			foreach((array)$ids as $id)
+			foreach ((array)$ids as $id)
 			{
 				list($app, $account_id, $location) = explode(':', $id, 3);
 
-				self::check_access($account_id, $location);	// throws exception, if no rights
+				self::check_access($account_id, $location); // throws exception, if no rights
 
 				$acl = $GLOBALS['egw']->acl;
 
@@ -389,9 +388,9 @@ 
 	 *
 	 * @param array $_content =null
 	 */
-	public function index(array $_content=null)
+	public function index(array $_content = null)
 	{
-		unset($_content);	// not used, required by function signature
+		unset($_content); // not used, required by function signature
 
 		$tpl = new Etemplate('admin.acl');
 
@@ -401,9 +400,7 @@ 
 		$content['nm'] = array(
 			'get_rows' => 'admin_acl::get_rows',
 			'no_cat' => true,
-			'filter' => !empty($_GET['acl_filter']) ? $_GET['acl_filter'] :
-				($GLOBALS['egw_info']['flags']['currentapp'] != 'admin' ? 'other' :
-					$GLOBALS['egw_info']['user']['preferences']['admin']['acl_filter']),
+			'filter' => !empty($_GET['acl_filter']) ? $_GET['acl_filter'] : ($GLOBALS['egw_info']['flags']['currentapp'] != 'admin' ? 'other' : $GLOBALS['egw_info']['user']['preferences']['admin']['acl_filter']),
 			'filter2' => !empty($_GET['acl_app']) ? $_GET['acl_app'] : '',
 			'lettersearch' => false,
 			'order' => 'acl_appname',

Braces +31 added lines, -8 removed lines

@@ -108,9 +108,12 @@ 
 		{
 			// nothing changed --> nothing to do
 		}
-		elseif (!$rights)	// all rights removed --> delete it
+		elseif (!$rights)
+		{
+			// all rights removed --> delete it
 		{
 			$this->acl->delete_repository($content['acl_appname'], $content['acl_location'], $content['acl_account']);
+		}
 			Framework::refresh_opener(lang('ACL deleted.'), 'admin', $id, 'delete');
 		}
 		else
@@ -195,7 +198,11 @@ 
 							{
 								$check = array_diff($memberships, $groups);
 								//error_log(__METHOD__."() app=$app, array_diff(memberships=".array2string($memberships).", groups=".array2string($groups).")=".array2string($check));
-								if (!$check) continue;	// would give sql error otherwise!
+								if (!$check)
+								{
+									continue;
+								}
+								// would give sql error otherwise!
 							}
 							$sql .= ' WHEN '.$GLOBALS['egw']->db->quote($app).' THEN '.$GLOBALS['egw']->db->expression(Acl::TABLE, array(
 								'acl_account' => $check,
@@ -206,7 +213,10 @@ 
 					$sql .= $GLOBALS['egw']->db->expression(Acl::TABLE, array(
 						'acl_account' => $memberships,
 					));
-					if ($not_enum_group_acls) $sql .= ' END)';
+					if ($not_enum_group_acls)
+					{
+						$sql .= ' END)';
+					}
 					$query['col_filter'][] = $sql;
 					break;
 
@@ -236,7 +246,10 @@ 
 			}
 			else
 			{
-				if ($app !== $row['acl_appname']) Api\Translation::add_app($row['app_name']);
+				if ($app !== $row['acl_appname'])
+				{
+					Api\Translation::add_app($row['app_name']);
+				}
 				foreach($query['acl_rights'][$row['acl_appname']] as $val => $label)
 				{
 					if ($row['acl_rights'] & $val)
@@ -245,10 +258,13 @@ 
 					}
 				}
 			}
-			if (!self::check_access($row['acl_account'], $row['acl_location'], false))	// false: do NOT throw an exception!
+			if (!self::check_access($row['acl_account'], $row['acl_location'], false))
+			{
+				// false: do NOT throw an exception!
 			{
 				$row['class'] = 'rowNoEdit';
 			}
+			}
 			//error_log(__METHOD__."() $n: ".array2string($row));
 		}
 		//error_log(__METHOD__."(".array2string($query).") returning ".$total);
@@ -276,7 +292,8 @@ 
 					'label' => lang($appname)
 				);
 			}
-			usort($rows['sel_options']['filter2'], function($a,$b) {
+			usort($rows['sel_options']['filter2'], function($a,$b)
+			{
 				return strcasecmp($a['label'], $b['label']);
 			});
 		}
@@ -306,7 +323,10 @@ 
 		if (!(int)$account_id || !((int)$account_id == (int)$GLOBALS['egw_info']['user']['account_id'] && $location !== 'run' ?
 				$own_access : $admin_access))
 		{
-			if ($throw) throw new Api\Exception\NoPermission(lang('Permission denied!!!'));
+			if ($throw)
+			{
+				throw new Api\Exception\NoPermission(lang('Permission denied!!!'));
+			}
 			return false;
 		}
 		return true;
@@ -349,10 +369,13 @@ 
 
 				$acl = $GLOBALS['egw']->acl;
 
-				if (!(int)$rights)	// this also handles taking away all rights as delete
+				if (!(int)$rights)
+				{
+					// this also handles taking away all rights as delete
 				{
 					$acl->delete_repository($app, $location, $account_id);
 				}
+				}
 				else
 				{
 					$acl->add_repository($app, $location, $account_id, $rights);

admin/inc/class.admin_cmd_edit_group.inc.php

Spacing +20 added lines, -20 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,32 +54,32 @@ 
 
 		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);
 		}
 		else
 		{
 			$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.'),9);
+			throw new Api\Exception\WrongUserinput(lang('You must enter a group name.'), 9);
 		}
-		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'),999);
+			throw new Api\Exception\WrongUserinput(lang('That loginid has already been taken'), 999);
 		}
 		if (!$data['account_members'] && !$this->account)
 		{
-			throw new Api\Exception\WrongUserinput(lang('You must select at least one group member.'),9);
+			throw new Api\Exception\WrongUserinput(lang('You must select at least one group member.'), 9);
 		}
 		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;
 
@@ -89,10 +89,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];
 			}
@@ -100,18 +100,18 @@ 
 		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);
 		}
-		$data['account_name'] = $data['account_lid'];	// also set deprecated name
-		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(
+		$data['account_name'] = $data['account_lid']; // also set deprecated name
+		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'];
@@ -127,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']));
 	}
 }

Braces +21 added lines, -5 removed lines

@@ -46,16 +46,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('group_access',$this->account ? 16 : 4);
+		if ($this->creator)
+		{
+			$this->_check_admin('group_access',$this->account ? 16 : 4);
+		}
 
 		admin_cmd::_instanciate_accounts();
 
 		$data = $this->set;
 
-		if ($this->account)	// existing account
+		if ($this->account)
+		{
+			// existing account
 		{
 			$data['account_id'] = admin_cmd::parse_account($this->account,false);
 		}
+		}
 		else
 		{
 			$data += array(
@@ -81,7 +87,10 @@ 
 		{
 			$data['account_members'] = admin_cmd::parse_accounts($data['account_members'],true);
 		}
-		if ($check_only) return true;
+		if ($check_only)
+		{
+			return true;
+		}
 
 		if (($update = $this->account))
 		{
@@ -94,7 +103,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];
+				}
 			}
 		}
 		if (!($data['account_id'] = admin_cmd::$accounts->save($data)))
@@ -103,7 +115,11 @@ 
 			throw new Api\Db\Exception(lang("Error saving account!"),11);
 		}
 		$data['account_name'] = $data['account_lid'];	// also set deprecated name
-		if ($update) $data['old_name'] = $old['account_lid'];	// make old name available for hooks
+		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'

admin/inc/class.admin_cmd_delete_account.inc.php

Spacing +12 added lines, -12 removed lines

@@ -24,7 +24,7 @@ 
 	 * @param string $new_user =null if specified, account to transfer the data to (users only)
 	 * @param string $is_user =true type of the account: true=user, false=group
 	 */
-	function __construct($account,$new_user=null,$is_user=true)
+	function __construct($account, $new_user = null, $is_user = true)
 	{
 		if (!is_array($account))
 		{
@@ -46,18 +46,18 @@ 
 	 * @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,$this->is_user);
+		$account_id = admin_cmd::parse_account($this->account, $this->is_user);
 		admin_cmd::_instanciate_accounts();
 		$account_lid = admin_cmd::$accounts->id2name($account_id);
 
 		if ($this->is_user && $this->new_user)
 		{
-			$new_user = admin_cmd::parse_account($this->new_user,true);	// true = user, no group
+			$new_user = admin_cmd::parse_account($this->new_user, true); // true = user, no group
 		}
 		// check creator is still admin and not explicitly forbidden to edit accounts
-		if ($this->creator) $this->_check_admin($this->is_user ? 'account_access' : 'group_access',32);
+		if ($this->creator) $this->_check_admin($this->is_user ? 'account_access' : 'group_access', 32);
 
 		if ($check_only) return true;
 
@@ -65,22 +65,22 @@ 
 		$GLOBALS['hook_values'] = array(
 			'account_id'  => $account_id,
 			'account_lid' => $account_lid,
-			'account_name'=> $account_lid,		// depericated name for deletegroup hook
-			'new_owner'   => (int)$new_user,	// deleteaccount only
+			'account_name'=> $account_lid, // depericated name for deletegroup hook
+			'new_owner'   => (int)$new_user, // deleteaccount only
 			'location'    => $this->is_user ? 'deleteaccount' : 'deletegroup',
 		);
 		// first all other apps, then preferences and admin
-		foreach(array_merge(array_diff(array_keys($GLOBALS['egw_info']['apps']),array('preferences','admin')),array('preferences','admin')) as $app)
+		foreach (array_merge(array_diff(array_keys($GLOBALS['egw_info']['apps']), array('preferences', 'admin')), array('preferences', 'admin')) as $app)
 		{
-			Api\Hooks::single($GLOBALS['hook_values'],$app);
+			Api\Hooks::single($GLOBALS['hook_values'], $app);
 		}
 		$GLOBALS['egw']->accounts->delete($account_id);
 
 		if ($account_id < 0)
 		{
-			return lang("Group '%1' deleted.",$account_lid)."\n\n";
+			return lang("Group '%1' deleted.", $account_lid)."\n\n";
 		}
-		return lang("Account '%1' deleted.",$account_lid)."\n\n";
+		return lang("Account '%1' deleted.", $account_lid)."\n\n";
 	}
 
 	/**
@@ -90,6 +90,6 @@ 
 	 */
 	function __tostring()
 	{
-		return lang('Delete account %1',admin_cmd::display_account($this->account));
+		return lang('Delete account %1', admin_cmd::display_account($this->account));
 	}
 }

Braces +8 added lines, -2 removed lines

@@ -57,9 +57,15 @@
 			$new_user = admin_cmd::parse_account($this->new_user,true);	// true = user, no group
 		}
 		// check creator is still admin and not explicitly forbidden to edit accounts
-		if ($this->creator) $this->_check_admin($this->is_user ? 'account_access' : 'group_access',32);
+		if ($this->creator)
+		{
+			$this->_check_admin($this->is_user ? 'account_access' : 'group_access',32);
+		}
 
-		if ($check_only) return true;
+		if ($check_only)
+		{
+			return true;
+		}
 
 		// delete the account
 		$GLOBALS['hook_values'] = array(