EGroupware / egroupware

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(

admin/inc/class.admin_denyaccess.inc.php

Spacing +35 added lines, -35 removed lines

@@ -28,7 +28,7 @@ 
 	function __construct()
 	{
 		$this->account_id = (int)$_GET['account_id'];
-		if (!$this->account_id || $GLOBALS['egw']->acl->check('account_access',64,'admin'))
+		if (!$this->account_id || $GLOBALS['egw']->acl->check('account_access', 64, 'admin'))
 		{
 			$GLOBALS['egw']->redirect_link('/index.php');
 		}
@@ -37,8 +37,8 @@ 
 
 	function common_header()
 	{
-		$GLOBALS['egw_info']['flags']['app_header'] = lang('Admin') . ' - ' . lang('ACL Manager') .
-			': ' . Api\Accounts::username($this->account_id);
+		$GLOBALS['egw_info']['flags']['app_header'] = lang('Admin').' - '.lang('ACL Manager').
+			': '.Api\Accounts::username($this->account_id);
 		echo $GLOBALS['egw']->framework->header();
 	}
 
@@ -46,39 +46,39 @@ 
 	{
 		$this->common_header();
 
-		Api\Hooks::process('acl_manager',array('preferences'));
+		Api\Hooks::process('acl_manager', array('preferences'));
 
 		$this->template->set_file(array(
 			'app_list'   => 'acl_applist.tpl'
 		));
-		$this->template->set_block('app_list','list');
-		$this->template->set_block('app_list','app_row');
-		$this->template->set_block('app_list','app_row_noicon');
-		$this->template->set_block('app_list','link_row');
-		$this->template->set_block('app_list','spacer_row');
+		$this->template->set_block('app_list', 'list');
+		$this->template->set_block('app_list', 'app_row');
+		$this->template->set_block('app_list', 'app_row_noicon');
+		$this->template->set_block('app_list', 'link_row');
+		$this->template->set_block('app_list', 'spacer_row');
 
 		if (is_array($GLOBALS['acl_manager']))
 		{
-			foreach($GLOBALS['acl_manager'] as $app => $locations)
+			foreach ($GLOBALS['acl_manager'] as $app => $locations)
 			{
-				$icon = Api\Image::find($app,array('navbar.png',$app.'png','navbar.gif',$app.'.gif'));
-				$this->template->set_var('icon_backcolor',$GLOBALS['egw_info']['theme']['row_off']);
-				$this->template->set_var('link_backcolor',$GLOBALS['egw_info']['theme']['row_off']);
-				$this->template->set_var('app_name',$GLOBALS['egw_info']['apps'][$app]['title']);
-				$this->template->set_var('app_icon',$icon);
+				$icon = Api\Image::find($app, array('navbar.png', $app.'png', 'navbar.gif', $app.'.gif'));
+				$this->template->set_var('icon_backcolor', $GLOBALS['egw_info']['theme']['row_off']);
+				$this->template->set_var('link_backcolor', $GLOBALS['egw_info']['theme']['row_off']);
+				$this->template->set_var('app_name', $GLOBALS['egw_info']['apps'][$app]['title']);
+				$this->template->set_var('app_icon', $icon);
 
 				if ($icon)
 				{
-					$this->template->fp('rows','app_row',True);
+					$this->template->fp('rows', 'app_row', True);
 				}
 				else
 				{
-					$this->template->fp('rows','app_row_noicon',True);
+					$this->template->fp('rows', 'app_row_noicon', True);
 				}
 
 				if (is_array($locations))
 				{
-					foreach($locations as $loc => $value)
+					foreach ($locations as $loc => $value)
 					{
 						$link_values = array(
 							'menuaction' => 'admin.admin_denyaccess.access_form',
@@ -87,20 +87,20 @@ 
 							'account_id' => $this->account_id
 						);
 
-						$this->template->set_var('link_location',$GLOBALS['egw']->link('/index.php',$link_values));
-						$this->template->set_var('lang_location',lang($value['name']));
-						$this->template->fp('rows','link_row',True);
+						$this->template->set_var('link_location', $GLOBALS['egw']->link('/index.php', $link_values));
+						$this->template->set_var('lang_location', lang($value['name']));
+						$this->template->fp('rows', 'link_row', True);
 					}
 				}
 
-				$this->template->parse('rows','spacer_row',True);
+				$this->template->parse('rows', 'spacer_row', True);
 			}
 		}
 		$this->template->set_var(array(
 			'cancel_action' => $GLOBALS['egw']->link('/admin/index.php'),
 			'lang_cancel'   => lang('Cancel')
 		));
-		$this->template->pfp('out','list');
+		$this->template->pfp('out', 'list');
 		echo $GLOBALS['egw']->framework->footer();
 	}
 
@@ -115,7 +115,7 @@ 
 				$total_rights = 0;
 				if (is_array($_POST['acl_rights']))
 				{
-					foreach($_POST['acl_rights'] as $rights)
+					foreach ($_POST['acl_rights'] as $rights)
 					{
 						$total_rights += $rights;
 					}
@@ -132,15 +132,15 @@ 
 			$this->list_apps();
 			return;
 		}
-		Api\Hooks::single('acl_manager',$_GET['acl_app']);
+		Api\Hooks::single('acl_manager', $_GET['acl_app']);
 		$acl_manager = $GLOBALS['acl_manager'][$_GET['acl_app']][$location];
 
 		$this->common_header();
-		$this->template->set_file('form','acl_manager_form.tpl');
+		$this->template->set_file('form', 'acl_manager_form.tpl');
 
 		$afn = Api\Accounts::username($this->account_id);
 
-		$this->template->set_var('lang_message',lang('Check items to <b>%1</b> to %2 for %3',lang($acl_manager['name']),$GLOBALS['egw_info']['apps'][$_GET['acl_app']]['title'],$afn));
+		$this->template->set_var('lang_message', lang('Check items to <b>%1</b> to %2 for %3', lang($acl_manager['name']), $GLOBALS['egw_info']['apps'][$_GET['acl_app']]['title'], $afn));
 		$link_values = array(
 			'menuaction' => 'admin.admin_denyaccess.access_form',
 			'acl_app'    => $_GET['acl_app'],
@@ -150,19 +150,19 @@ 
 
 		$acl    = new Api\Acl($this->account_id);
 		$acl->read_repository();
-		$grants = $acl->get_rights($location,$_GET['acl_app']);
+		$grants = $acl->get_rights($location, $_GET['acl_app']);
 
-		$this->template->set_var('form_action',$GLOBALS['egw']->link('/index.php',$link_values));
+		$this->template->set_var('form_action', $GLOBALS['egw']->link('/index.php', $link_values));
 
-		foreach($acl_manager['rights'] as $name => $value)
+		foreach ($acl_manager['rights'] as $name => $value)
 		{
-			$cb .= '<input type="checkbox" name="acl_rights[]" value="'.$value.'"'.($grants & $value ? ' checked' : '').'>&nbsp;'.lang($name)."<br>\n";
+			$cb .= '<input type="checkbox" name="acl_rights[]" value="'.$value.'"'.($grants&$value ? ' checked' : '').'>&nbsp;'.lang($name)."<br>\n";
 		}
-		$this->template->set_var('select_values',$cb);
-		$this->template->set_var('lang_submit',lang('Save'));
-		$this->template->set_var('lang_cancel',lang('Cancel'));
+		$this->template->set_var('select_values', $cb);
+		$this->template->set_var('lang_submit', lang('Save'));
+		$this->template->set_var('lang_cancel', lang('Cancel'));
 
-		$this->template->pfp('out','form');
+		$this->template->pfp('out', 'form');
 		echo $GLOBALS['egw']->framework->footer();
 	}
 }

admin/inc/hook_config_validate.inc.php

Spacing +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@ 
 /*
   Set global flag to indicate for which config settings we have equally named validation methods
 */
-$GLOBALS['egw_info']['server']['found_validation_hook'] = array('vfs_image_dir','fw_mobile_app_list');
+$GLOBALS['egw_info']['server']['found_validation_hook'] = array('vfs_image_dir', 'fw_mobile_app_list');
 
 /**
  * Check VFS dir exists and delete image map to recreate it, if vfs-image-dir changes
@@ -29,7 +29,7 @@ 
 	{
 		if (!Vfs::file_exists($vfs_image_dir) || !Vfs::is_dir($vfs_image_dir))
 		{
-			$GLOBALS['config_error'] = lang('VFS directory "%1" NOT found!',$vfs_image_dir);
+			$GLOBALS['config_error'] = lang('VFS directory "%1" NOT found!', $vfs_image_dir);
 			return;
 		}
 	}

admin/inc/class.admin_db_backup.inc.php

Spacing +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
  		if (($f = $this->db_backup->fopen_backup()))
  		{
 			$this->db_backup->backup($f);
-			if(is_resource($f))
+			if (is_resource($f))
 				fclose($f);
 			/* Remove old backups. */
 			$this->db_backup->housekeeping();
@@ -41,7 +41,7 @@ 
 	function index()
 	{
 		$tpl_root = EGW_SERVER_ROOT.'/setup/templates/default';
-		$self = $GLOBALS['egw']->link('/index.php',array('menuaction'=>'admin.admin_db_backup.index'));
+		$self = $GLOBALS['egw']->link('/index.php', array('menuaction'=>'admin.admin_db_backup.index'));
 		Api\Translation::add_app('setup');
 		Api\Header\ContentSecurityPolicy::add('script-src', 'unsafe-inline');
 

Braces +3 added lines, -1 removed lines

@@ -29,7 +29,9 @@
  		{
 			$this->db_backup->backup($f);
 			if(is_resource($f))
-				fclose($f);
+			{
+							fclose($f);
+			}
 			/* Remove old backups. */
 			$this->db_backup->housekeeping();
 		}

admin/inc/class.admin_egw_user_record.inc.php

Spacing +10 added lines, -10 removed lines

@@ -35,8 +35,8 @@ 
 	 *
 	 * @param string $_identifier
 	 */
-	public function __construct( $_identifier='' ) {
-		if(is_array($_identifier)) {
+	public function __construct($_identifier = '') {
+		if (is_array($_identifier)) {
 			$this->identifier = $_identifier['account_id'];
 		} else {
 			$this->identifier = $_identifier;
@@ -90,7 +90,7 @@ 
 	 * @todo add some checks
 	 * @return void
 	 */
-	public function set_record(array $_record){
+	public function set_record(array $_record) {
 		$this->user = $_record;
 		$this->account_groups = $GLOBALS['egw']->accounts->memberships($this->identifier, true);
 	}
@@ -119,8 +119,8 @@ 
 	 *
 	 * @return string identifier
 	 */
-	public function save ( $_dst_identifier ) {
-		unset($_dst_identifier);	// not used, but require by function signature
+	public function save($_dst_identifier) {
+		unset($_dst_identifier); // not used, but require by function signature
 	}
 
 	/**
@@ -129,8 +129,8 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function copy ( $_dst_identifier ) {
-		unset($_dst_identifier);	// not used, but require by function signature
+	public function copy($_dst_identifier) {
+		unset($_dst_identifier); // not used, but require by function signature
 	}
 
 	/**
@@ -140,15 +140,15 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function move ( $_dst_identifier ) {
-		unset($_dst_identifier);	// not used, but require by function signature
+	public function move($_dst_identifier) {
+		unset($_dst_identifier); // not used, but require by function signature
 	}
 
 	/**
 	 * delets current record from backend
 	 *
 	 */
-	public function delete () {
+	public function delete() {
 
 	}
 

Braces +31 added lines, -15 removed lines

@@ -34,10 +34,14 @@ 
 	 *
 	 * @param string $_identifier
 	 */
-	public function __construct( $_identifier='' ) {
-		if(is_array($_identifier)) {
+	public function __construct( $_identifier='' )
+	{
+		if(is_array($_identifier))
+		{
 			$this->identifier = $_identifier['account_id'];
-		} else {
+		}
+		else
+		{
 			$this->identifier = $_identifier;
 		}
 		$this->set_record($GLOBALS['egw']->accounts->read($this->identifier));
@@ -48,7 +52,8 @@ 
 	 *
 	 * @param string $_attribute_name
 	 */
-	public function __get($_attribute_name) {
+	public function __get($_attribute_name)
+	{
 		return $this->group[$_attribute_name];
 	}
 
@@ -58,7 +63,8 @@ 
 	 * @param string $_attribute_name
 	 * @param data $data
 	 */
-	public function __set($_attribute_name, $data) {
+	public function __set($_attribute_name, $data)
+	{
 		$this->group[$_attribute_name] = $data;
 	}
 
@@ -70,7 +76,8 @@ 
 	 *
 	 * @return array complete record as associative array
 	 */
-	public function get_record_array() {
+	public function get_record_array()
+	{
 		return $this->group;
 	}
 
@@ -79,7 +86,8 @@ 
 	 *
 	 *@return string title
 	 */
-	public function get_title() {
+	public function get_title()
+	{
 		return Api\Accounts::username($this->identifier);
 	}
 
@@ -89,7 +97,8 @@ 
 	 * @todo add some checks
 	 * @return void
 	 */
-	public function set_record(array $_record){
+	public function set_record(array $_record)
+	{
 		$this->group = $_record;
 		$this->group['account_members'] = $GLOBALS['egw']->accounts->members($this->group['account_id'],true);
 	}
@@ -99,7 +108,8 @@ 
 	 *
 	 * @return string identifier of current record
 	 */
-	public function get_identifier() {
+	public function get_identifier()
+	{
 		return $this->identifier;
 	}
 
@@ -109,7 +119,8 @@ 
 	 *
 	 * @return string Full URL of an icon, or appname/icon_name
 	 */
-	public function get_icon() {
+	public function get_icon()
+	{
 		return 'group';
 	}
 
@@ -118,7 +129,8 @@ 
 	 *
 	 * @return string identifier
 	 */
-	public function save ( $_dst_identifier ) {
+	public function save ( $_dst_identifier )
+	{
 		unset($_dst_identifier);	// not used, but require by function signature
 	}
 
@@ -128,7 +140,8 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function copy ( $_dst_identifier ) {
+	public function copy ( $_dst_identifier )
+	{
 		unset($_dst_identifier);	// not used, but require by function signature
 	}
 
@@ -139,7 +152,8 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function move ( $_dst_identifier ) {
+	public function move ( $_dst_identifier )
+	{
 		unset($_dst_identifier);	// not used, but require by function signature
 	}
 
@@ -147,7 +161,8 @@ 
 	 * delets current record from backend
 	 *
 	 */
-	public function delete () {
+	public function delete ()
+	{
 
 	}
 
@@ -155,7 +170,8 @@ 
 	 * destructor
 	 *
 	 */
-	public function __destruct() {
+	public function __destruct()
+	{
 		unset ($this->group);
 	}
 }

admin/inc/class.admin_asyncservice.inc.php

Spacing +18 added lines, -18 removed lines

@@ -23,7 +23,7 @@ 
 
 	function index()
 	{
-		if ($GLOBALS['egw']->acl->check('asyncservice_acc',1,'admin'))
+		if ($GLOBALS['egw']->acl->check('asyncservice_acc', 1, 'admin'))
 		{
 			Egw::redirect_link('/index.php');
 		}
@@ -31,7 +31,7 @@ 
 
 		echo $GLOBALS['egw']->framework->header();
 
-		$async = $GLOBALS['egw']->asyncservice;	// use an own instance, as we might set debug=True
+		$async = $GLOBALS['egw']->asyncservice; // use an own instance, as we might set debug=True
 
 		$async->debug = !!$_POST['debug'];
 
@@ -47,7 +47,7 @@ 
 		if ($_POST['send'] || $_POST['test'] || $_POST['cancel'] || $_POST['install'] || $_POST['deinstall'] || $_POST['update'] || isset($_POST['asyncservice']))
 		{
 			$times = array();
-			foreach($units as $u => $ulabel)
+			foreach ($units as $u => $ulabel)
 			{
 				if ($_POST[$u] !== '')
 				{
@@ -57,11 +57,11 @@ 
 
 			if ($_POST['test'])
 			{
-				if (strpos($GLOBALS['egw_info']['user']['account_email'],'@') === false)
+				if (strpos($GLOBALS['egw_info']['user']['account_email'], '@') === false)
 				{
 					echo '<p><b>'.lang("You have no email address for your user set !!!")."</b></p>\n";
 				}
-				elseif (!$async->set_timer($times,'test','admin.admin_asyncservice.test',$GLOBALS['egw_info']['user']['account_email']))
+				elseif (!$async->set_timer($times, 'test', 'admin.admin_asyncservice.test', $GLOBALS['egw_info']['user']['account_email']))
 				{
 					echo '<p><b>'.lang("Error setting timer, wrong syntax or maybe there's one already running !!!")."</b></p>\n";
 				}
@@ -77,25 +77,25 @@ 
 			{
 				if (!($install = $async->install($_POST['install'] ? $times : False)))
 				{
-					echo '<p><b>'.lang('Error: %1 not found or other error !!!',$async->crontab)."</b></p>\n";
+					echo '<p><b>'.lang('Error: %1 not found or other error !!!', $async->crontab)."</b></p>\n";
 				}
 				$_POST['asyncservice'] = $_POST['deinstall'] ? 'fallback' : 'crontab';
 			}
 		}
 		else
 		{
-			$times = array('min' => '*/5');		// set some default
+			$times = array('min' => '*/5'); // set some default
 		}
-		echo '<form action="'.$GLOBALS['egw']->link('/index.php',array('menuaction'=>'admin.admin_asyncservice.index')).'" method="POST">'."\n<p>";
+		echo '<form action="'.$GLOBALS['egw']->link('/index.php', array('menuaction'=>'admin.admin_asyncservice.index')).'" method="POST">'."\n<p>";
 		echo '<div style="text-align: left; margin: 10px;">'."\n";
 
 		$last_run = $async->last_check_run();
-		$lr_date = $last_run['end'] ? Api\DateTime::server2user($last_run['end'],'') : lang('never');
+		$lr_date = $last_run['end'] ? Api\DateTime::server2user($last_run['end'], '') : lang('never');
 		echo '<p><b>'.lang('Async services last executed').'</b>: '.$lr_date.' ('.$last_run['run_by'].")</p>\n<hr>\n";
 
 		if (isset($_POST['asyncservice']) && $_POST['asyncservice'] != $GLOBALS['egw_info']['server']['asyncservice'])
 		{
-			Api\Config::save_value('asyncservice', $GLOBALS['egw_info']['server']['asyncservice']=$_POST['asyncservice'], 'phpgwapi');
+			Api\Config::save_value('asyncservice', $GLOBALS['egw_info']['server']['asyncservice'] = $_POST['asyncservice'], 'phpgwapi');
 		}
 		if (!$async->only_fallback)
 		{
@@ -124,7 +124,7 @@ 
 
 		if ($async->only_fallback)
 		{
-			echo '<p>'.lang('Under windows you need to install the asyncservice %1manually%2 or use the fallback mode. Fallback means the jobs get only checked after each page-view !!!','<a href="http://www.egroupware.org/wiki/TimedAsyncServicesWindows" target="_blank">','</a>')."</p>\n";
+			echo '<p>'.lang('Under windows you need to install the asyncservice %1manually%2 or use the fallback mode. Fallback means the jobs get only checked after each page-view !!!', '<a href="http://www.egroupware.org/wiki/TimedAsyncServicesWindows" target="_blank">', '</a>')."</p>\n";
 		}
 		else
 		{
@@ -136,11 +136,11 @@ 
 			}
 			elseif ($installed === 0)
 			{
-				echo '<b>'.lang('%1 not found or not executable !!!',$async->crontab)."</b></p>\n";
+				echo '<b>'.lang('%1 not found or not executable !!!', $async->crontab)."</b></p>\n";
 			}
 			else
 			{
-				echo '<b>'.lang('asyncservices not yet installed or other error (%1) !!!',$installed['error'])."</b></p>\n";
+				echo '<b>'.lang('asyncservices not yet installed or other error (%1) !!!', $installed['error'])."</b></p>\n";
 			}
 			echo '<p><input type="submit" name="install" value="'.lang('Install crontab')."\">\n".
 				lang("for the times below (empty values count as '*', all empty = every minute)")."</p>\n";
@@ -158,9 +158,9 @@ 
 
 		if ($_POST['send'])
 		{
-			$next = $async->next_run($times,True);
+			$next = $async->next_run($times, True);
 
-			echo "<p>asyncservice::next_run(";print_r($times);echo")=".($next === False ? 'False':"'$next'=".Api\DateTime::server2user($next,''))."</p>\n";
+			echo "<p>asyncservice::next_run("; print_r($times); echo")=".($next === False ? 'False' : "'$next'=".Api\DateTime::server2user($next, ''))."</p>\n";
 		}
 		echo '<hr><p><input type="submit" name="cancel" value="'.lang('Cancel TestJob!')."\"> &nbsp;\n";
 		echo '<input type="submit" name="test" value="'.lang('Start TestJob!')."\">\n";
@@ -171,9 +171,9 @@ 
 		if (($jobs = $async->read('%')))
 		{
 			echo "<table border=1>\n<tr>\n<th>Id</th><th style='width:18ex;'>".lang('Next run').'</th><th>'.lang('Times').'</th><th>'.lang('Method').'</th><th>'.lang('Data')."</th><th>".lang('LoginID')."</th></tr>\n";
-			foreach($jobs as $job)
+			foreach ($jobs as $job)
 			{
-				echo "<tr>\n<td>$job[id]</td><td>".Api\DateTime::server2user($job['next'],'')."</td><td>";
+				echo "<tr>\n<td>$job[id]</td><td>".Api\DateTime::server2user($job['next'], '')."</td><td>";
 				print_r($job['times']);
 				echo "</td><td>$job[method]</td><td>";
 				print_r($job['data']);
@@ -192,7 +192,7 @@ 
 
 	function test($to)
 	{
-		$returncode = $GLOBALS['egw']->send->msg('email',$to,$subject='Asynchronous timed services','Greetings from cron ;-)');
+		$returncode = $GLOBALS['egw']->send->msg('email', $to, $subject = 'Asynchronous timed services', 'Greetings from cron ;-)');
 
 		if (!$returncode)	// not nice, but better than failing silently
 		{

Braces +4 added lines, -1 removed lines

@@ -194,9 +194,12 @@
 	{
 		$returncode = $GLOBALS['egw']->send->msg('email',$to,$subject='Asynchronous timed services','Greetings from cron ;-)');
 
-		if (!$returncode)	// not nice, but better than failing silently
+		if (!$returncode)
+		{
+			// not nice, but better than failing silently
 		{
 			echo "<p>bocalendar::send_update: sending message to '$to' subject='$subject' failed !!!<br>\n";
+		}
 			echo $GLOBALS['egw']->send->err['desc']."</p>\n";
 		}
 		//print_r($GLOBALS['egw_info']['user']);

admin/inc/class.admin_wizard_export_users_csv.inc.php

Indentation +13 added lines, -13 removed lines

@@ -18,20 +18,20 @@
 		parent::__construct();
 
 		// Field mapping
-                $this->export_fields = array(
+				$this->export_fields = array(
 			'account_id'		=> lang('Account ID'),
-                        'account_lid'		=> lang('LoginID'),
-                        'account_firstname'	=> lang('First Name'),
-                        'account_lastname'	=> lang('Last Name'),
-                        'account_email'		=> lang('email'),
-                        'account_pwd'		=> lang('Password'),
-                        'account_status'	=> lang('Status'),
-                        'account_primary_group'	=> lang('Primary Group'),
-                        'account_groups'	=> lang('Groups'),
-                        'account_expires'	=> lang('Expires'),
-                        'account_lastlogin'	=> lang('Last login'),
-                        'account_lastpwd_change'=> lang('Last password change'),
-                );
+						'account_lid'		=> lang('LoginID'),
+						'account_firstname'	=> lang('First Name'),
+						'account_lastname'	=> lang('Last Name'),
+						'account_email'		=> lang('email'),
+						'account_pwd'		=> lang('Password'),
+						'account_status'	=> lang('Status'),
+						'account_primary_group'	=> lang('Primary Group'),
+						'account_groups'	=> lang('Groups'),
+						'account_expires'	=> lang('Expires'),
+						'account_lastlogin'	=> lang('Last login'),
+						'account_lastpwd_change'=> lang('Last password change'),
+				);
 
 		// Custom fields - not really used in admin...
 		unset($this->export_fields['customfields']);

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
                 );
 
 		$custom = Api\Storage\Customfields::get('resources', true);
-		foreach($custom as $name => $data) {
+		foreach ($custom as $name => $data) {
 			$this->mapping_fields['#'.$name] = $data['label'];
 		}
 

Braces +4 added lines, -2 removed lines

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