EGroupware / egroupware

admin/inc/class.admin_ui.inc.php

Doc Comments +4 added lines

@@ -491,6 +491,10 @@
 	protected static function call_hook()
 	{
 		self::$hook_data = array();
+
+		/**
+		 * @param string $appname
+		 */
 		function display_section($appname,$file,$file2=False)
 		{
 			admin_ui::$hook_data[$appname] = $file2 ? $file2 : $file;

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

Spacing +39 added lines, -43 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',
@@ -96,13 +96,13 @@ 
 		// important for first time load eg. from an other application calling it's site configuration
 		$tpl->setElementAttribute('nm', 'disabled', !empty($_GET['load']));
 		$tpl->setElementAttribute('iframe', 'disabled', empty($_GET['load']));
-		$content['iframe'] = 'about:blank';	// we show accounts-list be default now
+		$content['iframe'] = 'about:blank'; // we show accounts-list be default now
 		if (!empty($_GET['load']))
 		{
 			$vars = $_GET;
 			$vars['menuaction'] = $vars['load'];
 			unset($vars['load']);
-			$content[$vars['ajax'] ? 'ajax_target':'iframe'] = Egw::link('/index.php', $vars);
+			$content[$vars['ajax'] ? 'ajax_target' : 'iframe'] = Egw::link('/index.php', $vars);
 		}
 
 		$tpl->exec('admin.admin_ui.index', $content, $sel_options);
@@ -117,7 +117,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')))
 			{
@@ -145,7 +145,7 @@ 
 					'default' => true,
 					'allowOnMultiple' => false,
 					'onExecute' => 'javaScript:app.admin.account',
-					'group' => $group=0,
+					'group' => $group = 0,
 				),
 				'add' => array(
 					'caption' => 'Add user',
@@ -156,25 +156,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']))
@@ -229,12 +229,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',
@@ -245,7 +245,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',
@@ -257,17 +257,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']))
@@ -307,7 +307,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',
@@ -322,7 +322,7 @@ 
 			$params['query'] = $query['searchletter'];
 			$params['query_type'] = 'start';
 		}
-		elseif($query['search'])
+		elseif ($query['search'])
 		{
 			$params['query'] = $query['search'];
 			$params['query_type'] = 'all';
@@ -331,13 +331,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';
 		}
@@ -360,29 +357,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;
 		}
 
@@ -422,14 +419,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))
 					{
@@ -460,18 +457,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),
@@ -483,7 +479,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']);
@@ -495,7 +491,7 @@ 
 		}
 		elseif ($root == '/groups')
 		{
-			foreach($GLOBALS['egw']->accounts->search(array(
+			foreach ($GLOBALS['egw']->accounts->search(array(
 				'type' => 'groups',
 				'order' => 'account_lid',
 				'sort' => 'ASC',
@@ -522,8 +518,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(
@@ -543,7 +539,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']))
 			{
@@ -561,7 +557,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()).")");

api/src/Acl.php

Doc Comments +3 added lines, -3 removed lines

@@ -166,7 +166,7 @@ 
 	 * Delete ACL record in the repository of the class
 	 *
 	 * @param string $appname appname or '' for $GLOBALS['egw_info']['flags']['currentapp']
-	 * @param string/boolean $location location or false for all locations
+	 * @param boolean $location location or false for all locations
 	 * @return array all ACL records from $this->data.
 	 */
 	function delete($appname,$location)
@@ -267,8 +267,8 @@ 
 	/**
 	 * check required rights agains the internal repository (included rights of $this->account_id and all it's memberships)
 	 *
-	 * @param $location app location
-	 * @param $required required right to check against
+	 * @param string $location app location
+	 * @param integer $required required right to check against
 	 * @param $appname optional defaults to currentapp
 	 * @return boolean
 	 */

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

@@ -32,7 +32,7 @@ 
 	/**
 	 * @var array $data internal repository with acl rows for the given app and account-id (incl. memberships)
 	 */
-	var $data = Array();
+	var $data = array();
 	/**
 	 * internal reference to global db-object
 	 *
@@ -133,7 +133,7 @@ 
 			array_unshift($acl_acc_list,$this->account_id);
 		}
 
-		$this->data = Array();
+		$this->data = array();
 		foreach($this->db->select(self::TABLE,'*',array('acl_account' => $acl_acc_list ),__LINE__,__FILE__) as $row)
 		{
 			$this->data[$row['acl_appname'].'-'.$row['acl_location'].'-'.$row['acl_account']] = Db::strip_array_keys($row,'acl_');
@@ -676,7 +676,7 @@ 
 			if ((int)$user > 0) $memberships = $GLOBALS['egw']->accounts->memberships($user, true);
 			$memberships[] = $user;
 
-			$grants = $accounts = Array();
+			$grants = $accounts = array();
 			foreach($this->db->select(self::TABLE,array('acl_account','acl_rights','acl_location'),array(
 				'acl_appname'  => $app,
 				'acl_location' => $memberships,

Spacing +100 added lines, -100 removed lines

@@ -47,15 +47,15 @@ 
 	/**
 	 * Constants for acl rights, like old EGW_ACL_* defines
 	 */
-	const READ      = 1;	// EGW_ACL_READ
-	const ADD       = 2;	// EGW_ACL_ADD
-	const EDIT      = 4;	// EGW_ACL_EDIT
-	const DELETE    = 8;	// EGW_ACL_DELETE
-	const PRIVAT    = 16;	// EGW_ACL_PRIVATE can NOT use PRIVATE as it is a PHP keyword, using German PRIVAT instead!
-	const GROUPMGRS = 32;	// EGW_ACL_GROUP_MANAGERS
-	const CUSTOM1  = 64;		// EGW_ACL_CUSTOM_1
-	const CUSTOM2  = 128;	// EGW_ACL_CUSTOM_2
-	const CUSTOM3  = 256;	// EGW_ACL_CUSTOM_3
+	const READ      = 1; // EGW_ACL_READ
+	const ADD       = 2; // EGW_ACL_ADD
+	const EDIT      = 4; // EGW_ACL_EDIT
+	const DELETE    = 8; // EGW_ACL_DELETE
+	const PRIVAT    = 16; // EGW_ACL_PRIVATE can NOT use PRIVATE as it is a PHP keyword, using German PRIVAT instead!
+	const GROUPMGRS = 32; // EGW_ACL_GROUP_MANAGERS
+	const CUSTOM1  = 64; // EGW_ACL_CUSTOM_1
+	const CUSTOM2  = 128; // EGW_ACL_CUSTOM_2
+	const CUSTOM3  = 256; // EGW_ACL_CUSTOM_3
 
 	/**
 	 * ACL constructor for setting account id
@@ -78,7 +78,7 @@ 
 		}
 		if ((int)$this->account_id != (int)$account_id)
 		{
-			$this->account_id = get_account_id((int)$account_id,@$GLOBALS['egw_info']['user']['account_id']);
+			$this->account_id = get_account_id((int)$account_id, @$GLOBALS['egw_info']['user']['account_id']);
 		}
 		$this->data = array();
 	}
@@ -91,7 +91,7 @@ 
 	 */
 	function __sleep()
 	{
-		return array('account_id','db');
+		return array('account_id', 'db');
 	}
 
 	/**************************************************************************\
@@ -104,7 +104,7 @@ 
 	 * @param boolean|array $no_groups = false if true, do not use memberships, if array do not use given groups
 	 * @return array along with storing it in $acl->data.  <br>
 	 */
-	function read_repository($no_groups=false)
+	function read_repository($no_groups = false)
 	{
 		// For some reason, calling this via XML-RPC doesn't call the constructor.
 		// Here is yet another work around(tm) (jengo)
@@ -119,14 +119,14 @@ 
 		else
 		{
 			$acl_acc_list = (array)$GLOBALS['egw']->accounts->memberships($this->account_id, true);
-			if (is_array($no_groups)) $acl_acc_list = array_diff($acl_acc_list,$no_groups);
-			array_unshift($acl_acc_list,$this->account_id);
+			if (is_array($no_groups)) $acl_acc_list = array_diff($acl_acc_list, $no_groups);
+			array_unshift($acl_acc_list, $this->account_id);
 		}
 
 		$this->data = Array();
-		foreach($this->db->select(self::TABLE,'*',array('acl_account' => $acl_acc_list ),__LINE__,__FILE__) as $row)
+		foreach ($this->db->select(self::TABLE, '*', array('acl_account' => $acl_acc_list), __LINE__, __FILE__) as $row)
 		{
-			$this->data[$row['acl_appname'].'-'.$row['acl_location'].'-'.$row['acl_account']] = Db::strip_array_keys($row,'acl_');
+			$this->data[$row['acl_appname'].'-'.$row['acl_location'].'-'.$row['acl_account']] = Db::strip_array_keys($row, 'acl_');
 		}
 		return $this->data;
 	}
@@ -155,15 +155,15 @@ 
 	 * @param int $rights rights
 	 * @return array all ACL records from $this->data.
 	 */
-	function add($appname,$location,$rights)
+	function add($appname, $location, $rights)
 	{
 		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
 
 		$row = array(
 			'appname'  => $appname,
 			'location' => $location,
-			'account'  => (int) $this->account_id,
-			'rights'   => (int) $rights
+			'account'  => (int)$this->account_id,
+			'rights'   => (int)$rights
 		);
 		$this->data[$row['appname'].'-'.$row['location'].'-'.$row['account']] = $row;
 
@@ -177,11 +177,11 @@ 
 	 * @param string/boolean $location location or false for all locations
 	 * @return array all ACL records from $this->data.
 	 */
-	function delete($appname,$location)
+	function delete($appname, $location)
 	{
 		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
 
-		foreach($this->data as $idx => $value)
+		foreach ($this->data as $idx => $value)
 		{
 			if ($value['appname'] == $appname &&
 				($location === false || $value['location'] == $location) &&
@@ -200,24 +200,24 @@ 
 	 */
 	function save_repository()
 	{
-		$this->db->delete(self::TABLE,array(
+		$this->db->delete(self::TABLE, array(
 			'acl_account' => $this->account_id,
-		),__LINE__,__FILE__);
+		), __LINE__, __FILE__);
 
-		foreach($this->data as $value)
+		foreach ($this->data as $value)
 		{
 			if ($value['account'] == $this->account_id)
 			{
-				$this->db->insert(self::TABLE,array(
+				$this->db->insert(self::TABLE, array(
 					'acl_appname'  => $value['appname'],
 					'acl_location' => $value['location'],
 					'acl_account'  => $this->account_id,
 					'acl_rights'   => $value['rights'],
-				),false,__LINE__,__FILE__);
+				), false, __LINE__, __FILE__);
 			}
 		}
 		if ($this->account_id == $GLOBALS['egw_info']['user']['account_id'] &&
-			method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+			method_exists($GLOBALS['egw'], 'invalidate_session_cache'))	// egw object in setup is limited
 		{
 			$GLOBALS['egw']->invalidate_session_cache();
 		}
@@ -235,7 +235,7 @@ 
 	 * @param string $appname optional defaults to $GLOBALS['egw_info']['flags']['currentapp'];
 	 * @return int all rights or'ed together
 	 */
-	function get_rights($location,$appname = '')
+	function get_rights($location, $appname = '')
 	{
 		// For XML-RPC, change this once its working correctly for passing parameters (jengo)
 		if (is_array($location))
@@ -255,7 +255,7 @@ 
 			return True;
 		}
 		$rights = 0;
-		foreach($this->data as $value)
+		foreach ($this->data as $value)
 		{
 			if ($value['appname'] == $appname)
 			{
@@ -282,9 +282,9 @@ 
 	 */
 	function check($location, $required, $appname = False)
 	{
-		$rights = $this->get_rights($location,$appname);
+		$rights = $this->get_rights($location, $appname);
 
-		return !!($rights & $required);
+		return !!($rights&$required);
 	}
 
 	/**
@@ -295,7 +295,7 @@ 
 	 * @param array $memberships = array() additional account_id, eg. memberships to match beside $this->account_id, default none
 	 * @return int $rights
 	 */
-	function get_specific_rights($location, $appname = '', $memberships=array())
+	function get_specific_rights($location, $appname = '', $memberships = array())
 	{
 		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
 
@@ -305,10 +305,10 @@ 
 		}
 		$rights = 0;
 
-		foreach($this->data as $value)
+		foreach ($this->data as $value)
 		{
 			if ($value['appname'] == $appname &&
-				($value['location'] == $location ||	$value['location'] == 'everywhere') &&
+				($value['location'] == $location || $value['location'] == 'everywhere') &&
 				($value['account'] == $this->account_id || $memberships && in_array($value['account'], $memberships)))
 			{
 				if ($value['rights'] == 0)
@@ -331,9 +331,9 @@ 
 	 */
 	function check_specific($location, $required, $appname = '')
 	{
-		$rights = $this->get_specific_rights($location,$appname);
+		$rights = $this->get_specific_rights($location, $appname);
 
-		return !!($rights & $required);
+		return !!($rights&$required);
 	}
 
 	/**************************************************************************\
@@ -350,19 +350,19 @@ 
 	 * @param boolean $invalidate_session =true false: do NOT invalidate session
 	 * @return boolean allways true
 	 */
-	function add_repository($app, $location, $account_id, $rights, $invalidate_session=true)
+	function add_repository($app, $location, $account_id, $rights, $invalidate_session = true)
 	{
 		//echo "<p>self::add_repository('$app','$location',$account_id,$rights);</p>\n";
-		$this->db->insert(self::TABLE,array(
+		$this->db->insert(self::TABLE, array(
 			'acl_rights' => $rights,
-		),array(
+		), array(
 			'acl_appname' => $app,
 			'acl_location' => $location,
 			'acl_account'  => $account_id,
-		),__LINE__,__FILE__);
+		), __LINE__, __FILE__);
 
 		if ($invalidate_session && $account_id == $GLOBALS['egw_info']['user']['account_id'] &&
-			method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+			method_exists($GLOBALS['egw'], 'invalidate_session_cache'))	// egw object in setup is limited
 		{
 			$GLOBALS['egw']->invalidate_session_cache();
 		}
@@ -378,7 +378,7 @@ 
 	 * @param boolean $invalidate_session =true false: do NOT invalidate session
 	 * @return int number of rows deleted
 	 */
-	function delete_repository($app, $location, $accountid='', $invalidate_session=true)
+	function delete_repository($app, $location, $accountid = '', $invalidate_session = true)
 	{
 		static $cache_accountid = array();
 
@@ -388,22 +388,22 @@ 
 		);
 		if ($accountid !== false)
 		{
-			if(isset($cache_accountid[$accountid]) && $cache_accountid[$accountid])
+			if (isset($cache_accountid[$accountid]) && $cache_accountid[$accountid])
 			{
 				$where['acl_account'] = $cache_accountid[$accountid];
 			}
 			else
 			{
-				$where['acl_account'] = $cache_accountid[$accountid] = get_account_id($accountid,$this->account_id);
+				$where['acl_account'] = $cache_accountid[$accountid] = get_account_id($accountid, $this->account_id);
 			}
 		}
 		if ($app == '%' || $app == '%%') unset($where['acl_appname']);
 
-		$this->db->delete(self::TABLE,$where,__LINE__,__FILE__);
+		$this->db->delete(self::TABLE, $where, __LINE__, __FILE__);
 
 		$deleted = $this->db->affected_rows();
 
-		if ($invalidate_session && $deleted && method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+		if ($invalidate_session && $deleted && method_exists($GLOBALS['egw'], 'invalidate_session_cache'))	// egw object in setup is limited
 		{
 			$GLOBALS['egw']->invalidate_session_cache();
 		}
@@ -418,15 +418,15 @@ 
 	 * @param string $appname = '' defaults to current app
 	 * @return int/boolean rights or false if none exist
 	 */
-	function get_specific_rights_for_account($account_id,$location,$appname='')
+	function get_specific_rights_for_account($account_id, $location, $appname = '')
 	{
 		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
 
-		return $this->db->select(self::TABLE,'acl_rights',array(
+		return $this->db->select(self::TABLE, 'acl_rights', array(
 			'acl_location' => $location,
 			'acl_account'  => $account_id,
 			'acl_appname'  => $appname,
-		),__LINE__,__FILE__)->fetchColumn();
+		), __LINE__, __FILE__)->fetchColumn();
 	}
 
 	/**
@@ -436,15 +436,15 @@ 
 	 * @param string $appname = '' defaults to current app
 	 * @return array with account => rights pairs
 	 */
-	function get_all_rights($location,$appname='')
+	function get_all_rights($location, $appname = '')
 	{
 		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
 
 		$rights = array();
-		foreach($this->db->select(self::TABLE,'acl_account,acl_rights',array(
+		foreach ($this->db->select(self::TABLE, 'acl_account,acl_rights', array(
 			'acl_location' => $location,
 			'acl_appname'  => $appname,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
 			$rights[$row['acl_account']] = $row['acl_rights'];
 		}
@@ -459,7 +459,7 @@ 
 	 * @param boolean $use_memberships = true
 	 * @return array with location => rights pairs
 	 */
-	function get_all_location_rights($account_id,$appname='',$use_memberships=true)
+	function get_all_location_rights($account_id, $appname = '', $use_memberships = true)
 	{
 		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
 
@@ -470,10 +470,10 @@ 
 			$accounts[] = $account_id;
 		}
 		$rights = array();
-		foreach($this->db->select(self::TABLE,'acl_location,acl_rights',array(
+		foreach ($this->db->select(self::TABLE, 'acl_location,acl_rights', array(
 			'acl_account' => $accounts,
 			'acl_appname' => $appname,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
 			$rights[$row['acl_location']] |= $row['acl_rights'];
 		}
@@ -492,28 +492,28 @@ 
 	{
 		static $cache_accountid = array();
 
-		if(isset($cache_accountid[$accountid]))
+		if (isset($cache_accountid[$accountid]))
 		{
 			$account_id = $cache_accountid[$accountid];
 		}
 		else
 		{
-			$account_id = get_account_id($accountid,$this->account_id);
+			$account_id = get_account_id($accountid, $this->account_id);
 			$cache_accountid[$accountid] = $account_id;
 		}
 		$rights = 0;
 		$apps = false;
-		foreach($this->db->select(self::TABLE,array('acl_appname','acl_rights'),array(
+		foreach ($this->db->select(self::TABLE, array('acl_appname', 'acl_rights'), array(
 			'acl_location' => $location,
 			'acl_account'  => $account_id,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
 			if ($row['acl_rights'] == 0)
 			{
 				return False;
 			}
 			$rights |= $row['acl_rights'];
-			if (!!($rights & $required))
+			if (!!($rights&$required))
 			{
 				$apps[] = $row['acl_appname'];
 			}
@@ -533,21 +533,21 @@ 
 	{
 		static $cache_accountid = array();
 
-		if(isset($cache_accountid[$accountid]))
+		if (isset($cache_accountid[$accountid]))
 		{
 			$accountid = $cache_accountid[$accountid];
 		}
 		else
 		{
-			$accountid = $cache_accountid[$accountid] = get_account_id($accountid,$this->account_id);
+			$accountid = $cache_accountid[$accountid] = get_account_id($accountid, $this->account_id);
 		}
 		$locations = false;
-		foreach($this->db->select(self::TABLE,'acl_location,acl_rights',array(
+		foreach ($this->db->select(self::TABLE, 'acl_location,acl_rights', array(
 			'acl_appname' => $app,
 			'acl_account' => $accountid,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
-			if ($row['acl_rights'] & $required)
+			if ($row['acl_rights']&$required)
 			{
 				$locations[] = $row['acl_location'];
 			}
@@ -568,14 +568,14 @@ 
 		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
 
 		$accounts = false;
-		foreach($this->db->select(self::TABLE,array('acl_account','acl_rights'),array(
+		foreach ($this->db->select(self::TABLE, array('acl_account', 'acl_rights'), array(
 			'acl_appname'  => $app,
 			'acl_location' => $location,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
-			if (!!($row['acl_rights'] & $required))
+			if (!!($row['acl_rights']&$required))
 			{
-				$accounts[] = (int) $row['acl_account'];
+				$accounts[] = (int)$row['acl_account'];
 			}
 		}
 		return $accounts;
@@ -587,14 +587,14 @@ 
 	 * @param string $app app optional defaults to $GLOBALS['egw_info']['flags']['currentapp'];
 	 * @return boolean/array false if there are no matching location in the db or array of locations
 	 */
-	function get_locations_for_app($app='')
+	function get_locations_for_app($app = '')
 	{
 		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
 
 		$locations = false;
-		foreach($this->db->select(self::TABLE,'DISTINCT '.'acl_location',array(
+		foreach ($this->db->select(self::TABLE, 'DISTINCT '.'acl_location', array(
 			'acl_appname'  => $app,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
 			if (($location = $row['acl_location']) != 'run')
 			{
@@ -612,38 +612,38 @@ 
 	 * @param boolean $add_implicit_apps = true true: add apps every user has implicit rights
 	 * @return array containing list of apps
 	 */
-	function get_user_applications($accountid = '', $use_memberships=true, $add_implicit_apps=true)
+	function get_user_applications($accountid = '', $use_memberships = true, $add_implicit_apps = true)
 	{
 		static $cache_accountid = array();
 
-		if(isset($cache_accountid[$accountid]))
+		if (isset($cache_accountid[$accountid]))
 		{
 			$account_id = $cache_accountid[$accountid];
 		}
 		else
 		{
-			$account_id = get_account_id($accountid,$this->account_id);
+			$account_id = get_account_id($accountid, $this->account_id);
 			$cache_accountid[$accountid] = $account_id;
 		}
 		if ($use_memberships && (int)$account_id > 0) $memberships = $GLOBALS['egw']->accounts->memberships($account_id, true);
 		$memberships[] = (int)$account_id;
 
 		$apps = array();
-		foreach($this->db->select(self::TABLE,array('acl_appname','acl_rights'),array(
+		foreach ($this->db->select(self::TABLE, array('acl_appname', 'acl_rights'), array(
 			'acl_location' => 'run',
 			'acl_account'  => $memberships,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
 			$app = $row['acl_appname'];
-			if(!isset($apps[$app]))
+			if (!isset($apps[$app]))
 			{
 				$apps[$app] = 0;
 			}
-			$apps[$app] |= (int) $row['acl_rights'];
+			$apps[$app] |= (int)$row['acl_rights'];
 		}
 		if ($add_implicit_apps)
 		{
-			$apps['api'] = 1;	// give everyone implicit rights for the home app
+			$apps['api'] = 1; // give everyone implicit rights for the home app
 		}
 		return $apps;
 	}
@@ -657,29 +657,29 @@ 
 	 * @param int $user = null user whos grants to return, default current user
 	 * @return array with account-ids (of owners) and granted rights as values
 	 */
-	function get_grants($app='',$enum_group_acls=true,$user=null)
+	function get_grants($app = '', $enum_group_acls = true, $user = null)
 	{
 		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
 		if (!$user) $user = $this->account_id;
 
-		static $cache = array();	// some caching withing the request
+		static $cache = array(); // some caching withing the request
 
-		$grants =& $cache[$app][$user];
+		$grants = & $cache[$app][$user];
 		if (!isset($grants))
 		{
 			if ((int)$user > 0) $memberships = $GLOBALS['egw']->accounts->memberships($user, true);
 			$memberships[] = $user;
 
 			$grants = $accounts = Array();
-			foreach($this->db->select(self::TABLE,array('acl_account','acl_rights','acl_location'),array(
+			foreach ($this->db->select(self::TABLE, array('acl_account', 'acl_rights', 'acl_location'), array(
 				'acl_appname'  => $app,
 				'acl_location' => $memberships,
-			),__LINE__,__FILE__) as $row)
+			), __LINE__, __FILE__) as $row)
 			{
 				$grantor    = $row['acl_account'];
 				$rights     = $row['acl_rights'];
 
-				if(!isset($grants[$grantor]))
+				if (!isset($grants[$grantor]))
 				{
 					$grants[$grantor] = 0;
 				}
@@ -687,17 +687,17 @@ 
 
 				// if the right is granted from a group and we enummerated group ACL's
 				if ($GLOBALS['egw']->accounts->get_type($grantor) == 'g' && $enum_group_acls &&
-					(!is_array($enum_group_acls) || !in_array($grantor,$enum_group_acls)))
+					(!is_array($enum_group_acls) || !in_array($grantor, $enum_group_acls)))
 				{
 					// return the grant for each member of the group (false = also for no longer active users)
-					foreach((array)$GLOBALS['egw']->accounts->members($grantor, true, false) as $grantor)
+					foreach ((array)$GLOBALS['egw']->accounts->members($grantor, true, false) as $grantor)
 					{
-						if (!$grantor) continue;	// can happen if group has no members
+						if (!$grantor) continue; // can happen if group has no members
 
 						// Don't allow to override private with group ACL's!
 						$rights &= ~self::PRIVAT;
 
-						if(!isset($grants[$grantor]))
+						if (!isset($grants[$grantor]))
 						{
 							$grants[$grantor] = 0;
 						}
@@ -719,21 +719,21 @@ 
 	 */
 	function delete_account($account_id)
 	{
-		if ((int) $account_id)
+		if ((int)$account_id)
 		{
 			// Delete all grants from this account
-			$this->db->delete(self::TABLE,array(
+			$this->db->delete(self::TABLE, array(
 				'acl_account' => $account_id
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 			// Delete all grants to this account
-			$this->db->delete(self::TABLE,array(
+			$this->db->delete(self::TABLE, array(
 				'acl_location' => $account_id
-			),__LINE__, __FILE__);
+			), __LINE__, __FILE__);
 			// delete all memberships in account_id (if it is a group)
-			$this->db->delete(self::TABLE,array(
+			$this->db->delete(self::TABLE, array(
 				'acl_appname' => 'phpgw_group',
 				'acl_location' => $account_id,
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 		}
 	}
 
@@ -744,15 +744,15 @@ 
 	 * @param string $app app optional defaults to $GLOBALS['egw_info']['flags']['currentapp'];
 	 * @return array with location => array(account => rights) pairs
 	 */
-	function get_location_grants($location,$app='')
+	function get_location_grants($location, $app = '')
 	{
 		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
 
 		$locations = array();
-		foreach($this->db->select(self::TABLE,'acl_location,acl_account,acl_rights',array(
+		foreach ($this->db->select(self::TABLE, 'acl_location,acl_account,acl_rights', array(
 			'acl_appname'  => $app,
 			'acl_location LIKE '.$this->db->quote($location),
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
 			if (($location = $row['acl_location']) != 'run')
 			{

Braces +81 added lines, -20 removed lines

@@ -119,7 +119,10 @@ 
 		else
 		{
 			$acl_acc_list = (array)$GLOBALS['egw']->accounts->memberships($this->account_id, true);
-			if (is_array($no_groups)) $acl_acc_list = array_diff($acl_acc_list,$no_groups);
+			if (is_array($no_groups))
+			{
+				$acl_acc_list = array_diff($acl_acc_list,$no_groups);
+			}
 			array_unshift($acl_acc_list,$this->account_id);
 		}
 
@@ -157,7 +160,10 @@ 
 	 */
 	function add($appname,$location,$rights)
 	{
-		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		$row = array(
 			'appname'  => $appname,
@@ -179,7 +185,10 @@ 
 	 */
 	function delete($appname,$location)
 	{
-		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		foreach($this->data as $idx => $value)
 		{
@@ -217,10 +226,13 @@ 
 			}
 		}
 		if ($this->account_id == $GLOBALS['egw_info']['user']['account_id'] &&
-			method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+			method_exists($GLOBALS['egw'],'invalidate_session_cache'))
+		{
+			// egw object in setup is limited
 		{
 			$GLOBALS['egw']->invalidate_session_cache();
 		}
+		}
 		return $this->data;
 	}
 
@@ -248,7 +260,10 @@ 
 		{
 			$this->read_repository();
 		}
-		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		if (!count($this->data) && $GLOBALS['egw_info']['server']['acl_default'] != 'deny')
 		{
@@ -297,7 +312,10 @@ 
 	 */
 	function get_specific_rights($location, $appname = '', $memberships=array())
 	{
-		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		if (!count($this->data) && $GLOBALS['egw_info']['server']['acl_default'] != 'deny')
 		{
@@ -362,10 +380,13 @@ 
 		),__LINE__,__FILE__);
 
 		if ($invalidate_session && $account_id == $GLOBALS['egw_info']['user']['account_id'] &&
-			method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+			method_exists($GLOBALS['egw'],'invalidate_session_cache'))
+		{
+			// egw object in setup is limited
 		{
 			$GLOBALS['egw']->invalidate_session_cache();
 		}
+		}
 		return True;
 	}
 
@@ -397,16 +418,22 @@ 
 				$where['acl_account'] = $cache_accountid[$accountid] = get_account_id($accountid,$this->account_id);
 			}
 		}
-		if ($app == '%' || $app == '%%') unset($where['acl_appname']);
+		if ($app == '%' || $app == '%%')
+		{
+			unset($where['acl_appname']);
+		}
 
 		$this->db->delete(self::TABLE,$where,__LINE__,__FILE__);
 
 		$deleted = $this->db->affected_rows();
 
-		if ($invalidate_session && $deleted && method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+		if ($invalidate_session && $deleted && method_exists($GLOBALS['egw'],'invalidate_session_cache'))
+		{
+			// egw object in setup is limited
 		{
 			$GLOBALS['egw']->invalidate_session_cache();
 		}
+		}
 		return $deleted;
 	}
 
@@ -420,7 +447,10 @@ 
 	 */
 	function get_specific_rights_for_account($account_id,$location,$appname='')
 	{
-		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		return $this->db->select(self::TABLE,'acl_rights',array(
 			'acl_location' => $location,
@@ -438,7 +468,10 @@ 
 	 */
 	function get_all_rights($location,$appname='')
 	{
-		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		$rights = array();
 		foreach($this->db->select(self::TABLE,'acl_account,acl_rights',array(
@@ -461,7 +494,10 @@ 
 	 */
 	function get_all_location_rights($account_id,$appname='',$use_memberships=true)
 	{
-		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		$accounts = array($account_id);
 		if ($use_memberships && (int)$account_id > 0)
@@ -565,7 +601,10 @@ 
 	 */
 	function get_ids_for_location($location, $required, $app = '')
 	{
-		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$app)
+		{
+			$app = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		$accounts = false;
 		foreach($this->db->select(self::TABLE,array('acl_account','acl_rights'),array(
@@ -589,7 +628,10 @@ 
 	 */
 	function get_locations_for_app($app='')
 	{
-		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$app)
+		{
+			$app = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		$locations = false;
 		foreach($this->db->select(self::TABLE,'DISTINCT '.'acl_location',array(
@@ -625,7 +667,10 @@ 
 			$account_id = get_account_id($accountid,$this->account_id);
 			$cache_accountid[$accountid] = $account_id;
 		}
-		if ($use_memberships && (int)$account_id > 0) $memberships = $GLOBALS['egw']->accounts->memberships($account_id, true);
+		if ($use_memberships && (int)$account_id > 0)
+		{
+			$memberships = $GLOBALS['egw']->accounts->memberships($account_id, true);
+		}
 		$memberships[] = (int)$account_id;
 
 		$apps = array();
@@ -659,15 +704,24 @@ 
 	 */
 	function get_grants($app='',$enum_group_acls=true,$user=null)
 	{
-		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
-		if (!$user) $user = $this->account_id;
+		if (!$app)
+		{
+			$app = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
+		if (!$user)
+		{
+			$user = $this->account_id;
+		}
 
 		static $cache = array();	// some caching withing the request
 
 		$grants =& $cache[$app][$user];
 		if (!isset($grants))
 		{
-			if ((int)$user > 0) $memberships = $GLOBALS['egw']->accounts->memberships($user, true);
+			if ((int)$user > 0)
+			{
+				$memberships = $GLOBALS['egw']->accounts->memberships($user, true);
+			}
 			$memberships[] = $user;
 
 			$grants = $accounts = Array();
@@ -692,7 +746,11 @@ 
 					// return the grant for each member of the group (false = also for no longer active users)
 					foreach((array)$GLOBALS['egw']->accounts->members($grantor, true, false) as $grantor)
 					{
-						if (!$grantor) continue;	// can happen if group has no members
+						if (!$grantor)
+						{
+							continue;
+						}
+						// can happen if group has no members
 
 						// Don't allow to override private with group ACL's!
 						$rights &= ~self::PRIVAT;
@@ -746,7 +804,10 @@ 
 	 */
 	function get_location_grants($location,$app='')
 	{
-		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$app)
+		{
+			$app = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		$locations = array();
 		foreach($this->db->select(self::TABLE,'acl_location,acl_account,acl_rights',array(

api/src/Asyncservice.php

Doc Comments +3 added lines, -3 removed lines

@@ -324,7 +324,7 @@ 
 	 * cancels a timer
 	 *
 	 * @param string $id has to be the one used to set it.
-	 * @return boolean True if the timer exists and is not expired.
+	 * @return integer True if the timer exists and is not expired.
 	 */
 	function cancel_timer($id)
 	{
@@ -470,7 +470,7 @@ 
 	/**
 	 * reads all matching db-rows / jobs
 	 *
-	 * @param string $id =0 reads all expired rows / jobs ready to run\
+	 * @param integer $id =0 reads all expired rows / jobs ready to run\
 	 * 	!= 0 reads all rows/jobs matching $id (sql-wildcards '%' and '_' can be used)
 	 * @param array|string $cols ='*' string or array of column-names / select-expressions
 	 * @param int|bool $offset =False offset for a limited query or False (default)
@@ -558,7 +558,7 @@ 
 	/**
 	 * delete db-row / job with $id
 	 *
-	 * @return boolean False if $id not found else True
+	 * @return integer False if $id not found else True
 	 */
 	function delete($id)
 	{

Spacing +76 added lines, -78 removed lines

@@ -43,7 +43,7 @@ 
 	/**
 	 * Time to keep expired jobs marked as  "keep", until they got finally deleted
 	 */
-	const DEFAULT_KEEP_TIME = 86400;	// 1day
+	const DEFAULT_KEEP_TIME = 86400; // 1day
 
 	/**
 	 * constructor of the class
@@ -58,9 +58,9 @@ 
 		{
 			$this->db = $GLOBALS['egw_setup']->db;
 		}
-		$this->cronline = EGW_SERVER_ROOT . '/api/asyncservices.php '.$GLOBALS['egw_info']['user']['domain'];
+		$this->cronline = EGW_SERVER_ROOT.'/api/asyncservices.php '.$GLOBALS['egw_info']['user']['domain'];
 
-		$this->only_fallback = substr(php_uname(), 0, 7) == "Windows";	// atm cron-jobs dont work on win
+		$this->only_fallback = substr(php_uname(), 0, 7) == "Windows"; // atm cron-jobs dont work on win
 	}
 
 	/**
@@ -83,10 +83,10 @@ 
 	 * @param boolean $allow_past =false allow to set alarms in the past eg. with times===0 to not trigger it in next run
 	 * @return boolean False if $id already exists, else True
 	 */
-	function set_timer($times, $id, $method, $data=null, $account_id=False, $debug=false, $allow_past=false)
+	function set_timer($times, $id, $method, $data = null, $account_id = False, $debug = false, $allow_past = false)
 	{
 		if (empty($id) || empty($method) || $this->read($id) ||
-				!($next = $this->next_run($times,$debug)))
+				!($next = $this->next_run($times, $debug)))
 		{
 			// allow to set "keep" alarms in the past ($next === false)
 			if ($next === false && !is_array($times) && $allow_past)
@@ -129,14 +129,14 @@ 
 	 * @param int $now Use this time to calculate then next run from.  Defaults to time().
 	 * @return int a unix timestamp of the next execution time or False if no more executions
 	 */
-	function next_run($times,$debug=False, $now = null)
+	function next_run($times, $debug = False, $now = null)
 	{
 		if ($this->debug)
 		{
-			error_log(__METHOD__."(".array2string($times).", '$debug', " . date('Y-m-d H:i', $now) . ")");
-			$debug = True;	// enable syntax-error messages too
+			error_log(__METHOD__."(".array2string($times).", '$debug', ".date('Y-m-d H:i', $now).")");
+			$debug = True; // enable syntax-error messages too
 		}
-		if(is_null($now)) {
+		if (is_null($now)) {
 			$now = time();
 		}
 
@@ -164,7 +164,7 @@ 
 			'dow'   => 6,
 			'day'   => 31,
 			'month' => 12,
-			'year'  => date('Y')+10	// else */[0-9] would never stop returning numbers
+			'year'  => date('Y') + 10	// else */[0-9] would never stop returning numbers
 		);
 		$min_unit = array(
 			'min'   => 0,
@@ -180,7 +180,7 @@ 
 		// get set to the minimum after
 		//
 		$i = $first_set = $last_set = 0;
-		foreach($units as $u => $date_pattern)
+		foreach ($units as $u => $date_pattern)
 		{
 			++$i;
 			if (isset($times[$u]))
@@ -198,24 +198,24 @@ 
 		// (as descript above), enumerations are arrays with unit-values as keys
 		//
 		$n = 0;
-		foreach($units as $u => $date_pattern)
+		foreach ($units as $u => $date_pattern)
 		{
 			++$n;
-			if ($this->debug) error_log("n=$n, $u: isset(times[$u]=".array2string($times[$u]).")=".(isset($times[$u])?'True':'False'));
+			if ($this->debug) error_log("n=$n, $u: isset(times[$u]=".array2string($times[$u]).")=".(isset($times[$u]) ? 'True' : 'False'));
 			if (isset($times[$u]))
 			{
-				if(is_array($times[$u])) {
+				if (is_array($times[$u])) {
 					$time = array_keys($times[$u]);
 				} else {
-					$time = explode(',',$times[$u]);
+					$time = explode(',', $times[$u]);
 				}
 				$times[$u] = array();
 
-				foreach($time as $t)
+				foreach ($time as $t)
 				{
-					if (strpos($t,'-') !== False && strpos($t,'/') === False)
+					if (strpos($t, '-') !== False && strpos($t, '/') === False)
 					{
-						list($min,$max) = $arr = explode('-',$t);
+						list($min, $max) = $arr = explode('-', $t);
 
 						if (count($arr) != 2 || !is_numeric($min) || !is_numeric($max) || $min > $max)
 						{
@@ -232,7 +232,7 @@ 
 					{
 						if ((string)$t == '*') 	$t = '*/1';
 
-						list($one,$inc) = $arr = explode('/',$t);
+						list($one, $inc) = $arr = explode('/', $t);
 
 						if (!(is_numeric($one) && count($arr) == 1 ||
 									count($arr) == 2 && is_numeric($inc)))
@@ -247,7 +247,7 @@ 
 						}
 						else
 						{
-							list($min,$max) = $arr = explode('-',$one);
+							list($min, $max) = $arr = explode('-', $one);
 							if (empty($one) || $one == '*')
 							{
 								$min = $min_unit[$u];
@@ -288,20 +288,19 @@ 
 		{
 			$future = False;
 
-			foreach($units as $u => $date_pattern)
+			foreach ($units as $u => $date_pattern)
 			{
-				$unit_now = $u != 'dow' ? (int)date($date_pattern, $now) :
-					(int)date($date_pattern,mktime(12,0,0,$found['month'],$found['day'],$found['year']));
+				$unit_now = $u != 'dow' ? (int)date($date_pattern, $now) : (int)date($date_pattern, mktime(12, 0, 0, $found['month'], $found['day'], $found['year']));
 
 				if (isset($found[$u]))
 				{
 					$future = $future || $found[$u] > $unit_now;
 					if ($this->debug) error_log("--> already have a $u = ".$found[$u].", future='$future'");
-					continue;	// already set
+					continue; // already set
 				}
-				foreach(array_keys($times[$u]) as $unit_value)
+				foreach (array_keys($times[$u]) as $unit_value)
 				{
-					switch($u)
+					switch ($u)
 					{
 						case 'dow':
 							$valid = $unit_value == $unit_now;
@@ -324,12 +323,12 @@ 
 				if (!isset($found[$u]))		// we have to try the next one, if it exists
 				{
 					$nexts = array_keys($units);
-					if (!isset($nexts[count($found)-1]))
+					if (!isset($nexts[count($found) - 1]))
 					{
 						if ($this->debug) error_log("Nothing found, exiting !!!");
 						return False;
 					}
-					$next = $nexts[count($found)-1];
+					$next = $nexts[count($found) - 1];
 					$over = $found[$next];
 					unset($found[$next]);
 					if ($this->debug) error_log("Have to try the next $next, $u's are over for $next=$over !!!");
@@ -339,7 +338,7 @@ 
 		}
 		if ($this->debug) error_log("next=".array2string($found));
 
-		return mktime($found['hour'],$found['min'],0,$found['month'],$found['day'],$found['year']);
+		return mktime($found['hour'], $found['min'], 0, $found['month'], $found['day'], $found['year']);
 	}
 
 	/**
@@ -361,7 +360,7 @@ 
 	 * @return mixed if !$set array('start' => $start,'end' => $end) with timestamps of last check_run start and end,  \
 	 * 	!$end means check_run is just running. If $set returns True if it was able to get the semaphore, else False
 	 */
-	function last_check_run($semaphore=False,$release=False,$run_by='')
+	function last_check_run($semaphore = False, $release = False, $run_by = '')
 	{
 		//echo "<p>last_check_run(semaphore=".($semaphore?'True':'False').",release=".($release?'True':'False').")</p>\n";
 		if (($exists = $this->read('##last-check-run##')))
@@ -383,7 +382,7 @@ 
 		}
 		else
 		{
-			@set_time_limit(0);		// dont stop for an execution-time-limit
+			@set_time_limit(0); // dont stop for an execution-time-limit
 			ignore_user_abort(True);
 
 			$last_run = array(
@@ -399,7 +398,7 @@ 
 			);
 			// as the async_next column is used as a semaphore we only update it,
 			// if it is 0 (semaphore released) or older then 10min to recover from failed or crashed attempts
-			if ($exists) $where = array('(async_next=0 OR async_next<'.(time()-600).')');
+			if ($exists) $where = array('(async_next=0 OR async_next<'.(time() - 600).')');
 		}
 		//echo "last_run=<pre>"; print_r($last_run); echo "</pre>\n";
 		return $this->write($last_run, !!$exists, $where) > 0;
@@ -408,20 +407,20 @@ 
 	/**
 	 * checks if there are any jobs ready to run (timer expired) and executes them
 	 */
-	function check_run($run_by='')
+	function check_run($run_by = '')
 	{
 		if ($run_by === 'fallback') flush();
 
-		if (!$this->last_check_run(True,False,$run_by))
+		if (!$this->last_check_run(True, False, $run_by))
 		{
-			return False;	// cant obtain semaphore
+			return False; // cant obtain semaphore
 		}
 		// mark enviroment as async-service, check with isset()!
 		$GLOBALS['egw_info']['flags']['async-service'] = $run_by;
 
 		if (($jobs = $this->read()))
 		{
-			foreach($jobs as $job)
+			foreach ($jobs as $job)
 			{
 				// checking / setting up egw_info/user
 				//
@@ -430,7 +429,7 @@ 
 					// run notifications, before changing account_id of enviroment
 					Link::run_notifies();
 					// unset all objects in $GLOBALS, which are created and used by ExecMethod, as they can contain user-data
-					foreach($GLOBALS as $name => $value)
+					foreach ($GLOBALS as $name => $value)
 					{
 						if ($name !== 'egw' && is_object($value)) unset($GLOBALS[$name]);
 					}
@@ -442,7 +441,7 @@ 
 					{
 						$GLOBALS['egw']->session->account_lid = $GLOBALS['egw']->accounts->id2name($job['account_id']);
 						$GLOBALS['egw']->session->account_domain = $domain;
-						$GLOBALS['egw_info']['user']  = $GLOBALS['egw']->session->read_repositories();
+						$GLOBALS['egw_info']['user'] = $GLOBALS['egw']->session->read_repositories();
 
 						if ($lang != $GLOBALS['egw_info']['user']['preferences']['common']['lang'])
 						{
@@ -457,12 +456,11 @@ 
 						$GLOBALS['egw_info']['user']['domain'] = $domain;
 					}
 				}
-				list($app) = strpos($job['method'],'::') !== false ? explode('_',$job['method']) :
-					explode('.',$job['method']);
+				list($app) = strpos($job['method'], '::') !== false ? explode('_', $job['method']) : explode('.', $job['method']);
 				Translation::add_app($app);
 				if (is_array($job['data']))
 				{
-					$job['data'] += array_diff_key($job,array('data' => false));
+					$job['data'] += array_diff_key($job, array('data' => false));
 				}
 
 				if ($this->debug) error_log(__METHOD__."() processing job ".array2string($job));
@@ -498,16 +496,16 @@ 
 				try
 				{
 					if ($this->debug) error_log(__METHOD__."() running job ".array2string($job));
-					ExecMethod($job['method'],$job['data']);
+					ExecMethod($job['method'], $job['data']);
 				}
-				catch(Exception $e)
+				catch (Exception $e)
 				{
 					// log the exception to error_log, but continue running other async jobs
 					_egw_log_exception($e);
 				}
 			}
 		}
-		$this->last_check_run(True,True,$run_by);	// release semaphore
+		$this->last_check_run(True, True, $run_by); // release semaphore
 
 		return $jobs ? count($jobs) : 0;
 	}
@@ -523,7 +521,7 @@ 
 	 * @param int $num_rows =0 number of rows to return if offset set, default 0 = use default in user prefs
 	 * @return array/boolean db-rows / jobs as array or False if no matches
 	 */
-	function read($id=0,$cols='*',$offset=False,$append='ORDER BY async_next',$num_rows=0)
+	function read($id = 0, $cols = '*', $offset = False, $append = 'ORDER BY async_next', $num_rows = 0)
 	{
 		if (!is_a($this->db, 'EGroupware\\Api\\Db')) return false;
 
@@ -531,7 +529,7 @@ 
 		{
 			$where = "async_id != '##last-check-run##'";
 		}
-		elseif (!is_array($id) && (strpos($id,'%') !== False || strpos($id,'_') !== False))
+		elseif (!is_array($id) && (strpos($id, '%') !== False || strpos($id, '_') !== False))
 		{
 			$id = $this->db->quote($id);
 			$where = "async_id LIKE $id AND async_id != '##last-check-run##'";
@@ -545,21 +543,21 @@ 
 			$where = array('async_id' => $id);
 		}
 		$jobs = array();
-		foreach($this->db->select($this->db_table,$cols,$where,__LINE__,__FILE__,$offset,$append,False,$num_rows) as $row)
+		foreach ($this->db->select($this->db_table, $cols, $where, __LINE__, __FILE__, $offset, $append, False, $num_rows) as $row)
 		{
 			$row['async_times'] = json_php_unserialize($row['async_times']);
 			// check for broken value during migration
 			if ($row['async_data'][0] == '"' && substr($row['async_data'], 0, 7) == '"\\"\\\\\\"')
 			{
 				$row['async_data'] = null;
-				$this->write(Db::strip_array_keys($row,'async_'), true);
+				$this->write(Db::strip_array_keys($row, 'async_'), true);
 			}
 			else
 			{
 				$row['async_data'] = !empty($row['async_data']) ?
-					json_php_unserialize($row['async_data'], true) : null;	// allow non-serialized data
+					json_php_unserialize($row['async_data'], true) : null; // allow non-serialized data
 			}
-			$jobs[$row['async_id']] = Db::strip_array_keys($row,'async_');
+			$jobs[$row['async_id']] = Db::strip_array_keys($row, 'async_');
 		}
 		if (!count($jobs))
 		{
@@ -576,7 +574,7 @@ 
 	 * @param array $where additional where statemetn to update only if a certain condition is met, used for the semaphore
 	 * @return int affected rows, can be 0 if an additional where statement is given
 	 */
-	function write($job, $exists = False, $where=array())
+	function write($job, $exists = False, $where = array())
 	{
 		if (!is_a($this->db, 'EGroupware\\Api\\Db')) return 0;
 
@@ -608,7 +606,7 @@ 
 	function delete($id)
 	{
 		if ($this->debug) error_log(__METHOD__."('$id') ".function_backtrace());
-		$this->db->delete($this->db_table,array('async_id' => $id),__LINE__,__FILE__);
+		$this->db->delete($this->db_table, array('async_id' => $id), __LINE__, __FILE__);
 
 		return $this->db->affected_rows();
 	}
@@ -633,38 +631,38 @@ 
 		{
 			$binarys = array(
 				'php'  => '/usr/bin/php',
-				'php5' => '/usr/bin/php5',		// SuSE 9.3 with php5
+				'php5' => '/usr/bin/php5', // SuSE 9.3 with php5
 				'crontab' => '/usr/bin/crontab'
 			);
 			foreach ($binarys as $name => $path)
 			{
-				$this->$name = $path;	// a reasonable default for *nix
+				$this->$name = $path; // a reasonable default for *nix
 
 				if (!($Ok = @is_executable($this->$name)))
 				{
 					if (file_exists($this->$name))
 					{
-						echo '<p>'.lang('%1 is not executable by the webserver !!!',$this->$name)."</p>\n";
+						echo '<p>'.lang('%1 is not executable by the webserver !!!', $this->$name)."</p>\n";
 						$perms = fileperms($this->$name);
-						if (!($perms & 0x0001) && ($perms & 0x0008) && function_exists('posix_getuid'))	// only executable by group
+						if (!($perms&0x0001) && ($perms&0x0008) && function_exists('posix_getuid'))	// only executable by group
 						{
 							$group = posix_getgrgid(filegroup($this->$name));
-							$webserver = posix_getpwuid(posix_getuid ());
-							echo '<p>'.lang("You need to add the webserver user '%1' to the group '%2'.",$webserver['name'],$group['name'])."</p>\n";							}
+							$webserver = posix_getpwuid(posix_getuid());
+							echo '<p>'.lang("You need to add the webserver user '%1' to the group '%2'.", $webserver['name'], $group['name'])."</p>\n"; }
 					}
-					if (($fd = popen('/bin/sh -c "type -p '.$name.'"','r')))
+					if (($fd = popen('/bin/sh -c "type -p '.$name.'"', 'r')))
 					{
-						$this->$name = fgets($fd,256);
+						$this->$name = fgets($fd, 256);
 						@pclose($fd);
 					}
-					if (($pos = strpos($this->$name,"\n")))
+					if (($pos = strpos($this->$name, "\n")))
 					{
-						$this->$name = substr($this->$name,0,$pos);
+						$this->$name = substr($this->$name, 0, $pos);
 					}
 				}
 				if (!$Ok && !@is_executable($this->$name))
 				{
-					$this->$name = $name;	// hopefully its in the path
+					$this->$name = $name; // hopefully its in the path
 				}
 				//echo "<p>$name = '".$this->$name."'</p>\n";
 			}
@@ -686,7 +684,7 @@ 
 	 *
 	 * @return int
 	 */
-	function installed(array &$other_cronlines=array())
+	function installed(array &$other_cronlines = array())
 	{
 		if ($this->only_fallback) {
 			return 0;
@@ -700,15 +698,15 @@ 
 		}
 		$times = False;
 		$other_cronlines = array();
-		if (($crontab = popen('/bin/sh -c "'.$this->crontab.' -l" 2>&1','r')) !== False)
+		if (($crontab = popen('/bin/sh -c "'.$this->crontab.' -l" 2>&1', 'r')) !== False)
 		{
 			$n = 0;
-			while ($line = fgets($crontab,256))
+			while ($line = fgets($crontab, 256))
 			{
 				if ($this->debug) error_log(__METHOD__.'() line '.++$n.": $line");
-				$parts = explode(' ',$line,6);
+				$parts = explode(' ', $line, 6);
 
-				if ($line{0} == '#' || count($parts) < 6 || ($parts[5]{0} != '/' && substr($parts[5],0,3) != 'php'))
+				if ($line{0} == '#' || count($parts) < 6 || ($parts[5]{0} != '/' && substr($parts[5], 0, 3) != 'php'))
 				{
 					// ignore comments
 					if ($line{0} != '#')
@@ -716,12 +714,12 @@ 
 						$times['error'] .= $line;
 					}
 				}
-				elseif (strpos($line,$this->cronline) !== False ||
+				elseif (strpos($line, $this->cronline) !== False ||
 					// also check of old phpgwapi/cron path
 					strpos($line, str_replace('/api/', '/phpgwapi/cron/', $this->cronline)) !== False)
 				{
-					$cron_units = array('min','hour','day','month','dow');
-					foreach($cron_units as $n => $u)
+					$cron_units = array('min', 'hour', 'day', 'month', 'dow');
+					foreach ($cron_units as $n => $u)
 					{
 						$times[$u] = $parts[$n];
 					}
@@ -753,26 +751,26 @@ 
 			return 0;
 		}
 		$other_cronlines = array();
-		$this->installed($other_cronlines);	// find other installed cronlines
+		$this->installed($other_cronlines); // find other installed cronlines
 
-		if (($crontab = popen('/bin/sh -c "'.$this->crontab.' -" 2>&1','w')) !== False)
+		if (($crontab = popen('/bin/sh -c "'.$this->crontab.' -" 2>&1', 'w')) !== False)
 		{
 			foreach ($other_cronlines as $cronline)
 			{
-				fwrite($crontab,$cronline);		// preserv the other lines on install
+				fwrite($crontab, $cronline); // preserv the other lines on install
 			}
 			if ($times !== False)
 			{
-				$cron_units = array('min','hour','day','month','dow');
+				$cron_units = array('min', 'hour', 'day', 'month', 'dow');
 				$cronline = '';
-				foreach($cron_units as $cu)
+				foreach ($cron_units as $cu)
 				{
-					$cronline .= (isset($times[$cu]) ? $times[$cu] : '*') . ' ';
+					$cronline .= (isset($times[$cu]) ? $times[$cu] : '*').' ';
 				}
 				// -d memory_limit=-1 --> no memory limit
 				$cronline .= $this->php.' -q -d memory_limit=-1 '.$this->cronline."\n";
 				//echo "<p>Installing: '$cronline'</p>\n";
-				fwrite($crontab,$cronline);
+				fwrite($crontab, $cronline);
 			}
 			@pclose($crontab);
 		}

Braces +137 added lines, -37 removed lines

@@ -95,7 +95,10 @@ 
 			}
 			else
 			{
-				if ($this->debug) error_log(__METHOD__."(".array2string($times).", '$id', '$method', ".array2string($data).", $account_id, $debug, $allow_past) returning FALSE");
+				if ($this->debug)
+				{
+					error_log(__METHOD__."(".array2string($times).", '$id', '$method', ".array2string($data).", $account_id, $debug, $allow_past) returning FALSE");
+				}
 				return False;
 			}
 		}
@@ -113,7 +116,10 @@ 
 		);
 		$this->write($job);
 
-		if ($this->debug) error_log(__METHOD__."(".array2string($times).", '$id', '$method', ".array2string($data).", $account_id, $debug, $allow_past) returning TRUE");
+		if ($this->debug)
+		{
+			error_log(__METHOD__."(".array2string($times).", '$id', '$method', ".array2string($data).", $account_id, $debug, $allow_past) returning TRUE");
+		}
 		return True;
 	}
 
@@ -136,7 +142,8 @@ 
 			error_log(__METHOD__."(".array2string($times).", '$debug', " . date('Y-m-d H:i', $now) . ")");
 			$debug = True;	// enable syntax-error messages too
 		}
-		if(is_null($now)) {
+		if(is_null($now))
+		{
 			$now = time();
 		}
 
@@ -201,12 +208,18 @@ 
 		foreach($units as $u => $date_pattern)
 		{
 			++$n;
-			if ($this->debug) error_log("n=$n, $u: isset(times[$u]=".array2string($times[$u]).")=".(isset($times[$u])?'True':'False'));
+			if ($this->debug)
+			{
+				error_log("n=$n, $u: isset(times[$u]=".array2string($times[$u]).")=".(isset($times[$u])?'True':'False'));
+			}
 			if (isset($times[$u]))
 			{
-				if(is_array($times[$u])) {
+				if(is_array($times[$u]))
+				{
 					$time = array_keys($times[$u]);
-				} else {
+				}
+				else
+				{
 					$time = explode(',',$times[$u]);
 				}
 				$times[$u] = array();
@@ -219,7 +232,10 @@ 
 
 						if (count($arr) != 2 || !is_numeric($min) || !is_numeric($max) || $min > $max)
 						{
-							if ($debug) error_log("Syntax error in $u='$t', allowed is 'min-max', min <= max, min='$min', max='$max'");
+							if ($debug)
+							{
+								error_log("Syntax error in $u='$t', allowed is 'min-max', min <= max, min='$min', max='$max'");
+							}
 
 							return False;
 						}
@@ -230,14 +246,20 @@ 
 					}
 					else
 					{
-						if ((string)$t == '*') 	$t = '*/1';
+						if ((string)$t == '*')
+						{
+							$t = '*/1';
+						}
 
 						list($one,$inc) = $arr = explode('/',$t);
 
 						if (!(is_numeric($one) && count($arr) == 1 ||
 									count($arr) == 2 && is_numeric($inc)))
 						{
-							if ($debug) error_log("Syntax error in $u='$t', allowed is a number or '{*|range}/inc', inc='$inc'");
+							if ($debug)
+							{
+								error_log("Syntax error in $u='$t', allowed is a number or '{*|range}/inc', inc='$inc'");
+							}
 
 							return False;
 						}
@@ -255,7 +277,10 @@ 
 							}
 							elseif (count($arr) != 2 || $min > $max)
 							{
-								if ($debug) error_log("Syntax error in $u='$t', allowed is '{*|min-max}/inc', min='$min',max='$max', inc='$inc'");
+								if ($debug)
+								{
+									error_log("Syntax error in $u='$t', allowed is '{*|min-max}/inc', min='$min',max='$max', inc='$inc'");
+								}
 								return False;
 							}
 							for ($i = $min; $i <= $max; $i += $inc)
@@ -266,9 +291,13 @@ 
 					}
 				}
 			}
-			elseif ($n < $last_set || $u == 'dow')	// before last value set (or dow) => empty gets enumerated
+			elseif ($n < $last_set || $u == 'dow')
 			{
-				for ($i = $min_unit[$u]; $i <= $max_unit[$u]; ++$i)
+				// before last value set (or dow) => empty gets enumerated
+			{
+				for ($i = $min_unit[$u];
+			}
+			$i <= $max_unit[$u]; ++$i)
 				{
 					$times[$u][$i] = True;
 				}
@@ -278,7 +307,10 @@ 
 				$times[$u][$min_unit[$u]] = True;
 			}
 		}
-		if ($this->debug) error_log("enumerated times=".array2string($times));
+		if ($this->debug)
+		{
+			error_log("enumerated times=".array2string($times));
+		}
 
 		// now we have the times enumerated, lets find the first not expired one
 		//
@@ -296,7 +328,10 @@ 
 				if (isset($found[$u]))
 				{
 					$future = $future || $found[$u] > $unit_now;
-					if ($this->debug) error_log("--> already have a $u = ".$found[$u].", future='$future'");
+					if ($this->debug)
+					{
+						error_log("--> already have a $u = ".$found[$u].", future='$future'");
+					}
 					continue;	// already set
 				}
 				foreach(array_keys($times[$u]) as $unit_value)
@@ -314,30 +349,45 @@ 
 							break;
 
 					}
-					if ($valid && ($u != $next || $unit_value > $over))	 // valid and not over
+					if ($valid && ($u != $next || $unit_value > $over))
+					{
+						// valid and not over
 					{
 						$found[$u] = $unit_value;
+					}
 						$future = $future || $unit_value > $unit_now;
 						break;
 					}
 				}
-				if (!isset($found[$u]))		// we have to try the next one, if it exists
+				if (!isset($found[$u]))
+				{
+					// we have to try the next one, if it exists
 				{
 					$nexts = array_keys($units);
+				}
 					if (!isset($nexts[count($found)-1]))
 					{
-						if ($this->debug) error_log("Nothing found, exiting !!!");
+						if ($this->debug)
+						{
+							error_log("Nothing found, exiting !!!");
+						}
 						return False;
 					}
 					$next = $nexts[count($found)-1];
 					$over = $found[$next];
 					unset($found[$next]);
-					if ($this->debug) error_log("Have to try the next $next, $u's are over for $next=$over !!!");
+					if ($this->debug)
+					{
+						error_log("Have to try the next $next, $u's are over for $next=$over !!!");
+					}
 					break;
 				}
 			}
 		}
-		if ($this->debug) error_log("next=".array2string($found));
+		if ($this->debug)
+		{
+			error_log("next=".array2string($found));
+		}
 
 		return mktime($found['hour'],$found['min'],0,$found['month'],$found['day'],$found['year']);
 	}
@@ -399,7 +449,10 @@ 
 			);
 			// as the async_next column is used as a semaphore we only update it,
 			// if it is 0 (semaphore released) or older then 10min to recover from failed or crashed attempts
-			if ($exists) $where = array('(async_next=0 OR async_next<'.(time()-600).')');
+			if ($exists)
+			{
+				$where = array('(async_next=0 OR async_next<'.(time()-600).')');
+			}
 		}
 		//echo "last_run=<pre>"; print_r($last_run); echo "</pre>\n";
 		return $this->write($last_run, !!$exists, $where) > 0;
@@ -410,7 +463,10 @@ 
 	 */
 	function check_run($run_by='')
 	{
-		if ($run_by === 'fallback') flush();
+		if ($run_by === 'fallback')
+		{
+			flush();
+		}
 
 		if (!$this->last_check_run(True,False,$run_by))
 		{
@@ -432,7 +488,10 @@ 
 					// unset all objects in $GLOBALS, which are created and used by ExecMethod, as they can contain user-data
 					foreach($GLOBALS as $name => $value)
 					{
-						if ($name !== 'egw' && is_object($value)) unset($GLOBALS[$name]);
+						if ($name !== 'egw' && is_object($value))
+						{
+							unset($GLOBALS[$name]);
+						}
 					}
 					$domain = $GLOBALS['egw_info']['user']['domain'];
 					$lang   = $GLOBALS['egw_info']['user']['preferences']['common']['lang'];
@@ -465,24 +524,36 @@ 
 					$job['data'] += array_diff_key($job,array('data' => false));
 				}
 
-				if ($this->debug) error_log(__METHOD__."() processing job ".array2string($job));
+				if ($this->debug)
+				{
+					error_log(__METHOD__."() processing job ".array2string($job));
+				}
 
 				// purge keeped jobs, if they are due
 				if (is_array($job['data']) && !empty($job['data']['keep_time']))
 				{
 					if ($job['data']['keep_time'] <= time())
 					{
-						if ($this->debug) error_log(__METHOD__."() finally deleting job ".array2string($job));
+						if ($this->debug)
+						{
+							error_log(__METHOD__."() finally deleting job ".array2string($job));
+						}
 						$this->delete($job['id']);
 					}
 					// fix somehow created async-job with a next time before the keep time, eg. not updated alarm trigger time in the past
 					if ($job['next'] < $job['data']['keep_time'])
 					{
 						$job['next'] = $job['data']['keep_time'];
-						if ($this->debug) error_log(__METHOD__."() setting next to keep_time (".date('Y-m-d H:i:s', $job['data']['keep_time']).') for job '.array2string($job));
+						if ($this->debug)
+						{
+							error_log(__METHOD__."() setting next to keep_time (".date('Y-m-d H:i:s', $job['data']['keep_time']).') for job '.array2string($job));
+						}
 						$this->write($job, True);
 					}
-					if ($this->debug) error_log(__METHOD__."() keeping job ".array2string($job));
+					if ($this->debug)
+					{
+						error_log(__METHOD__."() keeping job ".array2string($job));
+					}
 					continue;
 				}
 
@@ -494,7 +565,10 @@ 
 					if (!$job['next'])
 					{
 						$job['next'] = $job['data']['keep_time'] = time() + ((int)$job['data']['keep'] > 1 ? $job['data']['keep'] : self::DEFAULT_KEEP_TIME);
-						if ($this->debug) error_log(__METHOD__."() setting keep_time to ".date('Y-m-d H:i:s', $job['data']['keep_time']).' for job '.array2string($job));
+						if ($this->debug)
+						{
+							error_log(__METHOD__."() setting keep_time to ".date('Y-m-d H:i:s', $job['data']['keep_time']).' for job '.array2string($job));
+						}
 					}
 					$this->write($job, True);
 				}
@@ -504,7 +578,10 @@ 
 				}
 				try
 				{
-					if ($this->debug) error_log(__METHOD__."() running job ".array2string($job));
+					if ($this->debug)
+					{
+						error_log(__METHOD__."() running job ".array2string($job));
+					}
 					ExecMethod($job['method'],$job['data']);
 				}
 				catch(Exception $e)
@@ -532,7 +609,10 @@ 
 	 */
 	function read($id=0,$cols='*',$offset=False,$append='ORDER BY async_next',$num_rows=0)
 	{
-		if (!is_a($this->db, 'EGroupware\\Api\\Db')) return false;
+		if (!is_a($this->db, 'EGroupware\\Api\\Db'))
+		{
+			return false;
+		}
 
 		if ($id === '%')
 		{
@@ -585,9 +665,15 @@ 
 	 */
 	function write($job, $exists = False, $where=array())
 	{
-		if (!is_a($this->db, 'EGroupware\\Api\\Db')) return 0;
+		if (!is_a($this->db, 'EGroupware\\Api\\Db'))
+		{
+			return 0;
+		}
 
-		if (is_array($job['data']) && isset($job['data']['next']) && isset($job['next'])) $job['data']['next'] = $job['next'];
+		if (is_array($job['data']) && isset($job['data']['next']) && isset($job['next']))
+		{
+			$job['data']['next'] = $job['next'];
+		}
 		$data = array(
 			'async_next'      => $job['next'],
 			'async_times'     => json_encode($job['times']),
@@ -614,7 +700,10 @@ 
 	 */
 	function delete($id)
 	{
-		if ($this->debug) error_log(__METHOD__."('$id') ".function_backtrace());
+		if ($this->debug)
+		{
+			error_log(__METHOD__."('$id') ".function_backtrace());
+		}
 		$this->db->delete($this->db_table,array('async_id' => $id),__LINE__,__FILE__);
 
 		return $this->db->affected_rows();
@@ -653,9 +742,12 @@ 
 					{
 						echo '<p>'.lang('%1 is not executable by the webserver !!!',$this->$name)."</p>\n";
 						$perms = fileperms($this->$name);
-						if (!($perms & 0x0001) && ($perms & 0x0008) && function_exists('posix_getuid'))	// only executable by group
+						if (!($perms & 0x0001) && ($perms & 0x0008) && function_exists('posix_getuid'))
+						{
+							// only executable by group
 						{
 							$group = posix_getgrgid(filegroup($this->$name));
+						}
 							$webserver = posix_getpwuid(posix_getuid ());
 							echo '<p>'.lang("You need to add the webserver user '%1' to the group '%2'.",$webserver['name'],$group['name'])."</p>\n";							}
 					}
@@ -675,10 +767,13 @@ 
 				}
 				//echo "<p>$name = '".$this->$name."'</p>\n";
 			}
-			if ($this->php5[0] == '/')	// we found a php5 binary
+			if ($this->php5[0] == '/')
+			{
+				// we found a php5 binary
 			{
 				$this->php = $this->php5;
 			}
+			}
 		}
 	}
 
@@ -695,7 +790,8 @@ 
 	 */
 	function installed(array &$other_cronlines=array())
 	{
-		if ($this->only_fallback) {
+		if ($this->only_fallback)
+		{
 			return 0;
 		}
 		$this->find_binarys();
@@ -712,7 +808,10 @@ 
 			$n = 0;
 			while ($line = fgets($crontab,256))
 			{
-				if ($this->debug) error_log(__METHOD__.'() line '.++$n.": $line");
+				if ($this->debug)
+				{
+					error_log(__METHOD__.'() line '.++$n.": $line");
+				}
 				$parts = explode(' ',$line,6);
 
 				if ($line{0} == '#' || count($parts) < 6 || ($parts[5]{0} != '/' && substr($parts[5],0,3) != 'php'))
@@ -756,7 +855,8 @@ 
 	 */
 	function install($times)
 	{
-		if ($this->only_fallback && $times !== False) {
+		if ($this->only_fallback && $times !== False)
+		{
 			return 0;
 		}
 		$other_cronlines = array();

api/src/Auth.php

Doc Comments +5 added lines, -4 removed lines

@@ -84,8 +84,8 @@ 
 	 * check if users are supposed to change their password every x sdays, then check if password is of old age
 	 * or the devil-admin reset the users password and forced the user to change his password on next login.
 	 *
-	 * @param string& $message =null on return false: message why password needs to be changed
-	 * @return boolean true: all good, false: password change required, null: password expires in N days
+	 * @param string $message =null on return false: message why password needs to be changed
+	 * @return boolean|null true: all good, false: password change required, null: password expires in N days
 	 */
 	static function check_password_change(&$message=null)
 	{
@@ -294,7 +294,7 @@ 
 	 *
 	 * uses the encryption type set in setup and calls the appropriate encryption functions
 	 *
-	 * @param $password password to encrypt
+	 * @param string $password password to encrypt
 	 */
 	static function encrypt_password($password,$sql=False)
 	{
@@ -406,6 +406,7 @@ 
 	 * @param string $form_val user input value for comparison
 	 * @param string $db_val   stored value / hash (from database)
 	 * @param string &$type    detected crypt type on return
+	 * @param string $type
 	 * @return boolean	 True on successful comparison
 	*/
 	static function crypt_compare($form_val, $db_val, &$type)
@@ -618,7 +619,7 @@ 
 	 * @param string $forbid_name =null if "yes" username or full-name split by delimiters AND longer then 3 chars are
 	 *  forbidden to be included in password, default to whatever set in config for "passwd_forbid_name"
 	 * @param array|int $account =null array with account_lid and account_fullname or account_id for $forbid_name check
-	 * @return mixed false if password is considered "safe" (or no requirements) or a string $message if "unsafe"
+	 * @return string|false false if password is considered "safe" (or no requirements) or a string $message if "unsafe"
 	 */
 	static function crackcheck($passwd, $reqstrength=null, $minlength=null, $forbid_name=null, $account=null)
 	{

Indentation +4 added lines, -4 removed lines

@@ -407,7 +407,7 @@ 
 	 * @param string $db_val   stored value / hash (from database)
 	 * @param string &$type    detected crypt type on return
 	 * @return boolean	 True on successful comparison
-	*/
+	 */
 	static function crypt_compare($form_val, $db_val, &$type)
 	{
 		// detect type of hash by salt part of $db_val
@@ -706,7 +706,7 @@ 
 	 * @param string $form_val user input value for comparison
 	 * @param string $db_val stored value (from database)
 	 * @return boolean True on successful comparison
-	*/
+	 */
 	static function smd5_compare($form_val,$db_val)
 	{
 		/* Start with the first char after {SMD5} */
@@ -728,7 +728,7 @@ 
 	 * @param string $form_val user input value for comparison
 	 * @param string $db_val   stored value (from database)
 	 * @return boolean True on successful comparison
-	*/
+	 */
 	static function sha_compare($form_val,$db_val)
 	{
 		/* Start with the first char after {SHA} */
@@ -745,7 +745,7 @@ 
 	 * @param string $form_val user input value for comparison
 	 * @param string $db_val   stored value (from database)
 	 * @return boolean	 True on successful comparison
-	*/
+	 */
 	static function ssha_compare($form_val,$db_val)
 	{
 		/* Start with the first char after {SSHA} */

Spacing +94 added lines, -94 removed lines

@@ -20,7 +20,7 @@ 
 {
 	$GLOBALS['egw_info']['server']['auth_type'] = $GLOBALS['egw_info']['server']['auth_type_'.$GLOBALS['egw_info']['flags']['currentapp']];
 }
-if(empty($GLOBALS['egw_info']['server']['auth_type']))
+if (empty($GLOBALS['egw_info']['server']['auth_type']))
 {
 	$GLOBALS['egw_info']['server']['auth_type'] = 'sql';
 }
@@ -65,7 +65,7 @@ 
 	 *
 	 * @param Backend $type =null
 	 */
-	static function backend($type=null)
+	static function backend($type = null)
 	{
 		if (is_null($type)) $type = $GLOBALS['egw_info']['server']['auth_type'];
 
@@ -92,29 +92,29 @@ 
 	 * @param string& $message =null on return false: message why password needs to be changed
 	 * @return boolean true: all good, false: password change required, null: password expires in N days
 	 */
-	static function check_password_change(&$message=null)
+	static function check_password_change(&$message = null)
 	{
 		// dont check anything for anonymous sessions/ users that are flagged as anonymous
 		if (is_object($GLOBALS['egw']->session) && $GLOBALS['egw']->session->session_flags == 'A') return true;
 
 		// some statics (and initialisation to make information and timecalculation a) more readable in conditions b) persistent per request
 		// if user has to be warned about an upcomming passwordchange, remember for the session, that he was informed
-		static $UserKnowsAboutPwdChange=null;
-		if (is_null($UserKnowsAboutPwdChange)) $UserKnowsAboutPwdChange =& Cache::getSession('phpgwapi','auth_UserKnowsAboutPwdChange');
+		static $UserKnowsAboutPwdChange = null;
+		if (is_null($UserKnowsAboutPwdChange)) $UserKnowsAboutPwdChange = & Cache::getSession('phpgwapi', 'auth_UserKnowsAboutPwdChange');
 
 		// retrieve the timestamp regarding the last change of the password from auth system and store it with the session
-		static $alpwchange_val=null;
-		static $pwdTsChecked=null;
+		static $alpwchange_val = null;
+		static $pwdTsChecked = null;
 		if (is_null($pwdTsChecked) && is_null($alpwchange_val) || (string)$alpwchange_val === '0')
 		{
-			$alpwchange_val =& Cache::getSession('phpgwapi','auth_alpwchange_val'); // set that one with the session stored value
+			$alpwchange_val = & Cache::getSession('phpgwapi', 'auth_alpwchange_val'); // set that one with the session stored value
 			// initalize statics - better readability of conditions
 			if (is_null($alpwchange_val) || (string)$alpwchange_val === '0')
 			{
 				$backend = self::backend();
 				// this may change behavior, as it should detect forced PasswordChanges from your Authentication System too.
 				// on the other side, if your auth system does not require an forcedPasswordChange, you will not be asked.
-				if (method_exists($backend,'getLastPwdChange'))
+				if (method_exists($backend, 'getLastPwdChange'))
 				{
 					$alpwchange_val = $backend->getLastPwdChange($GLOBALS['egw']->session->account_lid);
 					$pwdTsChecked = true;
@@ -128,8 +128,8 @@ 
 				//error_log(__METHOD__.__LINE__.'#'.$alpwchange_val.'# is null:'.is_null($alpwchange_val).'# is empty:'.empty($alpwchange_val).'# is set:'.isset($alpwchange_val));
 			}
 		}
-		static $passwordAgeBorder=null;
-		static $daysLeftUntilChangeReq=null;
+		static $passwordAgeBorder = null;
+		static $daysLeftUntilChangeReq = null;
 
 		// if neither timestamp isset return true, nothing to do (exept this means the password is too old)
 		if (is_null($alpwchange_val) &&
@@ -139,15 +139,15 @@ 
 		}
 		if (is_null($passwordAgeBorder) && $GLOBALS['egw_info']['server']['change_pwd_every_x_days'])
 		{
-			$passwordAgeBorder = (DateTime::to('now','ts')-($GLOBALS['egw_info']['server']['change_pwd_every_x_days']*86400));
+			$passwordAgeBorder = (DateTime::to('now', 'ts') - ($GLOBALS['egw_info']['server']['change_pwd_every_x_days'] * 86400));
 		}
 		if (is_null($daysLeftUntilChangeReq) && $GLOBALS['egw_info']['server']['warn_about_upcoming_pwd_change'])
 		{
 			// maxage - passwordage = days left until change is required
-			$daysLeftUntilChangeReq = ($GLOBALS['egw_info']['server']['change_pwd_every_x_days'] - ((DateTime::to('now','ts')-($alpwchange_val?$alpwchange_val:0))/86400));
+			$daysLeftUntilChangeReq = ($GLOBALS['egw_info']['server']['change_pwd_every_x_days'] - ((DateTime::to('now', 'ts') - ($alpwchange_val ? $alpwchange_val : 0)) / 86400));
 		}
-		if ($alpwchange_val == 0 ||	// admin requested password change
-			$passwordAgeBorder > $alpwchange_val ||	// change password every N days policy requests change
+		if ($alpwchange_val == 0 || // admin requested password change
+			$passwordAgeBorder > $alpwchange_val || // change password every N days policy requests change
 			// user should be warned N days in advance about change and is not yet
 			$GLOBALS['egw_info']['server']['change_pwd_every_x_days'] &&
 			$GLOBALS['egw_info']['user']['apps']['preferences'] &&
@@ -164,7 +164,7 @@ 
 				error_log(__METHOD__.' Password of '.$GLOBALS['egw_info']['user']['account_lid'].' ('.$GLOBALS['egw_info']['user']['account_fullname'].') is of old age.'.array2string(array(
 					'ts'=> $alpwchange_val,
 					'date'=>DateTime::to($alpwchange_val))));
-				$message = lang('It has been more then %1 days since you changed your password',$GLOBALS['egw_info']['server']['change_pwd_every_x_days']);
+				$message = lang('It has been more then %1 days since you changed your password', $GLOBALS['egw_info']['server']['change_pwd_every_x_days']);
 			}
 			else
 			{
@@ -175,7 +175,7 @@ 
 				{
 					$UserKnowsAboutPwdChange = true;
 				}
-				$message = lang('Your password is about to expire in %1 days, you may change your password now',round($daysLeftUntilChangeReq));
+				$message = lang('Your password is about to expire in %1 days, you may change your password now', round($daysLeftUntilChangeReq));
 				// user has no rights to change password --> do NOT warn, as only forced check ignores rights
 				if ($GLOBALS['egw']->acl->check('nopasswordchange', 1, 'preferences')) return true;
 				return null;
@@ -193,7 +193,7 @@ 
 	 */
 	function getLastPwdChange($username)
 	{
-		if (method_exists($this->backend,'getLastPwdChange'))
+		if (method_exists($this->backend, 'getLastPwdChange'))
 		{
 			return $this->backend->getLastPwdChange($username);
 		}
@@ -208,9 +208,9 @@ 
 	 * @param int $lastpwdchange must be a unixtimestamp
 	 * @return boolean true if account_lastpwd_change successful changed, false otherwise
 	 */
-	function setLastPwdChange($account_id=0, $passwd=NULL, $lastpwdchange=NULL)
+	function setLastPwdChange($account_id = 0, $passwd = NULL, $lastpwdchange = NULL)
 	{
-		if (method_exists($this->backend,'setLastPwdChange'))
+		if (method_exists($this->backend, 'setLastPwdChange'))
 		{
 			return $this->backend->setLastPwdChange($account_id, $passwd, $lastpwdchange);
 		}
@@ -225,7 +225,7 @@ 
 	 * @param string $passwd_type ='text' 'text' for cleartext passwords (default)
 	 * @return boolean true if successful authenticated, false otherwise
 	 */
-	function authenticate($username, $passwd, $passwd_type='text')
+	function authenticate($username, $passwd, $passwd_type = 'text')
 	{
 		return $this->backend->authenticate($username, $passwd, $passwd_type);
 	}
@@ -240,9 +240,9 @@ 
 	 * @throws Exception from backends having extra requirements
 	 * @return boolean true if password successful changed, false otherwise
 	 */
-	function change_password($old_passwd, $new_passwd, $account_id=0)
+	function change_password($old_passwd, $new_passwd, $account_id = 0)
 	{
-		if (($err = self::crackcheck($new_passwd,null,null,null,$account_id)))
+		if (($err = self::crackcheck($new_passwd, null, null, null, $account_id)))
 		{
 			throw new Exception\WrongUserinput($err);
 		}
@@ -253,7 +253,7 @@ 
 				// need to change current users password in session
 				Cache::setSession('phpgwapi', 'password', base64_encode($new_passwd));
 				$GLOBALS['egw_info']['user']['passwd'] = $new_passwd;
-				$GLOBALS['egw_info']['user']['account_lastpwd_change'] = DateTime::to('now','ts');
+				$GLOBALS['egw_info']['user']['account_lastpwd_change'] = DateTime::to('now', 'ts');
 				// invalidate EGroupware session, as password is stored in egw_info in session
 				Egw::invalidate_session_cache();
 			}
@@ -273,7 +273,7 @@ 
 	 * @param string $new_passwd =null new password, default session password
 	 * @param int $account_id =null account_id, default current user
 	 */
-	static function changepwd($old_passwd, $new_passwd=null, $account_id=null)
+	static function changepwd($old_passwd, $new_passwd = null, $account_id = null)
 	{
 		if (!isset($account_id)) $account_id = $GLOBALS['egw']->session->account_id;
 		if (!isset($new_passwd)) $new_passwd = $GLOBALS['egw']->session->passwd;
@@ -285,9 +285,9 @@ 
 			'old_passwd'  => $old_passwd,
 			'new_passwd'  => $new_passwd,
 		);
-		Hooks::process($GLOBALS['hook_values']+array(
+		Hooks::process($GLOBALS['hook_values'] + array(
 			'location' => 'changepassword'
-		),False,True);	// called for every app now, not only enabled ones)
+		), False, True); // called for every app now, not only enabled ones)
 	}
 
 	/**
@@ -295,13 +295,13 @@ 
 	 *
 	 * @param $size int-size of random string to return
 	 */
-	static function randomstring($size, $use_specialchars=false)
+	static function randomstring($size, $use_specialchars = false)
 	{
 		$random_char = array(
-			'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f',
-			'g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v',
-			'w','x','y','z','A','B','C','D','E','F','G','H','I','J','K','L',
-			'M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z'
+			'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f',
+			'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
+			'w', 'x', 'y', 'z', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L',
+			'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'
 		);
 
 		// we need special chars
@@ -314,9 +314,9 @@ 
 		$func = function_exists('random_int') ? 'random_int' : 'mt_rand';
 
 		$s = '';
-		for ($i=0; $i < $size; $i++)
+		for ($i = 0; $i < $size; $i++)
 		{
-			$s .= $random_char[$func(0, count($random_char)-1)];
+			$s .= $random_char[$func(0, count($random_char) - 1)];
 		}
 		return $s;
 	}
@@ -328,9 +328,9 @@ 
 	 *
 	 * @param $password password to encrypt
 	 */
-	static function encrypt_password($password,$sql=False)
+	static function encrypt_password($password, $sql = False)
 	{
-		if($sql)
+		if ($sql)
 		{
 			return self::encrypt_sql($password);
 		}
@@ -349,21 +349,21 @@ 
 	 * @param string &$type =null on return detected type of hash
 	 * @return boolean
 	 */
-	static function compare_password($cleartext, $encrypted, $type_in, $username='', &$type=null)
+	static function compare_password($cleartext, $encrypted, $type_in, $username = '', &$type = null)
 	{
 		// allow to specify the hash type to prefix the hash, to easy migrate passwords from ldap
 		$type = $type_in;
 		$saved_enc = $encrypted;
 		$matches = null;
-		if (preg_match('/^\\{([a-z_5]+)\\}(.+)$/i',$encrypted,$matches))
+		if (preg_match('/^\\{([a-z_5]+)\\}(.+)$/i', $encrypted, $matches))
 		{
 			$type = strtolower($matches[1]);
 			$encrypted = $matches[2];
 
-			switch($type)	// some hashs are specially "packed" in ldap
+			switch ($type)	// some hashs are specially "packed" in ldap
 			{
 				case 'md5':
-					$encrypted = implode('',unpack('H*',base64_decode($encrypted)));
+					$encrypted = implode('', unpack('H*', base64_decode($encrypted)));
 					break;
 				case 'plain':
 				case 'crypt':
@@ -374,24 +374,24 @@ 
 					break;
 			}
 		}
-		elseif($encrypted[0] == '$')
+		elseif ($encrypted[0] == '$')
 		{
 			$type = 'crypt';
 		}
 
-		switch($type)
+		switch ($type)
 		{
 			case 'plain':
 				$ret = $cleartext === $encrypted;
 				break;
 			case 'smd5':
-				$ret = self::smd5_compare($cleartext,$encrypted);
+				$ret = self::smd5_compare($cleartext, $encrypted);
 				break;
 			case 'sha':
-				$ret = self::sha_compare($cleartext,$encrypted);
+				$ret = self::sha_compare($cleartext, $encrypted);
 				break;
 			case 'ssha':
-				$ret = self::ssha_compare($cleartext,$encrypted);
+				$ret = self::ssha_compare($cleartext, $encrypted);
 				break;
 			case 'crypt':
 			case 'des':
@@ -404,7 +404,7 @@ 
 				$ret = self::crypt_compare($cleartext, $encrypted, $type);
 				break;
 			case 'md5_hmac':
-				$ret = self::md5_hmac_compare($cleartext,$encrypted,$username);
+				$ret = self::md5_hmac_compare($cleartext, $encrypted, $username);
 				break;
 			default:
 				$type = 'md5';
@@ -427,9 +427,9 @@ 
 		'ext_crypt' => array('CRYPT_EXT_DES', '_J9..', 4, ''),
 		'md5_crypt' => array('CRYPT_MD5', '$1$', 8, '$'),
 		//'old_blowfish_crypt' => array('CRYPT_BLOWFISH', '$2$', 13, ''),	// old blowfish hash not in line with php.net docu, but could be in use
-		'blowfish_crypt' => array('CRYPT_BLOWFISH', '$2a$12$', 22, ''),	// $2a$12$ = 2^12 = 4096 rounds
-		'sha256_crypt' => array('CRYPT_SHA256', '$5$', 16, '$'),	// no "round=N$" --> default of 5000 rounds
-		'sha512_crypt' => array('CRYPT_SHA512', '$6$', 16, '$'),	// no "round=N$" --> default of 5000 rounds
+		'blowfish_crypt' => array('CRYPT_BLOWFISH', '$2a$12$', 22, ''), // $2a$12$ = 2^12 = 4096 rounds
+		'sha256_crypt' => array('CRYPT_SHA256', '$5$', 16, '$'), // no "round=N$" --> default of 5000 rounds
+		'sha512_crypt' => array('CRYPT_SHA512', '$6$', 16, '$'), // no "round=N$" --> default of 5000 rounds
 	);
 
 	/**
@@ -444,17 +444,17 @@ 
 	{
 		// detect type of hash by salt part of $db_val
 		list($first, $dollar, $salt, $salt2) = explode('$', $db_val);
-		foreach(self::$crypt_params as $type => $params)
+		foreach (self::$crypt_params as $type => $params)
 		{
 			list(,$prefix, $random, $postfix) = $params;
 			list(,$d) = explode('$', $prefix);
 			if ($dollar === $d || !$dollar && ($first[0] === $prefix[0] || $first[0] !== '_' && !$prefix))
 			{
-				$len = !$postfix ? strlen($prefix)+$random : strlen($prefix.$salt.$postfix);
+				$len = !$postfix ? strlen($prefix) + $random : strlen($prefix.$salt.$postfix);
 				// sha(256|512) might contain options, explicit $rounds=N$ prefix in salt
 				if (($type == 'sha256_crypt' || $type == 'sha512_crypt') && substr($salt, 0, 7) === 'rounds=')
 				{
-					$len += strlen($salt2)+1;
+					$len += strlen($salt2) + 1;
 				}
 				break;
 			}
@@ -476,12 +476,12 @@ 
 	 * @param string $type =null default to $GLOBALS['egw_info']['server']['ldap_encryption_type']
 	 * @return string
 	 */
-	static function encrypt_ldap($password, $type=null)
+	static function encrypt_ldap($password, $type = null)
 	{
 		if (is_null($type)) $type = $GLOBALS['egw_info']['server']['ldap_encryption_type'];
 
 		$salt = '';
-		switch(strtolower($type))
+		switch (strtolower($type))
 		{
 			default:	// eg. setup >> config never saved
 			case 'des':
@@ -495,7 +495,7 @@ 
 			case 'md5_crypt':
 			case 'ext_crypt':
 				list($const, $prefix, $len, $postfix) = self::$crypt_params[$type];
-				if(defined($const) && constant($const) == 1)
+				if (defined($const) && constant($const) == 1)
 				{
 					$salt = $prefix.self::randomstring($len).$postfix;
 					$e_password = '{crypt}'.crypt($password, $salt);
@@ -508,20 +508,20 @@ 
 				/* New method taken from the openldap-software list as recommended by
 				 * Kervin L. Pierre" <kervin@blueprint-tech.com>
 				 */
-				$e_password = '{md5}' . base64_encode(pack("H*",md5($password)));
+				$e_password = '{md5}'.base64_encode(pack("H*", md5($password)));
 				break;
 			case 'smd5':
 				$salt = self::randomstring(16);
-				$hash = md5($password . $salt, true);
-				$e_password = '{SMD5}' . base64_encode($hash . $salt);
+				$hash = md5($password.$salt, true);
+				$e_password = '{SMD5}'.base64_encode($hash.$salt);
 				break;
 			case 'sha':
-				$e_password = '{SHA}' . base64_encode(sha1($password,true));
+				$e_password = '{SHA}'.base64_encode(sha1($password, true));
 				break;
 			case 'ssha':
 				$salt = self::randomstring(16);
-				$hash = sha1($password . $salt, true);
-				$e_password = '{SSHA}' . base64_encode($hash . $salt);
+				$hash = sha1($password.$salt, true);
+				$e_password = '{SSHA}'.base64_encode($hash.$salt);
 				break;
 			case 'plain':
 				// if plain no type is prepended
@@ -539,7 +539,7 @@ 
 	 * @param string $type =null default $GLOBALS['egw_info']['server']['sql_encryption_type'], if valid otherwise blowfish_crypt
 	 * @return string hash
 	 */
-	static function encrypt_sql($password, $type=null)
+	static function encrypt_sql($password, $type = null)
 	{
 		/* Grab configured type, or default to md5() (old method) */
 		if (is_null($type))
@@ -547,7 +547,7 @@ 
 			$type = @$GLOBALS['egw_info']['server']['sql_encryption_type'] ?
 				strtolower($GLOBALS['egw_info']['server']['sql_encryption_type']) : 'md5';
 		}
-		switch($type)
+		switch ($type)
 		{
 			case 'plain':
 				// since md5 is the default, type plain must be prepended, for eGroupware to understand
@@ -587,28 +587,28 @@ 
 	 * @param string &$securest =null on return securest available hash
 	 * @return array hash => label
 	 */
-	public static function passwdhashes(&$securest=null)
+	public static function passwdhashes(&$securest = null)
 	{
 		$hashes = array();
 
 		/* Check for available crypt methods based on what is defined by php */
-		if(defined('CRYPT_BLOWFISH') && CRYPT_BLOWFISH == 1)
+		if (defined('CRYPT_BLOWFISH') && CRYPT_BLOWFISH == 1)
 		{
 			$hashes['blowfish_crypt'] = 'blowfish_crypt';
 		}
-		if(defined('CRYPT_SHA512') && CRYPT_SHA512 == 1)
+		if (defined('CRYPT_SHA512') && CRYPT_SHA512 == 1)
 		{
 			$hashes['sha512_crypt'] = 'sha512_crypt';
 		}
-		if(defined('CRYPT_SHA256') && CRYPT_SHA256 == 1)
+		if (defined('CRYPT_SHA256') && CRYPT_SHA256 == 1)
 		{
 			$hashes['sha256_crypt'] = 'sha256_crypt';
 		}
-		if(defined('CRYPT_MD5') && CRYPT_MD5 == 1)
+		if (defined('CRYPT_MD5') && CRYPT_MD5 == 1)
 		{
 			$hashes['md5_crypt'] = 'md5_crypt';
 		}
-		if(defined('CRYPT_EXT_DES') && CRYPT_EXT_DES == 1)
+		if (defined('CRYPT_EXT_DES') && CRYPT_EXT_DES == 1)
 		{
 			$hashes['ext_crypt'] = 'ext_crypt';
 		}
@@ -617,7 +617,7 @@ 
 			'smd5' => 'smd5',
 			'sha'  => 'sha',
 		);
-		if(@defined('CRYPT_STD_DES') && CRYPT_STD_DES == 1)
+		if (@defined('CRYPT_STD_DES') && CRYPT_STD_DES == 1)
 		{
 			$hashes['crypt'] = 'crypt';
 		}
@@ -650,7 +650,7 @@ 
 	 * @param array|int $account =null array with account_lid and account_fullname or account_id for $forbid_name check
 	 * @return mixed false if password is considered "safe" (or no requirements) or a string $message if "unsafe"
 	 */
-	static function crackcheck($passwd, $reqstrength=null, $minlength=null, $forbid_name=null, $account=null)
+	static function crackcheck($passwd, $reqstrength = null, $minlength = null, $forbid_name = null, $account = null)
 	{
 		if (!isset($reqstrength)) $reqstrength = $GLOBALS['egw_info']['server']['force_pwd_strength'];
 		if (!isset($minlength)) $minlength = $GLOBALS['egw_info']['server']['force_pwd_length'];
@@ -664,11 +664,11 @@ 
 		{
 			if (!isset($reqstrength) || $reqstrength == 5)
 			{
-				Config::save_value('force_pwd_strength', $reqstrength=4, 'phpgwapi');
+				Config::save_value('force_pwd_strength', $reqstrength = 4, 'phpgwapi');
 			}
 			if (!isset($minlength))
 			{
-				Config::save_value('force_pwd_length', $minlength=7, 'phpgwapi');
+				Config::save_value('force_pwd_length', $minlength = 7, 'phpgwapi');
 			}
 			Config::save_value('check_save_passwd', null, 'phpgwapi');
 		}
@@ -687,7 +687,7 @@ 
 				throw new Exception\WrongParameter('crackcheck(..., forbid_name=true, account) requires account-data!');
 			}
 			$parts = preg_split("/[,._ \t0-9-]+/", $account['account_fullname'].','.$account['account_lid']);
-			foreach($parts as $part)
+			foreach ($parts as $part)
 			{
 				if (strlen($part) > 2 && stripos($passwd, $part) !== false)
 				{
@@ -700,15 +700,15 @@ 
 		if ($reqstrength)
 		{
 			$missing = array();
-			if (!preg_match('/(.*\d.*){'. ($non=1). ',}/',$passwd))
+			if (!preg_match('/(.*\d.*){'.($non = 1).',}/', $passwd))
 			{
 				$missing[] = lang('numbers');
 			}
-			if (!preg_match('/(.*[[:upper:]].*){'. ($nou=1). ',}/',$passwd))
+			if (!preg_match('/(.*[[:upper:]].*){'.($nou = 1).',}/', $passwd))
 			{
 				$missing[] = lang('uppercase letters');
 			}
-			if (!preg_match('/(.*[[:lower:]].*){'. ($nol=1). ',}/',$passwd))
+			if (!preg_match('/(.*[[:lower:]].*){'.($nol = 1).',}/', $passwd))
 			{
 				$missing[] = lang('lowercase letters');
 			}
@@ -719,7 +719,7 @@ 
 			if (4 - count($missing) < $reqstrength)
 			{
 				$errors[] = lang('password contains only %1 of required %2 character classes: no %3',
-					4-count($missing), $reqstrength, implode(', ', $missing));
+					4 - count($missing), $reqstrength, implode(', ', $missing));
 			}
 		}
 		if ($errors)
@@ -737,19 +737,19 @@ 
 	 * @param string $db_val stored value (from database)
 	 * @return boolean True on successful comparison
 	*/
-	static function smd5_compare($form_val,$db_val)
+	static function smd5_compare($form_val, $db_val)
 	{
 		/* Start with the first char after {SMD5} */
-		$hash = base64_decode(substr($db_val,6));
+		$hash = base64_decode(substr($db_val, 6));
 
 		/* SMD5 hashes are 16 bytes long */
-		$orig_hash = cut_bytes($hash, 0, 16);	// binary string need to use cut_bytes, not mb_substr(,,'utf-8')!
+		$orig_hash = cut_bytes($hash, 0, 16); // binary string need to use cut_bytes, not mb_substr(,,'utf-8')!
 		$salt = cut_bytes($hash, 16);
 
-		$new_hash = md5($form_val . $salt,true);
+		$new_hash = md5($form_val.$salt, true);
 		//echo '<br>  DB: ' . base64_encode($orig_hash) . '<br>FORM: ' . base64_encode($new_hash);
 
-		return strcmp($orig_hash,$new_hash) == 0;
+		return strcmp($orig_hash, $new_hash) == 0;
 	}
 
 	/**
@@ -759,14 +759,14 @@ 
 	 * @param string $db_val   stored value (from database)
 	 * @return boolean True on successful comparison
 	*/
-	static function sha_compare($form_val,$db_val)
+	static function sha_compare($form_val, $db_val)
 	{
 		/* Start with the first char after {SHA} */
-		$hash = base64_decode(substr($db_val,5));
-		$new_hash = sha1($form_val,true);
+		$hash = base64_decode(substr($db_val, 5));
+		$new_hash = sha1($form_val, true);
 		//echo '<br>  DB: ' . base64_encode($orig_hash) . '<br>FORM: ' . base64_encode($new_hash);
 
-		return strcmp($hash,$new_hash) == 0;
+		return strcmp($hash, $new_hash) == 0;
 	}
 
 	/**
@@ -776,18 +776,18 @@ 
 	 * @param string $db_val   stored value (from database)
 	 * @return boolean	 True on successful comparison
 	*/
-	static function ssha_compare($form_val,$db_val)
+	static function ssha_compare($form_val, $db_val)
 	{
 		/* Start with the first char after {SSHA} */
 		$hash = base64_decode(substr($db_val, 6));
 
 		// SHA-1 hashes are 160 bits long
-		$orig_hash = cut_bytes($hash, 0, 20);	// binary string need to use cut_bytes, not mb_substr(,,'utf-8')!
+		$orig_hash = cut_bytes($hash, 0, 20); // binary string need to use cut_bytes, not mb_substr(,,'utf-8')!
 		$salt = cut_bytes($hash, 20);
-		$new_hash = sha1($form_val . $salt,true);
+		$new_hash = sha1($form_val.$salt, true);
 
 		//error_log(__METHOD__."('$form_val', '$db_val') hash='$hash', orig_hash='$orig_hash', salt='$salt', new_hash='$new_hash' returning ".array2string(strcmp($orig_hash,$new_hash) == 0));
-		return strcmp($orig_hash,$new_hash) == 0;
+		return strcmp($orig_hash, $new_hash) == 0;
 	}
 
 	/**
@@ -798,11 +798,11 @@ 
 	 * @param string $_key       key for md5_hmac-encryption (username for imported smf users)
 	 * @return boolean	 True on successful comparison
 	 */
-	static function md5_hmac_compare($form_val,$db_val,$_key)
+	static function md5_hmac_compare($form_val, $db_val, $_key)
 	{
 		$key = str_pad(strlen($_key) <= 64 ? $_key : pack('H*', md5($_key)), 64, chr(0x00));
-		$md5_hmac = md5(($key ^ str_repeat(chr(0x5c), 64)) . pack('H*', md5(($key ^ str_repeat(chr(0x36), 64)). $form_val)));
+		$md5_hmac = md5(($key^str_repeat(chr(0x5c), 64)).pack('H*', md5(($key^str_repeat(chr(0x36), 64)).$form_val)));
 
-		return strcmp($md5_hmac,$db_val) == 0;
+		return strcmp($md5_hmac, $db_val) == 0;
 	}
 }

Braces +40 added lines, -10 removed lines

@@ -67,7 +67,10 @@ 
 	 */
 	static function backend($type=null)
 	{
-		if (is_null($type)) $type = $GLOBALS['egw_info']['server']['auth_type'];
+		if (is_null($type))
+		{
+			$type = $GLOBALS['egw_info']['server']['auth_type'];
+		}
 
 		$backend_class = __CLASS__.'\\'.ucfirst($type);
 
@@ -95,12 +98,18 @@ 
 	static function check_password_change(&$message=null)
 	{
 		// dont check anything for anonymous sessions/ users that are flagged as anonymous
-		if (is_object($GLOBALS['egw']->session) && $GLOBALS['egw']->session->session_flags == 'A') return true;
+		if (is_object($GLOBALS['egw']->session) && $GLOBALS['egw']->session->session_flags == 'A')
+		{
+			return true;
+		}
 
 		// some statics (and initialisation to make information and timecalculation a) more readable in conditions b) persistent per request
 		// if user has to be warned about an upcomming passwordchange, remember for the session, that he was informed
 		static $UserKnowsAboutPwdChange=null;
-		if (is_null($UserKnowsAboutPwdChange)) $UserKnowsAboutPwdChange =& Cache::getSession('phpgwapi','auth_UserKnowsAboutPwdChange');
+		if (is_null($UserKnowsAboutPwdChange))
+		{
+			$UserKnowsAboutPwdChange =& Cache::getSession('phpgwapi','auth_UserKnowsAboutPwdChange');
+		}
 
 		// retrieve the timestamp regarding the last change of the password from auth system and store it with the session
 		static $alpwchange_val=null;
@@ -177,7 +186,10 @@ 
 				}
 				$message = lang('Your password is about to expire in %1 days, you may change your password now',round($daysLeftUntilChangeReq));
 				// user has no rights to change password --> do NOT warn, as only forced check ignores rights
-				if ($GLOBALS['egw']->acl->check('nopasswordchange', 1, 'preferences')) return true;
+				if ($GLOBALS['egw']->acl->check('nopasswordchange', 1, 'preferences'))
+				{
+					return true;
+				}
 				return null;
 			}
 			return false;
@@ -275,8 +287,14 @@ 
 	 */
 	static function changepwd($old_passwd, $new_passwd=null, $account_id=null)
 	{
-		if (!isset($account_id)) $account_id = $GLOBALS['egw']->session->account_id;
-		if (!isset($new_passwd)) $new_passwd = $GLOBALS['egw']->session->passwd;
+		if (!isset($account_id))
+		{
+			$account_id = $GLOBALS['egw']->session->account_id;
+		}
+		if (!isset($new_passwd))
+		{
+			$new_passwd = $GLOBALS['egw']->session->passwd;
+		}
 
 		// run changepwasswd hook
 		$GLOBALS['hook_values'] = array(
@@ -478,7 +496,10 @@ 
 	 */
 	static function encrypt_ldap($password, $type=null)
 	{
-		if (is_null($type)) $type = $GLOBALS['egw_info']['server']['ldap_encryption_type'];
+		if (is_null($type))
+		{
+			$type = $GLOBALS['egw_info']['server']['ldap_encryption_type'];
+		}
 
 		$salt = '';
 		switch(strtolower($type))
@@ -652,9 +673,18 @@ 
 	 */
 	static function crackcheck($passwd, $reqstrength=null, $minlength=null, $forbid_name=null, $account=null)
 	{
-		if (!isset($reqstrength)) $reqstrength = $GLOBALS['egw_info']['server']['force_pwd_strength'];
-		if (!isset($minlength)) $minlength = $GLOBALS['egw_info']['server']['force_pwd_length'];
-		if (!isset($forbid_name)) $forbid_name = $GLOBALS['egw_info']['server']['passwd_forbid_name'];
+		if (!isset($reqstrength))
+		{
+			$reqstrength = $GLOBALS['egw_info']['server']['force_pwd_strength'];
+		}
+		if (!isset($minlength))
+		{
+			$minlength = $GLOBALS['egw_info']['server']['force_pwd_length'];
+		}
+		if (!isset($forbid_name))
+		{
+			$forbid_name = $GLOBALS['egw_info']['server']['passwd_forbid_name'];
+		}
 
 		// load preferences translations, as changepassword get's called from admin too
 		Translation::add_app('preferences');

api/src/CalDAV/PropfindIterator.php

Doc Comments +1 added lines

@@ -94,6 +94,7 @@
 	 * @param Handler $handler
 	 * @param array $filter filter for propfind call
 	 * @param array $files =array() extra files/responses to return too
+	 * @param string $path
 	 */
 	public function __construct(Handler $handler, $path, array $filter,array &$files=array())
 	{

Spacing +7 added lines, -7 removed lines

@@ -71,7 +71,7 @@ 
 	 *
 	 * @var int
 	 */
-	protected $start=0;
+	protected $start = 0;
 
 	/**
 	 * Number of entries queried from callback in one call
@@ -95,7 +95,7 @@ 
 	 * @param array $filter filter for propfind call
 	 * @param array $files =array() extra files/responses to return too
 	 */
-	public function __construct(Handler $handler, $path, array $filter,array &$files=array())
+	public function __construct(Handler $handler, $path, array $filter, array &$files = array())
 	{
 		if ($this->debug) error_log(__METHOD__."('$path', ".array2string($filter).",)");
 		$this->path    = $path;
@@ -126,7 +126,7 @@ 
 		$current = current($this->files);
 
 		if ($this->debug) error_log(__METHOD__."() returning ".array2string($current['path']));
-		return $current['path'];	// we return path as key
+		return $current['path']; // we return path as key
 	}
 
 	/**
@@ -146,11 +146,11 @@ 
 			return false;
 		}
 		// try query further files via propfind callback of handler and store result in $this->files
-		$this->files = $this->handler->propfind_callback($this->path,$this->filter,array($this->start,self::CHUNK_SIZE));
+		$this->files = $this->handler->propfind_callback($this->path, $this->filter, array($this->start, self::CHUNK_SIZE));
 		if (!is_array($this->files) || !($entries = count($this->files)))
 		{
 			if ($this->debug) error_log(__METHOD__."() returning FALSE (no more entries)");
-			return false;	// no further entries
+			return false; // no further entries
 		}
 		$this->start += self::CHUNK_SIZE;
 		reset($this->files);
@@ -169,7 +169,7 @@ 
 
 		$this->start = 0;
 		$this->files = $this->common_files;
-		if (!$this->files) $this->next();	// otherwise valid will return false and nothing get returned
+		if (!$this->files) $this->next(); // otherwise valid will return false and nothing get returned
 		reset($this->files);
 	}
 
@@ -178,7 +178,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function valid ()
+	public function valid()
 	{
 		if ($this->debug) error_log(__METHOD__."() returning ".array2string(current($this->files) !== false));
 		return current($this->files) !== false;

Braces +41 added lines, -10 removed lines

@@ -97,7 +97,10 @@ 
 	 */
 	public function __construct(Handler $handler, $path, array $filter,array &$files=array())
 	{
-		if ($this->debug) error_log(__METHOD__."('$path', ".array2string($filter).",)");
+		if ($this->debug)
+		{
+			error_log(__METHOD__."('$path', ".array2string($filter).",)");
+		}
 		$this->path    = $path;
 		$this->handler = $handler;
 		$this->filter  = $filter;
@@ -112,7 +115,10 @@ 
 	 */
 	public function current()
 	{
-		if ($this->debug) error_log(__METHOD__."() returning ".array2string(current($this->files)));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."() returning ".array2string(current($this->files)));
+		}
 		return current($this->files);
 	}
 
@@ -125,7 +131,10 @@ 
 	{
 		$current = current($this->files);
 
-		if ($this->debug) error_log(__METHOD__."() returning ".array2string($current['path']));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."() returning ".array2string($current['path']));
+		}
 		return $current['path'];	// we return path as key
 	}
 
@@ -136,26 +145,38 @@ 
 	{
 		if (next($this->files) !== false)
 		{
-			if ($this->debug) error_log(__METHOD__."() returning TRUE");
+			if ($this->debug)
+			{
+				error_log(__METHOD__."() returning TRUE");
+			}
 			return true;
 		}
 		// check if previous query gave less then CHUNK_SIZE entries --> we're done
 		if ($this->start && count($this->files) < self::CHUNK_SIZE)
 		{
-			if ($this->debug) error_log(__METHOD__."() returning FALSE (no more entries)");
+			if ($this->debug)
+			{
+				error_log(__METHOD__."() returning FALSE (no more entries)");
+			}
 			return false;
 		}
 		// try query further files via propfind callback of handler and store result in $this->files
 		$this->files = $this->handler->propfind_callback($this->path,$this->filter,array($this->start,self::CHUNK_SIZE));
 		if (!is_array($this->files) || !($entries = count($this->files)))
 		{
-			if ($this->debug) error_log(__METHOD__."() returning FALSE (no more entries)");
+			if ($this->debug)
+			{
+				error_log(__METHOD__."() returning FALSE (no more entries)");
+			}
 			return false;	// no further entries
 		}
 		$this->start += self::CHUNK_SIZE;
 		reset($this->files);
 
-		if ($this->debug) error_log(__METHOD__."() this->start=$this->start, entries=$entries, count(this->files)=".count($this->files)." returning ".array2string(current($this->files) !== false));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."() this->start=$this->start, entries=$entries, count(this->files)=".count($this->files)." returning ".array2string(current($this->files) !== false));
+		}
 
 		return current($this->files) !== false;
 	}
@@ -165,11 +186,18 @@ 
 	 */
 	public function rewind()
 	{
-		if ($this->debug) error_log(__METHOD__."()");
+		if ($this->debug)
+		{
+			error_log(__METHOD__."()");
+		}
 
 		$this->start = 0;
 		$this->files = $this->common_files;
-		if (!$this->files) $this->next();	// otherwise valid will return false and nothing get returned
+		if (!$this->files)
+		{
+			$this->next();
+		}
+		// otherwise valid will return false and nothing get returned
 		reset($this->files);
 	}
 
@@ -180,7 +208,10 @@ 
 	 */
 	public function valid ()
 	{
-		if ($this->debug) error_log(__METHOD__."() returning ".array2string(current($this->files) !== false));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."() returning ".array2string(current($this->files) !== false));
+		}
 		return current($this->files) !== false;
 	}
 }

api/src/Categories.php

Doc Comments +6 added lines, -6 removed lines

@@ -322,13 +322,13 @@ 
 	 * return a sorted array populated with categories (main sorting criteria is hierachy!)
 	 *
 	 * @param int $start =0 see $limit
-	 * @param boolean|int $limit if true limited query to maxmatches rows (starting with $start)
+	 * @param boolean $limit if true limited query to maxmatches rows (starting with $start)
 	 * @param string $query ='' query-pattern
 	 * @param string $sort ='ASC' sort order, either defaults to 'ASC'
 	 * @param string $order ='cat_name' order by
 	 * @param boolean|string $globals includes the global egroupware categories or not,
 	 * 	'all_no_acl' to return global and all non-private user categories independent of ACL
-	 * @param array|int $parent_id =0 return only subcats of $parent_id(s)
+	 * @param integer $parent_id =0 return only subcats of $parent_id(s)
 	 * @param boolean $unserialize_data =true return $cat['data'] as array (not serialized array)
 	 * @return array with cats
 	 */
@@ -507,7 +507,7 @@ 
 	 * @param mixed $category category as array or the category_id
 	 * @param boolean $no_acl_check =false if true, grants are NOT checked, gives access to all non-private categories of all users
 	 * @param boolean $allow_global_read if true, global cats are allowed (independent of app) for reading
-	 * @return boolean true permission granted, false for permission denied, null for category does not exist
+	 * @return null|boolean true permission granted, false for permission denied, null for category does not exist
 	 */
 	public function check_perms($needed, $category, $no_acl_check=false, $allow_global_read=false)
 	{
@@ -675,7 +675,7 @@ 
 	 * check_consistency4update - for edit
 	 *
 	 * @param array $values array with cat-data (it need to be complete, as everything get's written)
-	 * @return mixed string/boolean errorstring if consitency check failed / true if the consistency check did not fail
+	 * @return string|boolean string/boolean errorstring if consitency check failed / true if the consistency check did not fail
 	 */
 	function check_consistency4update($values)
 	{
@@ -822,7 +822,7 @@ 
 	 *
 	 * @param int|array $cat
 	 * @param boolean $application_global =false true check for application global categories only (appname == 'phpgw')
-	 * @return boolean
+	 * @return null|boolean
 	 */
 	static function is_global($cat,$application_global=false)
 	{
@@ -1030,7 +1030,7 @@ 
 	 *
 	 * @param string appname
 	 *
-	 * @return Returns the URL, but you do not need to do anything with it.
+	 * @return string the URL, but you do not need to do anything with it.
 	 */
 	public static function css($appname)
 	{

Indentation +7 added lines, -7 removed lines

@@ -1044,13 +1044,13 @@
 	}
 
 	/**
-	* Get the color of a category
-	*
-	* For multiple cats, the first with a color is used
-	*
-	* @param int|string $_cats multiple comma-separated cat_id's
-	* @return string
-	*/
+	 * Get the color of a category
+	 *
+	 * For multiple cats, the first with a color is used
+	 *
+	 * @param int|string $_cats multiple comma-separated cat_id's
+	 * @return string
+	 */
 	static function cats2color($_cats)
 	{
 		static $cat2color = array();

Braces +208 added lines, -52 removed lines

@@ -122,7 +122,10 @@ 
 	 */
 	function __construct($accountid='',$app_name = '')
 	{
-		if (!$app_name) $app_name = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$app_name)
+		{
+			$app_name = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		if ($accountid === self::GLOBAL_ACCOUNT ||
 			$accountid < 0 && $GLOBALS['egw']->accounts->exists($accountid) == 2)
@@ -138,10 +141,13 @@ 
 		$this->app_name		= $app_name;
 		$this->db			= $GLOBALS['egw']->db;
 
-		if (is_null(self::$cache))	// should not be necessary, as cache is load and restored by egw object
+		if (is_null(self::$cache))
+		{
+			// should not be necessary, as cache is load and restored by egw object
 		{
 			self::init_cache();
 		}
+		}
 		if (is_null(self::$global_marker))
 		{
 			// as et2 adds options with .text(), it can't be entities, but php knows no string literals with utf-8
@@ -189,7 +195,9 @@ 
 		$cats = array();
 		foreach(self::$cache as $cat)
 		{
-			if ($filter) foreach($filter as $col => $val)
+			if ($filter)
+			{
+				foreach($filter as $col => $val)
 			{
 				if (!is_array($val) && $val[0] === '!')
 				{
@@ -197,10 +205,14 @@ 
 					if (($col == 'name' || $col == 'description') && is_string($cat[$col]))
 					{
 						if ($cat[$col] == substr($val,1) || trim($cat[$col]) == substr($val,1)) continue 2;
+			}
 					}
 					else
 					{
-						if ($cat[$col] == substr($val,1)) continue 2;
+						if ($cat[$col] == substr($val,1))
+						{
+							continue 2;
+						}
 					}
 				}
 				elseif (is_array($val))
@@ -208,11 +220,17 @@ 
 					// also match against trimmed database entry on name and description fields
 					if (($col == 'name' || $col == 'description') && is_string($cat[$col]))
 					{
-						if (!in_array($cat[$col],$val) && !in_array(trim($cat[$col]),$val)) continue 2;
+						if (!in_array($cat[$col],$val) && !in_array(trim($cat[$col]),$val))
+						{
+							continue 2;
+						}
 					}
 					else
 					{
-						if (!in_array($cat[$col],$val)) continue 2;
+						if (!in_array($cat[$col],$val))
+						{
+							continue 2;
+						}
 					}
 				}
 				else
@@ -220,16 +238,25 @@ 
 					// also match against trimmed database entry on name and description fields
 					if (($col == 'name' || $col == 'description') && is_string($cat[$col]))
 					{
-						if ($cat[$col] != $val && trim($cat[$col]) != $val) continue 2;
+						if ($cat[$col] != $val && trim($cat[$col]) != $val)
+						{
+							continue 2;
+						}
 					}
 					else
 					{
-						if ($cat[$col] != $val) continue 2;
+						if ($cat[$col] != $val)
+						{
+							continue 2;
+						}
 					}
 				}
 			}
 			// check if certain parent required
-			if ($parent_id && !in_array($cat['parent'],(array)$parent_id)) continue;
+			if ($parent_id && !in_array($cat['parent'],(array)$parent_id))
+			{
+				continue;
+			}
 
 			// return global categories just if $globals is set
 			if (!$globals && $cat['appname'] == self::GLOBAL_APPNAME)
@@ -247,30 +274,55 @@ 
 			switch ($type)
 			{
 				case 'subs':
-					if (!$cat['parent']) continue 2;	// 2 for switch AND foreach!
+					if (!$cat['parent'])
+					{
+						continue 2;
+					}
+					// 2 for switch AND foreach!
 					break;
 				case 'mains':
-					if ($cat['parent']) continue 2;
+					if ($cat['parent'])
+					{
+						continue 2;
+					}
 					break;
 				case 'appandmains':
-					if ($cat['appname'] != $this->app_name || $cat['parent']) continue 2;
+					if ($cat['appname'] != $this->app_name || $cat['parent'])
+					{
+						continue 2;
+					}
 					break;
 				case 'appandsubs':
-					if ($cat['appname'] != $this->app_name || !$cat['parent']) continue 2;
+					if ($cat['appname'] != $this->app_name || !$cat['parent'])
+					{
+						continue 2;
+					}
 					break;
 				case 'noglobal':
-					if ($cat['appname'] == $this->app_name) continue 2;
+					if ($cat['appname'] == $this->app_name)
+					{
+						continue 2;
+					}
 					break;
 				case 'noglobalapp':
-					if ($cat['appname'] != $this->app_name || $cat['owner'] == (int)$this->account_id) continue 2;
+					if ($cat['appname'] != $this->app_name || $cat['owner'] == (int)$this->account_id)
+					{
+						continue 2;
+					}
 					break;
 			}
 
 			// check name and description for $query
-			if ($query && stristr($cat['name'],$query) === false && stristr($cat['description'],$query) === false) continue;
+			if ($query && stristr($cat['name'],$query) === false && stristr($cat['description'],$query) === false)
+			{
+				continue;
+			}
 
 			// check if last modified since
-			if ($lastmod > 0 && $cat['last_mod'] <= $lastmod) continue;
+			if ($lastmod > 0 && $cat['last_mod'] <= $lastmod)
+			{
+				continue;
+			}
 
 			$cat['data'] = $cat['data'] ? json_php_unserialize($cat['data'], true) : array();
 
@@ -281,13 +333,23 @@ 
 			//error_log(__METHOD__."($type,$start,$limit,$query,$sort,$order,$globals,parent=$parent_id,$lastmod,$column) account_id=$this->account_id, appname=$this->app_name = FALSE");
 			return array();
 		}
-		if (!$sort) $sort = 'ASC';
+		if (!$sort)
+		{
+			$sort = 'ASC';
+		}
 		// order the entries if necessary (cache is already ordered in or default order: cat_main, cat_level, cat_name ASC)
 		if ($this->total_records > 1 && !empty($order) &&
 			preg_match('/^[a-zA-Z_(), ]+$/',$order) && preg_match('/^(ASC|DESC|asc|desc)$/',$sort))
 		{
-			if (strstr($order,'cat_data') !== false) $order = 'cat_data';	// sitemgr orders by round(cat_data)!
-			if (substr($order,0,4) == 'cat_') $order = substr($order,4);
+			if (strstr($order,'cat_data') !== false)
+			{
+				$order = 'cat_data';
+			}
+			// sitemgr orders by round(cat_data)!
+			if (substr($order,0,4) == 'cat_')
+			{
+				$order = substr($order,4);
+			}
 			$sign = strtoupper($sort) == 'DESC' ? -1 : 1;
 			usort($cats, function($a, $b) use ($order, $sign)
 			{
@@ -301,7 +363,10 @@ 
 		// limit the number of returned rows
 		if ($limit)
 		{
-			if (!is_int($limit)) $limit = (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
+			if (!is_int($limit))
+			{
+				$limit = (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
+			}
 			$cats = array_slice($cats,(int)$start,$limit);
 		}
 		// return only a certain column (why not return is as value?)
@@ -334,15 +399,24 @@ 
 	 */
 	function return_sorted_array($start=0,$limit=True,$query='',$sort='ASC',$order='cat_name',$globals=False, $parent_id=0,$unserialize_data=true,$filter=null)
 	{
-		if (!$sort)  $sort = 'ASC';
-		if (!$order) $order = 'cat_name';
+		if (!$sort)
+		{
+			$sort = 'ASC';
+		}
+		if (!$order)
+		{
+			$order = 'cat_name';
+		}
 
 		//error_log(__METHOD__."($start,$limit,$query,$sort,$order,globals=$globals,parent=$parent_id,$unserialize_data) account_id=$this->account_id, appname=$this->app_name: ".function_backtrace());
 
 		$parents = $cats = array();
 
 		// Cast parent_id to array, but only if there is one
-		if($parent_id !== false && $parent_id !== null) $parent_id = (array)$parent_id;
+		if($parent_id !== false && $parent_id !== null)
+		{
+			$parent_id = (array)$parent_id;
+		}
 		if (!($cats = $this->return_array('all',0,false,$query,$sort,$order,$globals,$parent_id,-1,'',$filter,$unserialize_data)))
 		{
 			$cats = array();
@@ -352,7 +426,9 @@ 
 			$parents[] = $cat['id'];
 		}
 
-		if($parent_id || !$cats) // Avoid wiping search results
+		if($parent_id || !$cats)
+		{
+			// Avoid wiping search results
 		{
 			// Go find the children
 			while (count($parents))
@@ -360,6 +436,7 @@ 
 				if (!($subs = $this->return_array('all',0,false,$query,$sort,$order,$globals,$parents,-1,'',$filter,$unserialize_data)))
 				{
 					break;
+		}
 				}
 				$parents = $children = array();
 				foreach($subs as $cat)
@@ -391,7 +468,10 @@ 
 		// limit the number of returned rows
 		if ($limit)
 		{
-			if (!is_int($limit)) $limit = (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
+			if (!is_int($limit))
+			{
+				$limit = (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
+			}
 			$cats = array_slice($cats,(int)$start,$limit);
 		}
 		reset($cats);	// some old code (eg. sitemgr) relies on the array-pointer!
@@ -410,9 +490,15 @@ 
 	 */
 	static function read($id)
 	{
-		if (is_null(self::$cache)) self::init_cache();
+		if (is_null(self::$cache))
+		{
+			self::init_cache();
+		}
 
-		if (!isset(self::$cache[$id])) return false;
+		if (!isset(self::$cache[$id]))
+		{
+			return false;
+		}
 
 		$cat = self::$cache[$id];
 		$cat['data'] = $cat['data'] ? ((($arr=json_php_unserialize($cat['data'], true)) !== false || $cat['data'] === 'b:0;') ?
@@ -475,8 +561,11 @@ 
 	 * @return string truncated commaseparated list of category ids
 	 */
 	function check_list($needed, $cat_list)
- 	{
-		if (empty($cat_list)) return $cat_list;
+	{
+		if (empty($cat_list))
+		{
+			return $cat_list;
+		}
 		if (is_array($cat_list))
 		{
 			$cat_list = implode(',',$cat_list);
@@ -487,10 +576,13 @@ 
 		{
 			foreach($cat_arr as $id=>$cat_id)
 			{
-				if (!$this->check_perms($needed, $cat_id, false, $needed == Acl::READ))	// allow reading all global cats
+				if (!$this->check_perms($needed, $cat_id, false, $needed == Acl::READ))
+				{
+					// allow reading all global cats
 				{
 					unset($cat_arr[$id]);
 				}
+				}
 			}
 			$cat_list = implode(',',$cat_arr);
 		}
@@ -596,9 +688,15 @@ 
 				{
 					$update = array('cat_level' => $cat['level']-1);
 
-					if ($new_main) $update['cat_main'] = $new_main;
+					if ($new_main)
+					{
+						$update['cat_main'] = $new_main;
+					}
 
-					if ($cat['parent'] == $cat_id) $update['cat_parent'] = $new_parent;
+					if ($cat['parent'] == $cat_id)
+					{
+						$update['cat_parent'] = $new_parent;
+					}
 
 					$this->db->update(self::TABLE,$update,array(
 						'cat_id' => $cat['id'],
@@ -624,9 +722,13 @@ 
 			'modify_subs' => $modify_subs,
 			'location'    => 'delete_category'
 		);
-		if($this->is_global($cat_id, true))	// true = application global (otherwise eg. global addressbook categories call all apps)
+		if($this->is_global($cat_id, true))
+		{
+			// true = application global (otherwise eg. global addressbook categories call all apps)
 		{
-			Hooks::process($GLOBALS['hook_values'],False,True);  // called for every app now, not only enabled ones)
+			Hooks::process($GLOBALS['hook_values'],False,True);
+		}
+		// called for every app now, not only enabled ones)
 		}
 		else
 		{
@@ -682,12 +784,22 @@ 
 		// check if we try to move an element down its own subtree, which will fail
 		foreach ($this->return_sorted_array('',False,'','','',False, $values['id']) as $cat)
 		{
-			if ($cat['id'] == $values['parent']) return lang('Cannot set a category as parent, which is part of this categorys subtree!');
+			if ($cat['id'] == $values['parent'])
+			{
+				return lang('Cannot set a category as parent, which is part of this categorys subtree!');
+			}
 		}
 		// check if we try to be our own parent
-		if ($values['parent']==$values['id']) return lang('Cannot set this cat as its own parent!'); // deny to be our own parent
+		if ($values['parent']==$values['id'])
+		{
+			return lang('Cannot set this cat as its own parent!');
+		}
+		// deny to be our own parent
 		// check if parent still exists
-		if ((int)$values['parent']>0 && !$this->read($values['parent'])) return lang('Chosen parent category no longer exists');
+		if ((int)$values['parent']>0 && !$this->read($values['parent']))
+		{
+			return lang('Chosen parent category no longer exists');
+		}
 		return true;
 	}
 
@@ -704,7 +816,10 @@ 
 		if (isset($values['old_parent']) && (int)$values['old_parent'] != (int)$values['parent'])
 		{
 			$ret = $this->check_consistency4update($values);
-			if ($ret !== true) throw new Exception\WrongUserinput($ret);
+			if ($ret !== true)
+			{
+				throw new Exception\WrongUserinput($ret);
+			}
 			// everything seems in order -> proceed
 			$values['level'] = ($values['parent'] ? $this->id2name($values['parent'],'level')+1:0);
 			$this->adapt_level_in_subtree($values);
@@ -717,7 +832,10 @@ 
 			if ($values['parent'] > 0)
 			{
 				$ret = $this->check_consistency4update($values);
-				if ($ret !== true) throw new Exception\WrongUserinput($ret);
+				if ($ret !== true)
+				{
+					throw new Exception\WrongUserinput($ret);
+				}
 
 				// everything seems in order -> proceed
 				$values['main']  = $this->id2name($values['parent'],'main');
@@ -773,7 +891,10 @@ 
 	{
 		static $cache = array();	// a litle bit of caching
 
-		if (isset($cache[$cat_name])) return $cache[$cat_name];
+		if (isset($cache[$cat_name]))
+		{
+			return $cache[$cat_name];
+		}
 
 		if ($strip === true)
 		{
@@ -826,7 +947,11 @@ 
 	 */
 	static function is_global($cat,$application_global=false)
 	{
-		if (!is_array($cat) && !($cat = self::read($cat))) return null;	// cat not found
+		if (!is_array($cat) && !($cat = self::read($cat)))
+		{
+			return null;
+		}
+		// cat not found
 
 		$global_owner = false;
 		foreach(explode(',',$cat['owner']) as $owner)
@@ -848,10 +973,19 @@ 
 	 */
 	static function id2name($cat_id=0, $item='name')
 	{
-		if(!$cat_id) return '--';
-		if (!$item) $item = 'parent';
+		if(!$cat_id)
+		{
+			return '--';
+		}
+		if (!$item)
+		{
+			$item = 'parent';
+		}
 
-		if (is_null(self::$cache)) self::init_cache();
+		if (is_null(self::$cache))
+		{
+			self::init_cache();
+		}
 
 		$cat = self::$cache[$cat_id];
 		if ($item == 'path')
@@ -892,7 +1026,10 @@ 
 		if ($cat_name)
 		{
 			$filter['name'] = $cat_name;
-			if ($cat_id) $filter['id'] = '!'.(int)$cat_id;
+			if ($cat_id)
+			{
+				$filter['id'] = '!'.(int)$cat_id;
+			}
 		}
 		elseif ($cat_id)
 		{
@@ -921,7 +1058,10 @@ 
 	{
 		$where = array('cat_owner' => $owner);
 
-		if ($app) $where['cat_appname'] = $app;
+		if ($app)
+		{
+			$where['cat_appname'] = $app;
+		}
 
 		if ((int)$to)
 		{
@@ -967,7 +1107,11 @@ 
 				false,'ORDER BY cat_main, cat_level, cat_name ASC') as $cat)
 			{
 				$cat = Db::strip_array_keys($cat,'cat_');
-				if ($cat['appname'] == '*update*') continue;	// --> ignore update marker
+				if ($cat['appname'] == '*update*')
+				{
+					continue;
+				}
+				// --> ignore update marker
 				$cat['app_name'] = $cat['appname'];
 				// backlink children to their parent
 				if ($cat['parent'])
@@ -1058,7 +1202,10 @@ 
 		// ACL check
 		$cats = $GLOBALS['egw']->categories->check_list(Acl::READ, $_cats);
 
-		if (!$cats) return null;
+		if (!$cats)
+		{
+			return null;
+		}
 
 		if (isset($cat2color[$cats]))
 		{
@@ -1090,7 +1237,10 @@ 
 	 */
 	public static function delete_account($account_id, $new_owner=null)
 	{
-		if (is_null(self::$cache)) self::init_cache();
+		if (is_null(self::$cache))
+		{
+			self::init_cache();
+		}
 
 		$deleted = 0;
 		$cat = null;
@@ -1110,7 +1260,10 @@ 
 				else
 				{
 					unset($owners[$owner_key]);
-					if ($new_owner && $account_id > 0) $owners[] = $new_owner;
+					if ($new_owner && $account_id > 0)
+					{
+						$owners[] = $new_owner;
+					}
 					$data['owner'] = implode(',', $owners);
 					// app_name have to match cat to update!
 					if (!isset($cat) || $cat->app_name != $data['appname'])
@@ -1132,7 +1285,10 @@ 
 	 */
 	public static function delete_orphans()
 	{
-		if (is_null(self::$cache)) self::init_cache();
+		if (is_null(self::$cache))
+		{
+			self::init_cache();
+		}
 
 		$checked = array();
 		$deleted = 0;

Spacing +119 added lines, -119 removed lines

@@ -120,23 +120,23 @@ 
 	 * @param int|string $accountid ='' account id or lid, default to current user
 	 * @param string $app_name ='' app name defaults to current app
 	 */
-	function __construct($accountid='',$app_name = '')
+	function __construct($accountid = '', $app_name = '')
 	{
 		if (!$app_name) $app_name = $GLOBALS['egw_info']['flags']['currentapp'];
 
 		if ($accountid === self::GLOBAL_ACCOUNT ||
 			$accountid < 0 && $GLOBALS['egw']->accounts->exists($accountid) == 2)
 		{
-			$this->account_id = (int) $accountid;
+			$this->account_id = (int)$accountid;
 		}
 		else
 		{
-			$this->account_id	= (int) get_account_id($accountid);
+			$this->account_id = (int)get_account_id($accountid);
 			$this->global_owners = $this->account_id ? $GLOBALS['egw']->accounts->memberships($this->account_id, true) : array();
 			$this->global_owners[] = self::GLOBAL_ACCOUNT;
 		}
-		$this->app_name		= $app_name;
-		$this->db			= $GLOBALS['egw']->db;
+		$this->app_name = $app_name;
+		$this->db = $GLOBALS['egw']->db;
 
 		if (is_null(self::$cache))	// should not be necessary, as cache is load and restored by egw object
 		{
@@ -158,10 +158,10 @@ 
 	{
 		$all_children = array_map('intval', (array)$cat_id);
 
-		$children = $this->return_array('subs',0,False,'','','',True,$cat_id,-1,'id');
+		$children = $this->return_array('subs', 0, False, '', '', '', True, $cat_id, -1, 'id');
 		if (is_array($children) && count($children))
 		{
-			$all_children = array_merge($all_children,$this->return_all_children($children));
+			$all_children = array_merge($all_children, $this->return_all_children($children));
 		}
 		return $all_children;
 	}
@@ -183,24 +183,24 @@ 
 	 * @param array $filter =null array with column-name (without cat_-prefix) => value pairs (! negates the value)
 	 * @return array of cat-arrays or $column values
 	 */
-	function return_array($type='all', $start=0, $limit=true, $query='', $sort='ASC',$order='',$globals=false, $parent_id=null, $lastmod=-1, $column='', $filter=null)
+	function return_array($type = 'all', $start = 0, $limit = true, $query = '', $sort = 'ASC', $order = '', $globals = false, $parent_id = null, $lastmod = -1, $column = '', $filter = null)
 	{
 		//error_log(__METHOD__."($type,$start,$limit,$query,$sort,$order,globals=$globals,parent=".array2string($parent_id).",$lastmod,$column,filter=".array2string($filter).") account_id=$this->account_id, appname=$this->app_name: ".function_backtrace());
 		$cats = array();
-		foreach(self::$cache as $cat)
+		foreach (self::$cache as $cat)
 		{
-			if ($filter) foreach($filter as $col => $val)
+			if ($filter) foreach ($filter as $col => $val)
 			{
 				if (!is_array($val) && $val[0] === '!')
 				{
 					// also match against trimmed database entry on name and description fields
 					if (($col == 'name' || $col == 'description') && is_string($cat[$col]))
 					{
-						if ($cat[$col] == substr($val,1) || trim($cat[$col]) == substr($val,1)) continue 2;
+						if ($cat[$col] == substr($val, 1) || trim($cat[$col]) == substr($val, 1)) continue 2;
 					}
 					else
 					{
-						if ($cat[$col] == substr($val,1)) continue 2;
+						if ($cat[$col] == substr($val, 1)) continue 2;
 					}
 				}
 				elseif (is_array($val))
@@ -208,11 +208,11 @@ 
 					// also match against trimmed database entry on name and description fields
 					if (($col == 'name' || $col == 'description') && is_string($cat[$col]))
 					{
-						if (!in_array($cat[$col],$val) && !in_array(trim($cat[$col]),$val)) continue 2;
+						if (!in_array($cat[$col], $val) && !in_array(trim($cat[$col]), $val)) continue 2;
 					}
 					else
 					{
-						if (!in_array($cat[$col],$val)) continue 2;
+						if (!in_array($cat[$col], $val)) continue 2;
 					}
 				}
 				else
@@ -229,7 +229,7 @@ 
 				}
 			}
 			// check if certain parent required
-			if ($parent_id && !in_array($cat['parent'],(array)$parent_id)) continue;
+			if ($parent_id && !in_array($cat['parent'], (array)$parent_id)) continue;
 
 			// return global categories just if $globals is set
 			if (!$globals && $cat['appname'] == self::GLOBAL_APPNAME)
@@ -238,7 +238,7 @@ 
 			}
 
 			// check for read permission
-			if(!$this->check_perms(Acl::READ, $cat, $globals === 'all_no_acl'))
+			if (!$this->check_perms(Acl::READ, $cat, $globals === 'all_no_acl'))
 			{
 				continue;
 			}
@@ -247,7 +247,7 @@ 
 			switch ($type)
 			{
 				case 'subs':
-					if (!$cat['parent']) continue 2;	// 2 for switch AND foreach!
+					if (!$cat['parent']) continue 2; // 2 for switch AND foreach!
 					break;
 				case 'mains':
 					if ($cat['parent']) continue 2;
@@ -267,7 +267,7 @@ 
 			}
 
 			// check name and description for $query
-			if ($query && stristr($cat['name'],$query) === false && stristr($cat['description'],$query) === false) continue;
+			if ($query && stristr($cat['name'], $query) === false && stristr($cat['description'], $query) === false) continue;
 
 			// check if last modified since
 			if ($lastmod > 0 && $cat['last_mod'] <= $lastmod) continue;
@@ -284,37 +284,37 @@ 
 		if (!$sort) $sort = 'ASC';
 		// order the entries if necessary (cache is already ordered in or default order: cat_main, cat_level, cat_name ASC)
 		if ($this->total_records > 1 && !empty($order) &&
-			preg_match('/^[a-zA-Z_(), ]+$/',$order) && preg_match('/^(ASC|DESC|asc|desc)$/',$sort))
+			preg_match('/^[a-zA-Z_(), ]+$/', $order) && preg_match('/^(ASC|DESC|asc|desc)$/', $sort))
 		{
-			if (strstr($order,'cat_data') !== false) $order = 'cat_data';	// sitemgr orders by round(cat_data)!
-			if (substr($order,0,4) == 'cat_') $order = substr($order,4);
+			if (strstr($order, 'cat_data') !== false) $order = 'cat_data'; // sitemgr orders by round(cat_data)!
+			if (substr($order, 0, 4) == 'cat_') $order = substr($order, 4);
 			$sign = strtoupper($sort) == 'DESC' ? -1 : 1;
 			usort($cats, function($a, $b) use ($order, $sign)
 			{
-				if (in_array($order, array('name','description','appname','app_name')))
+				if (in_array($order, array('name', 'description', 'appname', 'app_name')))
 				{
 					return $sign * strcasecmp($a[$order], $b[$order]);
 				}
-				return $sign*(int)$a[$order] - $sign*(int)$b[$order];
+				return $sign * (int)$a[$order] - $sign * (int)$b[$order];
 			});
 		}
 		// limit the number of returned rows
 		if ($limit)
 		{
 			if (!is_int($limit)) $limit = (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
-			$cats = array_slice($cats,(int)$start,$limit);
+			$cats = array_slice($cats, (int)$start, $limit);
 		}
 		// return only a certain column (why not return is as value?)
 		if ($column)
 		{
-			foreach($cats as $k => $cat)
+			foreach ($cats as $k => $cat)
 			{
 				$cats[$k] = $cat[$column];
 			}
 		}
 		//error_log(__METHOD__."($type,$start,$limit,$query,$sort,$order,$globals,parent=".array2string($parent_id).",$lastmod,$column,filter=".array2string($filter).",$unserialize_data) account_id=$this->account_id, appname=$this->app_name = ".array2string($cats));
 
-		reset($cats);	// some old code (eg. sitemgr) relies on the array-pointer!
+		reset($cats); // some old code (eg. sitemgr) relies on the array-pointer!
 		return $cats;
 	}
 
@@ -332,7 +332,7 @@ 
 	 * @param boolean $unserialize_data =true return $cat['data'] as array (not serialized array)
 	 * @return array with cats
 	 */
-	function return_sorted_array($start=0,$limit=True,$query='',$sort='ASC',$order='cat_name',$globals=False, $parent_id=0,$unserialize_data=true,$filter=null)
+	function return_sorted_array($start = 0, $limit = True, $query = '', $sort = 'ASC', $order = 'cat_name', $globals = False, $parent_id = 0, $unserialize_data = true, $filter = null)
 	{
 		if (!$sort)  $sort = 'ASC';
 		if (!$order) $order = 'cat_name';
@@ -342,27 +342,27 @@ 
 		$parents = $cats = array();
 
 		// Cast parent_id to array, but only if there is one
-		if($parent_id !== false && $parent_id !== null) $parent_id = (array)$parent_id;
-		if (!($cats = $this->return_array('all',0,false,$query,$sort,$order,$globals,$parent_id,-1,'',$filter,$unserialize_data)))
+		if ($parent_id !== false && $parent_id !== null) $parent_id = (array)$parent_id;
+		if (!($cats = $this->return_array('all', 0, false, $query, $sort, $order, $globals, $parent_id, -1, '', $filter, $unserialize_data)))
 		{
 			$cats = array();
 		}
-		foreach($cats as $cat)
+		foreach ($cats as $cat)
 		{
 			$parents[] = $cat['id'];
 		}
 
-		if($parent_id || !$cats) // Avoid wiping search results
+		if ($parent_id || !$cats) // Avoid wiping search results
 		{
 			// Go find the children
 			while (count($parents))
 			{
-				if (!($subs = $this->return_array('all',0,false,$query,$sort,$order,$globals,$parents,-1,'',$filter,$unserialize_data)))
+				if (!($subs = $this->return_array('all', 0, false, $query, $sort, $order, $globals, $parents, -1, '', $filter, $unserialize_data)))
 				{
 					break;
 				}
 				$parents = $children = array();
-				foreach($subs as $cat)
+				foreach ($subs as $cat)
 				{
 					$parents[] = $cat['id'];
 					$children[$cat['parent']][] = $cat;
@@ -372,12 +372,12 @@ 
 				{
 					$cats2 = $cats;
 					$cats = array();
-					foreach($cats2 as $cat)
+					foreach ($cats2 as $cat)
 					{
 						$cats[] = $cat;
 						if (isset($children[$cat['id']]))
 						{
-							foreach($children[$cat['id']] as $child)
+							foreach ($children[$cat['id']] as $child)
 							{
 								$cats[] = $child;
 							}
@@ -392,9 +392,9 @@ 
 		if ($limit)
 		{
 			if (!is_int($limit)) $limit = (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
-			$cats = array_slice($cats,(int)$start,$limit);
+			$cats = array_slice($cats, (int)$start, $limit);
 		}
-		reset($cats);	// some old code (eg. sitemgr) relies on the array-pointer!
+		reset($cats); // some old code (eg. sitemgr) relies on the array-pointer!
 		return $cats;
 	}
 
@@ -415,7 +415,7 @@ 
 		if (!isset(self::$cache[$id])) return false;
 
 		$cat = self::$cache[$id];
-		$cat['data'] = $cat['data'] ? ((($arr=json_php_unserialize($cat['data'], true)) !== false || $cat['data'] === 'b:0;') ?
+		$cat['data'] = $cat['data'] ? ((($arr = json_php_unserialize($cat['data'], true)) !== false || $cat['data'] === 'b:0;') ?
 			$arr : $cat['data']) : array();
 
 		return $cat;
@@ -433,31 +433,31 @@ 
 	{
 		if ((int)$values['parent'] > 0)
 		{
-			$values['level'] = $this->id2name($values['parent'],'level')+1;
-			$values['main'] = $this->id2name($values['parent'],'main');
+			$values['level'] = $this->id2name($values['parent'], 'level') + 1;
+			$values['main'] = $this->id2name($values['parent'], 'main');
 		}
 		else
 		{
 			$values['level'] = 0;
 		}
-		$this->db->insert(self::TABLE,$cat=array(
+		$this->db->insert(self::TABLE, $cat = array(
 			'cat_parent'  => $values['parent'],
 			'cat_owner' => isset($values['owner']) ? $values['owner'] : $this->account_id,
 			'cat_access'  => isset($values['access']) ? $values['access'] : 'public',
 			'cat_appname' => $this->app_name,
 			'cat_name'    => $values['name'],
-			'cat_description' => isset($values['description']) ? $values['description'] : $values['descr'],	// support old name different from returned one
+			'cat_description' => isset($values['description']) ? $values['description'] : $values['descr'], // support old name different from returned one
 			'cat_data'    => is_array($values['data']) ? json_encode($values['data']) : $values['data'],
 			'cat_main'    => $values['main'],
 			'cat_level'   => $values['level'],
 			'last_mod'    => time(),
-		),(int)$values['id'] > 0 ? array('cat_id' =>  $values['id']) : array(),__LINE__,__FILE__);
+		), (int)$values['id'] > 0 ? array('cat_id' =>  $values['id']) : array(), __LINE__, __FILE__);
 
-		$cat['cat_id'] = $id = (int)$values['id'] > 0 ? (int)$values['id'] : $this->db->get_last_insert_id(self::TABLE,'cat_id');
+		$cat['cat_id'] = $id = (int)$values['id'] > 0 ? (int)$values['id'] : $this->db->get_last_insert_id(self::TABLE, 'cat_id');
 
 		if (!(int)$values['parent'] && $id != $values['main'])
 		{
-			$this->db->update(self::TABLE,array('cat_main' => $id),array('cat_id' => $id),__LINE__,__FILE__);
+			$this->db->update(self::TABLE, array('cat_main' => $id), array('cat_id' => $id), __LINE__, __FILE__);
 			$cat['cat_main'] = $id;
 		}
 		// update cache accordingly
@@ -479,20 +479,20 @@ 
 		if (empty($cat_list)) return $cat_list;
 		if (is_array($cat_list))
 		{
-			$cat_list = implode(',',$cat_list);
+			$cat_list = implode(',', $cat_list);
 			//error_log(__METHOD__.__LINE__.' string expected, array found for cat_list. Converted to:'.$cat_list);
 		}
-		$cat_arr = explode(',',$cat_list);
+		$cat_arr = explode(',', $cat_list);
 		if (!empty($cat_arr) && is_array($cat_arr) && count($cat_arr) > 0)
 		{
-			foreach($cat_arr as $id=>$cat_id)
+			foreach ($cat_arr as $id=>$cat_id)
 			{
 				if (!$this->check_perms($needed, $cat_id, false, $needed == Acl::READ))	// allow reading all global cats
 				{
 					unset($cat_arr[$id]);
 				}
 			}
-			$cat_list = implode(',',$cat_arr);
+			$cat_list = implode(',', $cat_arr);
 		}
 
 		return $cat_list;
@@ -509,7 +509,7 @@ 
 	 * @param boolean $allow_global_read if true, global cats are allowed (independent of app) for reading
 	 * @return boolean true permission granted, false for permission denied, null for category does not exist
 	 */
-	public function check_perms($needed, $category, $no_acl_check=false, $allow_global_read=false)
+	public function check_perms($needed, $category, $no_acl_check = false, $allow_global_read = false)
 	{
 		if (!is_array($category) && !($category = self::read($category)))
 		{
@@ -525,8 +525,8 @@ 
 		}
 
 		// Read access to global categories
-		if ($needed == Acl::READ && (($is_global=array_intersect(explode(',',$category['owner']),$this->global_owners)) ||
-			$no_acl_check && $category['access'] == 'public') &&	// no_acl_check only means public cats
+		if ($needed == Acl::READ && (($is_global = array_intersect(explode(',', $category['owner']), $this->global_owners)) ||
+			$no_acl_check && $category['access'] == 'public') && // no_acl_check only means public cats
 			($category['appname'] == self::GLOBAL_APPNAME || $category['appname'] == $this->app_name ||
 			$is_global && $allow_global_read))
 		{
@@ -549,16 +549,16 @@ 
 		// Load the application grants
 		if ($category['appname'] == $this->app_name && is_null($this->grants))
 		{
-			$this->grants = $GLOBALS['egw']->acl->get_grants($this->app_name,true);
+			$this->grants = $GLOBALS['egw']->acl->get_grants($this->app_name, true);
 		}
 
 		// Check for ACL granted access, the self::GLOBAL_ACCOUNT user must not get access by ACL to keep old behaviour
 		$acl_grant = $this->account_id != self::GLOBAL_ACCOUNT && $category['appname'] == $this->app_name;
 		$owner_grant = false;
-		foreach(explode(',',$category['owner']) as $owner)
+		foreach (explode(',', $category['owner']) as $owner)
 		{
-			$owner_grant = $owner_grant || (($this->grants[$owner] & $needed) &&
-				($category['access'] == 'public' ||  ($this->grants[$owner] & Acl::PRIVAT)));
+			$owner_grant = $owner_grant || (($this->grants[$owner]&$needed) &&
+				($category['access'] == 'public' || ($this->grants[$owner]&Acl::PRIVAT)));
 		}
 		return $acl_grant && $owner_grant;
 	}
@@ -575,35 +575,35 @@ 
 		//error_log(__METHOD__."(".array2string($cat_id).', drop_subs='.array2string($drop_subs).', modify_subs='.array2string($modify_subs).') '.function_backtrace());
 		if ($modify_subs)
 		{
-			$new_parent = $this->id2name($cat_id,'parent');
+			$new_parent = $this->id2name($cat_id, 'parent');
 
-			foreach ((array) $this->return_sorted_array('',False,'','','',False, $cat_id) as $cat)
+			foreach ((array)$this->return_sorted_array('', False, '', '', '', False, $cat_id) as $cat)
 			{
 				if ($cat['level'] == 1)
 				{
-					$this->db->update(self::TABLE,array(
+					$this->db->update(self::TABLE, array(
 						'cat_level'  => 0,
 						'cat_parent' => 0,
 						'cat_main'   => $cat['id'],
-					),array(
+					), array(
 						'cat_id' => $cat['id'],
 						'cat_appname' => $this->app_name,
-					),__LINE__,__FILE__);
+					), __LINE__, __FILE__);
 
 					$new_main = $cat['id'];
 				}
 				else
 				{
-					$update = array('cat_level' => $cat['level']-1);
+					$update = array('cat_level' => $cat['level'] - 1);
 
 					if ($new_main) $update['cat_main'] = $new_main;
 
 					if ($cat['parent'] == $cat_id) $update['cat_parent'] = $new_parent;
 
-					$this->db->update(self::TABLE,$update,array(
+					$this->db->update(self::TABLE, $update, array(
 						'cat_id' => $cat['id'],
 						'cat_appname' => $this->app_name,
-					),__LINE__,__FILE__);
+					), __LINE__, __FILE__);
 				}
 			}
 		}
@@ -624,16 +624,16 @@ 
 			'modify_subs' => $modify_subs,
 			'location'    => 'delete_category'
 		);
-		if($this->is_global($cat_id, true))	// true = application global (otherwise eg. global addressbook categories call all apps)
+		if ($this->is_global($cat_id, true))	// true = application global (otherwise eg. global addressbook categories call all apps)
 		{
-			Hooks::process($GLOBALS['hook_values'],False,True);  // called for every app now, not only enabled ones)
+			Hooks::process($GLOBALS['hook_values'], False, True); // called for every app now, not only enabled ones)
 		}
 		else
 		{
-			Hooks::single($GLOBALS['hook_values'], self::id2name($cat_id,'appname'));
+			Hooks::single($GLOBALS['hook_values'], self::id2name($cat_id, 'appname'));
 		}
 
-		$this->db->delete(self::TABLE,$where,__LINE__,__FILE__);
+		$this->db->delete(self::TABLE, $where, __LINE__, __FILE__);
 
 		// update cache accordingly
 		self::invalidate_cache($modify_subs ? null : $where['cat_id']);
@@ -649,17 +649,17 @@ 
 	 */
 	function adapt_level_in_subtree($values)
 	{
-		foreach ((array) $this->return_sorted_array('',False,'','','',False, $values['id']) as $cat)
+		foreach ((array)$this->return_sorted_array('', False, '', '', '', False, $values['id']) as $cat)
 		{
 			if ($cat['parent'] == $values['id'])
 			{
-				$this->db->update(self::TABLE,array(
-					'cat_level' => $values['level']+1,
+				$this->db->update(self::TABLE, array(
+					'cat_level' => $values['level'] + 1,
 					'last_mod' => time(),
-				),array(
+				), array(
 					'cat_id' => $cat['id'],
 					'cat_appname' => $this->app_name,
-				),__LINE__,__FILE__);
+				), __LINE__, __FILE__);
 				$cat['level'] = $values['level'] + 1;
 				self::invalidate_cache($cat['id']);
 				$this->adapt_level_in_subtree($cat);
@@ -680,14 +680,14 @@ 
 	function check_consistency4update($values)
 	{
 		// check if we try to move an element down its own subtree, which will fail
-		foreach ($this->return_sorted_array('',False,'','','',False, $values['id']) as $cat)
+		foreach ($this->return_sorted_array('', False, '', '', '', False, $values['id']) as $cat)
 		{
 			if ($cat['id'] == $values['parent']) return lang('Cannot set a category as parent, which is part of this categorys subtree!');
 		}
 		// check if we try to be our own parent
-		if ($values['parent']==$values['id']) return lang('Cannot set this cat as its own parent!'); // deny to be our own parent
+		if ($values['parent'] == $values['id']) return lang('Cannot set this cat as its own parent!'); // deny to be our own parent
 		// check if parent still exists
-		if ((int)$values['parent']>0 && !$this->read($values['parent'])) return lang('Chosen parent category no longer exists');
+		if ((int)$values['parent'] > 0 && !$this->read($values['parent'])) return lang('Chosen parent category no longer exists');
 		return true;
 	}
 
@@ -706,7 +706,7 @@ 
 			$ret = $this->check_consistency4update($values);
 			if ($ret !== true) throw new Exception\WrongUserinput($ret);
 			// everything seems in order -> proceed
-			$values['level'] = ($values['parent'] ? $this->id2name($values['parent'],'level')+1:0);
+			$values['level'] = ($values['parent'] ? $this->id2name($values['parent'], 'level') + 1 : 0);
 			$this->adapt_level_in_subtree($values);
 
 			return $this->add($values);
@@ -720,8 +720,8 @@ 
 				if ($ret !== true) throw new Exception\WrongUserinput($ret);
 
 				// everything seems in order -> proceed
-				$values['main']  = $this->id2name($values['parent'],'main');
-				$values['level'] = $this->id2name($values['parent'],'level') + 1;
+				$values['main']  = $this->id2name($values['parent'], 'main');
+				$values['level'] = $this->id2name($values['parent'], 'level') + 1;
 			}
 			else
 			{
@@ -732,9 +732,9 @@ 
 			// adapt the level info in each child
 			$this->adapt_level_in_subtree($values);
 		}
-		$this->db->update(self::TABLE,$cat=array(
+		$this->db->update(self::TABLE, $cat = array(
 			'cat_name' => $values['name'],
-			'cat_description' => isset($values['description']) ? $values['description'] : $values['descr'],	// support old name different from the one read
+			'cat_description' => isset($values['description']) ? $values['description'] : $values['descr'], // support old name different from the one read
 			'cat_data'    => is_array($values['data']) ? json_encode($values['data']) : $values['data'],
 			'cat_parent' => $values['parent'],
 			'cat_access' => $values['access'],
@@ -742,10 +742,10 @@ 
 			'cat_main' => $values['main'],
 			'cat_level' => $values['level'],
 			'last_mod' => time(),
-		),array(
+		), array(
 			'cat_id' => $values['id'],
 			'cat_appname' => $this->app_name,
-		),__LINE__,__FILE__);
+		), __LINE__, __FILE__);
 
 		$cat['cat_id'] = $values['id'];
 		$cat['cat_appname'] = $this->app_name;
@@ -769,9 +769,9 @@ 
 	 * @param boolean|string $strip =false if true, strips 'X-'  ($strip) from category names added by some SyncML clients
 	 * @return int cat-id or 0 if not found
 	 */
-	function name2id($cat_name, $strip=false)
+	function name2id($cat_name, $strip = false)
 	{
-		static $cache = array();	// a litle bit of caching
+		static $cache = array(); // a litle bit of caching
 
 		if (isset($cache[$cat_name])) return $cache[$cat_name];
 
@@ -792,17 +792,17 @@ 
 			$cats[] = $stripped_cat_name;
 		}
 
-		if (!($cats = $this->return_array('all',0,false,'','','',true,null,-1,'',array(
+		if (!($cats = $this->return_array('all', 0, false, '', '', '', true, null, -1, '', array(
 			'name' => $cats,
 			'appname' => array($this->app_name, self::GLOBAL_APPNAME),
 		))))
 		{
-			return 0;	// cat not found, dont cache it, as it might be created in this request
+			return 0; // cat not found, dont cache it, as it might be created in this request
 		}
 		if (count($cats) > 1)
 		{
 			// if more the one cat matches we weight them by: exact name match; own, global, other users cat; appplication cats
-			foreach($cats as $k => $cat)
+			foreach ($cats as $k => $cat)
 			{
 				$cats[$k]['weight'] = 100 * ($cat['name'] == $cat_name) +
 					10 * ($cat['owner'] == $this->account_id ? 3 : ($cat['owner'] <= self::GLOBAL_ACCOUNT ? 2 : 1)) +
@@ -814,7 +814,7 @@ 
 				return $b['weight'] - $a['weight'];
 			});
 		}
-		return $cache[$cat['cat_name']] = (int) $cats[0]['id'];
+		return $cache[$cat['cat_name']] = (int)$cats[0]['id'];
 	}
 
 	/**
@@ -824,12 +824,12 @@ 
 	 * @param boolean $application_global =false true check for application global categories only (appname == 'phpgw')
 	 * @return boolean
 	 */
-	static function is_global($cat,$application_global=false)
+	static function is_global($cat, $application_global = false)
 	{
-		if (!is_array($cat) && !($cat = self::read($cat))) return null;	// cat not found
+		if (!is_array($cat) && !($cat = self::read($cat))) return null; // cat not found
 
 		$global_owner = false;
-		foreach(explode(',',$cat['owner']) as $owner)
+		foreach (explode(',', $cat['owner']) as $owner)
 		{
 			$global_owner = $global_owner || $owner <= self::GLOBAL_ACCOUNT;
 		}
@@ -846,9 +846,9 @@ 
 	 * @param string $item ='name' requested information, 'path' = / delimited path of category names (incl. parents)
 	 * @return string information or '--' if not found or !$cat_id
 	 */
-	static function id2name($cat_id=0, $item='name')
+	static function id2name($cat_id = 0, $item = 'name')
 	{
-		if(!$cat_id) return '--';
+		if (!$cat_id) return '--';
 		if (!$item) $item = 'parent';
 
 		if (is_null(self::$cache)) self::init_cache();
@@ -858,7 +858,7 @@ 
 		{
 			if ($cat['parent'])
 			{
-				return self::id2name($cat['parent'],'path').' / '.$cat['name'];
+				return self::id2name($cat['parent'], 'path').' / '.$cat['name'];
 			}
 			$item = 'name';
 		}
@@ -887,7 +887,7 @@ 
 	 * @param int $parent =0 category id of parent
 	 * @return int/boolean cat_id or false if cat not exists
 	 */
-	function exists($type,$cat_name = '',$cat_id = 0,$parent = 0)
+	function exists($type, $cat_name = '', $cat_id = 0, $parent = 0)
 	{
 		if ($cat_name)
 		{
@@ -898,7 +898,7 @@ 
 		{
 			$filter['id'] = $cat_id;
 		}
-		if (!($cats = $this->return_array($type,0,false,'','','',true,$parent,-1,'id',$filter)))
+		if (!($cats = $this->return_array($type, 0, false, '', '', '', true, $parent, -1, 'id', $filter)))
 		{
 			$ret = false;
 		}
@@ -917,7 +917,7 @@ 
 	 * @param int $to =0 new owner or 0 to delete the cats
 	 * @param string $app ='' if given only cats matching $app are modifed/deleted
 	 */
-	function change_owner($owner,$to=0,$app='')
+	function change_owner($owner, $to = 0, $app = '')
 	{
 		$where = array('cat_owner' => $owner);
 
@@ -925,11 +925,11 @@ 
 
 		if ((int)$to)
 		{
-			$this->db->update(self::TABLE,array('cat_owner' => $to),$where,__LINE__,__FILE__);
+			$this->db->update(self::TABLE, array('cat_owner' => $to), $where, __LINE__, __FILE__);
 		}
 		else
 		{
-			$this->db->delete(self::TABLE,$where,__LINE__,__FILE__);
+			$this->db->delete(self::TABLE, $where, __LINE__, __FILE__);
 		}
 		// update cache accordingly
 		self::invalidate_cache();
@@ -947,10 +947,10 @@ 
 		if (is_null(self::$cache))
 		{
 			// check if we are already updated to global owner == 0, if not do it now
-			if (!$GLOBALS['egw']->db->select(self::TABLE,'COUNT(*)',array('cat_owner'=>'0'),__LINE__,__FILE__)->fetchColumn())
+			if (!$GLOBALS['egw']->db->select(self::TABLE, 'COUNT(*)', array('cat_owner'=>'0'), __LINE__, __FILE__)->fetchColumn())
 			{
-				$GLOBALS['egw']->db->update(self::TABLE,array('cat_owner'=>'0'),"(cat_owner='-1' OR cat_appname='phpgw')",__LINE__,__FILE__);
-				$GLOBALS['egw']->db->insert(self::TABLE,array(
+				$GLOBALS['egw']->db->update(self::TABLE, array('cat_owner'=>'0'), "(cat_owner='-1' OR cat_appname='phpgw')", __LINE__, __FILE__);
+				$GLOBALS['egw']->db->insert(self::TABLE, array(
 					'cat_main'    => 0,
 					'cat_parent'  => 0,
 					'cat_level'   => 0,
@@ -959,15 +959,15 @@ 
 					'cat_name'    => 'global=0',
 					'cat_description' => 'global=0',
 					'last_mod'    => time(),
-				),false,__LINE__,__FILE__);
+				), false, __LINE__, __FILE__);
 			}
 			self::$cache = array();
 			// read all cats (cant use $this->db!)
-			foreach($GLOBALS['egw']->db->select(self::TABLE,'*',false,__LINE__,__FILE__,
-				false,'ORDER BY cat_main, cat_level, cat_name ASC') as $cat)
+			foreach ($GLOBALS['egw']->db->select(self::TABLE, '*', false, __LINE__, __FILE__,
+				false, 'ORDER BY cat_main, cat_level, cat_name ASC') as $cat)
 			{
-				$cat = Db::strip_array_keys($cat,'cat_');
-				if ($cat['appname'] == '*update*') continue;	// --> ignore update marker
+				$cat = Db::strip_array_keys($cat, 'cat_');
+				if ($cat['appname'] == '*update*') continue; // --> ignore update marker
 				$cat['app_name'] = $cat['appname'];
 				// backlink children to their parent
 				if ($cat['parent'])
@@ -977,7 +977,7 @@ 
 				if (isset(self::$cache[$cat['id']]))
 				{
 					$cat['children'] = self::$cache[$cat['id']]['children'];
-					unset(self::$cache[$cat['id']]);	// otherwise the order gets messed up!
+					unset(self::$cache[$cat['id']]); // otherwise the order gets messed up!
 				}
 				self::$cache[$cat['id']] = $cat;
 			}
@@ -994,7 +994,7 @@ 
 	 *
 	 * @param int|array $cat concerned id(s) or array with cat-data or null for all cats
 	 */
-	public static function invalidate_cache($cat=null)
+	public static function invalidate_cache($cat = null)
 	{
 		//error_log(__METHOD__."(".array2string($cat).') '.function_backtrace());
 
@@ -1006,12 +1006,12 @@ 
 		{
 			if (!is_array($cat) || isset($cat[0]))
 			{
-				foreach((array)$cat as $cat_id)
+				foreach ((array)$cat as $cat_id)
 				{
 					unset(self::$cache[$cat_id]);
 				}
 			}
-			elseif($cat['id'])
+			elseif ($cat['id'])
 			{
 				self::$cache[$cat['id']] = $cat;
 			}
@@ -1034,8 +1034,8 @@ 
 	 */
 	public static function css($appname)
 	{
-		$cats = new Categories('',$appname);
-		$last_mod = $cats->return_array('all',0,1,'','DESC','last_mod', $appname == self::GLOBAL_APPNAME);
+		$cats = new Categories('', $appname);
+		$last_mod = $cats->return_array('all', 0, 1, '', 'DESC', 'last_mod', $appname == self::GLOBAL_APPNAME);
 		$time = count($last_mod) ? $last_mod[0]['last_mod'] : time();
 		$path = '/api/categories.php?app='.$appname.'&'.$time;
 		Framework::includeCSS($path);
@@ -1065,7 +1065,7 @@ 
 			return $cat2color[$cats];
 		}
 
-		foreach(explode(',', $cats) as $cat)
+		foreach (explode(',', $cats) as $cat)
 		{
 			if (isset($cat2color[$cat]))
 			{
@@ -1088,13 +1088,13 @@ 
 	 * @param int $new_owner =null for users data can be transfered to new owner
 	 * @return int number of deleted or modified categories
 	 */
-	public static function delete_account($account_id, $new_owner=null)
+	public static function delete_account($account_id, $new_owner = null)
 	{
 		if (is_null(self::$cache)) self::init_cache();
 
 		$deleted = 0;
 		$cat = null;
-		foreach(self::$cache as $cat_id => $data)
+		foreach (self::$cache as $cat_id => $data)
 		{
 			if ($data['owner'] && ($owners = explode(',', $data['owner'])) && ($owner_key = array_search($account_id, $owners)) !== false)
 			{
@@ -1136,9 +1136,9 @@ 
 
 		$checked = array();
 		$deleted = 0;
-		foreach(self::$cache as $data)
+		foreach (self::$cache as $data)
 		{
-			foreach(explode(',', $data['owner']) as $owner)
+			foreach (explode(',', $data['owner']) as $owner)
 			{
 				if ($owner && !in_array($owner, $checked))
 				{

api/src/Config.php

Doc Comments +1 added lines, -1 removed lines

@@ -194,7 +194,7 @@
 	/**
 	 * sets a single value in the repositry, you need to call save_repository after
 	 *
-	 * @param $variable_name string name of the config
+	 * @param string $variable_name string name of the config
 	 * @param $variable_data mixed the content
 	 */
 	function value($variable_name,$variable_data)

Braces +28 added lines, -8 removed lines

@@ -92,16 +92,23 @@ 
 			}
 			foreach(self::$configs[$this->appname] as $name => $value)
 			{
-				if (!isset($this->config_data[$name]))	// has been deleted
+				if (!isset($this->config_data[$name]))
+				{
+					// has been deleted
 				{
 					self::save_value($name, null, $this->appname, false);
+				}
 					//self::$db->delete(self::TABLE,array('config_app'=>$this->appname,'config_name'=>$name),__LINE__,__FILE__);
 				}
 			}
 
-			if ($this->appname == 'phpgwapi' && method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+			if ($this->appname == 'phpgwapi' && method_exists($GLOBALS['egw'],'invalidate_session_cache'))
+			{
+				// egw object in setup is limited
 			{
-				$GLOBALS['egw']->invalidate_session_cache();	// in case egw_info is cached in the session (phpgwapi is in egw_info[server])
+				$GLOBALS['egw']->invalidate_session_cache();
+			}
+			// in case egw_info is cached in the session (phpgwapi is in egw_info[server])
 			}
 			self::$configs[$this->appname] = $this->config_data;
 
@@ -145,20 +152,30 @@ 
 
 		if (!isset($value) || $value === '')
 		{
-			if (isset(self::$configs[$app])) unset(self::$configs[$app][$name]);
+			if (isset(self::$configs[$app]))
+			{
+				unset(self::$configs[$app][$name]);
+			}
 			self::$db->delete(self::TABLE,array('config_app'=>$app,'config_name'=>$name),__LINE__,__FILE__);
 		}
 		else
 		{
 			self::$configs[$app][$name] = $value;
-			if(is_array($value)) $value = json_encode($value);
+			if(is_array($value))
+			{
+				$value = json_encode($value);
+			}
 			self::$db->insert(self::TABLE,array('config_value'=>$value),array('config_app'=>$app,'config_name'=>$name),__LINE__,__FILE__);
 		}
 		if ($update_cache)
 		{
-			if ($app == 'phpgwapi' && method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+			if ($app == 'phpgwapi' && method_exists($GLOBALS['egw'],'invalidate_session_cache'))
+			{
+				// egw object in setup is limited
 			{
-				$GLOBALS['egw']->invalidate_session_cache();	// in case egw_info is cached in the session (phpgwapi is in egw_info[server])
+				$GLOBALS['egw']->invalidate_session_cache();
+			}
+			// in case egw_info is cached in the session (phpgwapi is in egw_info[server])
 			}
 			Cache::setInstance(__CLASS__, 'configs', self::$configs);
 		}
@@ -278,7 +295,10 @@ 
 		{
 			foreach($config as $name => $value)
 			{
-				if (strpos($name, 'pass') !== false) continue;
+				if (strpos($name, 'pass') !== false)
+				{
+					continue;
+				}
 
 				if (in_array($name, $white_list['all']) || isset($white_list[$app]) && in_array($name, $white_list[$app]))
 				{

Spacing +25 added lines, -25 removed lines

@@ -86,11 +86,11 @@ 
 	{
 		if (is_array($this->config_data))
 		{
-			foreach($this->config_data as $name => $value)
+			foreach ($this->config_data as $name => $value)
 			{
 				self::save_value($name, $value, $this->appname, false);
 			}
-			foreach(self::$configs[$this->appname] as $name => $value)
+			foreach (self::$configs[$this->appname] as $name => $value)
 			{
 				if (!isset($this->config_data[$name]))	// has been deleted
 				{
@@ -99,9 +99,9 @@ 
 				}
 			}
 
-			if ($this->appname == 'phpgwapi' && method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+			if ($this->appname == 'phpgwapi' && method_exists($GLOBALS['egw'], 'invalidate_session_cache'))	// egw object in setup is limited
 			{
-				$GLOBALS['egw']->invalidate_session_cache();	// in case egw_info is cached in the session (phpgwapi is in egw_info[server])
+				$GLOBALS['egw']->invalidate_session_cache(); // in case egw_info is cached in the session (phpgwapi is in egw_info[server])
 			}
 			self::$configs[$this->appname] = $this->config_data;
 
@@ -122,7 +122,7 @@ 
 	 * @throws Exception\WrongParameter if no $app parameter given for static call
 	 * @return boolean|int true if no change, else number of affected rows
 	 */
-	static function save_value($name, $value, $app, $update_cache=true)
+	static function save_value($name, $value, $app, $update_cache = true)
 	{
 		if (!$app)
 		{
@@ -135,25 +135,25 @@ 
 
 		if (isset(self::$configs[$app][$name]) && self::$configs[$app][$name] === $value)
 		{
-			return True;	// no change ==> exit
+			return True; // no change ==> exit
 		}
 
 		if (!isset($value) || $value === '')
 		{
 			if (isset(self::$configs[$app])) unset(self::$configs[$app][$name]);
-			self::$db->delete(self::TABLE,array('config_app'=>$app,'config_name'=>$name),__LINE__,__FILE__);
+			self::$db->delete(self::TABLE, array('config_app'=>$app, 'config_name'=>$name), __LINE__, __FILE__);
 		}
 		else
 		{
 			self::$configs[$app][$name] = $value;
-			if(is_array($value)) $value = json_encode($value);
-			self::$db->insert(self::TABLE,array('config_value'=>$value),array('config_app'=>$app,'config_name'=>$name),__LINE__,__FILE__);
+			if (is_array($value)) $value = json_encode($value);
+			self::$db->insert(self::TABLE, array('config_value'=>$value), array('config_app'=>$app, 'config_name'=>$name), __LINE__, __FILE__);
 		}
 		if ($update_cache)
 		{
-			if ($app == 'phpgwapi' && method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+			if ($app == 'phpgwapi' && method_exists($GLOBALS['egw'], 'invalidate_session_cache'))	// egw object in setup is limited
 			{
-				$GLOBALS['egw']->invalidate_session_cache();	// in case egw_info is cached in the session (phpgwapi is in egw_info[server])
+				$GLOBALS['egw']->invalidate_session_cache(); // in case egw_info is cached in the session (phpgwapi is in egw_info[server])
 			}
 			Cache::setInstance(__CLASS__, 'configs', self::$configs);
 		}
@@ -170,7 +170,7 @@ 
 		{
 			self::init_static();
 		}
-		self::$db->delete(self::TABLE,array('config_app' => $this->appname),__LINE__,__FILE__);
+		self::$db->delete(self::TABLE, array('config_app' => $this->appname), __LINE__, __FILE__);
 
 		unset(self::$configs[$this->appname]);
 		Cache::setInstance(__CLASS__, 'configs', self::$configs);
@@ -192,7 +192,7 @@ 
 	 * @param $variable_name string name of the config
 	 * @param $variable_data mixed the content
 	 */
-	function value($variable_name,$variable_data)
+	function value($variable_name, $variable_data)
 	{
 		$this->config_data[$variable_name] = $variable_data;
 	}
@@ -223,7 +223,7 @@ 
 	 * @deprecated use Api\Storage\Customfields::get()
 	 * @return array with customfields
 	 */
-	static function get_customfields($app, $all_private_too=false, $only_type2=null)
+	static function get_customfields($app, $all_private_too = false, $only_type2 = null)
 	{
 		//error_log(__METHOD__."('$app', $all_private_too, $only_type2) deprecated, use Storage\Customfields::get() in ".  function_backtrace());
 		return Storage\Customfields::get($app, $all_private_too, $only_type2);
@@ -253,12 +253,12 @@ 
 	{
 		static $white_list = array(
 			'all' => array('customfields', 'types'),
-			'phpgwapi' => array('webserver_url','server_timezone','enforce_ssl','system_charset',
-				'checkfornewversion','checkappversions','email_address_format',	// admin >> site config
-				'site_title','login_logo_file','login_logo_url','login_logo_title','favicon_file',
-				'markuntranslated','link_list_thumbnail','enabled_spellcheck','debug_minify',
-				'call_link','call_popup','geolocation_url',	// addressbook
-				'hide_birthdays','calview_no_consolidate', 'egw_tutorial_disable','fw_mobile_app_list'),	// calendar
+			'phpgwapi' => array('webserver_url', 'server_timezone', 'enforce_ssl', 'system_charset',
+				'checkfornewversion', 'checkappversions', 'email_address_format', // admin >> site config
+				'site_title', 'login_logo_file', 'login_logo_url', 'login_logo_title', 'favicon_file',
+				'markuntranslated', 'link_list_thumbnail', 'enabled_spellcheck', 'debug_minify',
+				'call_link', 'call_popup', 'geolocation_url', // addressbook
+				'hide_birthdays', 'calview_no_consolidate', 'egw_tutorial_disable', 'fw_mobile_app_list'), // calendar
 			'projectmanager' => array('hours_per_workday', 'duration_units'),
 			'manual' => array('manual_remote_egw_url'),
 			'infolog' => array('status'),
@@ -269,9 +269,9 @@ 
 			self::init_static();
 		}
 		$client_config = array();
-		foreach(self::$configs as $app => $config)
+		foreach (self::$configs as $app => $config)
 		{
-			foreach($config as $name => $value)
+			foreach ($config as $name => $value)
 			{
 				if (strpos($name, 'pass') !== false) continue;
 
@@ -309,12 +309,12 @@ 
 		}
 		// handling of old PHP serialized config values
 		$data = php_safe_unserialize($str);
-		if($data === false)
+		if ($data === false)
 		{
 			// manually retrieve the string lengths of the serialized array if unserialize failed (iso / utf-8 conversation)
 			$data = php_safe_unserialize(preg_replace_callback('!s:(\d+):"(.*?)";!s', function($matches)
 			{
-				return 's:'.mb_strlen($matches[2],'8bit').':"'.$matches[2].'";';
+				return 's:'.mb_strlen($matches[2], '8bit').':"'.$matches[2].'";';
 			}, $str));
 		}
 		// returning original string, if unserialize failed, eg. for "a:hello"
@@ -339,7 +339,7 @@ 
 		if (!(self::$configs = Cache::getInstance(__CLASS__, 'configs')) || !is_array(self::$configs['phpgwapi']))
 		{
 			self::$configs = array();
-			foreach(self::$db->select(self::TABLE,'*',false,__LINE__,__FILE__) as $row)
+			foreach (self::$db->select(self::TABLE, '*', false, __LINE__, __FILE__) as $row)
 			{
 				self::$configs[$row['config_app']][$row['config_name']] = self::unserialize($row['config_value']);
 				//error_log(__METHOD__."() configs[$row[config_app]][$row[config_name]]=".array2string(self::$configs[$row['config_app']][$row['config_name']]));

api/src/Contacts/Ads.php

Doc Comments -1 removed lines

@@ -213,7 +213,6 @@
 	/**
 	 * Remove attributes we are not allowed to update
 	 *
-	 * @param array $attributes
 	 */
 	function sanitize_update(array &$ldapContact)
 	{

Indentation +1 added lines, -1 removed lines

@@ -170,7 +170,7 @@
 	 *
 	 * @param string/array $_contact_id contact_id or array with values for id or account_id
 	 * @return array/boolean data if row could be retrived else False
-	*/
+	 */
 	function read($_contact_id)
 	{
 		if (is_array($_contact_id) && isset($_contact_id['account_id']) ||

Spacing +17 added lines, -18 removed lines

@@ -35,8 +35,8 @@ 
 	 * minimum: $this->columns_to_search = array('n_family','n_given','org_name','email');
 	 */
 	var $search_attributes = array(
-		'n_family','n_middle','n_given','org_name','org_unit',
-		'adr_one_location','note','email','samaccountname',
+		'n_family', 'n_middle', 'n_given', 'org_name', 'org_unit',
+		'adr_one_location', 'note', 'email', 'samaccountname',
 	);
 
 	/**
@@ -50,7 +50,7 @@ 
 	 *
 	 * @var string
 	 */
-	var $dn_attribute='cn';
+	var $dn_attribute = 'cn';
 
 	/**
 	 * Do NOT attempt to change DN (dn-attribute can NOT be part of schemas used in addressbook!)
@@ -82,11 +82,11 @@ 
 	 * @param array $ldap_config =null default use from $GLOBALS['egw_info']['server']
 	 * @param resource $ds =null ldap connection to use
 	 */
-	function __construct(array $ldap_config=null, $ds=null)
+	function __construct(array $ldap_config = null, $ds = null)
 	{
-		if (false) parent::__construct ();	// quiten IDE warning, we are explicitly NOT calling parrent constructor!
+		if (false) parent::__construct(); // quiten IDE warning, we are explicitly NOT calling parrent constructor!
 
-		$this->accountName 		= $GLOBALS['egw_info']['user']['account_lid'];
+		$this->accountName = $GLOBALS['egw_info']['user']['account_lid'];
 
 		if ($ldap_config)
 		{
@@ -94,7 +94,7 @@ 
 		}
 		else
 		{
-			$this->ldap_config =& $GLOBALS['egw_info']['server'];
+			$this->ldap_config = & $GLOBALS['egw_info']['server'];
 		}
 
 		$this->accounts_ads = $GLOBALS['egw']->accounts->backend;
@@ -119,15 +119,15 @@ 
 			'account_id'	=> 'objectsid',
 			'id'            => 'objectguid',
 			'uid'			=> 'objectguid',
-			'n_fn'          => 'displayname',	// leave CN used in DN untouched
-			'accountexpires', 'useraccountcontrol',	// needed to exclude deactivated or expired accounts
+			'n_fn'          => 'displayname', // leave CN used in DN untouched
+			'accountexpires', 'useraccountcontrol', // needed to exclude deactivated or expired accounts
 		));
 		unset($this->schema2egw['user']['n_fileas']);
 		unset($this->schema2egw['inetorgperson']);
 
-		foreach($this->schema2egw as $attributes)
+		foreach ($this->schema2egw as $attributes)
 		{
-			$this->all_attributes = array_merge($this->all_attributes,array_values($attributes));
+			$this->all_attributes = array_merge($this->all_attributes, array_values($attributes));
 		}
 		$this->all_attributes = array_values(array_unique($this->all_attributes));
 
@@ -139,9 +139,9 @@ 
 	 *
 	 * @param boolean $admin =false true (re-)connect with admin not user credentials, eg. to modify accounts
 	 */
-	function connect($admin=false)
+	function connect($admin = false)
 	{
-		unset($admin);	// not used, but required by function signature
+		unset($admin); // not used, but required by function signature
 
 		$this->ds = $this->accounts_ads->ldap_connection();
 	}
@@ -174,15 +174,14 @@ 
 	function read($_contact_id)
 	{
 		if (is_array($_contact_id) && isset($_contact_id['account_id']) ||
-			!is_array($_contact_id) && substr($_contact_id,0,8) == 'account:')
+			!is_array($_contact_id) && substr($_contact_id, 0, 8) == 'account:')
 		{
-			$account_id = (int)(is_array($_contact_id) ? $_contact_id['account_id'] : substr($_contact_id,8));
+			$account_id = (int)(is_array($_contact_id) ? $_contact_id['account_id'] : substr($_contact_id, 8));
 			$_contact_id = $GLOBALS['egw']->accounts->id2name($account_id, 'person_id');
 		}
-		$contact_id = !is_array($_contact_id) ? $_contact_id :
-			(isset ($_contact_id['id']) ? $_contact_id['id'] : $_contact_id['uid']);
+		$contact_id = !is_array($_contact_id) ? $_contact_id : (isset ($_contact_id['id']) ? $_contact_id['id'] : $_contact_id['uid']);
 
-		$rows = $this->_searchLDAP($this->allContactsDN, $filter=$this->id_filter($contact_id), $this->all_attributes, Ldap::ALL);
+		$rows = $this->_searchLDAP($this->allContactsDN, $filter = $this->id_filter($contact_id), $this->all_attributes, Ldap::ALL);
 		//error_log(__METHOD__."('$contact_id') _searchLDAP($this->allContactsDN, '$filter',...)=".array2string($rows));
 		return $rows ? $rows[0] : false;
 	}

Braces +13 added lines, -3 removed lines

@@ -84,7 +84,11 @@ 
 	 */
 	function __construct(array $ldap_config=null, $ds=null)
 	{
-		if (false) parent::__construct ();	// quiten IDE warning, we are explicitly NOT calling parrent constructor!
+		if (false)
+		{
+			parent::__construct ();
+		}
+		// quiten IDE warning, we are explicitly NOT calling parrent constructor!
 
 		$this->accountName 		= $GLOBALS['egw_info']['user']['account_lid'];
 
@@ -202,10 +206,16 @@ 
 		$contact['id'] = $contact['uid'] = $this->accounts_ads->objectguid2str($data['objectguid']);
 
 		// ignore system accounts
-		if ($contact['account_id'] < Api\Accounts\Ads::MIN_ACCOUNT_ID) return false;
+		if ($contact['account_id'] < Api\Accounts\Ads::MIN_ACCOUNT_ID)
+		{
+			return false;
+		}
 
 		// ignore deactivated or expired accounts
-		if (!$this->accounts_ads->user_active($data)) return false;
+		if (!$this->accounts_ads->user_active($data))
+		{
+			return false;
+		}
 
 		$this->_inetorgperson2egw($contact, $data, 'displayname');
 	}

api/src/Contacts/Sql.php

Doc Comments +2 added lines, -2 removed lines

@@ -250,7 +250,7 @@ 
 	 * For a union-query you call search for each query with $start=='UNION' and one more with only $order_by and $start set to run the union-query.
 	 *
 	 * @param array|string $criteria array of key and data cols, OR a SQL query (content for WHERE), fully quoted (!)
-	 * @param boolean|string|array $only_keys =true True returns only keys, False returns all cols. or
+	 * @param boolean|string $only_keys =true True returns only keys, False returns all cols. or
 	 *	comma seperated list or array of columns to return
 	 * @param string $order_by ='' fieldnames + {ASC|DESC} separated by colons ',', can also contain a GROUP BY (if it contains ORDER BY)
 	 * @param string|array $extra_cols ='' string or array of strings to be added to the SELECT, eg. "count(*) as num"
@@ -508,7 +508,7 @@ 
 	 * 	or whole where array: column-name => value(s) pairs
 	 * @param string $uid_column ='list_owner' column-name or null to use $uids as where array
 	 * @param string $member_attr =null null: no members, 'contact_uid', 'contact_id', 'caldav_name' return members as that attribute
-	 * @param boolean|int|array $limit_in_ab =false if true only return members from the same owners addressbook,
+	 * @param boolean $limit_in_ab =false if true only return members from the same owners addressbook,
 	 * 	if int|array only return members from the given owners addressbook(s)
 	 * @return array with list_id => array(list_id,list_name,list_owner,...) pairs
 	 */

Indentation +3 added lines, -3 removed lines

@@ -858,9 +858,9 @@
 	}
 
 	/**
-	* Deletes custom field data
-	* Implemented to deal with LDAP backend, which saves CFs in SQL, but the account record is in LDAP
-	*/
+	 * Deletes custom field data
+	 * Implemented to deal with LDAP backend, which saves CFs in SQL, but the account record is in LDAP
+	 */
 	function delete_customfields($data)
 	{
 		$this->db->delete($this->extra_table,$data,__LINE__,__FILE__);

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

@@ -336,18 +336,18 @@ 
 		$match_count = $GLOBALS['egw_info']['user']['preferences']['addressbook']['duplicate_threshold'] ?
 				$GLOBALS['egw_info']['user']['preferences']['addressbook']['duplicate_threshold'] : 3;
 
-		$columns = Array();
-		$extra = Array();
+		$columns = array();
+		$extra = array();
 		$order = in_array($param['order'], $group) ? $param['order'] : $group[0];
 		$join .= $this->table_name .'.contact_id != a2.contact_id AND (';
-		$join_fields = Array();
+		$join_fields = array();
 		foreach($group as $field)
 		{
 			$extra[] = "IF({$this->table_name}.$field = a2.$field, 1, 0)";
 			$join_fields[] = $this->table_name . ".$field = a2.$field";
 			$columns[] = "IF({$this->table_name}.$field = a2.$field, {$this->table_name}.$field, '') AS $field";
 		}
-		$extra = Array(
+		$extra = array(
 			implode('+', $extra) . ' AS match_count'
 		);
 		$join .= $this->db->column_data_implode(' OR ',$join_fields) . ')';
@@ -382,7 +382,7 @@ 
 		}
 		
 		$rows = $this->db->query(
-				"SELECT $mysql_calc_rows " . $columns. ', COUNT(contact_id) AS group_count' .
+				"select $mysql_calc_rows " . $columns. ', COUNT(contact_id) AS group_count' .
 				' FROM (' . $sub_query . ') AS matches GROUP BY ' . implode(',',$group) .
 				' HAVING group_count > 1 ORDER BY ' . $order,
 				__LINE__, __FILE__, (int)$param['start'],$mysql_calc_rows ? (int)$param['num_rows'] : -1
@@ -720,7 +720,7 @@ 
 			foreach($this->db->select($this->ab2list_table,"$this->ab2list_table.list_id,$this->table_name.$member_attr",
 				$this->db->expression($this->ab2list_table, $this->ab2list_table.'.', array('list_id'=>array_keys($lists))),
 				__LINE__,__FILE__,false,$member_attr=='contact_id' ? '' :
-				'',false,0,"JOIN $this->table_name ON $this->ab2list_table.contact_id=$this->table_name.contact_id".$in_ab_join) as $row)
+				'',false,0,"join $this->table_name ON $this->ab2list_table.contact_id=$this->table_name.contact_id".$in_ab_join) as $row)
 			{
 				$lists[$row['list_id']]['members'][] = $row[$member_attr];
 			}

Braces +144 added lines, -37 removed lines

@@ -112,11 +112,20 @@ 
 		$filter = is_array($param['col_filter']) ? $param['col_filter'] : array();
 		$join = '';
 		$op = 'OR';
-		if (isset($param['op']) && !empty($param['op'])) $op = $param['op'];
+		if (isset($param['op']) && !empty($param['op']))
+		{
+			$op = $param['op'];
+		}
 		$advanced_search = false;
-		if (isset($param['advanced_search']) && !empty($param['advanced_search'])) $advanced_search = true;
+		if (isset($param['advanced_search']) && !empty($param['advanced_search']))
+		{
+			$advanced_search = true;
+		}
 		$wildcard ='%';
-		if ($advanced_search || (isset($param['wildcard']) && !empty($param['wildcard']))) $wildcard = ($param['wildcard']?$param['wildcard']:'');
+		if ($advanced_search || (isset($param['wildcard']) && !empty($param['wildcard'])))
+		{
+			$wildcard = ($param['wildcard']?$param['wildcard']:'');
+		}
 
 		// fix cat_id filter to search in comma-separated multiple cats and return subcats
 		if ($filter['cat_id'])
@@ -134,7 +143,11 @@ 
 			// we have no private grants in addressbook at the moment, they have then to be added here too
 			if ($param['owner'])
 			{
-				if (!$this->grants[(int) $filter['owner']]) return false;	// we have no access to that addressbook
+				if (!$this->grants[(int) $filter['owner']])
+				{
+					return false;
+				}
+				// we have no access to that addressbook
 
 				$filter['owner'] = $param['owner'];
 				$filter['private'] = 0;
@@ -209,7 +222,10 @@ 
 		$rows = parent::search($param['search'],array('org_name'),$append,$extra,$wildcard,false,$op/*'OR'*/,
 			array($param['start'],$param['num_rows']),$filter,$join);
 
-		if (!$rows) return false;
+		if (!$rows)
+		{
+			return false;
+		}
 
 		// query the values for *_count == 1, to display them instead
 		$filter['org_name'] = $orgs = array();
@@ -284,11 +300,20 @@ 
 		$join = 'JOIN ' . $this->table_name . ' AS a2 ON ';
 		$filter = $param['col_filter'];
 		$op = 'OR';
-		if (isset($param['op']) && !empty($param['op'])) $op = $param['op'];
+		if (isset($param['op']) && !empty($param['op']))
+		{
+			$op = $param['op'];
+		}
 		$advanced_search = false;
-		if (isset($param['advanced_search']) && !empty($param['advanced_search'])) $advanced_search = true;
+		if (isset($param['advanced_search']) && !empty($param['advanced_search']))
+		{
+			$advanced_search = true;
+		}
 		$wildcard ='%';
-		if ($advanced_search || (isset($param['wildcard']) && !empty($param['wildcard']))) $wildcard = ($param['wildcard']?$param['wildcard']:'');
+		if ($advanced_search || (isset($param['wildcard']) && !empty($param['wildcard'])))
+		{
+			$wildcard = ($param['wildcard']?$param['wildcard']:'');
+		}
 
 		// fix cat_id filter to search in comma-separated multiple cats and return subcats
 		if ($param['cat_id'])
@@ -319,7 +344,11 @@ 
 			// we have no private grants in addressbook at the moment, they have then to be added here too
 			if (array_key_exists('owner', $param))
 			{
-				if (!$this->grants[(int) $param['owner']]) return false;	// we have no access to that addressbook
+				if (!$this->grants[(int) $param['owner']])
+				{
+					return false;
+				}
+				// we have no access to that addressbook
 
 				$filter[$this->table_name.'.contact_owner'] = $param['owner'];
 				$filter[$this->table_name.'.private'] = 0;
@@ -459,7 +488,10 @@ 
 	 */
 	function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false, $ignore_acl=false)
 	{
-		if ((int) $this->debug >= 4) echo '<p>'.__METHOD__.'('.array2string($criteria).','.array2string($only_keys).",'$order_by','$extra_cols','$wildcard','$empty','$op',$start,".array2string($filter).",'$join')</p>\n";
+		if ((int) $this->debug >= 4)
+		{
+			echo '<p>'.__METHOD__.'('.array2string($criteria).','.array2string($only_keys).",'$order_by','$extra_cols','$wildcard','$empty','$op',$start,".array2string($filter).",'$join')</p>\n";
+		}
 		//error_log(__METHOD__.'('.array2string($criteria,true).','.array2string($only_keys).",'$order_by', ".array2string($extra_cols).",'$wildcard','$empty','$op',$start,".array2string($filter).",'$join')");
 
 		$owner = isset($filter['owner']) ? $filter['owner'] : (isset($criteria['owner']) ? $criteria['owner'] : null);
@@ -508,7 +540,10 @@ 
 				// no grants for selected owner/addressbook
 				if (!($filter['owner'] = array_intersect((array)$filter['owner'],array_keys($this->grants))))
 				{
-					if (!isset($groupmember_sql)) return false;
+					if (!isset($groupmember_sql))
+					{
+						return false;
+					}
 					$filter[] = substr($groupmember_sql,4);
 					unset($filter['owner']);
 				}
@@ -560,13 +595,16 @@ 
 				$filter[] = str_replace('UNIX_TIMESTAMP(NOW())',time(),self::ACOUNT_ACTIVE_FILTER);
 			}
 		}
-		if ($join || ($criteria && is_string($criteria)) || ($criteria && is_array($criteria) && $order_by))	// search also adds a join for custom fields!
+		if ($join || ($criteria && is_string($criteria)) || ($criteria && is_array($criteria) && $order_by))
+		{
+			// search also adds a join for custom fields!
 		{
 			switch(gettype($only_keys))
 			{
 				case 'boolean':
 					// Correctly handled by parent class
 					break;
+		}
 				case 'string':
 					$only_keys = explode(',',$only_keys);
 					// fall through
@@ -576,13 +614,23 @@ 
 			if ($this->db->Type != 'mysql' && preg_match_all("/(#?[a-zA-Z_.]+) *(<> *''|IS NULL|IS NOT NULL)? *(ASC|DESC)?(,|$)/ui",
 				$order_by, $all_matches, PREG_SET_ORDER))
 			{
-				if (!is_array($extra_cols))	$extra_cols = $extra_cols ? explode(',',$extra_cols) : array();
+				if (!is_array($extra_cols))
+				{
+					$extra_cols = $extra_cols ? explode(',',$extra_cols) : array();
+				}
 				foreach($all_matches as $matches)
 				{
 					$table = '';
 					$column = $matches[1];
-					if ($column[0] == '#') continue;	// order by custom field is handeled in so_sql_cf anyway
-					if (($key = array_search($column, $this->db_cols)) !== false) $column = $key;
+					if ($column[0] == '#')
+					{
+						continue;
+					}
+					// order by custom field is handeled in so_sql_cf anyway
+					if (($key = array_search($column, $this->db_cols)) !== false)
+					{
+						$column = $key;
+					}
 					if (strpos($column,'.') === false)
 					{
 						$table = $column == $this->extra_value ? $this->extra_table : $this->table_name;
@@ -597,10 +645,13 @@ 
 					}
 					$extra_cols[] = $table.$column.' '.$matches[2];
 					//_debug_array($matches);
-					if (!empty($order_by) && $table) // postgres requires explizit order by
+					if (!empty($order_by) && $table)
+					{
+						// postgres requires explizit order by
 					{
 						$order_by = str_replace($matches[0],$table.$column.' '.$matches[2].' '.$matches[3].$matches[4],$order_by);
 					}
+					}
 				}
 				//_debug_array($order_by); _debug_array($extra_cols);
 			}
@@ -626,7 +677,11 @@ 
 		}
 		$rows =& parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,$start,$filter,$join,$need_full_no_count);
 
-		if ($start === false) $this->total = is_array($rows) ? count($rows) : 0;	// so_sql sets total only for $start !== false!
+		if ($start === false)
+		{
+			$this->total = is_array($rows) ? count($rows) : 0;
+		}
+		// so_sql sets total only for $start !== false!
 
 		return $rows;
 	}
@@ -668,7 +723,10 @@ 
 		$cat_filter = array();
 		foreach(is_array($cats) ? $cats : (is_numeric($cats) ? array($cats) : explode(',',$cats)) as $cat)
 		{
-			if (is_numeric($cat)) $cat_filter[] = $this->db->concat("','",cat_id,"','")." LIKE '%,$cat,%'";
+			if (is_numeric($cat))
+			{
+				$cat_filter[] = $this->db->concat("','",cat_id,"','")." LIKE '%,$cat,%'";
+			}
 		}
 		return $cat_filter;
 	}
@@ -681,10 +739,13 @@ 
 	 */
 	function change_owner($account_id,$new_owner)
 	{
-		if (!$new_owner)	// otherwise we would create an account (contact_owner==0)
+		if (!$new_owner)
+		{
+			// otherwise we would create an account (contact_owner==0)
 		{
 			throw Api\Exception\WrongParameter(__METHOD__."($account_id, $new_owner) new owner must not be 0!");
 		}
+		}
 		// contacts
 		$this->db->update($this->table_name,array(
 			'contact_owner' => $new_owner,
@@ -729,7 +790,10 @@ 
 		foreach($this->db->select($this->lists_table,'*',$uid_column?array($uid_column=>$uids):$uids,__LINE__,__FILE__,
 			false,'ORDER BY list_owner<>'.(int)$GLOBALS['egw_info']['user']['account_id'].',list_name') as $row)
 		{
-			if ($member_attr) $row['members'] = array();
+			if ($member_attr)
+			{
+				$row['members'] = array();
+			}
 			$lists[$row['list_id']] = $row;
 		}
 		if ($lists && $member_attr && in_array($member_attr,array('contact_id','contact_uid','caldav_name')))
@@ -792,9 +856,15 @@ 
 	function add_list($keys,$owner,$contacts=array(),array &$data=array())
 	{
 		//error_log(__METHOD__.'('.array2string($keys).", $owner, ".array2string($contacts).', '.array2string($data).') '.function_backtrace());
-		if (!$keys && !$data || !(int)$owner) return false;
+		if (!$keys && !$data || !(int)$owner)
+		{
+			return false;
+		}
 
-		if ($keys && !is_array($keys)) $keys = array('list_name' => $keys);
+		if ($keys && !is_array($keys))
+		{
+			$keys = array('list_name' => $keys);
+		}
 		if ($keys)
 		{
 			$keys['list_owner'] = $owner;
@@ -814,9 +884,15 @@ 
 		}
 		$data['list_modified'] = time();
 		$data['list_modifier'] = $GLOBALS['egw_info']['user']['account_id'];
-		if (!$data['list_id']) unset($data['list_id']);
+		if (!$data['list_id'])
+		{
+			unset($data['list_id']);
+		}
 
-		if (!$this->db->insert($this->lists_table,$data,$keys,__LINE__,__FILE__)) return false;
+		if (!$this->db->insert($this->lists_table,$data,$keys,__LINE__,__FILE__))
+		{
+			return false;
+		}
 
 		if (!$list_id && ($list_id = $this->db->get_last_insert_id($this->lists_table,'list_id')) &&
 			(!isset($data['list_uid']) || !isset($data['list_carddav_name'])))
@@ -834,7 +910,10 @@ 
 
 			$this->add2list($list_id,$contacts,array());
 		}
-		if ($keys) $data += $keys;
+		if ($keys)
+		{
+			$data += $keys;
+		}
 		//error_log(__METHOD__.'('.array2string($keys).", $owner, ...) data=".array2string($data).' returning '.array2string($list_id));
 		return $list_id;
 	}
@@ -849,7 +928,10 @@ 
 	 */
 	function add2list($contact,$list,array $existing=null)
 	{
-		if (!(int)$list || !is_array($contact) && !(int)$contact) return false;
+		if (!(int)$list || !is_array($contact) && !(int)$contact)
+		{
+			return false;
+		}
 
 		if (!is_array($existing))
 		{
@@ -891,7 +973,10 @@ 
 	 */
 	function remove_from_list($contact,$list=null)
 	{
-		if (!(int)$list && !is_null($list) || !is_array($contact) && !(int)$contact) return false;
+		if (!(int)$list && !is_null($list) || !is_array($contact) && !(int)$contact)
+		{
+			return false;
+		}
 
 		$where = array(
 			'contact_id' => $contact,
@@ -933,7 +1018,10 @@ 
 	 */
 	function delete_list($list)
 	{
-		if (!$this->db->delete($this->lists_table,array('list_id' => $list),__LINE__,__FILE__)) return false;
+		if (!$this->db->delete($this->lists_table,array('list_id' => $list),__LINE__,__FILE__))
+		{
+			return false;
+		}
 
 		$this->db->delete($this->ab2list_table,array('list_id' => $list),__LINE__,__FILE__);
 
@@ -948,7 +1036,10 @@ 
 	 */
 	function lists_ctag($owner=null)
 	{
-		if (is_null($owner)) $owner = array_keys($this->grants);
+		if (is_null($owner))
+		{
+			$owner = array_keys($this->grants);
+		}
 
 		if (!($modified = $this->db->select($this->lists_table,'MAX(list_modified)',array('list_owner'=>$owner),
 			__LINE__,__FILE__)->fetchColumn()))
@@ -968,9 +1059,12 @@ 
 	 */
 	function read($keys,$extra_cols='',$join='')
 	{
-		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'])) {
+		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length']))
+		{
 			$minimum_uid_length = $GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'];
-		} else {
+		}
+		else
+		{
 			$minimum_uid_length = 8;
 		}
 
@@ -990,7 +1084,8 @@ 
 
 		// enforce a minium uid strength
 		if (is_array($contact) && (!isset($contact['uid'])
-				|| strlen($contact['uid']) < $minimum_uid_length)) {
+				|| strlen($contact['uid']) < $minimum_uid_length))
+		{
 			parent::update(array('uid' => Api\CalDAV::generate_uid('addressbook',$contact['id'])));
 		}
 		return $contact;
@@ -1007,19 +1102,28 @@ 
 	{
 		unset($extra_where);	// not used, but required by function signature
 
-		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'])) {
+		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length']))
+		{
 			$minimum_uid_length = $GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'];
-		} else {
+		}
+		else
+		{
 			$minimum_uid_length = 8;
 		}
 
-		if (is_array($keys) && count($keys)) $this->data_merge($keys);
+		if (is_array($keys) && count($keys))
+		{
+			$this->data_merge($keys);
+		}
 
 		$new_entry = !$this->data['id'];
 
-		if (isset($this->data['etag']))		// do we have an etag in the data to write
+		if (isset($this->data['etag']))
+		{
+			// do we have an etag in the data to write
 		{
 			$etag = $this->data['etag'];
+		}
 			unset($this->data['etag']);
 			if (!($err = parent::save(array('contact_etag=contact_etag+1'),array('contact_etag' => $etag))))
 			{
@@ -1091,7 +1195,10 @@ 
 	 */
 	function read_list($list)
 	{
-		if (!$list) return false;
+		if (!$list)
+		{
+			return false;
+		}
 
 		return $this->db->select($this->lists_table,'*',array('list_id'=>$list),__LINE__,__FILE__)->fetch();
 	}

Spacing +155 added lines, -158 removed lines

@@ -44,7 +44,7 @@ 
 	 *
 	 * @var string
 	 */
-	var $contacts_id='id';
+	var $contacts_id = 'id';
 
 	/**
 	 * Name of the table for distribution lists
@@ -67,7 +67,7 @@ 
 	 *
 	 * @param Api\Db $db =null
 	 */
-	function __construct(Api\Db $db=null)
+	function __construct(Api\Db $db = null)
 	{
 		parent::__construct('api', 'egw_addressbook', self::EXTRA_TABLE,
 			'contact_', '_name', '_value', '_id', $db);
@@ -115,8 +115,8 @@ 
 		if (isset($param['op']) && !empty($param['op'])) $op = $param['op'];
 		$advanced_search = false;
 		if (isset($param['advanced_search']) && !empty($param['advanced_search'])) $advanced_search = true;
-		$wildcard ='%';
-		if ($advanced_search || (isset($param['wildcard']) && !empty($param['wildcard']))) $wildcard = ($param['wildcard']?$param['wildcard']:'');
+		$wildcard = '%';
+		if ($advanced_search || (isset($param['wildcard']) && !empty($param['wildcard']))) $wildcard = ($param['wildcard'] ? $param['wildcard'] : '');
 
 		// fix cat_id filter to search in comma-separated multiple cats and return subcats
 		if ($filter['cat_id'])
@@ -134,7 +134,7 @@ 
 			// we have no private grants in addressbook at the moment, they have then to be added here too
 			if ($param['owner'])
 			{
-				if (!$this->grants[(int) $filter['owner']]) return false;	// we have no access to that addressbook
+				if (!$this->grants[(int)$filter['owner']]) return false; // we have no access to that addressbook
 
 				$filter['owner'] = $param['owner'];
 				$filter['private'] = 0;
@@ -143,18 +143,18 @@ 
 			{
 				if ($this->account_repository != 'sql' && $this->contact_repository != 'sql-ldap')
 				{
-					$filter[] = $this->table_name.'.contact_owner != 0';	// in case there have been accounts in sql previously
+					$filter[] = $this->table_name.'.contact_owner != 0'; // in case there have been accounts in sql previously
 				}
 				$filter[] = "(".$this->table_name.".contact_owner=".(int)$GLOBALS['egw_info']['user']['account_id'].
 					" OR contact_private=0 AND ".$this->table_name.".contact_owner IN (".
-					implode(',',array_keys($this->grants))."))";
+					implode(',', array_keys($this->grants))."))";
 			}
 			if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'] !== 'none')
 			{
 				$join .= self::ACCOUNT_ACTIVE_JOIN;
 				if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'] === '0')
 				{
-					$filter[] = str_replace('UNIX_TIMESTAMP(NOW())',time(),self::ACOUNT_ACTIVE_FILTER);
+					$filter[] = str_replace('UNIX_TIMESTAMP(NOW())', time(), self::ACOUNT_ACTIVE_FILTER);
 				}
 				else
 				{
@@ -168,7 +168,7 @@ 
 		}
 		else
 		{
-			$filter[] = "org_name != ''";// AND org_name IS NOT NULL";
+			$filter[] = "org_name != ''"; // AND org_name IS NOT NULL";
 		}
 		if (isset($filter['list']))
 		{
@@ -186,7 +186,7 @@ 
 		}
 		$sort = $param['sort'] == 'DESC' ? 'DESC' : 'ASC';
 
-		list(,$by) = explode(',',$param['org_view']);
+		list(,$by) = explode(',', $param['org_view']);
 		if (!$by)
 		{
 			$extra = array(
@@ -199,41 +199,40 @@ 
 		else	// by adr_one_location or org_unit
 		{
 			// org total for more then one $by
-			$by_expr = $by == 'org_unit_count' ? "COUNT(DISTINCT CASE WHEN org_unit IS NULL THEN '' ELSE org_unit END)" :
-				"COUNT(DISTINCT CASE WHEN adr_one_locality IS NULL THEN '' ELSE adr_one_locality END)";
-			parent::search($param['search'],array('org_name'),
+			$by_expr = $by == 'org_unit_count' ? "COUNT(DISTINCT CASE WHEN org_unit IS NULL THEN '' ELSE org_unit END)" : "COUNT(DISTINCT CASE WHEN adr_one_locality IS NULL THEN '' ELSE adr_one_locality END)";
+			parent::search($param['search'], array('org_name'),
 				"GROUP BY org_name HAVING $by_expr > 1 ORDER BY org_name $sort", array(
 				"NULL AS $by",
 				'1 AS is_main',
 				'COUNT(DISTINCT egw_addressbook.contact_id) AS org_count',
 				"COUNT(DISTINCT CASE WHEN org_unit IS NULL THEN '' ELSE org_unit END) AS org_unit_count",
 				"COUNT(DISTINCT CASE WHEN adr_one_locality IS NULL THEN '' ELSE adr_one_locality END) AS adr_one_locality_count",
-			),$wildcard,false,$op/*'OR'*/,'UNION',$filter,$join);
+			), $wildcard, false, $op/*'OR'*/, 'UNION', $filter, $join);
 			// org by location
-			parent::search($param['search'],array('org_name'),
+			parent::search($param['search'], array('org_name'),
 				"GROUP BY org_name,$by ORDER BY org_name $sort,$by $sort", array(
 				"CASE WHEN $by IS NULL THEN '' ELSE $by END AS $by",
 				'0 AS is_main',
 				'COUNT(DISTINCT egw_addressbook.contact_id) AS org_count',
 				"COUNT(DISTINCT CASE WHEN org_unit IS NULL THEN '' ELSE org_unit END) AS org_unit_count",
 				"COUNT(DISTINCT CASE WHEN adr_one_locality IS NULL THEN '' ELSE adr_one_locality END) AS adr_one_locality_count",
-			),$wildcard,false,$op/*'OR'*/,'UNION',$filter,$join);
+			), $wildcard, false, $op/*'OR'*/, 'UNION', $filter, $join);
 			$append = "ORDER BY org_name $sort,is_main DESC,$by $sort";
 		}
-		$rows = parent::search($param['search'],array('org_name'),$append,$extra,$wildcard,false,$op/*'OR'*/,
-			array($param['start'],$param['num_rows']),$filter,$join);
+		$rows = parent::search($param['search'], array('org_name'), $append, $extra, $wildcard, false, $op/*'OR'*/,
+			array($param['start'], $param['num_rows']), $filter, $join);
 
 		if (!$rows) return false;
 
 		// query the values for *_count == 1, to display them instead
 		$filter['org_name'] = $orgs = array();
-		foreach($rows as $row)
+		foreach ($rows as $row)
 		{
 			if ($row['org_unit_count'] == 1 || $row['adr_one_locality_count'] == 1)
 			{
-				$filter['org_name'][$row['org_name']] = $row['org_name'];	// use as key too to have every org only once
+				$filter['org_name'][$row['org_name']] = $row['org_name']; // use as key too to have every org only once
 			}
-			$org_key = $row['org_name'].($by ? '|||'.($row[$by] || $row[$by.'_count']==1 ? $row[$by] : '|||') : '');
+			$org_key = $row['org_name'].($by ? '|||'.($row[$by] || $row[$by.'_count'] == 1 ? $row[$by] : '|||') : '');
 			$row['group_count'] = $row['org_count'];
 			$orgs[$org_key] = $row;
 		}
@@ -241,9 +240,9 @@ 
 
 		if (count($filter['org_name']))
 		{
-			foreach((array) parent::search(null, array('org_name','org_unit','adr_one_locality'),
+			foreach ((array)parent::search(null, array('org_name', 'org_unit', 'adr_one_locality'),
 				'GROUP BY org_name,org_unit,adr_one_locality',
-				'',$wildcard,false,$op/*'AND'*/,false,$filter,$join) as $row)
+				'', $wildcard, false, $op/*'AND'*/, false, $filter, $join) as $row)
 			{
 				$org_key = $row['org_name'].($by ? '|||'.$row[$by] : '');
 				if ($orgs[$org_key]['org_unit_count'] == 1)
@@ -295,27 +294,27 @@ 
 	 */
 	function duplicates($param)
 	{
-		$join = 'JOIN ' . $this->table_name . ' AS a2 ON ';
+		$join = 'JOIN '.$this->table_name.' AS a2 ON ';
 		$filter = $param['col_filter'];
 		$op = 'OR';
 		if (isset($param['op']) && !empty($param['op'])) $op = $param['op'];
 		$advanced_search = false;
 		if (isset($param['advanced_search']) && !empty($param['advanced_search'])) $advanced_search = true;
-		$wildcard ='%';
-		if ($advanced_search || (isset($param['wildcard']) && !empty($param['wildcard']))) $wildcard = ($param['wildcard']?$param['wildcard']:'');
+		$wildcard = '%';
+		if ($advanced_search || (isset($param['wildcard']) && !empty($param['wildcard']))) $wildcard = ($param['wildcard'] ? $param['wildcard'] : '');
 
 		// fix cat_id filter to search in comma-separated multiple cats and return subcats
 		if ($param['cat_id'])
 		{
 			$cat_filter = $this->_cat_filter($filter['cat_id']);
-			$filter[] = str_replace('cat_id', $this->table_name . '.cat_id', $cat_filter);
-			$join .= str_replace('cat_id', 'a2.cat_id', $cat_filter) . ' AND ';
+			$filter[] = str_replace('cat_id', $this->table_name.'.cat_id', $cat_filter);
+			$join .= str_replace('cat_id', 'a2.cat_id', $cat_filter).' AND ';
 			unset($filter['cat_id']);
 		}
 		if ($filter['tid'])
 		{
-			$filter[$this->table_name . '.contact_tid'] = $param['col_filter']['tid'];
-			$join .= 'a2.contact_tid = ' . $this->db->quote($filter['tid']) . ' AND ';
+			$filter[$this->table_name.'.contact_tid'] = $param['col_filter']['tid'];
+			$join .= 'a2.contact_tid = '.$this->db->quote($filter['tid']).' AND ';
 			unset($filter['tid']);
 		}
 		else
@@ -323,33 +322,33 @@ 
 			$join .= 'a2.contact_tid != \'D\' AND ';
 		}
 		// add filter for read ACL in sql, if user is NOT the owner of the addressbook
-		if (array_key_exists('owner',$param) && $param['owner'] == $GLOBALS['egw_info']['user']['account_id'])
+		if (array_key_exists('owner', $param) && $param['owner'] == $GLOBALS['egw_info']['user']['account_id'])
 		{
 			$filter[$this->table_name.'.contact_owner'] = $param['owner'];
-			$join .= 'a2.contact_owner = ' . $this->db->quote($param['owner']) . ' AND ';
+			$join .= 'a2.contact_owner = '.$this->db->quote($param['owner']).' AND ';
 		}
 		else
 		{
 			// we have no private grants in addressbook at the moment, they have then to be added here too
 			if (array_key_exists('owner', $param))
 			{
-				if (!$this->grants[(int) $param['owner']]) return false;	// we have no access to that addressbook
+				if (!$this->grants[(int)$param['owner']]) return false; // we have no access to that addressbook
 
 				$filter[$this->table_name.'.contact_owner'] = $param['owner'];
 				$filter[$this->table_name.'.private'] = 0;
-				$join .= 'a2.contact_owner = ' . $this->db->quote($param['owner']) . ' AND ';
-				$join .= 'a2.contact_private = ' . $this->db->quote($filter['private']) . ' AND ';
+				$join .= 'a2.contact_owner = '.$this->db->quote($param['owner']).' AND ';
+				$join .= 'a2.contact_private = '.$this->db->quote($filter['private']).' AND ';
 			}
 			else	// search all addressbooks, incl. accounts
 			{
 				if ($this->account_repository != 'sql' && $this->contact_repository != 'sql-ldap')
 				{
-					$filter[] = $this->table_name.'.contact_owner != 0';	// in case there have been accounts in sql previously
+					$filter[] = $this->table_name.'.contact_owner != 0'; // in case there have been accounts in sql previously
 				}
 				$filter[] = $access = "(".$this->table_name.".contact_owner=".(int)$GLOBALS['egw_info']['user']['account_id'].
 					" OR {$this->table_name}.contact_private=0 AND ".$this->table_name.".contact_owner IN (".
-					implode(',',array_keys($this->grants))."))";
-				$join .= str_replace($this->table_name, 'a2', $access) . ' AND ';
+					implode(',', array_keys($this->grants))."))";
+				$join .= str_replace($this->table_name, 'a2', $access).' AND ';
 			}
 		}
 		if ($param['searchletter'])
@@ -358,34 +357,33 @@ 
 		}
 		$sort = $param['sort'] == 'DESC' ? 'DESC' : 'ASC';
 		$group = $GLOBALS['egw_info']['user']['preferences']['addressbook']['duplicate_fields'] ?
-				explode(',',$GLOBALS['egw_info']['user']['preferences']['addressbook']['duplicate_fields']):
-				array('n_family', 'org_name', 'contact_email');
+				explode(',', $GLOBALS['egw_info']['user']['preferences']['addressbook']['duplicate_fields']) : array('n_family', 'org_name', 'contact_email');
 		$match_count = $GLOBALS['egw_info']['user']['preferences']['addressbook']['duplicate_threshold'] ?
 				$GLOBALS['egw_info']['user']['preferences']['addressbook']['duplicate_threshold'] : 3;
 
 		$columns = Array();
 		$extra = Array();
 		$order = in_array($param['order'], $group) ? $param['order'] : $group[0];
-		$join .= $this->table_name .'.contact_id != a2.contact_id AND (';
+		$join .= $this->table_name.'.contact_id != a2.contact_id AND (';
 		$join_fields = Array();
-		foreach($group as $field)
+		foreach ($group as $field)
 		{
 			$extra[] = "IF({$this->table_name}.$field = a2.$field, 1, 0)";
-			$join_fields[] = $this->table_name . ".$field = a2.$field";
+			$join_fields[] = $this->table_name.".$field = a2.$field";
 			$columns[] = "IF({$this->table_name}.$field = a2.$field, {$this->table_name}.$field, '') AS $field";
 		}
 		$extra = Array(
-			implode('+', $extra) . ' AS match_count'
+			implode('+', $extra).' AS match_count'
 		);
-		$join .= $this->db->column_data_implode(' OR ',$join_fields) . ')';
+		$join .= $this->db->column_data_implode(' OR ', $join_fields).')';
 		if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'] !== 'none')
 		{
 			if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'] === '0')
 			{
-				$join .=' LEFT JOIN egw_accounts AS account_1 ON egw_addressbook.account_id=account_1.account_id ';
-				$join .=' LEFT JOIN egw_accounts AS account_2 ON egw_addressbook.account_id=account_2.account_id ';
-				$filter[] = str_replace(array('UNIX_TIMESTAMP(NOW())', 'account_'),array(time(),'account_1.account_'),self::ACOUNT_ACTIVE_FILTER);
-				$filter[] = str_replace(array('UNIX_TIMESTAMP(NOW())', 'account_'),array(time(),'account_2.account_'),self::ACOUNT_ACTIVE_FILTER);
+				$join .= ' LEFT JOIN egw_accounts AS account_1 ON egw_addressbook.account_id=account_1.account_id ';
+				$join .= ' LEFT JOIN egw_accounts AS account_2 ON egw_addressbook.account_id=account_2.account_id ';
+				$filter[] = str_replace(array('UNIX_TIMESTAMP(NOW())', 'account_'), array(time(), 'account_1.account_'), self::ACOUNT_ACTIVE_FILTER);
+				$filter[] = str_replace(array('UNIX_TIMESTAMP(NOW())', 'account_'), array(time(), 'account_2.account_'), self::ACOUNT_ACTIVE_FILTER);
 			}
 			else
 			{
@@ -399,17 +397,17 @@ 
 		if ($param['search'] && !is_array($param['search']))
 		{
 			$search_cols = array();
-			foreach($group as $col)
+			foreach ($group as $col)
 			{
-				$search_cols[] = $this->table_name . '.' . $col;
+				$search_cols[] = $this->table_name.'.'.$col;
 			}
-			$search = $this->search2criteria($param['search'],$wildcard,$op, null, $search_cols);
+			$search = $this->search2criteria($param['search'], $wildcard, $op, null, $search_cols);
 			$criteria = array($search);
 		}
 		$query = $this->parse_search(array_merge($criteria, $filter), $wildcard, false, ' AND ');
 
 		$sub_query = $this->db->select($this->table_name,
-			'DISTINCT ' . implode(', ',array_merge($columns, $extra)),
+			'DISTINCT '.implode(', ', array_merge($columns, $extra)),
 			$query,
 			False, False, 0, $append, False, -1,
 			$join
@@ -422,15 +420,15 @@ 
 		}
 
 		$rows = $this->db->query(
-				"SELECT $mysql_calc_rows " . $columns. ', COUNT(contact_id) AS group_count' .
-				' FROM (' . $sub_query . ') AS matches GROUP BY ' . implode(',',$group) .
-				' HAVING group_count > 1 ORDER BY ' . $order,
-				__LINE__, __FILE__, (int)$param['start'],$mysql_calc_rows ? (int)$param['num_rows'] : -1
+				"SELECT $mysql_calc_rows ".$columns.', COUNT(contact_id) AS group_count'.
+				' FROM ('.$sub_query.') AS matches GROUP BY '.implode(',', $group).
+				' HAVING group_count > 1 ORDER BY '.$order,
+				__LINE__, __FILE__, (int)$param['start'], $mysql_calc_rows ? (int)$param['num_rows'] : -1
 		);
 
 		// Go through rows and only return one for each pair/triplet/etc. of matches
 		$dupes = array();
-		foreach($rows as $key => $row)
+		foreach ($rows as $key => $row)
 		{
 			$row['email'] = $row['contact_email'];
 			$row['email_home'] = $row['contact_email_home'];
@@ -471,9 +469,9 @@ 
 	 * @param boolean $ignore_acl =false true: no acl check
 	 * @return boolean/array of matching rows (the row is an array of the cols) or False
 	 */
-	function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false, $ignore_acl=false)
+	function &search($criteria, $only_keys = True, $order_by = '', $extra_cols = '', $wildcard = '', $empty = False, $op = 'AND', $start = false, $filter = null, $join = '', $need_full_no_count = false, $ignore_acl = false)
 	{
-		if ((int) $this->debug >= 4) echo '<p>'.__METHOD__.'('.array2string($criteria).','.array2string($only_keys).",'$order_by','$extra_cols','$wildcard','$empty','$op',$start,".array2string($filter).",'$join')</p>\n";
+		if ((int)$this->debug >= 4) echo '<p>'.__METHOD__.'('.array2string($criteria).','.array2string($only_keys).",'$order_by','$extra_cols','$wildcard','$empty','$op',$start,".array2string($filter).",'$join')</p>\n";
 		//error_log(__METHOD__.'('.array2string($criteria,true).','.array2string($only_keys).",'$order_by', ".array2string($extra_cols).",'$wildcard','$empty','$op',$start,".array2string($filter).",'$join')");
 
 		$owner = isset($filter['owner']) ? $filter['owner'] : (isset($criteria['owner']) ? $criteria['owner'] : null);
@@ -489,10 +487,10 @@ 
 		{
 			if ($filter['cat_id'][0] == '!')
 			{
-				$filter['cat_id'] = substr($filter['cat_id'],1);
+				$filter['cat_id'] = substr($filter['cat_id'], 1);
 				$not = 'NOT';
 			}
-			$filter[] = $this->_cat_filter($filter['cat_id'],$not);
+			$filter[] = $this->_cat_filter($filter['cat_id'], $not);
 			unset($filter['cat_id']);
 		}
 
@@ -502,17 +500,17 @@ 
 		{
 			// add read ACL for groupmembers (they have no
 			if ($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] == 'groupmembers' &&
-				(!isset($filter['owner']) || in_array('0',(array)$filter['owner'])))
+				(!isset($filter['owner']) || in_array('0', (array)$filter['owner'])))
 			{
 				$groupmembers = array();
-				foreach($GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'],true) as $group_id)
+				foreach ($GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'], true) as $group_id)
 				{
-					if (($members = $GLOBALS['egw']->accounts->members($group_id,true)))
+					if (($members = $GLOBALS['egw']->accounts->members($group_id, true)))
 					{
-						$groupmembers = array_merge($groupmembers,$members);
+						$groupmembers = array_merge($groupmembers, $members);
 					}
 				}
-				$groupmember_sql = $this->db->expression($this->table_name, ' OR '.$this->table_name.'.',array(
+				$groupmember_sql = $this->db->expression($this->table_name, ' OR '.$this->table_name.'.', array(
 					'account_id' => array_unique($groupmembers),
 				));
 			}
@@ -520,34 +518,34 @@ 
 			if (isset($filter['owner']))
 			{
 				// no grants for selected owner/addressbook
-				if (!($filter['owner'] = array_intersect((array)$filter['owner'],array_keys($this->grants))))
+				if (!($filter['owner'] = array_intersect((array)$filter['owner'], array_keys($this->grants))))
 				{
 					if (!isset($groupmember_sql)) return false;
-					$filter[] = substr($groupmember_sql,4);
+					$filter[] = substr($groupmember_sql, 4);
 					unset($filter['owner']);
 				}
 				// for an owner filter, which does NOT include current user, filter out private entries
-				elseif (!in_array($GLOBALS['egw_info']['user']['account_id'],$filter['owner']))
+				elseif (!in_array($GLOBALS['egw_info']['user']['account_id'], $filter['owner']))
 				{
 					$filter['private'] = 0;
 				}
 				// if multiple addressbooks (incl. current owner) are searched, we need full acl filter
-				elseif(count($filter['owner']) > 1)
+				elseif (count($filter['owner']) > 1)
 				{
 					$filter[] = "($this->table_name.contact_owner=".(int)$GLOBALS['egw_info']['user']['account_id'].
 						" OR contact_private=0 AND $this->table_name.contact_owner IN (".
-						implode(',',array_keys($this->grants)).") $groupmember_sql OR $this->table_name.contact_owner IS NULL)";
+						implode(',', array_keys($this->grants)).") $groupmember_sql OR $this->table_name.contact_owner IS NULL)";
 				}
 			}
 			else	// search all addressbooks, incl. accounts
 			{
 				if ($this->account_repository != 'sql' && $this->contact_repository != 'sql-ldap')
 				{
-					$filter[] = $this->table_name.'.contact_owner != 0';	// in case there have been accounts in sql previously
+					$filter[] = $this->table_name.'.contact_owner != 0'; // in case there have been accounts in sql previously
 				}
 				$filter[] = "($this->table_name.contact_owner=".(int)$GLOBALS['egw_info']['user']['account_id'].
 					" OR contact_private=0 AND $this->table_name.contact_owner IN (".
-					implode(',',array_keys($this->grants)).") $groupmember_sql OR $this->table_name.contact_owner IS NULL)";
+					implode(',', array_keys($this->grants)).") $groupmember_sql OR $this->table_name.contact_owner IS NULL)";
 			}
 		}
 		if (isset($filter['list']))
@@ -565,24 +563,24 @@ 
 			unset($filter['list']);
 		}
 		// add join to show only active accounts (only if accounts are shown and in sql and we not already join the accounts table, eg. used by admin)
-		if ((is_array($owner) ? in_array(0, $owner) : !$owner) && substr($this->account_repository,0,3) == 'sql' &&
-			strpos($join,$GLOBALS['egw']->accounts->backend->table) === false && !array_key_exists('account_id',$filter))
+		if ((is_array($owner) ? in_array(0, $owner) : !$owner) && substr($this->account_repository, 0, 3) == 'sql' &&
+			strpos($join, $GLOBALS['egw']->accounts->backend->table) === false && !array_key_exists('account_id', $filter))
 		{
 			$join .= self::ACCOUNT_ACTIVE_JOIN;
 			if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'] === '0')
 			{
-				$filter[] = str_replace('UNIX_TIMESTAMP(NOW())',time(),self::ACOUNT_ACTIVE_FILTER);
+				$filter[] = str_replace('UNIX_TIMESTAMP(NOW())', time(), self::ACOUNT_ACTIVE_FILTER);
 			}
 		}
 		if ($join || ($criteria && is_string($criteria)) || ($criteria && is_array($criteria) && $order_by))	// search also adds a join for custom fields!
 		{
-			switch(gettype($only_keys))
+			switch (gettype($only_keys))
 			{
 				case 'boolean':
 					// Correctly handled by parent class
 					break;
 				case 'string':
-					$only_keys = explode(',',$only_keys);
+					$only_keys = explode(',', $only_keys);
 					// fall through
 			}
 			// postgres requires that expressions in order by appear in the columns of a distinct select
@@ -590,14 +588,14 @@ 
 			if ($this->db->Type != 'mysql' && preg_match_all("/(#?[a-zA-Z_.]+) *(<> *''|IS NULL|IS NOT NULL)? *(ASC|DESC)?(,|$)/ui",
 				$order_by, $all_matches, PREG_SET_ORDER))
 			{
-				if (!is_array($extra_cols))	$extra_cols = $extra_cols ? explode(',',$extra_cols) : array();
-				foreach($all_matches as $matches)
+				if (!is_array($extra_cols))	$extra_cols = $extra_cols ? explode(',', $extra_cols) : array();
+				foreach ($all_matches as $matches)
 				{
 					$table = '';
 					$column = $matches[1];
-					if ($column[0] == '#') continue;	// order by custom field is handeled in so_sql_cf anyway
+					if ($column[0] == '#') continue; // order by custom field is handeled in so_sql_cf anyway
 					if (($key = array_search($column, $this->db_cols)) !== false) $column = $key;
-					if (strpos($column,'.') === false)
+					if (strpos($column, '.') === false)
 					{
 						$table = $column == $this->extra_value ? $this->extra_table : $this->table_name;
 						if (isset($this->db_cols[$column]))
@@ -613,34 +611,34 @@ 
 					//_debug_array($matches);
 					if (!empty($order_by) && $table) // postgres requires explizit order by
 					{
-						$order_by = str_replace($matches[0],$table.$column.' '.$matches[2].' '.$matches[3].$matches[4],$order_by);
+						$order_by = str_replace($matches[0], $table.$column.' '.$matches[2].' '.$matches[3].$matches[4], $order_by);
 					}
 				}
 				//_debug_array($order_by); _debug_array($extra_cols);
 			}
 
 			// Understand search by date with wildcard (????.10.??) according to user date preference
-			if(is_string($criteria) && strpos($criteria, '?') !== false)
+			if (is_string($criteria) && strpos($criteria, '?') !== false)
 			{
 				// First, check for a 'date', with wildcards, in the user's format
-				$date_regex = str_replace('Q','d',
-					str_replace(array('Y','m','d','.','-'),
-						array('(?P<Y>(?:\?|\Q){4})','(?P<m>(?:\?|\Q){2})','(?P<d>(?:\?|\Q){2})','\.','\-'),
+				$date_regex = str_replace('Q', 'd',
+					str_replace(array('Y', 'm', 'd', '.', '-'),
+						array('(?P<Y>(?:\?|\Q){4})', '(?P<m>(?:\?|\Q){2})', '(?P<d>(?:\?|\Q){2})', '\.', '\-'),
 							$GLOBALS['egw_info']['user']['preferences']['common']['dateformat']));
 
-				if(preg_match_all('$'.$date_regex.'$', $criteria, $matches))
+				if (preg_match_all('$'.$date_regex.'$', $criteria, $matches))
 				{
-					foreach($matches[0] as $m_id => $match)
+					foreach ($matches[0] as $m_id => $match)
 					{
 						// Birthday is Y-m-d
-						$criteria = str_replace($match, "*{$matches['Y'][$m_id]}-{$matches['m'][$m_id]}-{$matches['d'][$m_id]}*",$criteria);
+						$criteria = str_replace($match, "*{$matches['Y'][$m_id]}-{$matches['m'][$m_id]}-{$matches['d'][$m_id]}*", $criteria);
 					}
 				}
 			}
 		}
-		$rows =& parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,$start,$filter,$join,$need_full_no_count);
+		$rows = & parent::search($criteria, $only_keys, $order_by, $extra_cols, $wildcard, $empty, $op, $start, $filter, $join, $need_full_no_count);
 
-		if ($start === false) $this->total = is_array($rows) ? count($rows) : 0;	// so_sql sets total only for $start !== false!
+		if ($start === false) $this->total = is_array($rows) ? count($rows) : 0; // so_sql sets total only for $start !== false!
 
 		return $rows;
 	}
@@ -652,18 +650,18 @@ 
 	 * @param int|array $cat_id
 	 * @return string sql to filter by given cat
 	 */
-	function _cat_filter($cat_id, $not='')
+	function _cat_filter($cat_id, $not = '')
 	{
 		if (!is_object($GLOBALS['egw']->categories))
 		{
 			$GLOBALS['egw']->categories = new Api\Categories;
 		}
-		foreach($GLOBALS['egw']->categories->return_all_children($cat_id) as $cat)
+		foreach ($GLOBALS['egw']->categories->return_all_children($cat_id) as $cat)
 		{
-			$cat_filter[] = $this->db->concat("','",cat_id,"','")." $not LIKE '%,$cat,%'";
+			$cat_filter[] = $this->db->concat("','", cat_id, "','")." $not LIKE '%,$cat,%'";
 		}
-		$cfilter = '('.implode(' OR ',$cat_filter).')';
-		if(!empty($not))
+		$cfilter = '('.implode(' OR ', $cat_filter).')';
+		if (!empty($not))
 		{
 			$cfilter = "( $cfilter OR cat_id IS NULL )";
 		}
@@ -680,9 +678,9 @@ 
 	function _cat_search($cats)
 	{
 		$cat_filter = array();
-		foreach(is_array($cats) ? $cats : (is_numeric($cats) ? array($cats) : explode(',',$cats)) as $cat)
+		foreach (is_array($cats) ? $cats : (is_numeric($cats) ? array($cats) : explode(',', $cats)) as $cat)
 		{
-			if (is_numeric($cat)) $cat_filter[] = $this->db->concat("','",cat_id,"','")." LIKE '%,$cat,%'";
+			if (is_numeric($cat)) $cat_filter[] = $this->db->concat("','", cat_id, "','")." LIKE '%,$cat,%'";
 		}
 		return $cat_filter;
 	}
@@ -693,32 +691,32 @@ 
 	 * @param int $account_id account-id of the old owner
 	 * @param int $new_owner account-id of the new owner
 	 */
-	function change_owner($account_id,$new_owner)
+	function change_owner($account_id, $new_owner)
 	{
 		if (!$new_owner)	// otherwise we would create an account (contact_owner==0)
 		{
 			throw Api\Exception\WrongParameter(__METHOD__."($account_id, $new_owner) new owner must not be 0!");
 		}
 		// contacts
-		$this->db->update($this->table_name,array(
+		$this->db->update($this->table_name, array(
 			'contact_owner' => $new_owner,
-		),array(
+		), array(
 			'contact_owner' => $account_id,
-		),__LINE__,__FILE__);
+		), __LINE__, __FILE__);
 
 		// cfs
 		$this->db->update(self::EXTRA_TABLE, array(
 			'contact_owner' => $new_owner
-		),array(
+		), array(
 			'contact_owner' => $account_id
 		), __LINE__, __FILE__);
 
 		// lists
 		$this->db->update($this->lists_table, array(
 			'list_owner' => $new_owner,
-		),array(
+		), array(
 			'list_owner' => $account_id,
-		),__LINE__,__FILE__);
+		), __LINE__, __FILE__);
 	}
 
 	/**
@@ -732,21 +730,21 @@ 
 	 * 	if int|array only return members from the given owners addressbook(s)
 	 * @return array with list_id => array(list_id,list_name,list_owner,...) pairs
 	 */
-	function get_lists($uids,$uid_column='list_owner',$member_attr=null,$limit_in_ab=false)
+	function get_lists($uids, $uid_column = 'list_owner', $member_attr = null, $limit_in_ab = false)
 	{
 		if (is_array($uids) && array_key_exists('list_id', $uids))
 		{
-			$uids[] = $this->db->expression($this->lists_table, $this->lists_table.'.',array('list_id' => $uids['list_id']));
+			$uids[] = $this->db->expression($this->lists_table, $this->lists_table.'.', array('list_id' => $uids['list_id']));
 			unset($uids['list_id']);
 		}
 		$lists = array();
-		foreach($this->db->select($this->lists_table,'*',$uid_column?array($uid_column=>$uids):$uids,__LINE__,__FILE__,
-			false,'ORDER BY list_owner<>'.(int)$GLOBALS['egw_info']['user']['account_id'].',list_name') as $row)
+		foreach ($this->db->select($this->lists_table, '*', $uid_column ? array($uid_column=>$uids) : $uids, __LINE__, __FILE__,
+			false, 'ORDER BY list_owner<>'.(int)$GLOBALS['egw_info']['user']['account_id'].',list_name') as $row)
 		{
 			if ($member_attr) $row['members'] = array();
 			$lists[$row['list_id']] = $row;
 		}
-		if ($lists && $member_attr && in_array($member_attr,array('contact_id','contact_uid','caldav_name')))
+		if ($lists && $member_attr && in_array($member_attr, array('contact_id', 'contact_uid', 'caldav_name')))
 		{
 			if ($limit_in_ab)
 			{
@@ -760,10 +758,9 @@ 
 					$in_ab_join .= "list_owner=$this->table_name.contact_owner";
 				}
 			}
-			foreach($this->db->select($this->ab2list_table,"$this->ab2list_table.list_id,$this->table_name.$member_attr",
+			foreach ($this->db->select($this->ab2list_table, "$this->ab2list_table.list_id,$this->table_name.$member_attr",
 				$this->db->expression($this->ab2list_table, $this->ab2list_table.'.', array('list_id'=>array_keys($lists))),
-				__LINE__,__FILE__,false,$member_attr=='contact_id' ? '' :
-				'',false,0,"JOIN $this->table_name ON $this->ab2list_table.contact_id=$this->table_name.contact_id".$in_ab_join) as $row)
+				__LINE__, __FILE__, false, $member_attr == 'contact_id' ? '' : '', false, 0, "JOIN $this->table_name ON $this->ab2list_table.contact_id=$this->table_name.contact_id".$in_ab_join) as $row)
 			{
 				$lists[$row['list_id']]['members'][] = $row[$member_attr];
 			}
@@ -803,7 +800,7 @@ 
 	 * @param array &$data=array() values for keys 'list_uid', 'list_carddav_name', 'list_name'
 	 * @return int|boolean integer list_id or false on error
 	 */
-	function add_list($keys,$owner,$contacts=array(),array &$data=array())
+	function add_list($keys, $owner, $contacts = array(), array &$data = array())
 	{
 		//error_log(__METHOD__.'('.array2string($keys).", $owner, ".array2string($contacts).', '.array2string($data).') '.function_backtrace());
 		if (!$keys && !$data || !(int)$owner) return false;
@@ -817,7 +814,7 @@ 
 		{
 			$data['list_owner'] = $owner;
 		}
-		if (!$keys || !($list_id = $this->db->select($this->lists_table,'list_id',$keys,__LINE__,__FILE__)->fetchColumn()))
+		if (!$keys || !($list_id = $this->db->select($this->lists_table, 'list_id', $keys, __LINE__, __FILE__)->fetchColumn()))
 		{
 			$data['list_created'] = time();
 			$data['list_creator'] = $GLOBALS['egw_info']['user']['account_id'];
@@ -830,9 +827,9 @@ 
 		$data['list_modifier'] = $GLOBALS['egw_info']['user']['account_id'];
 		if (!$data['list_id']) unset($data['list_id']);
 
-		if (!$this->db->insert($this->lists_table,$data,$keys,__LINE__,__FILE__)) return false;
+		if (!$this->db->insert($this->lists_table, $data, $keys, __LINE__, __FILE__)) return false;
 
-		if (!$list_id && ($list_id = $this->db->get_last_insert_id($this->lists_table,'list_id')) &&
+		if (!$list_id && ($list_id = $this->db->get_last_insert_id($this->lists_table, 'list_id')) &&
 			(!isset($data['list_uid']) || !isset($data['list_carddav_name'])))
 		{
 			$update = array();
@@ -844,9 +841,9 @@ 
 			{
 				$update['list_carddav_name'] = $data['list_carddav_name'] = $data['list_uid'].'.vcf';
 			}
-			$this->db->update($this->lists_table,$update,array('list_id'=>$list_id),__LINE__,__FILE__);
+			$this->db->update($this->lists_table, $update, array('list_id'=>$list_id), __LINE__, __FILE__);
 
-			$this->add2list($list_id,$contacts,array());
+			$this->add2list($list_id, $contacts, array());
 		}
 		if ($keys) $data += $keys;
 		//error_log(__METHOD__.'('.array2string($keys).", $owner, ...) data=".array2string($data).' returning '.array2string($list_id));
@@ -861,39 +858,39 @@ 
 	 * @param array $existing =null array of existing contact-id(s) of list, to not reread it, eg. array()
 	 * @return false on error
 	 */
-	function add2list($contact,$list,array $existing=null)
+	function add2list($contact, $list, array $existing = null)
 	{
 		if (!(int)$list || !is_array($contact) && !(int)$contact) return false;
 
 		if (!is_array($existing))
 		{
 			$existing = array();
-			foreach($this->db->select($this->ab2list_table,'contact_id',array('list_id'=>$list),__LINE__,__FILE__) as $row)
+			foreach ($this->db->select($this->ab2list_table, 'contact_id', array('list_id'=>$list), __LINE__, __FILE__) as $row)
 			{
 				$existing[] = $row['contact_id'];
 			}
 		}
-		if (!($to_add = array_diff((array)$contact,$existing)))
+		if (!($to_add = array_diff((array)$contact, $existing)))
 		{
-			return true;	// no need to insert it, would give sql error
+			return true; // no need to insert it, would give sql error
 		}
-		foreach($to_add as $contact)
+		foreach ($to_add as $contact)
 		{
-			$this->db->insert($this->ab2list_table,array(
+			$this->db->insert($this->ab2list_table, array(
 				'contact_id' => $contact,
 				'list_id' => $list,
 				'list_added' => time(),
 				'list_added_by' => $GLOBALS['egw_info']['user']['account_id'],
-			),array(),__LINE__,__FILE__);
+			), array(), __LINE__, __FILE__);
 		}
 		// update etag
-		return $this->db->update($this->lists_table,array(
+		return $this->db->update($this->lists_table, array(
 			'list_etag=list_etag+1',
 			'list_modified' => time(),
 			'list_modifier' => $GLOBALS['egw_info']['user']['account_id'],
-		),array(
+		), array(
 			'list_id' => $list,
-		),__LINE__,__FILE__);
+		), __LINE__, __FILE__);
 	}
 
 	/**
@@ -903,7 +900,7 @@ 
 	 * @param int $list =null list-id or null to remove from all lists
 	 * @return false on error
 	 */
-	function remove_from_list($contact,$list=null)
+	function remove_from_list($contact, $list = null)
 	{
 		if (!(int)$list && !is_null($list) || !is_array($contact) && !(int)$contact) return false;
 
@@ -917,24 +914,24 @@ 
 		else
 		{
 			$list = array();
-			foreach($this->db->select($this->ab2list_table,'list_id',$where,__LINE__,__FILE__) as $row)
+			foreach ($this->db->select($this->ab2list_table, 'list_id', $where, __LINE__, __FILE__) as $row)
 			{
 				$list[] = $row['list_id'];
 			}
 		}
-		if (!$this->db->delete($this->ab2list_table,$where,__LINE__,__FILE__))
+		if (!$this->db->delete($this->ab2list_table, $where, __LINE__, __FILE__))
 		{
 			return false;
 		}
-		foreach((array)$list as $list_id)
+		foreach ((array)$list as $list_id)
 		{
-			$this->db->update($this->lists_table,array(
+			$this->db->update($this->lists_table, array(
 				'list_etag=list_etag+1',
 				'list_modified' => time(),
 				'list_modifier' => $GLOBALS['egw_info']['user']['account_id'],
-			),array(
+			), array(
 				'list_id' => $list_id,
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 		}
 		return true;
 	}
@@ -947,9 +944,9 @@ 
 	 */
 	function delete_list($list)
 	{
-		if (!$this->db->delete($this->lists_table,array('list_id' => $list),__LINE__,__FILE__)) return false;
+		if (!$this->db->delete($this->lists_table, array('list_id' => $list), __LINE__, __FILE__)) return false;
 
-		$this->db->delete($this->ab2list_table,array('list_id' => $list),__LINE__,__FILE__);
+		$this->db->delete($this->ab2list_table, array('list_id' => $list), __LINE__, __FILE__);
 
 		return $this->db->affected_rows();
 	}
@@ -960,12 +957,12 @@ 
 	 * @param int|array $owner =null null for all lists user has access too
 	 * @return int
 	 */
-	function lists_ctag($owner=null)
+	function lists_ctag($owner = null)
 	{
 		if (is_null($owner)) $owner = array_keys($this->grants);
 
-		if (!($modified = $this->db->select($this->lists_table,'MAX(list_modified)',array('list_owner'=>$owner),
-			__LINE__,__FILE__)->fetchColumn()))
+		if (!($modified = $this->db->select($this->lists_table, 'MAX(list_modified)', array('list_owner'=>$owner),
+			__LINE__, __FILE__)->fetchColumn()))
 		{
 			return 0;
 		}
@@ -980,7 +977,7 @@ 
 	 * @param string $join
 	 * @return array|boolean
 	 */
-	function read($keys,$extra_cols='',$join='')
+	function read($keys, $extra_cols = '', $join = '')
 	{
 		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'])) {
 			$minimum_uid_length = $GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'];
@@ -993,11 +990,11 @@ 
 			$keys = array('uid' => $keys);
 		}
 		try {
-			$contact = parent::read($keys,$extra_cols,$join);
+			$contact = parent::read($keys, $extra_cols, $join);
 		}
 		// catch Illegal mix of collations (ascii_general_ci,IMPLICIT) and (utf8_general_ci,COERCIBLE) for operation '=' (1267)
 		// caused by non-ascii chars compared with ascii field uid
-		catch(Api\Db\Exception $e) {
+		catch (Api\Db\Exception $e) {
 			_egw_log_exception($e);
 			return false;
 		}
@@ -1005,7 +1002,7 @@ 
 		// enforce a minium uid strength
 		if (is_array($contact) && (!isset($contact['uid'])
 				|| strlen($contact['uid']) < $minimum_uid_length)) {
-			parent::update(array('uid' => Api\CalDAV::generate_uid('addressbook',$contact['id'])));
+			parent::update(array('uid' => Api\CalDAV::generate_uid('addressbook', $contact['id'])));
 		}
 		return $contact;
 	}
@@ -1019,7 +1016,7 @@ 
 	 */
 	function save($keys = NULL, $extra_where = NULL)
 	{
-		unset($extra_where);	// not used, but required by function signature
+		unset($extra_where); // not used, but required by function signature
 
 		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'])) {
 			$minimum_uid_length = $GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'];
@@ -1035,9 +1032,9 @@ 
 		{
 			$etag = $this->data['etag'];
 			unset($this->data['etag']);
-			if (!($err = parent::save(array('contact_etag=contact_etag+1'),array('contact_etag' => $etag))))
+			if (!($err = parent::save(array('contact_etag=contact_etag+1'), array('contact_etag' => $etag))))
 			{
-				$this->data['etag'] = $etag+1;
+				$this->data['etag'] = $etag + 1;
 			}
 			else
 			{
@@ -1057,7 +1054,7 @@ 
 		// enforce a minium uid strength
 		if (!isset($this->data['uid']) || strlen($this->data['uid']) < $minimum_uid_length)
 		{
-			$update['uid'] = Api\CalDAV::generate_uid('addressbook',$this->data['id']);
+			$update['uid'] = Api\CalDAV::generate_uid('addressbook', $this->data['id']);
 			//echo "<p>set uid={$this->data['uid']}, etag={$this->data['etag']}</p>";
 		}
 		// set carddav_name, if not given by caller
@@ -1075,17 +1072,17 @@ 
 					'contact_id' => $this->data['id'],
 				), __LINE__, __FILE__)->fetchColumn();
 			}
-			$path =  Api\Link::vfs_path('addressbook', $this->data['id'], Api\Contacts::FILES_PHOTO);
+			$path = Api\Link::vfs_path('addressbook', $this->data['id'], Api\Contacts::FILES_PHOTO);
 			$backup = Api\Vfs::$is_root; Api\Vfs::$is_root = true;
 			if (empty($this->data['jpegphoto']))
 			{
 				unlink($path);
-				$update['files'] = $this->data['files'] & ~Api\Contacts::FILES_BIT_PHOTO;
+				$update['files'] = $this->data['files']&~Api\Contacts::FILES_BIT_PHOTO;
 			}
 			else
 			{
 				file_put_contents($path, $this->data['jpegphoto']);
-				$update['files'] = $this->data['files'] | Api\Contacts::FILES_BIT_PHOTO;
+				$update['files'] = $this->data['files']|Api\Contacts::FILES_BIT_PHOTO;
 			}
 			Api\Vfs::$is_root = $backup;
 		}
@@ -1107,7 +1104,7 @@ 
 	{
 		if (!$list) return false;
 
-		return $this->db->select($this->lists_table,'*',array('list_id'=>$list),__LINE__,__FILE__)->fetch();
+		return $this->db->select($this->lists_table, '*', array('list_id'=>$list), __LINE__, __FILE__)->fetch();
 	}
 
 	/**
@@ -1118,9 +1115,9 @@ 
 	 * @param array $extra_cols =array() extra-data to be saved
 	 * @return bool false on success, errornumber on failure
 	 */
-	function save_customfields(&$data, array $extra_cols=array())
+	function save_customfields(&$data, array $extra_cols = array())
 	{
-		return parent::save_customfields($data, array('contact_owner' => $data['owner'])+$extra_cols);
+		return parent::save_customfields($data, array('contact_owner' => $data['owner']) + $extra_cols);
 	}
 
 	/**
@@ -1129,6 +1126,6 @@ 
 	*/
 	function delete_customfields($data)
 	{
-		$this->db->delete($this->extra_table,$data,__LINE__,__FILE__);
+		$this->db->delete($this->extra_table, $data, __LINE__, __FILE__);
 	}
 }