EGroupware / egroupware

admin/inc/class.admin_ui.inc.php

Spacing +38 added lines, -42 removed lines

@@ -40,7 +40,7 @@ 
 	 *
 	 * @param array $content
 	 */
-	public function index(array $content=null)
+	public function index(array $content = null)
 	{
 		if (admin_statistics::check(false))
 		{
@@ -75,7 +75,7 @@ 
 		//$content['msg'] = 'Hi Ralf ;-)';
 		$sel_options['tree'] = $this->tree_data();
 		$sel_options['filter'] = array('' => lang('All groups'));
-		foreach(self::$accounts->search(array(
+		foreach (self::$accounts->search(array(
 			'type' => 'groups',
 			'start' => false,
 			'order' => 'account_lid',
@@ -105,7 +105,7 @@ 
 		}
 		else
 		{
-			$content['iframe'] = 'about:blank';	// we show accounts-list be default now
+			$content['iframe'] = 'about:blank'; // we show accounts-list be default now
 		}
 
 		$tpl->exec('admin.admin_ui.index', $content, $sel_options);
@@ -120,7 +120,7 @@ 
 	{
 		$actions = static::group_actions();
 
-		foreach($actions as $action_id =>  &$action)
+		foreach ($actions as $action_id =>  &$action)
 		{
 			if (!isset($action['enableId']) && !in_array($action_id, array('add')))
 			{
@@ -148,7 +148,7 @@ 
 					'default' => true,
 					'allowOnMultiple' => false,
 					'onExecute' => 'javaScript:app.admin.account',
-					'group' => $group=0,
+					'group' => $group = 0,
 				),
 				'add' => array(
 					'caption' => 'Add user',
@@ -159,25 +159,25 @@ 
 			// generate urls for add/edit accounts via addressbook
 			$edit = Link::get_registry('addressbook', 'edit');
 			$edit['account_id'] = '$id';
-			foreach($edit as $name => $val)
+			foreach ($edit as $name => $val)
 			{
 				$actions['edit']['url'] .= ($actions['edit']['url'] ? '&' : '').$name.'='.$val;
 			}
 			unset($edit['account_id']);
 			$edit['owner'] = 0;
-			foreach($edit as $name => $val)
+			foreach ($edit as $name => $val)
 			{
 				$actions['add']['url'] .= ($actions['edit']['url'] ? '&' : '').$name.'='.$val;
 			}
 			++$group;
 			// supporting both old way using $GLOBALS['menuData'] and new just returning data in hook
 			$apps = array_unique(array_merge(array('admin'), Api\Hooks::implemented('edit_user')));
-			foreach($apps as $app)
+			foreach ($apps as $app)
 			{
 				$GLOBALS['menuData'] = $data = array();
 				$data = Api\Hooks::single('edit_user', $app);
 				if (!is_array($data)) $data = $GLOBALS['menuData'];
-				foreach($data as $item)
+				foreach ($data as $item)
 				{
 					// allow hook to return "real" actions, but still support legacy: description, url, extradata, options
 					if (empty($item['caption']))
@@ -232,12 +232,12 @@ 
 				'onExecute' => 'javaScript:app.admin.group',
 				'caption' => 'Show members',
 				'default' => true,
-				'group' => $group=1,
+				'group' => $group = 1,
 				'allowOnMultiple' => false
 			),
 			'add' => array(
 				'group' => $group,
-			)+$user_actions['add'],
+			) + $user_actions['add'],
 			'acl' => array(
 				'onExecute' => 'javaScript:app.admin.group',
 				'caption' => 'Access control',
@@ -248,7 +248,7 @@ 
 				'allowOnMultiple' => false
 			),
 		);
-		if (!$GLOBALS['egw']->acl->check('account_access',64,'admin'))	// no rights to set ACL-rights
+		if (!$GLOBALS['egw']->acl->check('account_access', 64, 'admin'))	// no rights to set ACL-rights
 		{
 			$actions['deny'] = array(
 				'caption'   => 'Deny access',
@@ -260,17 +260,17 @@ 
 			);
 		}
 
-		$group = 5;	// allow to place actions in different groups by hook, this is the default
+		$group = 5; // allow to place actions in different groups by hook, this is the default
 
 		// supporting both old way using $GLOBALS['menuData'] and new just returning data in hook
 		$apps = array_unique(array_merge(array('admin'), Api\Hooks::implemented('edit_group')));
-		foreach($apps as $app)
+		foreach ($apps as $app)
 		{
 			$GLOBALS['menuData'] = $data = array();
 			$data = Api\Hooks::single('edit_group', $app);
 			if (!is_array($data)) $data = $GLOBALS['menuData'];
 
-			foreach($data as $item)
+			foreach ($data as $item)
 			{
 				// allow hook to return "real" actions, but still support legacy: description, url, extradata, options
 				if (empty($item['caption']))
@@ -310,7 +310,7 @@ 
 	 * @param array &$rows=null
 	 * @return int total number of rows available
 	 */
-	public static function get_users(array $query, array &$rows=null)
+	public static function get_users(array $query, array &$rows = null)
 	{
 		$params = array(
 			'type' => (int)$query['filter'] ? (int)$query['filter'] : 'accounts',
@@ -325,7 +325,7 @@ 
 			$params['query'] = $query['searchletter'];
 			$params['query_type'] = 'start';
 		}
-		elseif($query['search'])
+		elseif ($query['search'])
 		{
 			$params['query'] = $query['search'];
 			$params['query_type'] = 'all';
@@ -334,13 +334,10 @@ 
 		$rows = array_values(self::$accounts->search($params));
 		//error_log(__METHOD__."() accounts->search(".array2string($params).") total=".self::$accounts->total);
 
-		foreach($rows as &$row)
+		foreach ($rows as &$row)
 		{
 			$row['status'] = self::$accounts->is_expired($row) ?
-				lang('Expired').' '.Api\DateTime::to($row['account_expires'], true) :
-					(!self::$accounts->is_active($row) ? lang('Disabled') :
-						($row['account_expires'] != -1 ? lang('Expires').' '.Api\DateTime::to($row['account_expires'], true) :
-							lang('Enabled')));
+				lang('Expired').' '.Api\DateTime::to($row['account_expires'], true) : (!self::$accounts->is_active($row) ? lang('Disabled') : ($row['account_expires'] != -1 ? lang('Expires').' '.Api\DateTime::to($row['account_expires'], true) : lang('Enabled')));
 
 			if (!self::$accounts->is_active($row)) $row['status_class'] = 'adminAccountInactive';
 		}
@@ -362,29 +359,29 @@ 
 			));
 
 		$apps = array();
-		foreach($GLOBALS['egw_info']['apps'] as $app => $data)
+		foreach ($GLOBALS['egw_info']['apps'] as $app => $data)
 		{
 			if (!$data['enabled'] || !$data['status'] || $data['status'] == 3)
 			{
-				continue;	// do NOT show disabled apps, or our API (status = 3)
+				continue; // do NOT show disabled apps, or our API (status = 3)
 			}
 
 			$apps[] = $app;
 		}
 
 		$rows = array();
-		foreach($groups as &$group)
+		foreach ($groups as &$group)
 		{
 			$run_rights = $GLOBALS['egw']->acl->get_user_applications($group['account_id'], false, false);
-			foreach($apps as $app)
+			foreach ($apps as $app)
 			{
-				if((boolean)$run_rights[$app])
+				if ((boolean)$run_rights[$app])
 				{
 					$group['apps'][] = $app;
 				}
 			}
 
-			$group['members'] = $GLOBALS['egw']->accounts->members($group['account_id'],true);
+			$group['members'] = $GLOBALS['egw']->accounts->members($group['account_id'], true);
 			$rows[] = $group;
 		}
 
@@ -424,14 +421,14 @@ 
 		if ($root == '/')
 		{
 			$hook_data = self::call_hook();
-			foreach($hook_data as $app => $app_data)
+			foreach ($hook_data as $app => $app_data)
 			{
-				if(!is_array($app_data))
+				if (!is_array($app_data))
 				{
 					// Application has no data
 					continue;
 				}
-				foreach($app_data as $text => $data)
+				foreach ($app_data as $text => $data)
 				{
 					if (!is_array($data))
 					{
@@ -462,18 +459,17 @@ 
 						}
 					}
 					unset($data['icon']);
-					$parent =& $tree['item'];
+					$parent = & $tree['item'];
 					$parts = explode('/', $data['id']);
-					if ($data['id'][0] == '/') array_shift($parts);	// remove root
+					if ($data['id'][0] == '/') array_shift($parts); // remove root
 					array_pop($parts);
 					$path = '';
-					foreach($parts as $part)
+					foreach ($parts as $part)
 					{
 						$path .= ($path == '/' ? '' : '/').$part;
 						if (!isset($parent[$path]))
 						{
-							$icon = Etemplate\Widget\Tree::imagePath($part == 'apps' ? Api\Image::find('api', 'home') :
-								(($i=Api\Image::find($part, 'navbar')) ? $i : Api\Image::find('api', 'nonav')));
+							$icon = Etemplate\Widget\Tree::imagePath($part == 'apps' ? Api\Image::find('api', 'home') : (($i = Api\Image::find($part, 'navbar')) ? $i : Api\Image::find('api', 'nonav')));
 							$parent[$path] = array(
 								'id' => $path,
 								'text' => $part == 'apps' ? lang('Applications') : lang($part),
@@ -485,7 +481,7 @@ 
 							);
 							if ($path == '/admin') $parent[$path]['open'] = true;
 						}
-						$parent =& $parent[$path]['item'];
+						$parent = & $parent[$path]['item'];
 					}
 					$data['text'] = lang($data['text']);
 					if (!empty($data['tooltip'])) $data['tooltip'] = lang($data['tooltip']);
@@ -497,7 +493,7 @@ 
 		}
 		elseif ($root == '/groups')
 		{
-			foreach($GLOBALS['egw']->accounts->search(array(
+			foreach ($GLOBALS['egw']->accounts->search(array(
 				'type' => 'groups',
 				'order' => 'account_lid',
 				'sort' => 'ASC',
@@ -524,8 +520,8 @@ 
 	private static function fix_userdata(array $data)
 	{
 		// store link as userdata, maybe we should store everything not directly understood by tree this way ...
-		foreach(array_diff_key($data, array_flip(array(
-			'id','text','tooltip','im0','im1','im2','item','child','select','open','call',
+		foreach (array_diff_key($data, array_flip(array(
+			'id', 'text', 'tooltip', 'im0', 'im1', 'im2', 'item', 'child', 'select', 'open', 'call',
 		))) as $name => $content)
 		{
 			$data['userdata'][] = array(
@@ -545,7 +541,7 @@ 
 	private static function strip_item_keys(array &$items)
 	{
 		$items = array_values($items);
-		foreach($items as &$item)
+		foreach ($items as &$item)
 		{
 			if (is_array($item) && isset($item['item']))
 			{
@@ -563,7 +559,7 @@ 
 	protected static function call_hook()
 	{
 		self::$hook_data = array();
-		function display_section($appname,$file,$file2=False)
+		function display_section($appname, $file, $file2 = False)
 		{
 			admin_ui::$hook_data[$appname] = $file2 ? $file2 : $file;
 			//error_log(__METHOD__."(".array2string(func_get_args()).")");

Braces +81 added lines, -20 removed lines

@@ -48,7 +48,10 @@ 
 		}
 		$tpl = new Etemplate('admin.index');
 
-		if (!is_array($content)) $content = array();
+		if (!is_array($content))
+		{
+			$content = array();
+		}
 		$content['nm'] = array(
 			'get_rows' => 'admin_ui::get_users',
 			'no_cat' => true,
@@ -176,7 +179,10 @@ 
 			{
 				$GLOBALS['menuData'] = $data = array();
 				$data = Api\Hooks::single('edit_user', $app);
-				if (!is_array($data)) $data = $GLOBALS['menuData'];
+				if (!is_array($data))
+				{
+					$data = $GLOBALS['menuData'];
+				}
 				foreach($data as $item)
 				{
 					// allow hook to return "real" actions, but still support legacy: description, url, extradata, options
@@ -194,15 +200,30 @@ 
 						if ($item['options'] && preg_match('/(egw_openWindowCentered2?|window.open)\([^)]+,(\d+),(\d+).*(title="([^"]+)")?/', $item['options'], $matches))
 						{
 							$item['popup'] = $matches[2].'x'.$matches[3];
-							if (isset($matches[5])) $item['tooltip'] = $matches[5];
+							if (isset($matches[5]))
+							{
+								$item['tooltip'] = $matches[5];
+							}
 							unset($item['options']);
 						}
 					}
-					if (empty($item['icon'])) $item['icon'] = $app.'/navbar';
-					if (empty($item['group'])) $item['group'] = $group;
-					if (empty($item['onExecute'])) $item['onExecute'] = $item['popup'] ?
+					if (empty($item['icon']))
+					{
+						$item['icon'] = $app.'/navbar';
+					}
+					if (empty($item['group']))
+					{
+						$item['group'] = $group;
+					}
+					if (empty($item['onExecute']))
+					{
+						$item['onExecute'] = $item['popup'] ?
 						'javaScript:nm_action' : 'javaScript:app.admin.iframe_location';
-					if (!isset($item['allowOnMultiple'])) $item['allowOnMultiple'] = false;
+					}
+					if (!isset($item['allowOnMultiple']))
+					{
+						$item['allowOnMultiple'] = false;
+					}
 
 					$actions[$item['id']] = $item;
 				}
@@ -248,7 +269,9 @@ 
 				'allowOnMultiple' => false
 			),
 		);
-		if (!$GLOBALS['egw']->acl->check('account_access',64,'admin'))	// no rights to set ACL-rights
+		if (!$GLOBALS['egw']->acl->check('account_access',64,'admin'))
+		{
+			// no rights to set ACL-rights
 		{
 			$actions['deny'] = array(
 				'caption'   => 'Deny access',
@@ -259,6 +282,7 @@ 
 				'allowOnMultiple' => false
 			);
 		}
+		}
 
 		$group = 5;	// allow to place actions in different groups by hook, this is the default
 
@@ -268,7 +292,10 @@ 
 		{
 			$GLOBALS['menuData'] = $data = array();
 			$data = Api\Hooks::single('edit_group', $app);
-			if (!is_array($data)) $data = $GLOBALS['menuData'];
+			if (!is_array($data))
+			{
+				$data = $GLOBALS['menuData'];
+			}
 
 			foreach($data as $item)
 			{
@@ -288,14 +315,29 @@ 
 					{
 						$item['popup'] = $matches[2].'x'.$matches[3];
 						$item['onExecute'] = 'javaScript:nm_action';
-						if (isset($matches[5])) $item['tooltip'] = $matches[5];
+						if (isset($matches[5]))
+						{
+							$item['tooltip'] = $matches[5];
+						}
 						unset($item['options']);
 					}
 				}
-				if (empty($item['icon'])) $item['icon'] = $app.'/navbar';
-				if (empty($item['group'])) $item['group'] = $group;
-				if (empty($item['onExecute'])) $item['onExecute'] = 'javaScript:app.admin.group';
-				if (!isset($item['allowOnMultiple'])) $item['allowOnMultiple'] = false;
+				if (empty($item['icon']))
+				{
+					$item['icon'] = $app.'/navbar';
+				}
+				if (empty($item['group']))
+				{
+					$item['group'] = $group;
+				}
+				if (empty($item['onExecute']))
+				{
+					$item['onExecute'] = 'javaScript:app.admin.group';
+				}
+				if (!isset($item['allowOnMultiple']))
+				{
+					$item['allowOnMultiple'] = false;
+				}
 
 				$actions[$item['id']] = $item;
 			}
@@ -342,7 +384,10 @@ 
 						($row['account_expires'] != -1 ? lang('Expires').' '.Api\DateTime::to($row['account_expires'], true) :
 							lang('Enabled')));
 
-			if (!self::$accounts->is_active($row)) $row['status_class'] = 'adminAccountInactive';
+			if (!self::$accounts->is_active($row))
+			{
+				$row['status_class'] = 'adminAccountInactive';
+			}
 		}
 
 		return self::$accounts->total;
@@ -439,7 +484,10 @@ 
 							'link' => $data,
 						);
 					}
-					if (empty($data['text'])) $data['text'] = $text;
+					if (empty($data['text']))
+					{
+						$data['text'] = $text;
+					}
 					if (empty($data['id']))
 					{
 						$data['id'] = $root.($app == 'admin' ? 'admin' : 'apps/'.$app).'/';
@@ -464,7 +512,11 @@ 
 					unset($data['icon']);
 					$parent =& $tree['item'];
 					$parts = explode('/', $data['id']);
-					if ($data['id'][0] == '/') array_shift($parts);	// remove root
+					if ($data['id'][0] == '/')
+					{
+						array_shift($parts);
+					}
+					// remove root
 					array_pop($parts);
 					$path = '';
 					foreach($parts as $part)
@@ -483,14 +535,23 @@ 
 								'item' => array(),
 								'child' => 1,
 							);
-							if ($path == '/admin') $parent[$path]['open'] = true;
+							if ($path == '/admin')
+							{
+								$parent[$path]['open'] = true;
+							}
 						}
 						$parent =& $parent[$path]['item'];
 					}
 					$data['text'] = lang($data['text']);
-					if (!empty($data['tooltip'])) $data['tooltip'] = lang($data['tooltip']);
+					if (!empty($data['tooltip']))
+					{
+						$data['tooltip'] = lang($data['tooltip']);
+					}
 					// make sure keys are unique, as we overwrite tree entries otherwise
-					if (isset($parent[$data['id']])) $data['id'] .= md5($data['link']);
+					if (isset($parent[$data['id']]))
+					{
+						$data['id'] .= md5($data['link']);
+					}
 					$parent[$data['id']] = self::fix_userdata($data);
 				}
 			}