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;

Spacing +31 added lines, -35 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))
 		{
@@ -65,7 +65,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,7 +96,7 @@ 
 		}
 		else
 		{
-			$content['iframe'] = 'about:blank';	// we show accounts-list be default now
+			$content['iframe'] = 'about:blank'; // we show accounts-list be default now
 		}
 
 		$tpl->exec('admin.admin_ui.index', $content, $sel_options);
@@ -117,11 +117,11 @@ 
 				'caption' => 'Show members',
 				'enableId' => '^/groups/-\\d+',
 				'default' => true,
-				'group' => $group=1,
+				'group' => $group = 1,
 			),
 			'add' => array(
 				'group' => $group,
-			)+$user_actions['add'],
+			) + $user_actions['add'],
 			'acl' => array(
 				'onExecute' => 'javaScript:app.admin.group',
 				'caption' => 'Access control',
@@ -132,7 +132,7 @@ 
 				'group' => 2,
 			),
 		);
-		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',
@@ -143,16 +143,16 @@ 
 				'group'     => 2,
 			);
 		}
-		$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'];
 			//error_log(__METHOD__."() app $app returned ".array2string($data));
-			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']))
@@ -203,7 +203,7 @@ 
 					'default' => true,
 					'allowOnMultiple' => false,
 					'onExecute' => 'javaScript:app.admin.account',
-					'group' => $group=0,
+					'group' => $group = 0,
 				),
 				'add' => array(
 					'caption' => 'Add user',
@@ -214,25 +214,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']))
@@ -281,7 +281,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',
@@ -296,7 +296,7 @@ 
 			$params['query'] = $query['searchletter'];
 			$params['query_type'] = 'start';
 		}
-		elseif($query['search'])
+		elseif ($query['search'])
 		{
 			$params['query'] = $query['search'];
 			$params['query_type'] = 'all';
@@ -305,13 +305,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';
 		}
@@ -352,14 +349,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))
 					{
@@ -390,18 +387,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),
@@ -413,7 +409,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']);
@@ -425,7 +421,7 @@ 
 		}
 		elseif ($root == '/groups')
 		{
-			foreach($GLOBALS['egw']->accounts->search(array(
+			foreach ($GLOBALS['egw']->accounts->search(array(
 				'type' => 'groups',
 				'order' => 'account_lid',
 				'sort' => 'ASC',
@@ -452,8 +448,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(
@@ -473,7 +469,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']))
 			{
@@ -491,7 +487,7 @@ 
 	protected static function call_hook()
 	{
 		self::$hook_data = array();
-		function display_section($appname,$file,$file2=False)
+		function display_section($appname, $file, $file2 = False)
 		{
 			admin_ui::$hook_data[$appname] = $file2 ? $file2 : $file;
 			//error_log(__METHOD__."(".array2string(func_get_args()).")");

Braces +85 added lines, -21 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,
@@ -132,7 +135,9 @@ 
 				'group' => 2,
 			),
 		);
-		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',
@@ -143,6 +148,7 @@ 
 				'group'     => 2,
 			);
 		}
+		}
 		$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')));
@@ -150,7 +156,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'];
+			}
 			//error_log(__METHOD__."() app $app returned ".array2string($data));
 			foreach($data as $item)
 			{
@@ -170,15 +179,33 @@ 
 					{
 						$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 (!isset($item['enableId'])) $item['enableId'] = '^/groups/-\\d+';
+				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 (!isset($item['enableId']))
+				{
+					$item['enableId'] = '^/groups/-\\d+';
+				}
 
 				$actions[$item['id']] = $item;
 			}
@@ -231,7 +258,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
@@ -249,15 +279,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;
 				}
@@ -313,7 +358,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;
@@ -367,7 +415,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).'/';
@@ -392,7 +443,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)
@@ -411,14 +466,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);
 				}
 			}

admin/inc/class.customfields.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -548,7 +548,7 @@
 	 * Validate and create a new content type
 	 *
 	 * @param array $content
-	 * @return string|boolean New type ID, or false for error
+	 * @return false|string New type ID, or false for error
 	 */
 	function create_content_type(&$content)
 	{

Indentation +27 added lines, -27 removed lines

@@ -32,10 +32,10 @@ 
 {
 
 	/**
-	* appname of app which want to add / edit its customfields
-	*
-	* @var string
-	*/
+	 * appname of app which want to add / edit its customfields
+	 *
+	 * @var string
+	 */
 	var $appname;
 
 	/**
@@ -44,10 +44,10 @@ 
 	protected $use_private = false;
 
 	/**
-	* userdefiened types e.g. type of infolog
-	*
-	* @var array
-	*/
+	 * userdefiened types e.g. type of infolog
+	 *
+	 * @var array
+	 */
 	var $types2 = array();
 	var $content_types,$fields;
 
@@ -507,8 +507,8 @@ 
 	}
 
 	/**
-	* deletes custom field from customfield definitions
-	*/
+	 * deletes custom field from customfield definitions
+	 */
 	function delete_field(&$content)
 	{
 		unset($this->fields[key($content['fields']['delete'])]);
@@ -525,8 +525,8 @@ 
 	}
 
 	/**
-	* create a new custom field
-	*/
+	 * create a new custom field
+	 */
 	function create_field(&$content)
 	{
 		$new_name = trim($content['fields'][count($content['fields'])-1]['name']);
@@ -587,8 +587,8 @@ 
 	}
 
 	/**
-	* save changes to repository
-	*/
+	 * save changes to repository
+	 */
 	function save_repository()
 	{
 		//echo '<p>uicustomfields::save_repository() \$this->fields=<pre style="text-aling: left;">'; print_r($this->fields); echo "</pre>\n";
@@ -601,25 +601,25 @@ 
 	}
 
 	/**
-	* get customfields of using application
-	*
-	* @deprecated use Api\Storage\Customfields::get() direct, no need to instanciate this UI class
-	* @author Cornelius Weiss
-	* @param boolean $all_private_too =false should all the private fields be returned too
-	* @return array with customfields
-	*/
+	 * get customfields of using application
+	 *
+	 * @deprecated use Api\Storage\Customfields::get() direct, no need to instanciate this UI class
+	 * @author Cornelius Weiss
+	 * @param boolean $all_private_too =false should all the private fields be returned too
+	 * @return array with customfields
+	 */
 	function get_customfields($all_private_too=false)
 	{
 		return Api\Storage\Customfields::get($this->appname,$all_private_too);
 	}
 
 	/**
-	* get_content_types of using application
-	*
-	* @deprecated use Api\Config::get_content_types() direct, no need to instanciate this UI class
-	* @author Cornelius Weiss
-	* @return array with content-types
-	*/
+	 * get_content_types of using application
+	 *
+	 * @deprecated use Api\Config::get_content_types() direct, no need to instanciate this UI class
+	 * @author Cornelius Weiss
+	 * @return array with content-types
+	 */
 	function get_content_types()
 	{
 		return Api\Config::get_content_types($this->appname);

Spacing +79 added lines, -80 removed lines

@@ -49,7 +49,7 @@ 
 	* @var array
 	*/
 	var $types2 = array();
-	var $content_types,$fields;
+	var $content_types, $fields;
 
 	/**
 	 * Currently selected content type (if used by app)
@@ -103,14 +103,14 @@ 
 	 *
 	 * @param string $appname
 	 */
-	function __construct($appname='')
+	function __construct($appname = '')
 	{
 		if (($this->appname = $appname))
 		{
-			$this->fields = Api\Storage\Customfields::get($this->appname,true);
+			$this->fields = Api\Storage\Customfields::get($this->appname, true);
 			$this->content_types = Api\Config::get_content_types($this->appname);
 		}
-		$this->so = new Api\Storage\Base('phpgwapi','egw_customfields',null,'',true);
+		$this->so = new Api\Storage\Base('phpgwapi', 'egw_customfields', null, '', true);
 	}
 
 	/**
@@ -120,43 +120,43 @@ 
 	{
 		// determine appname
 		$this->appname = $this->appname ? $this->appname : ($_GET['appname'] ? $_GET['appname'] : ($content['appname'] ? $content['appname'] : false));
-		if(!$this->appname) die(lang('Error! No appname found'));
+		if (!$this->appname) die(lang('Error! No appname found'));
 
 		$this->use_private = !isset($_GET['use_private']) || (boolean)$_GET['use_private'] || $content['use_private'];
 
 		// Read fields, constructor doesn't always know appname
-		$this->fields = Api\Storage\Customfields::get($this->appname,true);
+		$this->fields = Api\Storage\Customfields::get($this->appname, true);
 
 		$this->tmpl = new Etemplate();
 		$this->tmpl->read('admin.customfields');
 
 		// do we manage content-types?
 		$test = new Etemplate();
-		if($test->read($this->appname.'.admin.types')) $this->manage_content_types = true;
+		if ($test->read($this->appname.'.admin.types')) $this->manage_content_types = true;
 
 		// Handle incoming - types, options, etc.
-		if($this->manage_content_types)
+		if ($this->manage_content_types)
 		{
-			if(count($this->content_types) == 0)
+			if (count($this->content_types) == 0)
 			{
 				$this->content_types = Api\Config::get_content_types($this->appname);
 			}
-			if (count($this->content_types)==0)
+			if (count($this->content_types) == 0)
 			{
 				// if you define your default types of your app with the search_link hook, they are available here, if no types were found
-				$this->content_types = (array)Api\Link::get_registry($this->appname,'default_types');
+				$this->content_types = (array)Api\Link::get_registry($this->appname, 'default_types');
 			}
 			// Set this now, we need to know it for updates
-			$this->content_type = $content['content_types']['types'] ? $content['content_types']['types'] : (array_key_exists(0,$this->content_types) ? $this->content_types[0] : key($this->content_types));
+			$this->content_type = $content['content_types']['types'] ? $content['content_types']['types'] : (array_key_exists(0, $this->content_types) ? $this->content_types[0] : key($this->content_types));
 
 			// Common type changes - add, delete
-			if($content['content_types']['delete'])
+			if ($content['content_types']['delete'])
 			{
 				$this->delete_content_type($content);
 			}
-			elseif($content['content_types']['create'])
+			elseif ($content['content_types']['create'])
 			{
-				if(($new_type = $this->create_content_type($content)))
+				if (($new_type = $this->create_content_type($content)))
 				{
 					$content['content_types']['types'] = $this->content_type = $new_type;
 				}
@@ -164,18 +164,18 @@ 
 				unset($content['content_types']['name']);
 			}
 			// No common type change and type didn't change, try an update
-			elseif($this->content_type && is_array($content) && $this->content_type == $content['old_content_type'])
+			elseif ($this->content_type && is_array($content) && $this->content_type == $content['old_content_type'])
 			{
 				$this->update($content);
 			}
 		}
 
 		// Custom field deleted from nextmatch
-		if($content['nm']['action'] == 'delete')
+		if ($content['nm']['action'] == 'delete')
 		{
-			foreach($this->fields as $name => $data)
+			foreach ($this->fields as $name => $data)
 			{
-				if(in_array($data['id'],$content['nm']['selected']))
+				if (in_array($data['id'], $content['nm']['selected']))
 				{
 					unset($this->fields[$name]);
 				}
@@ -184,7 +184,7 @@ 
 			$this->save_repository();
 		}
 
-		$content['nm']= Api\Cache::getSession('admin', 'customfield-index');
+		$content['nm'] = Api\Cache::getSession('admin', 'customfield-index');
 		if (!is_array($content['nm']))
 		{
 			// Initialize nextmatch
@@ -194,8 +194,8 @@ 
 				'no_filter'      => 'true',
 				'no_filter2'     => 'true',
 				'row_id'         => 'cf_id',
-				'order'          =>	'cf_order',// IO name of the column to sort
-				'sort'           =>	'ASC',// IO direction of the sort: 'ASC' or 'DESC'
+				'order'          =>	'cf_order', // IO name of the column to sort
+				'sort'           =>	'ASC', // IO direction of the sort: 'ASC' or 'DESC'
 				'actions'        => $this->get_actions()
 			);
 		}
@@ -203,11 +203,11 @@ 
 		$content['nm']['use_private'] = $this->use_private;
 
 		// Set up sub-types
-		if($this->manage_content_types)
+		if ($this->manage_content_types)
 		{
-			foreach($this->content_types as $type => $entry)
+			foreach ($this->content_types as $type => $entry)
 			{
-				if(!is_array($entry))
+				if (!is_array($entry))
 				{
 					$this->content_types[$type] = array('name' => $entry);
 					$entry = $this->content_types[$type];
@@ -216,7 +216,7 @@ 
 			}
 			$sel_options['types'] = $sel_options['cf_type2'] = $this->types2;
 
-			$content['type_template'] = $this->appname . '.admin.types';
+			$content['type_template'] = $this->appname.'.admin.types';
 			$content['content_types']['appname'] = $this->appname;
 
 			$content['content_type_options'] = $this->content_types[$this->content_type]['options'];
@@ -258,15 +258,15 @@ 
 		static::app_index($content, $sel_options, $readonlys, $preserve);
 
 		// Make sure app css gets loaded, extending app might cause et2 to miss it
-		Framework::includeCSS('admin','app');
+		Framework::includeCSS('admin', 'app');
 
 		$GLOBALS['egw_info']['flags']['app_header'] = $GLOBALS['egw_info']['apps'][$this->appname]['title'].' - '.lang('Custom fields');
 
 		// Some logic to make sure extending class (if there is one) gets called
 		// when etemplate2 comes back instead of parent class
-		$exec = get_class() == get_called_class() ? 'admin.customfields.index' : $this->appname . '.' . get_called_class() . '.index';
+		$exec = get_class() == get_called_class() ? 'admin.customfields.index' : $this->appname.'.'.get_called_class().'.index';
 
-		$this->tmpl->exec($exec,$content,$sel_options,$readonlys,$preserve);
+		$this->tmpl->exec($exec, $content, $sel_options, $readonlys, $preserve);
 	}
 
 	/**
@@ -281,28 +281,28 @@ 
 
 		// determine appname
 		$this->appname = $this->appname ? $this->appname : ($_GET['appname'] ? $_GET['appname'] : ($content['cf_app'] ? $content['cf_app'] : false));
-		if(!$this->appname)
+		if (!$this->appname)
 		{
-			if($cf_id && $this->so)
+			if ($cf_id && $this->so)
 			{
 				$content = $this->so->read($cf_id);
 				$this->appname = $content['cf_app'];
 			}
 		}
-		if(!$this->appname)
+		if (!$this->appname)
 		{
 			die(lang('Error! No appname found'));
 		}
 		$this->use_private = !isset($_GET['use_private']) || (boolean)$_GET['use_private'] || $content['use_private'];
 
 		// Read fields, constructor doesn't always know appname
-		$this->fields = Api\Storage\Customfields::get($this->appname,true);
+		$this->fields = Api\Storage\Customfields::get($this->appname, true);
 
 		// Update based on info returned from template
 		if (is_array($content))
 		{
 			list($action) = @each($content['button']);
-			switch($action)
+			switch ($action)
 			{
 				case 'delete':
 					$this->so->delete($cf_id);
@@ -311,46 +311,46 @@ 
 					break;
 				case 'save':
 				case 'apply':
-					if(!$cf_id && $this->fields[$content['cf_name']])
+					if (!$cf_id && $this->fields[$content['cf_name']])
 					{
-						Framework::message(lang("Field '%1' already exists !!!",$content['cf_name']),'error');
+						Framework::message(lang("Field '%1' already exists !!!", $content['cf_name']), 'error');
 						$content['cf_name'] = '';
 						break;
 					}
-					if(empty($content['cf_label']))
+					if (empty($content['cf_label']))
 					{
 						$content['cf_label'] = $content['cf_name'];
 					}
 					if (!empty($content['cf_values']))
 					{
 						$values = array();
-						if($content['cf_values'][0] === '@')
+						if ($content['cf_values'][0] === '@')
 						{
-							$values['@'] = substr($content['cf_values'], $content['cf_values'][1] === '=' ? 2:1);
+							$values['@'] = substr($content['cf_values'], $content['cf_values'][1] === '=' ? 2 : 1);
 						}
 						else
 						{
-							foreach(explode("\n",trim($content['cf_values'])) as $line)
+							foreach (explode("\n", trim($content['cf_values'])) as $line)
 							{
-								list($var_raw,$value) = explode('=',trim($line),2);
+								list($var_raw, $value) = explode('=', trim($line), 2);
 								$var = trim($var_raw);
-								$values[$var] = trim($value)==='' ? $var : $value;
+								$values[$var] = trim($value) === '' ? $var : $value;
 							}
 						}
 						$content['cf_values'] = $values;
 					}
 					$update_content = array();
-					foreach($content as $key => $value)
+					foreach ($content as $key => $value)
 					{
-						if(substr($key,0,3) == 'cf_')
+						if (substr($key, 0, 3) == 'cf_')
 						{
-							$update_content[substr($key,3)] = $value;
+							$update_content[substr($key, 3)] = $value;
 						}
 					}
 					Api\Storage\Customfields::update($update_content);
-					if(!$cf_id)
+					if (!$cf_id)
 					{
-						$this->fields = Api\Storage\Customfields::get($this->appname,true);
+						$this->fields = Api\Storage\Customfields::get($this->appname, true);
 						$cf_id = (int)$this->fields[$content['cf_name']]['id'];
 					}
 					Framework::refresh_opener('Saved', 'admin', $cf_id, 'edit');
@@ -371,30 +371,30 @@ 
 
 		// do we manage content-types?
 		$test = new Etemplate();
-		if($test->read($this->appname.'.admin.types')) $this->manage_content_types = true;
+		if ($test->read($this->appname.'.admin.types')) $this->manage_content_types = true;
 
 		$this->tmpl = new Etemplate();
 		$this->tmpl->read('admin.customfield_edit');
 
-		Api\Translation::add_app('infolog');	// til we move the translations
+		Api\Translation::add_app('infolog'); // til we move the translations
 
 		$GLOBALS['egw_info']['flags']['app_header'] = $GLOBALS['egw_info']['apps'][$this->appname]['title'].' - '.lang('Custom fields');
 		$sel_options = array();
 		$readonlys = array();
 
 		//echo 'customfields=<pre style="text-align: left;">'; print_r($this->fields); echo "</pre>\n";
-		$content['cf_order'] = (count($this->fields)+1) * 10;
+		$content['cf_order'] = (count($this->fields) + 1) * 10;
 		$content['use_private'] = $this->use_private;
 
-		if($cf_id)
+		if ($cf_id)
 		{
 			$content = array_merge($content, $this->so->read($cf_id));
 			$this->appname = $content['cf_app'];
-			if($content['cf_private'])
+			if ($content['cf_private'])
 			{
-				$content['cf_private'] = explode(',',$content['cf_private']);
+				$content['cf_private'] = explode(',', $content['cf_private']);
 			}
-			if($content['cf_name'])
+			if ($content['cf_name'])
 			{
 				$readonlys['cf_name'] = true;
 			}
@@ -407,7 +407,7 @@ 
 		if (is_array($content['cf_values']))
 		{
 			$values = '';
-			foreach($content['cf_values'] as $var => $value)
+			foreach ($content['cf_values'] as $var => $value)
 			{
 				$values .= (!empty($values) ? "\n" : '').$var.'='.$value;
 			}
@@ -415,18 +415,18 @@ 
 		}
 
 		// Show sub-type row, and get types
-		if($this->manage_content_types)
+		if ($this->manage_content_types)
 		{
-			if(count($this->content_types) == 0)
+			if (count($this->content_types) == 0)
 			{
 				$this->content_types = Api\Config::get_content_types($this->appname);
 			}
-			if (count($this->content_types)==0)
+			if (count($this->content_types) == 0)
 			{
 				// if you define your default types of your app with the search_link hook, they are available here, if no types were found
-				$this->content_types = (array)egw_link::get_registry($this->appname,'default_types');
+				$this->content_types = (array)egw_link::get_registry($this->appname, 'default_types');
 			}
-			foreach($this->content_types as $type => $entry)
+			foreach ($this->content_types as $type => $entry)
 			{
 				$this->types2[$type] = is_array($entry) ? $entry['name'] : $entry;
 			}
@@ -438,19 +438,19 @@ 
 		}
 
 		// Include type-specific value help
-		foreach(self::$type_option_help as $key => $value)
+		foreach (self::$type_option_help as $key => $value)
 		{
 			$content['options'][$key] = lang($value);
 		}
 		$content['statustext'] = $content['options'][$content['cf_type']];
 		$content['attributes'] = self::$type_attribute_flags;
 
-		$this->tmpl->exec('admin.customfields.edit',$content,$sel_options,$readonlys,array(
+		$this->tmpl->exec('admin.customfields.edit', $content, $sel_options, $readonlys, array(
 			'cf_id' => $cf_id,
 			'cf_app' => $this->appname,
 			'cf_name' => $content['cf_name'],
 			'use_private' => $this->use_private,
-		),2);
+		), 2);
 	}
 
 	/**
@@ -459,7 +459,7 @@ 
 	 */
 	protected function app_index(&$content, &$sel_options, &$readonlys)
 	{
-		unset($content, $sel_options, $readonlys);	// not used, as this is a stub
+		unset($content, $sel_options, $readonlys); // not used, as this is a stub
 		// This is just a stub.
 	}
 
@@ -479,7 +479,7 @@ 
 				'allowOnMultiple' => false,
 				'url' => 'menuaction=admin.customfields.edit&cf_id=$id&use_private='.$this->use_private,
 				'popup' => '500x380',
-				'group' => $group=1,
+				'group' => $group = 1,
 				'disableClass' => 'th',
 			),
 			'add' => array(
@@ -529,17 +529,16 @@ 
 	*/
 	function create_field(&$content)
 	{
-		$new_name = trim($content['fields'][count($content['fields'])-1]['name']);
+		$new_name = trim($content['fields'][count($content['fields']) - 1]['name']);
 		if (empty($new_name) || isset($this->fields[$new_name]))
 		{
 			$content['error_msg'] .= empty($new_name) ?
-				lang('You have to enter a name, to create a new field!!!') :
-				lang("Field '%1' already exists !!!",$new_name);
+				lang('You have to enter a name, to create a new field!!!') : lang("Field '%1' already exists !!!", $new_name);
 		}
 		else
 		{
-			$this->fields[$new_name] = $content['fields'][count($content['fields'])-1];
-			if(!$this->fields[$new_name]['label']) $this->fields[$new_name]['label'] = $this->fields[$new_name]['name'];
+			$this->fields[$new_name] = $content['fields'][count($content['fields']) - 1];
+			if (!$this->fields[$new_name]['label']) $this->fields[$new_name]['label'] = $this->fields[$new_name]['name'];
 			$this->save_repository();
 		}
 	}
@@ -556,20 +555,20 @@ 
 		$new_type = false;
 		if (empty($new_name))
 		{
-			$this->tmpl->set_validation_error('content_types[name]','You have to enter a name, to create a new type!!!');
+			$this->tmpl->set_validation_error('content_types[name]', 'You have to enter a name, to create a new type!!!');
 		}
 		else
 		{
-			foreach($this->content_types as $type)
+			foreach ($this->content_types as $type)
 			{
-				if($type['name'] == $new_name)
+				if ($type['name'] == $new_name)
 				{
-					$this->tmpl->set_validation_error('content_types[name]',lang("type '%1' already exists !!!",$new_name));
+					$this->tmpl->set_validation_error('content_types[name]', lang("type '%1' already exists !!!", $new_name));
 					return false;
 				}
 			}
 			// search free type character
-			for($i=97;$i<=122;$i++)
+			for ($i = 97; $i <= 122; $i++)
 			{
 				if (!$this->content_types[chr($i)] &&
 					// skip letter of deleted type for addressbook content-types, as it gives SQL error
@@ -594,7 +593,7 @@ 
 		//echo '<p>uicustomfields::save_repository() \$this->fields=<pre style="text-aling: left;">'; print_r($this->fields); echo "</pre>\n";
 		$config = new Api\Config($this->appname);
 		$config->read_repository();
-		$config->value('types',$this->content_types);
+		$config->value('types', $this->content_types);
 		$config->save_repository();
 
 		Api\Storage\Customfields::save($this->appname, $this->fields);
@@ -608,9 +607,9 @@ 
 	* @param boolean $all_private_too =false should all the private fields be returned too
 	* @return array with customfields
 	*/
-	function get_customfields($all_private_too=false)
+	function get_customfields($all_private_too = false)
 	{
-		return Api\Storage\Customfields::get($this->appname,$all_private_too);
+		return Api\Storage\Customfields::get($this->appname, $all_private_too);
 	}
 
 	/**
@@ -636,13 +635,13 @@ 
 		$total = $this->so->get_rows($query, $rows, $readonlys);
 		unset($query['col_filter']['cf_app']);
 
-		foreach($rows as &$row)
+		foreach ($rows as &$row)
 		{
 			$row['cf_values'] = json_decode($row['cf_values'], true);
 			if (is_array($row['cf_values']))
 			{
 				$values = '';
-				foreach($row['cf_values'] as $var => $value)
+				foreach ($row['cf_values'] as $var => $value)
 				{
 					$values .= (!empty($values) ? "\n" : '').$var.'='.$value;
 				}

Braces +16 added lines, -4 removed lines

@@ -120,7 +120,10 @@ 
 	{
 		// determine appname
 		$this->appname = $this->appname ? $this->appname : ($_GET['appname'] ? $_GET['appname'] : ($content['appname'] ? $content['appname'] : false));
-		if(!$this->appname) die(lang('Error! No appname found'));
+		if(!$this->appname)
+		{
+			die(lang('Error! No appname found'));
+		}
 
 		$this->use_private = !isset($_GET['use_private']) || (boolean)$_GET['use_private'] || $content['use_private'];
 
@@ -132,7 +135,10 @@ 
 
 		// do we manage content-types?
 		$test = new Etemplate();
-		if($test->read($this->appname.'.admin.types')) $this->manage_content_types = true;
+		if($test->read($this->appname.'.admin.types'))
+		{
+			$this->manage_content_types = true;
+		}
 
 		// Handle incoming - types, options, etc.
 		if($this->manage_content_types)
@@ -371,7 +377,10 @@ 
 
 		// do we manage content-types?
 		$test = new Etemplate();
-		if($test->read($this->appname.'.admin.types')) $this->manage_content_types = true;
+		if($test->read($this->appname.'.admin.types'))
+		{
+			$this->manage_content_types = true;
+		}
 
 		$this->tmpl = new Etemplate();
 		$this->tmpl->read('admin.customfield_edit');
@@ -539,7 +548,10 @@ 
 		else
 		{
 			$this->fields[$new_name] = $content['fields'][count($content['fields'])-1];
-			if(!$this->fields[$new_name]['label']) $this->fields[$new_name]['label'] = $this->fields[$new_name]['name'];
+			if(!$this->fields[$new_name]['label'])
+			{
+				$this->fields[$new_name]['label'] = $this->fields[$new_name]['name'];
+			}
 			$this->save_repository();
 		}
 	}

api/src/Accounts.php

Doc Comments +4 added lines, -5 removed lines

@@ -360,7 +360,7 @@ 
 	 * All key of the returned array use the 'account_' prefix.
 	 * For backward compatibility some values are additionaly availible without the prefix, using them is depricated!
 	 *
-	 * @param int|string $id numeric account_id or string with account_lid (use of default value of 0 is depricated!!!)
+	 * @param integer $id numeric account_id or string with account_lid (use of default value of 0 is depricated!!!)
 	 * @param boolean $set_depricated_names =false set _additionaly_ the depricated keys without 'account_' prefix
 	 * @return array/boolean array with account data (keys: account_id, account_lid, ...) or false if account not found
 	 */
@@ -400,7 +400,7 @@ 
 	 * - 'account_firstname','account_lastname','account_email','account_fullname','account_phone'
 	 *
 	 * @param int|string $id
-	 * @return string|boolean json or false if not found
+	 * @return string json or false if not found
 	 */
 	function json($id)
 	{
@@ -791,7 +791,7 @@ 
 	 * Not all existing accounts are visible because off account_selection preference: 'none' or 'groupmembers'
 	 *
 	 * @param int|string $account_id nummeric account_id or account_lid
-	 * @return boolean true = account is visible, false = account not visible, null = account does not exist
+	 * @return null|boolean true = account is visible, false = account not visible, null = account does not exist
 	 */
 	function visible($account_id)
 	{
@@ -986,7 +986,6 @@ 
 	 *
 	 * @param string $account_lid
 	 * @param string $passwd
-	 * @param array $GLOBALS['auto_create_acct'] values for 'firstname', 'lastname', 'email' and 'primary_group'
 	 * @return int|boolean account_id or false on error
 	 */
 	function auto_add($account_lid, $passwd)
@@ -1106,7 +1105,7 @@ 
 	 *
 	 * We use now an instance-wide read-cache storing account-data and members(hips).
 	 *
-	 * @param int|array $account_ids user- or group-id(s) for which cache should be invalidated, default 0 = only search/name2id cache
+	 * @param integer $account_ids user- or group-id(s) for which cache should be invalidated, default 0 = only search/name2id cache
 	 */
 	static function cache_invalidate($account_ids=0)
 	{

Braces +121 added lines, -30 removed lines

@@ -148,7 +148,10 @@ 
 		{
 			$this->config =& $GLOBALS['egw_info']['server'];
 
-			if (!isset(self::$_instance)) self::$_instance = $this;
+			if (!isset(self::$_instance))
+			{
+				self::$_instance = $this;
+			}
 		}
 		if (is_null($backend))
 		{
@@ -195,7 +198,11 @@ 
 	function search($param)
 	{
 		//error_log(__METHOD__.'('.array2string($param).') '.function_backtrace());
-		if (!isset($param['active'])) $param['active'] = true;	// default is true = only return active accounts
+		if (!isset($param['active']))
+		{
+			$param['active'] = true;
+		}
+		// default is true = only return active accounts
 
 		self::setup_cache();
 		$account_search = &self::$cache['account_search'];
@@ -229,7 +236,10 @@ 
 				foreach((array)$this->memberships($GLOBALS['egw_info']['user']['account_id'],true) as $grp)
 				{
 					$members = array_unique(array_merge($members, (array)$this->members($grp,true,$param['active'])));
-					if ($param['type'] == 'groupmembers+memberships') $members[] = $grp;
+					if ($param['type'] == 'groupmembers+memberships')
+					{
+						$members[] = $grp;
+					}
 				}
 				$param['type'] = $param['type'] == 'groupmembers+memberships' ? 'both' : 'accounts';
 			}
@@ -246,7 +256,10 @@ 
 			if (isset($members))
 			{
 				//error_log(__METHOD__.'() members='.array2string($members));
-				if (!$members) $members = array();
+				if (!$members)
+				{
+					$members = array();
+				}
 				$valid = !$app ? $members : array_intersect($valid,$members);	// use the intersection
 			}
 			//error_log(__METHOD__."() limiting result to app='$app' and/or group=$group valid-ids=".array2string($valid));
@@ -366,15 +379,21 @@ 
 	 */
 	function read($id=0,$set_depricated_names=false)
 	{
-		if (!$id)	// deprecated use!!!
+		if (!$id)
+		{
+			// deprecated use!!!
 		{
 			return $this->data ? $this->data : $this->read_repository();
 		}
+		}
 		if (!is_int($id) && !is_numeric($id))
 		{
 			$id = $this->name2id($id);
 		}
-		if (!$id) return false;
+		if (!$id)
+		{
+			return false;
+		}
 
 		$data = self::cache_read($id);
 
@@ -442,7 +461,10 @@ 
 		}
 		$is_group = $GLOBALS['egw']->accounts->get_type($accountid ? $accountid : $lid) == 'g';
 
-		if (empty($firstname)) $firstname = $lid;
+		if (empty($firstname))
+		{
+			$firstname = $lid;
+		}
 		if (empty($lastname) || $is_group)
 		{
 			$lastname  = $is_group ? lang('Group') : lang('User');
@@ -521,9 +543,12 @@ 
 			$$name = Translation::to_ascii($$name);
 		}
 		//echo " --> ('$first', '$last', '$account')";
-		if (!$first && !$last)	// fallback to the account-name, if real names contain only special chars
+		if (!$first && !$last)
+		{
+			// fallback to the account-name, if real names contain only special chars
 		{
 			$first = '';
+		}
 			$last = $account;
 		}
 		if (!$first || !$last)
@@ -535,8 +560,14 @@ 
 			$dot = '.';
 			$underscore = '_';
 		}
-		if (!$domain) $domain = $GLOBALS['egw_info']['server']['mail_suffix'];
-		if (!$domain) $domain = $_SERVER['SERVER_NAME'];
+		if (!$domain)
+		{
+			$domain = $GLOBALS['egw_info']['server']['mail_suffix'];
+		}
+		if (!$domain)
+		{
+			$domain = $_SERVER['SERVER_NAME'];
+		}
 
 		$email = str_replace(array('first','last','initial','account','dot','underscore','-'),
 			array($first,$last,substr($first,0,1),$account,$dot,$underscore,''),
@@ -602,7 +633,10 @@ 
 				$old['account_lastname'] != $data['account_lastname'] ||
 				$old['account_email'] != $data['account_email']))
 			{
-				if (!$data['person_id']) $data['person_id'] = $old['person_id'];
+				if (!$data['person_id'])
+				{
+					$data['person_id'] = $old['person_id'];
+				}
 
 				$contact = array(
 					'n_given'    => $data['account_firstname'],
@@ -642,7 +676,10 @@ 
 		{
 			$id = $this->name2id($id);
 		}
-		if (!$id) return false;
+		if (!$id)
+		{
+			return false;
+		}
 
 		if ($this->get_type($id) == 'u')
 		{
@@ -677,7 +714,11 @@ 
 	 */
 	function is_expired($data=null)
 	{
-		if (is_null($data)) $data = $this->data;	// depricated use
+		if (is_null($data))
+		{
+			$data = $this->data;
+		}
+		// depricated use
 
 		$expires = isset($data['account_expires']) ? $data['account_expires'] : $data['expires'];
 
@@ -694,7 +735,10 @@ 
 	 */
 	function is_active($data)
 	{
-		if (!is_array($data)) $data = $this->read($data);
+		if (!is_array($data))
+		{
+			$data = $this->read($data);
+		}
 
 		return $data && !(self::is_expired($data) || $data['account_status'] != 'A');
 	}
@@ -747,7 +791,10 @@ 
 			return false;
 		}
 		try {
-			if (!($data = self::cache_read($account_id))) return false;
+			if (!($data = self::cache_read($account_id)))
+			{
+				return false;
+			}
 		}
 		catch (Exception $e) {
 			unset($e);
@@ -801,14 +848,23 @@ 
 	 */
 	function visible($account_id)
 	{
-		if (!is_numeric($account_id))	// account_lid given
+		if (!is_numeric($account_id))
+		{
+			// account_lid given
 		{
 			$account_lid = $account_id;
-			if (!($account_id = $this->name2id($account_lid))) return null;
+		}
+			if (!($account_id = $this->name2id($account_lid)))
+			{
+				return null;
+			}
 		}
 		else
 		{
-			if (!($account_lid = $this->id2name($account_id))) return null;
+			if (!($account_lid = $this->id2name($account_id)))
+			{
+				return null;
+			}
 		}
 		if (!isset($GLOBALS['egw_info']['user']['apps']['admin']) &&
 			// do NOT allow other user, if account-selection is none
@@ -862,7 +918,10 @@ 
 		{
 			$this->backend->set_memberships($groups, $account_id);
 
-			if (!$old_memberships) $old_memberships = array();
+			if (!$old_memberships)
+			{
+				$old_memberships = array();
+			}
 			self::cache_invalidate(array_unique(array_merge(
 				array($account_id),
 				array_diff($old_memberships, $groups),
@@ -1008,7 +1067,10 @@ 
 		{
 			if (($group_id = $this->name2id($group_lid,'account_lid','g')))
 			{
-				if (!$default_group_id) $default_group_id = $group_id;
+				if (!$default_group_id)
+				{
+					$default_group_id = $group_id;
+				}
 				$memberships[] = $group_id;
 			}
 		}
@@ -1093,7 +1155,10 @@ 
 	function change_account_lid_allowed()
 	{
 		$change_account_lid = constant(get_class($this->backend).'::CHANGE_ACCOUNT_LID');
-		if (!isset($change_account_lid)) $change_account_lid = true;
+		if (!isset($change_account_lid))
+		{
+			$change_account_lid = true;
+		}
 		return $change_account_lid;
 	}
 
@@ -1132,12 +1197,19 @@ 
 		}
 
 		// session-cache
-		if (self::$cache) self::$cache = array();
+		if (self::$cache)
+		{
+			self::$cache = array();
+		}
 		Cache::unsetSession('accounts_cache','phpgwapi');
 
-		if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+		if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))
 		{
-			Egw::invalidate_session_cache();	// invalidates whole egw-enviroment if stored in the session
+			// egw object in setup is limited
+		{
+			Egw::invalidate_session_cache();
+		}
+		// invalidates whole egw-enviroment if stored in the session
 		}
 	}
 
@@ -1163,27 +1235,39 @@ 
 	 */
 	static function cache_read($account_id, $need_active=false)
 	{
-		if (!is_numeric($account_id)) throw new Exception\WrongParameter('Not an integer!');
+		if (!is_numeric($account_id))
+		{
+			throw new Exception\WrongParameter('Not an integer!');
+		}
 
 		$account =& self::$request_cache[$account_id];
 
-		if (!isset($account))	// not in request cache --> try instance cache
+		if (!isset($account))
+		{
+			// not in request cache --> try instance cache
 		{
 			$instance = self::getInstance();
+		}
 
 			$account = Cache::getCache($instance->config['install_id'], __CLASS__, 'account-'.$account_id);
 
-			if (!isset($account))	// not in instance cache --> read from backend
+			if (!isset($account))
+			{
+				// not in instance cache --> read from backend
 			{
 				if (($account = $instance->backend->read($account_id)))
 				{
 					if ($instance->get_type($account_id) == 'u')
 					{
 						if (!isset($account['memberships'])) $account['memberships'] = $instance->backend->memberships($account_id);
+			}
 					}
 					else
 					{
-						if (!isset($account['members'])) $account['members'] = $instance->backend->members($account_id);
+						if (!isset($account['members']))
+						{
+							$account['members'] = $instance->backend->members($account_id);
+						}
 					}
 					Cache::setCache($instance->config['install_id'], __CLASS__, 'account-'.$account_id, $account, self::READ_CACHE_TIMEOUT);
 				}
@@ -1198,7 +1282,10 @@ 
 			$account['members-active'] = array();
 			foreach((array)$account['members'] as $id => $lid)
 			{
-				if ($instance->is_active($id)) $account['members-active'][$id] = $lid;
+				if ($instance->is_active($id))
+				{
+					$account['members-active'][$id] = $lid;
+				}
 			}
 			Cache::setCache($instance->config['install_id'], __CLASS__, 'account-'.$account_id, $account, self::READ_CACHE_TIMEOUT);
 		}
@@ -1222,7 +1309,11 @@ 
 	 */
 	private static function setup_cache()
 	{
-		if (is_array(self::$cache)) return;	// cache is already setup
+		if (is_array(self::$cache))
+		{
+			return;
+		}
+		// cache is already setup
 
 		if (self::$use_session_cache && is_object($GLOBALS['egw']->session))
 		{

Spacing +101 added lines, -102 removed lines

@@ -57,8 +57,8 @@ 
 	 *
 	 * @var array
 	 */
-	var $depricated_names = array('firstname','lastname','fullname','email','type',
-		'status','expires','lastlogin','lastloginfrom','lastpasswd_change');
+	var $depricated_names = array('firstname', 'lastname', 'fullname', 'email', 'type',
+		'status', 'expires', 'lastlogin', 'lastloginfrom', 'lastpasswd_change');
 
 	/**
 	 * List of all config vars accounts depend on and therefore should be passed in when calling contructor with array syntax
@@ -66,11 +66,11 @@ 
 	 * @var array
 	 */
 	static public $config_vars = array(
-		'account_repository', 'auth_type',	// auth_type if fallback if account_repository is not set
-		'install_id',	// instance-specific caching
-		'auto_create_expire', 'default_group_lid',	// auto-creation of accounts
-		'ldap_host','ldap_root_dn','ldap_root_pw','ldap_context','ldap_group_context','ldap_search_filter',	// ldap backend
-		'ads_domain', 'ads_host', 'ads_admin_user', 'ads_admin_passwd', 'ads_connection', 'ads_context',	// ads backend
+		'account_repository', 'auth_type', // auth_type if fallback if account_repository is not set
+		'install_id', // instance-specific caching
+		'auto_create_expire', 'default_group_lid', // auto-creation of accounts
+		'ldap_host', 'ldap_root_dn', 'ldap_root_pw', 'ldap_context', 'ldap_group_context', 'ldap_search_filter', // ldap backend
+		'ads_domain', 'ads_host', 'ads_admin_user', 'ads_admin_passwd', 'ads_connection', 'ads_context', // ads backend
 	);
 
 	/**
@@ -135,18 +135,18 @@ 
 	 *
 	 * @param string|array $backend =null string with backend 'sql'|'ldap', or whole config array, default read from global egw_info
 	 */
-	public function __construct($backend=null)
+	public function __construct($backend = null)
 	{
 		if (is_array($backend))
 		{
 			$this->config = $backend;
 			$backend = null;
-			self::$_instance = $this;	// also set instance returned by singleton
-			self::$cache = array();		// and empty our internal (session) cache
+			self::$_instance = $this; // also set instance returned by singleton
+			self::$cache = array(); // and empty our internal (session) cache
 		}
 		else
 		{
-			$this->config =& $GLOBALS['egw_info']['server'];
+			$this->config = & $GLOBALS['egw_info']['server'];
 
 			if (!isset(self::$_instance)) self::$_instance = $this;
 		}
@@ -195,7 +195,7 @@ 
 	function search($param)
 	{
 		//error_log(__METHOD__.'('.array2string($param).') '.function_backtrace());
-		if (!isset($param['active'])) $param['active'] = true;	// default is true = only return active accounts
+		if (!isset($param['active'])) $param['active'] = true; // default is true = only return active accounts
 
 		self::setup_cache();
 		$account_search = &self::$cache['account_search'];
@@ -207,8 +207,8 @@ 
 		}
 		// no backend understands $param['app'], only sql understands type owngroups or groupmemember[+memberships]
 		// --> do an full search first and then filter and limit that search
-		elseif($param['app'] || $this->config['account_repository'] != 'sql' &&
-			in_array($param['type'], array('owngroups','groupmembers','groupmembers+memberships')))
+		elseif ($param['app'] || $this->config['account_repository'] != 'sql' &&
+			in_array($param['type'], array('owngroups', 'groupmembers', 'groupmembers+memberships')))
 		{
 			$app = $param['app'];
 			unset($param['app']);
@@ -220,15 +220,15 @@ 
 
 			if ($param['type'] == 'owngroups')
 			{
-				$members = $this->memberships($GLOBALS['egw_info']['user']['account_id'],true);
+				$members = $this->memberships($GLOBALS['egw_info']['user']['account_id'], true);
 				$param['type'] = 'groups';
 			}
-			elseif(in_array($param['type'],array('groupmembers','groupmembers+memberships')))
+			elseif (in_array($param['type'], array('groupmembers', 'groupmembers+memberships')))
 			{
 				$members = array();
-				foreach((array)$this->memberships($GLOBALS['egw_info']['user']['account_id'],true) as $grp)
+				foreach ((array)$this->memberships($GLOBALS['egw_info']['user']['account_id'], true) as $grp)
 				{
-					$members = array_unique(array_merge($members, (array)$this->members($grp,true,$param['active'])));
+					$members = array_unique(array_merge($members, (array)$this->members($grp, true, $param['active'])));
 					if ($param['type'] == 'groupmembers+memberships') $members[] = $grp;
 				}
 				$param['type'] = $param['type'] == 'groupmembers+memberships' ? 'both' : 'accounts';
@@ -241,20 +241,20 @@ 
 			if ($app)
 			{
 				// we want the result merged, whatever it takes, as we only care for the ids
-				$valid = $this->split_accounts($app,!in_array($param['type'],array('accounts','groups')) ? 'merge' : $param['type'],$param['active']);
+				$valid = $this->split_accounts($app, !in_array($param['type'], array('accounts', 'groups')) ? 'merge' : $param['type'], $param['active']);
 			}
 			if (isset($members))
 			{
 				//error_log(__METHOD__.'() members='.array2string($members));
 				if (!$members) $members = array();
-				$valid = !$app ? $members : array_intersect($valid,$members);	// use the intersection
+				$valid = !$app ? $members : array_intersect($valid, $members); // use the intersection
 			}
 			//error_log(__METHOD__."() limiting result to app='$app' and/or group=$group valid-ids=".array2string($valid));
 			$n = 0;
 			$account_search[$serial]['data'] = array();
 			foreach ($full_search as $id => $data)
 			{
-				if (!in_array($id,$valid))
+				if (!in_array($id, $valid))
 				{
 					$this->total--;
 					continue;
@@ -274,7 +274,7 @@ 
 			$account_search[$serial]['data'] = $this->backend->search($param);
 			if ($param['type'] !== 'accounts')
 			{
-				foreach($account_search[$serial]['data'] as &$account)
+				foreach ($account_search[$serial]['data'] as &$account)
 				{
 					// add default description for Admins and Default group
 					if ($account['account_type'] === 'g')
@@ -303,7 +303,7 @@ 
 		{
 			$options['filter'] = (array)$options['filter'];
 		}
-		switch($GLOBALS['egw_info']['user']['preferences']['common']['account_display'])
+		switch ($GLOBALS['egw_info']['user']['preferences']['common']['account_display'])
 		{
 			case 'firstname':
 			case 'firstall':
@@ -319,7 +319,7 @@ 
 		}
 		$only_own = $GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] === 'groupmembers' &&
 			!isset($GLOBALS['egw_info']['user']['apps']['admin']);
-		switch($options['account_type'])
+		switch ($options['account_type'])
 		{
 			case 'accounts':
 				$type = $only_own ? 'groupmembers' : 'accounts';
@@ -340,7 +340,7 @@ 
 				break;
 		}
 		$accounts = array();
-		foreach(self::getInstance()->search(array(
+		foreach (self::getInstance()->search(array(
 			'type' => $options['filter']['group'] < 0 ? $options['filter']['group'] : $type,
 			'query' => $pattern,
 			'query_type' => 'all',
@@ -348,7 +348,7 @@ 
 		)) as $account)
 		{
 			$accounts[$account['account_id']] = self::format_username($account['account_lid'],
-				$account['account_firstname'],$account['account_lastname'],$account['account_id']);
+				$account['account_firstname'], $account['account_lastname'], $account['account_id']);
 		}
 		return $accounts;
 	}
@@ -364,7 +364,7 @@ 
 	 * @param boolean $set_depricated_names =false set _additionaly_ the depricated keys without 'account_' prefix
 	 * @return array/boolean array with account data (keys: account_id, account_lid, ...) or false if account not found
 	 */
-	function read($id=0,$set_depricated_names=false)
+	function read($id = 0, $set_depricated_names = false)
 	{
 		if (!$id)	// deprecated use!!!
 		{
@@ -386,9 +386,9 @@ 
 
 		if ($set_depricated_names && $data)
 		{
-			foreach($this->depricated_names as $name)
+			foreach ($this->depricated_names as $name)
 			{
-				$data[$name] =& $data['account_'.$name];
+				$data[$name] = & $data['account_'.$name];
 			}
 		}
 		return $data;
@@ -405,8 +405,8 @@ 
 	function json($id)
 	{
 		static $keys = array(
-			'account_id','account_lid','person_id','account_status',
-			'account_firstname','account_lastname','account_email','account_fullname','account_phone',
+			'account_id', 'account_lid', 'person_id', 'account_status',
+			'account_firstname', 'account_lastname', 'account_email', 'account_fullname', 'account_phone',
 		);
 		if (($account = $this->read($id)))
 		{
@@ -415,9 +415,9 @@ 
 		// for current user, add the apps available to him
 		if ($id == $GLOBALS['egw_info']['user']['account_id'])
 		{
-			foreach((array)$GLOBALS['egw_info']['user']['apps'] as $app => $data)
+			foreach ((array)$GLOBALS['egw_info']['user']['apps'] as $app => $data)
 			{
-				unset($data['table_defs']);	// no need for that on the client
+				unset($data['table_defs']); // no need for that on the client
 				$account['apps'][$app] = $data;
 			}
 		}
@@ -432,7 +432,7 @@ 
 	 * @param $lastname ='' lastname
 	 * @param $accountid =0 id, to check if it's a user or group, otherwise the lid will be used
 	 */
-	static function format_username($lid = '', $firstname = '', $lastname = '', $accountid=0)
+	static function format_username($lid = '', $firstname = '', $lastname = '', $accountid = 0)
 	{
 		if (!$lid && !$firstname && !$lastname)
 		{
@@ -445,7 +445,7 @@ 
 		if (empty($firstname)) $firstname = $lid;
 		if (empty($lastname) || $is_group)
 		{
-			$lastname  = $is_group ? lang('Group') : lang('User');
+			$lastname = $is_group ? lang('Group') : lang('User');
 		}
 		$display = $GLOBALS['egw_info']['user']['preferences']['common']['account_display'];
 
@@ -459,30 +459,30 @@ 
 		}
 
 		$name = '';
-		switch($display)
+		switch ($display)
 		{
 			case 'firstname':
-				$name = $firstname . ' ' . $lastname;
+				$name = $firstname.' '.$lastname;
 				break;
 			case 'lastname':
-				$name = $lastname . $delimiter . $firstname;
+				$name = $lastname.$delimiter.$firstname;
 				break;
 			case 'username':
 				$name = $lid;
 				break;
 			case 'firstall':
-				$name = $firstname . ' ' . $lastname . ' ['.$lid.']';
+				$name = $firstname.' '.$lastname.' ['.$lid.']';
 				break;
 			case 'lastall':
-				$name = $lastname . $delimiter . $firstname . ' ['.$lid.']';
+				$name = $lastname.$delimiter.$firstname.' ['.$lid.']';
 				break;
 			case 'allfirst':
-				$name = '['.$lid.'] ' . $firstname . ' ' . $lastname;
+				$name = '['.$lid.'] '.$firstname.' '.$lastname;
 				break;
 			case 'all':
 				/* fall through */
 			default:
-				$name = '['.$lid.'] ' . $lastname . $delimiter . $firstname;
+				$name = '['.$lid.'] '.$lastname.$delimiter.$firstname;
 		}
 		return $name;
 	}
@@ -493,14 +493,14 @@ 
 	 * @param string $account_id =null account id
 	 * @return string full name of user or "#$accountid" if user not found
 	 */
-	static function username($account_id=null)
+	static function username($account_id = null)
 	{
 		if ($account_id && !($account = self::cache_read((int)$account_id)))
 		{
 			return '#'.$account_id;
 		}
 		return self::format_username($account['account_lid'],
-			$account['account_firstname'] , $account['account_lastname'], $account_id);
+			$account['account_firstname'], $account['account_lastname'], $account_id);
 	}
 
 	/**
@@ -514,9 +514,9 @@ 
 	 * @param string $domain =null domain-name or null to use eGW's default domain $GLOBALS['egw_info']['server']['mail_suffix]
 	 * @return string with email address
 	 */
-	static function email($first,$last,$account,$domain=null)
+	static function email($first, $last, $account, $domain = null)
 	{
-		foreach (array('first','last','account') as $name)
+		foreach (array('first', 'last', 'account') as $name)
 		{
 			$$name = Translation::to_ascii($$name);
 		}
@@ -538,8 +538,8 @@ 
 		if (!$domain) $domain = $GLOBALS['egw_info']['server']['mail_suffix'];
 		if (!$domain) $domain = $_SERVER['SERVER_NAME'];
 
-		$email = str_replace(array('first','last','initial','account','dot','underscore','-'),
-			array($first,$last,substr($first,0,1),$account,$dot,$underscore,''),
+		$email = str_replace(array('first', 'last', 'initial', 'account', 'dot', 'underscore', '-'),
+			array($first, $last, substr($first, 0, 1), $account, $dot, $underscore, ''),
 			$GLOBALS['egw_info']['server']['email_address_format'] ? $GLOBALS['egw_info']['server']['email_address_format'] : 'first-dot-last').
 			($domain ? '@'.$domain : '');
 		//echo " = '$email'</p>\n";
@@ -555,7 +555,7 @@ 
 	{
 		if (empty($data['account_description']))
 		{
-			switch($data['account_lid'])
+			switch ($data['account_lid'])
 			{
 				case 'Default':
 					$data['account_description'] = lang('EGroupware all users group, do NOT delete');
@@ -583,15 +583,15 @@ 
 	 * @param boolean $check_depricated_names =false check _additionaly_ the depricated keys without 'account_' prefix
 	 * @return int|boolean the account_id or false on error
 	 */
-	function save(&$data,$check_depricated_names=false)
+	function save(&$data, $check_depricated_names = false)
 	{
 		if ($check_depricated_names)
 		{
-			foreach($this->depricated_names as $name)
+			foreach ($this->depricated_names as $name)
 			{
 				if (isset($data[$name]) && !isset($data['account_'.$name]))
 				{
-					$data['account_'.$name] =& $data[$name];
+					$data['account_'.$name] = & $data[$name];
 				}
 			}
 		}
@@ -604,7 +604,7 @@ 
 		{
 			// if we are not on a pure LDAP system, we have to write the account-date via the contacts class now
 			if (($this->config['account_repository'] == 'sql' || $this->config['contact_repository'] == 'sql-ldap') &&
-				(!($old = $this->read($data['account_id'])) ||	// only for new account or changed contact-data
+				(!($old = $this->read($data['account_id'])) || // only for new account or changed contact-data
 				$old['account_firstname'] != $data['account_firstname'] ||
 				$old['account_lastname'] != $data['account_lastname'] ||
 				$old['account_email'] != $data['account_email']))
@@ -619,14 +619,14 @@ 
 					'id'         => $data['person_id'],
 					'owner'      => 0,
 				);
-				$GLOBALS['egw']->contacts->save($contact,true);		// true = ignore addressbook acl
+				$GLOBALS['egw']->contacts->save($contact, true); // true = ignore addressbook acl
 			}
 			// save primary group if necessary
-			if ($data['account_primary_group'] && (!($memberships = $this->memberships($id,true)) ||
-				!in_array($data['account_primary_group'],$memberships)))
+			if ($data['account_primary_group'] && (!($memberships = $this->memberships($id, true)) ||
+				!in_array($data['account_primary_group'], $memberships)))
 			{
 				$memberships[] = $data['account_primary_group'];
-				$this->set_memberships($memberships, $id);	// invalidates cache for account_id and primary group
+				$this->set_memberships($memberships, $id); // invalidates cache for account_id and primary group
 			}
 		}
 		// as some backends set (group-)members in save, we need to invalidate their members too!
@@ -682,9 +682,9 @@ 
 	 * @param array $data =null array with account data, not specifying the account is depricated!!!
 	 * @return boolean true=expired (no more login possible), false otherwise
 	 */
-	function is_expired($data=null)
+	function is_expired($data = null)
 	{
-		if (is_null($data)) $data = $this->data;	// depricated use
+		if (is_null($data)) $data = $this->data; // depricated use
 
 		$expires = isset($data['account_expires']) ? $data['account_expires'] : $data['expires'];
 
@@ -718,10 +718,10 @@ 
 	 * @param string $account_type =null u = user or g = group, or default null = try both
 	 * @return int|false numeric account_id or false on error ($name not found)
 	 */
-	function name2id($name,$which='account_lid',$account_type=null)
+	function name2id($name, $which = 'account_lid', $account_type = null)
 	{
 		// Don't bother searching for empty or non-scalar account_lid
-		if(empty($name) || !is_scalar($name))
+		if (empty($name) || !is_scalar($name))
 		{
 			return False;
 		}
@@ -729,12 +729,12 @@ 
 		self::setup_cache();
 		$name_list = &self::$cache['name_list'];
 
-		if(@isset($name_list[$which][$name]) && $name_list[$which][$name])
+		if (@isset($name_list[$which][$name]) && $name_list[$which][$name])
 		{
 			return $name_list[$which][$name];
 		}
 
-		return $name_list[$which][$name] = $this->backend->name2id($name,$which,$account_type);
+		return $name_list[$which][$name] = $this->backend->name2id($name, $which, $account_type);
 	}
 
 	/**
@@ -747,7 +747,7 @@ 
 	 * @param boolean $generate_email =false true: generate an email address, if user has none
 	 * @return string|boolean converted value or false on error ($account_id not found)
 	 */
-	static function id2name($account_id, $which='account_lid', $generate_email=false)
+	static function id2name($account_id, $which = 'account_lid', $generate_email = false)
 	{
 		if (!is_numeric($account_id) && !($account_id = self::getInstance()->name2id($account_id)))
 		{
@@ -823,13 +823,13 @@ 
 				$account_lid != $GLOBALS['egw_info']['user']['account_lid'] ||
 			// only allow group-members for account-selection is groupmembers
 			$GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] == 'groupmembers' &&
-				!array_intersect((array)$this->memberships($account_id,true),
-					(array)$this->memberships($GLOBALS['egw_info']['user']['account_id'],true))))
+				!array_intersect((array)$this->memberships($account_id, true),
+					(array)$this->memberships($GLOBALS['egw_info']['user']['account_id'], true))))
 		{
 			//error_log(__METHOD__."($account_id='$account_lid') returning FALSE");
-			return false;	// user is not allowed to see given account
+			return false; // user is not allowed to see given account
 		}
-		return true;	// user allowed to see given account
+		return true; // user allowed to see given account
 	}
 
 	/**
@@ -839,11 +839,11 @@ 
 	 * @param boolean $just_id =false return just account_id's or account_id => account_lid pairs
 	 * @return array with account_id's ($just_id) or account_id => account_lid pairs (!$just_id)
 	 */
-	function memberships($account_id, $just_id=false)
+	function memberships($account_id, $just_id = false)
 	{
 		if (!is_int($account_id) && !is_numeric($account_id))
 		{
-			$account_id = $this->name2id($account_id,'account_lid','u');
+			$account_id = $this->name2id($account_id, 'account_lid', 'u');
 		}
 		if ($account_id && ($data = self::cache_read($account_id)))
 		{
@@ -859,7 +859,7 @@ 
 	 * @param array $groups array with gidnumbers
 	 * @param int $account_id uidnumber
 	 */
-	function set_memberships($groups,$account_id)
+	function set_memberships($groups, $account_id)
 	{
 		if (!is_int($account_id) && !is_numeric($account_id))
 		{
@@ -887,7 +887,7 @@ 
 	 * @param boolean $active =false true: return only active (not expired or deactived) members, false: return all accounts
 	 * @return array with account_id ($just_id) or account_id => account_lid pairs (!$just_id)
 	 */
-	function members($account_id, $just_id=false, $active=true)
+	function members($account_id, $just_id = false, $active = true)
 	{
 		if (!is_int($account_id) && !is_numeric($account_id))
 		{
@@ -908,7 +908,7 @@ 
 	 * @param array $members array with uidnumber or uid's
 	 * @param int $gid gidnumber of group to set
 	 */
-	function set_members($members,$gid)
+	function set_members($members, $gid)
 	{
 		if (($old_members = $this->members($gid, true, false)) != $members)
 		{
@@ -932,7 +932,7 @@ 
 	 * @param boolean $active =false true: return only active (not expired or deactived) members, false: return all accounts
 	 * @return array/boolean see $use, false on error (wront $use)
 	 */
-	function split_accounts($app_users,$use='both',$active=true)
+	function split_accounts($app_users, $use = 'both', $active = true)
 	{
 		if (!is_array($app_users))
 		{
@@ -943,21 +943,21 @@ 
 			{
 				return $cache;
 			}
-			$app_users = $GLOBALS['egw']->acl->get_ids_for_location('run',1,$app_users);
+			$app_users = $GLOBALS['egw']->acl->get_ids_for_location('run', 1, $app_users);
 		}
 		$accounts = array(
 			'accounts' => array(),
 			'groups' => array(),
 		);
-		foreach($app_users as $id)
+		foreach ($app_users as $id)
 		{
 			$type = $this->get_type($id);
-			if($type == 'g')
+			if ($type == 'g')
 			{
 				$accounts['groups'][$id] = $id;
 				if ($use != 'groups')
 				{
-					foreach((array)$this->members($id, true, $active) as $id)
+					foreach ((array)$this->members($id, true, $active) as $id)
 					{
 						$accounts['accounts'][$id] = $id;
 					}
@@ -978,7 +978,7 @@ 
 			$cache = $accounts;
 		}
 
-		switch($use)
+		switch ($use)
 		{
 			case 'both':
 				return $accounts;
@@ -987,7 +987,7 @@ 
 			case 'accounts':
 				return $accounts['accounts'];
 			case 'merge':
-				return array_merge($accounts['accounts'],$accounts['groups']);
+				return array_merge($accounts['accounts'], $accounts['groups']);
 		}
 		return False;
 	}
@@ -1005,21 +1005,20 @@ 
 	function auto_add($account_lid, $passwd)
 	{
 		$expires = !isset($this->config['auto_create_expire']) ||
-			$this->config['auto_create_expire'] == 'never' ? -1 :
-			time() + $this->config['auto_create_expire'] + 2;
+			$this->config['auto_create_expire'] == 'never' ? -1 : time() + $this->config['auto_create_expire'] + 2;
 
 		$memberships = array();
 		$default_group_id = null;
 		// check if we have a comma or semicolon delimited list of groups --> add first as primary and rest as memberships
-		foreach(preg_split('/[,;] */',$this->config['default_group_lid']) as $group_lid)
+		foreach (preg_split('/[,;] */', $this->config['default_group_lid']) as $group_lid)
 		{
-			if (($group_id = $this->name2id($group_lid,'account_lid','g')))
+			if (($group_id = $this->name2id($group_lid, 'account_lid', 'g')))
 			{
 				if (!$default_group_id) $default_group_id = $group_id;
 				$memberships[] = $group_id;
 			}
 		}
-		if (!$default_group_id && ($default_group_id = $this->name2id('Default','account_lid','g')))
+		if (!$default_group_id && ($default_group_id = $this->name2id('Default', 'account_lid', 'g')))
 		{
 			$memberships[] = $default_group_id;
 		}
@@ -1056,25 +1055,25 @@ 
 		// set memberships if given
 		if ($memberships)
 		{
-			$this->set_memberships($memberships,$data['account_id']);
+			$this->set_memberships($memberships, $data['account_id']);
 		}
 		// set the appropriate value for the can change password flag (assume users can, if the admin requires users to change their password)
 		$data['changepassword'] = (bool)$GLOBALS['egw_info']['server']['change_pwd_every_x_days'];
-		if(!$data['changepassword'])
+		if (!$data['changepassword'])
 		{
-			$GLOBALS['egw']->acl->add_repository('preferences','nopasswordchange',$data['account_id'],1);
+			$GLOBALS['egw']->acl->add_repository('preferences', 'nopasswordchange', $data['account_id'], 1);
 		}
 		else
 		{
-			$GLOBALS['egw']->acl->delete_repository('preferences','nopasswordchange',$data['account_id']);
+			$GLOBALS['egw']->acl->delete_repository('preferences', 'nopasswordchange', $data['account_id']);
 		}
 		// call hook to notify interested apps about the new account
 		$GLOBALS['hook_values'] = $data;
-		Hooks::process($data+array(
+		Hooks::process($data + array(
 			'location' => 'addaccount',
 			// at login-time only the hooks from the following apps will be called
-			'order' => array('felamimail','fudforum'),
-		),False,True);  // called for every app now, not only enabled ones
+			'order' => array('felamimail', 'fudforum'),
+		), False, True); // called for every app now, not only enabled ones
 		unset($data['changepassword']);
 
 		return $data['account_id'];
@@ -1121,14 +1120,14 @@ 
 	 *
 	 * @param int|array $account_ids user- or group-id(s) for which cache should be invalidated, default 0 = only search/name2id cache
 	 */
-	static function cache_invalidate($account_ids=0)
+	static function cache_invalidate($account_ids = 0)
 	{
 		//error_log(__METHOD__.'('.array2string($account_ids).')');
 
 		// instance-wide cache
 		if ($account_ids)
 		{
-			foreach((array)$account_ids as $account_id)
+			foreach ((array)$account_ids as $account_id)
 			{
 				$instance = self::getInstance();
 
@@ -1140,11 +1139,11 @@ 
 
 		// session-cache
 		if (self::$cache) self::$cache = array();
-		Cache::unsetSession('accounts_cache','phpgwapi');
+		Cache::unsetSession('accounts_cache', 'phpgwapi');
 
-		if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+		if (method_exists($GLOBALS['egw'], 'invalidate_session_cache'))	// egw object in setup is limited
 		{
-			Egw::invalidate_session_cache();	// invalidates whole egw-enviroment if stored in the session
+			Egw::invalidate_session_cache(); // invalidates whole egw-enviroment if stored in the session
 		}
 	}
 
@@ -1168,11 +1167,11 @@ 
 	 * @return array
 	 * @throws Exception\WrongParameter if no integer was passed as $account_id
 	 */
-	static function cache_read($account_id, $need_active=false)
+	static function cache_read($account_id, $need_active = false)
 	{
 		if (!is_numeric($account_id)) throw new Exception\WrongParameter('Not an integer!');
 
-		$account =& self::$request_cache[$account_id];
+		$account = & self::$request_cache[$account_id];
 
 		if (!isset($account))	// not in request cache --> try instance cache
 		{
@@ -1203,7 +1202,7 @@ 
 		{
 			$instance = self::getInstance();
 			$account['members-active'] = array();
-			foreach((array)$account['members'] as $id => $lid)
+			foreach ((array)$account['members'] as $id => $lid)
 			{
 				if ($instance->is_active($id)) $account['members-active'][$id] = $lid;
 			}
@@ -1229,11 +1228,11 @@ 
 	 */
 	private static function setup_cache()
 	{
-		if (is_array(self::$cache)) return;	// cache is already setup
+		if (is_array(self::$cache)) return; // cache is already setup
 
 		if (self::$use_session_cache && is_object($GLOBALS['egw']->session))
 		{
-			self::$cache =& Cache::getSession('accounts_cache','phpgwapi');
+			self::$cache = & Cache::getSession('accounts_cache', 'phpgwapi');
 		}
 		//error_log(__METHOD__."() use_session_cache=".array2string(self::$use_session_cache).", is_array(self::\$cache)=".array2string(is_array(self::$cache)));
 

api/src/Accounts/Ldap.php

Doc Comments +2 added lines, -3 removed lines

@@ -190,7 +190,7 @@ 
 	 * If no account_id is set in data the account is added and the new id is set in $data.
 	 *
 	 * @param array $data array with account-data
-	 * @return int|boolean the account_id or false on error
+	 * @return false|string the account_id or false on error
 	 */
 	function save(&$data)
 	{
@@ -995,7 +995,7 @@ 
 	 *
 	 * @param int $_account_id
 	 * @param string $ip
-	 * @return int lastlogin time
+	 * @return boolean lastlogin time
 	 */
 	function update_lastlogin($_account_id, $ip)
 	{
@@ -1097,7 +1097,6 @@ 
 	 * @param int $gid gidnumber of group to set
 	 * @param array $objectclass =null should we set the member and uniqueMember attributes (groupOf(Unique)Names|univentionGroup) (default detect it)
 	 * @param string $use_cn =null if set $cn is used instead $gid and the attributes are returned, not written to ldap
-	 * @param boolean $uniqueMember =null should we set the uniqueMember attribute (default detect it)
 	 * @return boolean/array false on failure, array or true otherwise
 	 */
 	function set_members($members, $gid, array $objectclass=null, $use_cn=null)

Indentation +1 added lines, -1 removed lines

@@ -962,7 +962,7 @@
 			'account_fullname' => 'cn',
 		);
 		if (!isset($to_ldap[$which]) || $account_type === 'g') {
-		    return False;
+			return False;
 		}
 
 		$sri = ldap_search($this->ds, $this->user_context, '(&('.$to_ldap[$which].'=' . $name . ')(objectclass=posixaccount))', array('uidNumber'));

Spacing +138 added lines, -141 removed lines

@@ -89,14 +89,14 @@ 
 	 */
 	var $requiredObjectClasses = array(
 		'user' => array(
-			'top','person','organizationalperson','inetorgperson','posixaccount','shadowaccount'
+			'top', 'person', 'organizationalperson', 'inetorgperson', 'posixaccount', 'shadowaccount'
 		),
 		'user-if-supported' => array(	// these classes get added, if server supports them
 			'mozillaabpersonalpha', 'mozillaorgperson', 'evolutionperson',
 			'univentionperson', 'univentionmail', array('univentionobject', 'univentionObjectType' => 'users/user'),
 		),
 		'group' => array(
-			'top','posixgroup','groupofnames'
+			'top', 'posixgroup', 'groupofnames'
 		),
 		'group-if-supported' => array(	// these classes get added, if servers supports them
 			'univentiongroup', array('univentionobject', 'univentionObjectType' => 'groups/group'),
@@ -115,8 +115,8 @@ 
 	 */
 	var $group_mail_classes = array(
 		'dbmailforwardingaddress' => 'mailforwardingaddress',
-		'dbmailuser' => array('mailforwardingaddress','uid'),
-		'qmailuser' => array('mailforwardingaddress','uid'),
+		'dbmailuser' => array('mailforwardingaddress', 'uid'),
+		'qmailuser' => array('mailforwardingaddress', 'uid'),
 		'mailaccount' => 'mailalias',
 		'univentiongroup' => array(false, false, true),
 	);
@@ -158,7 +158,7 @@ 
 		$this->use_session_cache = true;
 
 		$this->ldap = Api\Ldap::factory(false, $this->frontend->config['ldap_host'],
-			$this->frontend->config['ldap_root_dn'],$this->frontend->config['ldap_root_pw']);
+			$this->frontend->config['ldap_root_dn'], $this->frontend->config['ldap_root_pw']);
 		$this->ds = $this->ldap->ds;
 
 		$this->user_context  = $this->frontend->config['ldap_context'];
@@ -196,7 +196,7 @@ 
 	{
 		$is_group = $data['account_id'] < 0 || $data['account_type'] === 'g';
 
-		$data_utf8 = Api\Translation::convert($data,Api\Translation::charset(),'utf-8');
+		$data_utf8 = Api\Translation::convert($data, Api\Translation::charset(), 'utf-8');
 		$members = $data['account_members'];
 
 		if (!is_object($this->ldapServerInfo))
@@ -208,8 +208,7 @@ 
 		if ($data_utf8['account_id'] && $data_utf8['account_lid'])
 		{
 			// read the entry first, to check if the dn (account_lid) has changed
-			$sri = $is_group ? ldap_search($this->ds,$this->group_context,'gidnumber='.abs($data['account_id'])) :
-				ldap_search($this->ds,$this->user_context,'uidnumber='.$data['account_id']);
+			$sri = $is_group ? ldap_search($this->ds, $this->group_context, 'gidnumber='.abs($data['account_id'])) : ldap_search($this->ds, $this->user_context, 'uidnumber='.$data['account_id']);
 			$old = ldap_get_entries($this->ds, $sri);
 
 			if (!$old['count'])
@@ -221,9 +220,9 @@ 
 				$old = Api\Ldap::result2array($old[0]);
 				$old['objectclass'] = array_map('strtolower', $old['objectclass']);
 				$key = false;
-				if ($is_group && ($key = array_search('namedobject',$old['objectclass'])) !== false ||
-					$is_group && ($old['cn'] != $data_utf8['account_lid'] || substr($old['dn'],0,3) != 'cn=') ||
-					!$is_group && ($old['uid'] != $data_utf8['account_lid'] || substr($old['dn'],0,4) != 'uid='))
+				if ($is_group && ($key = array_search('namedobject', $old['objectclass'])) !== false ||
+					$is_group && ($old['cn'] != $data_utf8['account_lid'] || substr($old['dn'], 0, 3) != 'cn=') ||
+					!$is_group && ($old['uid'] != $data_utf8['account_lid'] || substr($old['dn'], 0, 4) != 'uid='))
 				{
 					// query the memberships to set them again later
 					if (!$is_group)
@@ -252,7 +251,7 @@ 
 			}
 		}
 		// check if we need to write the objectclass: new entry or required object classes are missing
-		if (!$old || array_diff($this->requiredObjectClasses[$is_group ? 'group' : 'user'],$old['objectclass']))
+		if (!$old || array_diff($this->requiredObjectClasses[$is_group ? 'group' : 'user'], $old['objectclass']))
 		{
 			// additional objectclasse might be already set in $to_write or $old
 			if (!is_array($to_write['objectclass']))
@@ -261,7 +260,7 @@ 
 			}
 			if (!$old)	// for new accounts add additional addressbook object classes, if supported by server
 			{			// as setting them later might loose eg. password, if we are not allowed to read them
-				foreach($this->requiredObjectClasses[$is_group?'group-if-supported':'user-if-supported'] as $additional)
+				foreach ($this->requiredObjectClasses[$is_group ? 'group-if-supported' : 'user-if-supported'] as $additional)
 				{
 					$add = array();
 					if (is_array($additional))
@@ -283,8 +282,7 @@ 
 		{
 			if (!$data['account_lid']) return false;
 
-			$dn = $is_group ? 'cn='.$data_utf8['account_lid'].','.$this->group_context :
-				'uid='.$data_utf8['account_lid'].','.$this->user_context;
+			$dn = $is_group ? 'cn='.$data_utf8['account_lid'].','.$this->group_context : 'uid='.$data_utf8['account_lid'].','.$this->user_context;
 		}
 		// now we merge the user or group data
 		if ($is_group)
@@ -293,23 +291,23 @@ 
 			$data['account_type'] = 'g';
 
 			$objectclass = $old ? $old['objectclass'] : $to_write['objectclass'];
-			if ($members || !$old && array_intersect(array('groupofnames','groupofuniquenames','univentiongroup'), $objectclass))
+			if ($members || !$old && array_intersect(array('groupofnames', 'groupofuniquenames', 'univentiongroup'), $objectclass))
 			{
 				$to_write = array_merge($to_write, $this->set_members($members, $data['account_id'], $objectclass, $dn));
 			}
 			// check if we should set a mail address and forwards for each member
-			foreach($this->group_mail_classes as $objectclass => $forward)
+			foreach ($this->group_mail_classes as $objectclass => $forward)
 			{
 				$extra_attr = false;
 				$keep_objectclass = false;
-				if (is_array($forward)) list($forward,$extra_attr,$keep_objectclass) = $forward;
+				if (is_array($forward)) list($forward, $extra_attr, $keep_objectclass) = $forward;
 
 				if ($this->ldapServerInfo->supportsObjectClass($objectclass) &&
-					($old && in_array($objectclass,$old['objectclass']) || $data_utf8['account_email'] || $old[static::MAIL_ATTR]))
+					($old && in_array($objectclass, $old['objectclass']) || $data_utf8['account_email'] || $old[static::MAIL_ATTR]))
 				{
 					if ($data_utf8['account_email'])	// setting an email
 					{
-						if (!in_array($objectclass,$old ? $old['objectclass'] : $to_write['objectclass']))
+						if (!in_array($objectclass, $old ? $old['objectclass'] : $to_write['objectclass']))
 						{
 							if ($old) $to_write['objectclass'] = $old['objectclass'];
 							$to_write['objectclass'][] = $objectclass;
@@ -323,19 +321,19 @@ 
 							$to_write[$forward] = array();
 							foreach (array_keys($members) as $member)
 							{
-								if (($email = $this->id2name($member,'account_email')))
+								if (($email = $this->id2name($member, 'account_email')))
 								{
 									$to_write[$forward][] = $email;
 								}
 							}
 						}
 					}
-					elseif($old)	// remove the mail and forwards only for existing entries
+					elseif ($old)	// remove the mail and forwards only for existing entries
 					{
 						$to_write[static::MAIL_ATTR] = array();
 						if ($forward) $to_write[$forward] = array();
 						if ($extra_attr) $to_write[$extra_attr] = array();
-						if (!$keep_objectclass && ($key = array_search($objectclass,$old['objectclass'])))
+						if (!$keep_objectclass && ($key = array_search($objectclass, $old['objectclass'])))
 						{
 							$to_write['objectclass'] = $old['objectclass'];
 							unset($to_write['objectclass'][$key]);
@@ -349,7 +347,7 @@ 
 		}
 		else
 		{
-			$to_write = $this->_merge_user($to_write,$data_utf8,!$old);
+			$to_write = $this->_merge_user($to_write, $data_utf8, !$old);
 			// make sure multiple email-addresses in the mail attribute "survive"
 			if (isset($to_write[static::MAIL_ATTR]) && count($old[static::MAIL_ATTR]) > 1)
 			{
@@ -368,21 +366,21 @@ 
 		}
 
 		// remove memberuid when adding a group
-		if(!$old && is_array($to_write['memberuid']) && empty($to_write['memberuid'])) {
+		if (!$old && is_array($to_write['memberuid']) && empty($to_write['memberuid'])) {
 			unset($to_write['memberuid']);
 		}
 		// modifying or adding the entry
-		if ($old && !@ldap_modify($this->ds,$dn,$to_write) ||
-			!$old && !@ldap_add($this->ds,$dn,$to_write))
+		if ($old && !@ldap_modify($this->ds, $dn, $to_write) ||
+			!$old && !@ldap_add($this->ds, $dn, $to_write))
 		{
 			$err = true;
-			if ($is_group && ($key = array_search('groupofnames',$to_write['objectclass'])) !== false)
+			if ($is_group && ($key = array_search('groupofnames', $to_write['objectclass'])) !== false)
 			{
 				// try again with removed groupOfNames stuff, as I cant detect if posixGroup is a structural object
 				unset($to_write['objectclass'][$key]);
 				$to_write['objectclass'] = array_values($to_write['objectclass']);
 				unset($to_write['member']);
-				$err = $old ? !ldap_modify($this->ds,$dn,$to_write) : !ldap_add($this->ds,$dn,$to_write);
+				$err = $old ? !ldap_modify($this->ds, $dn, $to_write) : !ldap_add($this->ds, $dn, $to_write);
 			}
 			if ($err)
 			{
@@ -392,7 +390,7 @@ 
 		}
 		if ($memberships)
 		{
-			$this->set_memberships($memberships,$data['account_id']);
+			$this->set_memberships($memberships, $data['account_id']);
 		}
 		return $data['account_id'];
 	}
@@ -409,14 +407,14 @@ 
 
 		if ($account_id < 0)
 		{
-			$sri = ldap_search($this->ds, $this->group_context, 'gidnumber=' . abs($account_id));
+			$sri = ldap_search($this->ds, $this->group_context, 'gidnumber='.abs($account_id));
 		}
 		else
 		{
 			// remove the user's memberships
-			$this->set_memberships(array(),$account_id);
+			$this->set_memberships(array(), $account_id);
 
-			$sri = ldap_search($this->ds, $this->user_context, 'uidnumber=' . $account_id);
+			$sri = ldap_search($this->ds, $this->user_context, 'uidnumber='.$account_id);
 		}
 		if (!$sri) return false;
 
@@ -440,7 +438,7 @@ 
 		{
 			$this->ldapServerInfo = $this->ldap->getLDAPServerInfo($this->frontend->config['ldap_host']);
 		}
-		foreach(array_keys($this->group_mail_classes) as $objectclass)
+		foreach (array_keys($this->group_mail_classes) as $objectclass)
 		{
 			if ($this->ldapServerInfo->supportsObjectClass($objectclass))
 			{
@@ -448,15 +446,15 @@ 
 				break;
 			}
 		}
-		$sri = ldap_search($this->ds, $this->group_context,'(&(objectClass=posixGroup)(gidnumber=' . abs($account_id).'))',
+		$sri = ldap_search($this->ds, $this->group_context, '(&(objectClass=posixGroup)(gidnumber='.abs($account_id).'))',
 			array('dn', 'gidnumber', 'cn', 'objectclass', static::MAIL_ATTR, 'memberuid', 'description'));
 
 		$ldap_data = ldap_get_entries($this->ds, $sri);
 		if (!$ldap_data['count'])
 		{
-			return false;	// group not found
+			return false; // group not found
 		}
-		$data = Api\Translation::convert($ldap_data[0],'utf-8');
+		$data = Api\Translation::convert($ldap_data[0], 'utf-8');
 		unset($data['objectclass']['count']);
 
 		$group += array(
@@ -477,7 +475,7 @@ 
 		{
 			unset($data['memberuid']['count']);
 
-			foreach($data['memberuid'] as $lid)
+			foreach ($data['memberuid'] as $lid)
 			{
 				if (($id = $this->name2id($lid, 'account_lid', 'u')))
 				{
@@ -498,16 +496,16 @@ 
 	 */
 	protected function _read_user($account_id)
 	{
-		$sri = ldap_search($this->ds, $this->user_context, '(&(objectclass=posixAccount)(uidnumber=' . (int)$account_id.'))',
-			array('dn','uidnumber','uid','gidnumber','givenname','sn','cn',static::MAIL_ATTR,'userpassword','telephonenumber',
-				'shadowexpire','shadowlastchange','homedirectory','loginshell','createtimestamp','modifytimestamp'));
+		$sri = ldap_search($this->ds, $this->user_context, '(&(objectclass=posixAccount)(uidnumber='.(int)$account_id.'))',
+			array('dn', 'uidnumber', 'uid', 'gidnumber', 'givenname', 'sn', 'cn', static::MAIL_ATTR, 'userpassword', 'telephonenumber',
+				'shadowexpire', 'shadowlastchange', 'homedirectory', 'loginshell', 'createtimestamp', 'modifytimestamp'));
 
 		$ldap_data = ldap_get_entries($this->ds, $sri);
 		if (!$ldap_data['count'])
 		{
-			return false;	// user not found
+			return false; // user not found
 		}
-		$data = Api\Translation::convert($ldap_data[0],'utf-8');
+		$data = Api\Translation::convert($ldap_data[0], 'utf-8');
 
 		$utc_diff = date('Z');
 		$user = array(
@@ -527,13 +525,13 @@ 
 			// - if it's set to 0, the account is disabled
 			// - if it's set to > 0, it will or already has expired --> acount is active if it not yet expired
 			// shadowexpire is in days since 1970/01/01 (equivalent to a timestamp (int UTC!) / (24*60*60)
-			'account_status'    => isset($data['shadowexpire']) && $data['shadowexpire'][0]*24*3600+$utc_diff < time() ? false : 'A',
-			'account_expires'   => isset($data['shadowexpire']) && $data['shadowexpire'][0] ? $data['shadowexpire'][0]*24*3600+$utc_diff : -1, // LDAP date is in UTC
-			'account_lastpwd_change' => isset($data['shadowlastchange']) ? $data['shadowlastchange'][0]*24*3600+($data['shadowlastchange'][0]!=0?$utc_diff:0) : null,
+			'account_status'    => isset($data['shadowexpire']) && $data['shadowexpire'][0] * 24 * 3600 + $utc_diff < time() ? false : 'A',
+			'account_expires'   => isset($data['shadowexpire']) && $data['shadowexpire'][0] ? $data['shadowexpire'][0] * 24 * 3600 + $utc_diff : -1, // LDAP date is in UTC
+			'account_lastpwd_change' => isset($data['shadowlastchange']) ? $data['shadowlastchange'][0] * 24 * 3600 + ($data['shadowlastchange'][0] != 0 ? $utc_diff : 0) : null,
 			// lastlogin and lastlogin from are not availible via the shadowAccount object class
 			// 'account_lastlogin' => $data['phpgwaccountlastlogin'][0],
 			// 'account_lastloginfrom' => $data['phpgwaccountlastloginfrom'][0],
-			'person_id'         => $data['uid'][0],	// id of associated contact
+			'person_id'         => $data['uid'][0], // id of associated contact
 			'account_created' => isset($data['createtimestamp'][0]) ? self::accounts_ldap2ts($data['createtimestamp'][0]) : null,
 			'account_modified' => isset($data['modifytimestamp'][0]) ? self::accounts_ldap2ts($data['modifytimestamp'][0]) : null,
 		);
@@ -554,7 +552,7 @@ 
 	 * @param array $data array with account-data in utf-8
 	 * @return array merged data
 	 */
-	protected function _merge_group($to_write,$data,$old=null)
+	protected function _merge_group($to_write, $data, $old = null)
 	{
 		$to_write['gidnumber'] = abs($data['account_id']);
 		$to_write['cn'] = $data['account_lid'];
@@ -574,7 +572,7 @@ 
 	 * @param boolean $new_entry
 	 * @return array merged data
 	 */
-	protected function _merge_user($to_write,$data,$new_entry)
+	protected function _merge_user($to_write, $data, $new_entry)
 	{
 		$to_write['uidnumber'] = $data['account_id'];
 		$to_write['uid']       = $data['account_lid'];
@@ -583,12 +581,12 @@ 
 		{
 			$to_write['givenname'] = $data['account_firstname'] ? $data['account_firstname'] : array();
 		}
-		$to_write['sn']        = $data['account_lastname'];
+		$to_write['sn'] = $data['account_lastname'];
 		if (!$new_entry || $data['account_email'])
 		{
-			$to_write[static::MAIL_ATTR]  = $data['account_email'] ? $data['account_email'] : array();
+			$to_write[static::MAIL_ATTR] = $data['account_email'] ? $data['account_email'] : array();
 		}
-		$to_write['cn']        = $data['account_fullname'] ? $data['account_fullname'] : $data['account_firstname'].' '.$data['account_lastname'];
+		$to_write['cn'] = $data['account_fullname'] ? $data['account_fullname'] : $data['account_firstname'].' '.$data['account_lastname'];
 
 		$utc_diff = date('Z');
 		if (isset($data['account_passwd']) && $data['account_passwd'])
@@ -597,47 +595,46 @@ 
 			{
 				$data['account_passwd'] = setup_cmd_ldap::hash_sql2ldap($data['account_passwd']);
 			}
-			elseif (!preg_match('/^\\{[a-z5]{3,5}\\}.+/i',$data['account_passwd']))	// if it's not already entcrypted, do so now
+			elseif (!preg_match('/^\\{[a-z5]{3,5}\\}.+/i', $data['account_passwd']))	// if it's not already entcrypted, do so now
 			{
 				$data['account_passwd'] = Api\Auth::encrypt_ldap($data['account_passwd']);
 			}
 			$to_write['userpassword'] = $data['account_passwd'];
-			$to_write['shadowlastchange'] = round((time()-$utc_diff) / (24*3600));
+			$to_write['shadowlastchange'] = round((time() - $utc_diff) / (24 * 3600));
 		}
 		// both status and expires are encoded in the single shadowexpire value in LDAP
 		// - if it's unset an account is enabled AND does never expire
 		// - if it's set to 0, the account is disabled
 		// - if it's set to > 0, it will or already has expired --> acount is active if it not yet expired
 		// shadowexpire is in days since 1970/01/01 (equivalent to a timestamp (int UTC!) / (24*60*60)
-		$shadowexpire = ($data['account_expires']-$utc_diff) / (24*3600);
+		$shadowexpire = ($data['account_expires'] - $utc_diff) / (24 * 3600);
 
 		$to_write['shadowexpire'] = !$data['account_status'] ?
-			($data['account_expires'] != -1 && $data['account_expires'] < time() ? round($shadowexpire) : 0) :
-			($data['account_expires'] != -1 ? round($shadowexpire) : array());	// array() = unset value
+			($data['account_expires'] != -1 && $data['account_expires'] < time() ? round($shadowexpire) : 0) : ($data['account_expires'] != -1 ? round($shadowexpire) : array()); // array() = unset value
 
 		if ($new_entry && is_array($to_write['shadowexpire']) && !count($to_write['shadowexpire']))
 		{
-			unset($to_write['shadowexpire']);	// gives protocoll error otherwise
+			unset($to_write['shadowexpire']); // gives protocoll error otherwise
 		}
 		//error_log(__METHOD__.__LINE__.$data['account_lid'].'#'.$data['account_lastpwd_change'].'#');
-		if ($data['account_lastpwd_change']) $to_write['shadowlastchange'] = round(($data['account_lastpwd_change']-$utc_diff)/(24*3600));
-		if (isset($data['account_lastpwd_change']) && $data['account_lastpwd_change']==0) $to_write['shadowlastchange'] = 0;
+		if ($data['account_lastpwd_change']) $to_write['shadowlastchange'] = round(($data['account_lastpwd_change'] - $utc_diff) / (24 * 3600));
+		if (isset($data['account_lastpwd_change']) && $data['account_lastpwd_change'] == 0) $to_write['shadowlastchange'] = 0;
 		// lastlogin and lastlogin from are not availible via the shadowAccount object class
 		// $to_write['phpgwaccountlastlogin'] = $data['lastlogin'];
 		// $to_write['phpgwaccountlastloginfrom'] = $data['lastloginfrom'];
 
 		if ($this->frontend->config['ldap_extra_attributes'])
 		{
-			if (isset($data['homedirectory'])) $to_write['homedirectory']  = $data['homedirectory'];
+			if (isset($data['homedirectory'])) $to_write['homedirectory'] = $data['homedirectory'];
 			if (isset($data['loginshell'])) $to_write['loginshell'] = $data['loginshell'] ? $data['loginshell'] : array();
 		}
 		if (($new_entry || isset($to_write['homedirectory'])) && empty($to_write['homedirectory']))
 		{
-			$to_write['homedirectory']  = '/dev/null';	// is a required attribute of posixAccount
+			$to_write['homedirectory'] = '/dev/null'; // is a required attribute of posixAccount
 		}
 		if ($new_entry && empty($to_write['loginshell']))
 		{
-			unset($to_write['loginshell']);	// setting array() for new entry gives "Protocol error", must not set it
+			unset($to_write['loginshell']); // setting array() for new entry gives "Protocol error", must not set it
 		}
 		return $to_write;
 	}
@@ -665,7 +662,7 @@ 
 	function search($param)
 	{
 		//error_log(__METHOD__."(".array2string($param).")");
-		$account_search =& Api\Accounts::$cache['account_search'];
+		$account_search = & Api\Accounts::$cache['account_search'];
 
 		// check if the query is cached
 		$serial = serialize($param);
@@ -691,12 +688,12 @@ 
 			$query = Api\Ldap::quote(strtolower($param['query']));
 
 			$accounts = array();
-			if($param['type'] != 'groups')
+			if ($param['type'] != 'groups')
 			{
 				$filter = "(&(objectclass=posixaccount)";
 				if (!empty($query) && $query != '*')
 				{
-					switch($param['query_type'])
+					switch ($param['query_type'])
 					{
 						case 'all':
 						default:
@@ -723,7 +720,7 @@ 
 					}
 				}
 				// add account_filter to filter (user has to be '*', as we otherwise only search uid's)
-				$filter .= str_replace(array('%user','%domain'),array('*',$GLOBALS['egw_info']['user']['domain']),$this->account_filter);
+				$filter .= str_replace(array('%user', '%domain'), array('*', $GLOBALS['egw_info']['user']['domain']), $this->account_filter);
 				$filter .= ')';
 
 				if ($param['type'] != 'both')
@@ -742,9 +739,9 @@ 
 						'account_fullname'  => 'cn',
 						'account_primary_group' => 'gidnumber',
 					);
-					$orders = explode(',',$param['order']);
+					$orders = explode(',', $param['order']);
 					$order = isset($propertyMap[$orders[0]]) ? $propertyMap[$orders[0]] : 'uid';
-					$sri = ldap_search($this->ds, $this->user_context, $filter,array('uid', $order));
+					$sri = ldap_search($this->ds, $this->user_context, $filter, array('uid', $order));
 					$fullSet = array();
 					foreach ((array)ldap_get_entries($this->ds, $sri) as $key => $entry)
 					{
@@ -754,7 +751,7 @@ 
 					if (is_numeric($param['type'])) // return only group-members
 					{
 						$relevantAccounts = array();
-						$sri = ldap_search($this->ds,$this->group_context,"(&(objectClass=posixGroup)(gidnumber=" . abs($param['type']) . "))",array('memberuid'));
+						$sri = ldap_search($this->ds, $this->group_context, "(&(objectClass=posixGroup)(gidnumber=".abs($param['type'])."))", array('memberuid'));
 						$group = ldap_get_entries($this->ds, $sri);
 						$fullSet = $group[0]['memberuid'] ? array_intersect_key($fullSet, array_flip($group[0]['memberuid'])) : array();
 					}
@@ -763,26 +760,26 @@ 
 					$sortFn = $param['sort'] == 'DESC' ? 'arsort' : 'asort';
 					$sortFn($fullSet);
 					$relevantAccounts = is_numeric($start) ? array_slice(array_keys($fullSet), $start, $offset) : array_keys($fullSet);
-					$filter = '(&(objectclass=posixaccount)(|(uid='.implode(')(uid=',$relevantAccounts).'))' . $this->account_filter.')';
-					$filter = str_replace(array('%user','%domain'),array('*',$GLOBALS['egw_info']['user']['domain']),$filter);
+					$filter = '(&(objectclass=posixaccount)(|(uid='.implode(')(uid=', $relevantAccounts).'))'.$this->account_filter.')';
+					$filter = str_replace(array('%user', '%domain'), array('*', $GLOBALS['egw_info']['user']['domain']), $filter);
 				}
-				$sri = ldap_search($this->ds, $this->user_context, $filter,array('uid','uidNumber','givenname','sn',static::MAIL_ATTR,'shadowExpire','createtimestamp','modifytimestamp','objectclass','gidNumber'));
+				$sri = ldap_search($this->ds, $this->user_context, $filter, array('uid', 'uidNumber', 'givenname', 'sn', static::MAIL_ATTR, 'shadowExpire', 'createtimestamp', 'modifytimestamp', 'objectclass', 'gidNumber'));
 
 				$utc_diff = date('Z');
-				foreach(ldap_get_entries($this->ds, $sri) as $allVals)
+				foreach (ldap_get_entries($this->ds, $sri) as $allVals)
 				{
-					settype($allVals,'array');
+					settype($allVals, 'array');
 					$test = @$allVals['uid'][0];
 					if (!$this->frontend->config['global_denied_users'][$test] && $allVals['uid'][0])
 					{
 						$account = Array(
 							'account_id'        => $allVals['uidnumber'][0],
-							'account_lid'       => Api\Translation::convert($allVals['uid'][0],'utf-8'),
+							'account_lid'       => Api\Translation::convert($allVals['uid'][0], 'utf-8'),
 							'account_type'      => 'u',
-							'account_firstname' => Api\Translation::convert($allVals['givenname'][0],'utf-8'),
-							'account_lastname'  => Api\Translation::convert($allVals['sn'][0],'utf-8'),
-							'account_status'    => isset($allVals['shadowexpire'][0]) && $allVals['shadowexpire'][0]*24*3600-$utc_diff < time() ? false : 'A',
-							'account_expires'   => isset($allVals['shadowexpire']) && $allVals['shadowexpire'][0] ? $allVals['shadowexpire'][0]*24*3600+$utc_diff : -1, // LDAP date is in UTC
+							'account_firstname' => Api\Translation::convert($allVals['givenname'][0], 'utf-8'),
+							'account_lastname'  => Api\Translation::convert($allVals['sn'][0], 'utf-8'),
+							'account_status'    => isset($allVals['shadowexpire'][0]) && $allVals['shadowexpire'][0] * 24 * 3600 - $utc_diff < time() ? false : 'A',
+							'account_expires'   => isset($allVals['shadowexpire']) && $allVals['shadowexpire'][0] ? $allVals['shadowexpire'][0] * 24 * 3600 + $utc_diff : -1, // LDAP date is in UTC
 							'account_email'     => $allVals[static::MAIL_ATTR][0],
 							'account_created' => isset($allVals['createtimestamp'][0]) ? self::accounts_ldap2ts($allVals['createtimestamp'][0]) : null,
 							'account_modified' => isset($allVals['modifytimestamp'][0]) ? self::accounts_ldap2ts($allVals['modifytimestamp'][0]) : null,
@@ -808,13 +805,13 @@ 
 			}
 			if ($param['type'] == 'groups' || $param['type'] == 'both')
 			{
-				if(empty($query) || $query == '*')
+				if (empty($query) || $query == '*')
 				{
 					$filter = '(objectclass=posixgroup)';
 				}
 				else
 				{
-					switch($param['query_type'])
+					switch ($param['query_type'])
 					{
 						case 'all':
 						default:
@@ -828,21 +825,21 @@ 
 					}
 					$filter = "(&(objectclass=posixgroup)(cn=$query))";
 				}
-				$sri = ldap_search($this->ds, $this->group_context, $filter,array('cn','gidNumber'));
-				foreach((array)ldap_get_entries($this->ds, $sri) as $allVals)
+				$sri = ldap_search($this->ds, $this->group_context, $filter, array('cn', 'gidNumber'));
+				foreach ((array)ldap_get_entries($this->ds, $sri) as $allVals)
 				{
-					settype($allVals,'array');
+					settype($allVals, 'array');
 					$test = $allVals['cn'][0];
 					if (!$this->frontend->config['global_denied_groups'][$test] && $allVals['cn'][0])
 					{
 						$accounts[(string)-$allVals['gidnumber'][0]] = Array(
 							'account_id'        => -$allVals['gidnumber'][0],
-							'account_lid'       => Api\Translation::convert($allVals['cn'][0],'utf-8'),
+							'account_lid'       => Api\Translation::convert($allVals['cn'][0], 'utf-8'),
 							'account_type'      => 'g',
-							'account_firstname' => Api\Translation::convert($allVals['cn'][0],'utf-8'),
+							'account_firstname' => Api\Translation::convert($allVals['cn'][0], 'utf-8'),
 							'account_lastname'  => lang('Group'),
 							'account_status'    => 'A',
-							'account_fullname'  => Api\Translation::convert($allVals['cn'][0],'utf-8'),
+							'account_fullname'  => Api\Translation::convert($allVals['cn'][0], 'utf-8'),
 						);
 						if (isset($totalcount)) ++$totalcount;
 					}
@@ -850,9 +847,9 @@ 
 			}
 			// sort the array
 			$this->_callback_sort = strtoupper($param['sort']);
-			$this->_callback_order = empty($param['order']) ? array('account_lid') : explode(',',$param['order']);
+			$this->_callback_order = empty($param['order']) ? array('account_lid') : explode(',', $param['order']);
 			$sortedAccounts = $accounts;
-			uasort($sortedAccounts,array($this,'_sort_callback'));
+			uasort($sortedAccounts, array($this, '_sort_callback'));
 			$this->total = isset($totalcount) ? $totalcount : count($accounts);
 
 			// if totalcount is set, $sortedAccounts is NOT the full set, but already a limited set!
@@ -864,7 +861,7 @@ 
 		}
 		// return only the wanted accounts
 		reset($sortedAccounts);
-		if(is_numeric($start) && is_numeric($offset))
+		if (is_numeric($start) && is_numeric($offset))
 		{
 			$account_search[$serial]['total'] = $this->total;
 			return $account_search[$serial]['data'] = isset($totalcount) ? $sortedAccounts : array_slice($sortedAccounts, $start, $offset);
@@ -892,19 +889,19 @@ 
 	 * @param array $b
 	 * @return int
 	 */
-	function _sort_callback($a,$b)
+	function _sort_callback($a, $b)
 	{
-		foreach($this->_callback_order as $col )
+		foreach ($this->_callback_order as $col)
 		{
-			if($this->_callback_sort != 'DESC')
+			if ($this->_callback_sort != 'DESC')
 			{
-				$cmp = strcasecmp( $a[$col], $b[$col] );
+				$cmp = strcasecmp($a[$col], $b[$col]);
 			}
 			else
 			{
-				$cmp = strcasecmp( $b[$col], $a[$col] );
+				$cmp = strcasecmp($b[$col], $a[$col]);
 			}
-			if ( $cmp != 0 )
+			if ($cmp != 0)
 			{
 				return $cmp;
 			}
@@ -923,8 +920,8 @@ 
 	{
 		if (!empty($date))
 		{
-			return gmmktime(substr($date,8,2),substr($date,10,2),substr($date,12,2),
-				substr($date,4,2),substr($date,6,2),substr($date,0,4));
+			return gmmktime(substr($date, 8, 2), substr($date, 10, 2), substr($date, 12, 2),
+				substr($date, 4, 2), substr($date, 6, 2), substr($date, 0, 4));
 		}
 		return NULL;
 	}
@@ -941,14 +938,14 @@ 
 	 * @param string $account_type u = user, g = group, default null = try both
 	 * @return int|false numeric account_id or false on error ($name not found)
 	 */
-	function name2id($_name,$which='account_lid',$account_type=null)
+	function name2id($_name, $which = 'account_lid', $account_type = null)
 	{
-		$name = Api\Ldap::quote(Api\Translation::convert($_name,Api\Translation::charset(),'utf-8'));
+		$name = Api\Ldap::quote(Api\Translation::convert($_name, Api\Translation::charset(), 'utf-8'));
 
 		if ($which == 'account_lid' && $account_type !== 'u') // groups only support account_lid
 		{
 
-			$sri = ldap_search($this->ds, $this->group_context, '(&(cn=' . $name . ')(objectclass=posixgroup))', array('gidNumber'));
+			$sri = ldap_search($this->ds, $this->group_context, '(&(cn='.$name.')(objectclass=posixgroup))', array('gidNumber'));
 			$allValues = ldap_get_entries($this->ds, $sri);
 
 			if (@$allValues[0]['gidnumber'][0])
@@ -965,7 +962,7 @@ 
 		    return False;
 		}
 
-		$sri = ldap_search($this->ds, $this->user_context, '(&('.$to_ldap[$which].'=' . $name . ')(objectclass=posixaccount))', array('uidNumber'));
+		$sri = ldap_search($this->ds, $this->user_context, '(&('.$to_ldap[$which].'='.$name.')(objectclass=posixaccount))', array('uidNumber'));
 
 		$allValues = ldap_get_entries($this->ds, $sri);
 
@@ -985,9 +982,9 @@ 
 	 * @param string $which ='account_lid' type to convert to: account_lid (default), account_email, ...
 	 * @return string/false converted value or false on error ($account_id not found)
 	 */
-	function id2name($account_id,$which='account_lid')
+	function id2name($account_id, $which = 'account_lid')
 	{
-		return $this->frontend->id2name($account_id,$which);
+		return $this->frontend->id2name($account_id, $which);
 	}
 
 	/**
@@ -1000,7 +997,7 @@ 
 	function update_lastlogin($_account_id, $ip)
 	{
 		unset($_account_id, $ip);
-		return false;	// not longer supported
+		return false; // not longer supported
 	}
 
 	/**
@@ -1011,11 +1008,11 @@ 
 	 */
 	function memberships($account_id)
 	{
-		if (!(int) $account_id || !($account_lid = $this->id2name($account_id))) return false;
+		if (!(int)$account_id || !($account_lid = $this->id2name($account_id))) return false;
 
-		$sri = ldap_search($this->ds,$this->group_context,'(&(objectClass=posixGroup)(memberuid='.Api\Ldap::quote($account_lid).'))',array('cn','gidnumber'));
+		$sri = ldap_search($this->ds, $this->group_context, '(&(objectClass=posixGroup)(memberuid='.Api\Ldap::quote($account_lid).'))', array('cn', 'gidnumber'));
 		$memberships = array();
-		foreach((array)ldap_get_entries($this->ds, $sri) as $key => $data)
+		foreach ((array)ldap_get_entries($this->ds, $sri) as $key => $data)
 		{
 			if ($key === 'count') continue;
 
@@ -1035,13 +1032,13 @@ 
 		if (!is_numeric($_gid))
 		{
 			// try to recover
-			$_gid = $this->name2id($_gid,'account_lid','g');
+			$_gid = $this->name2id($_gid, 'account_lid', 'g');
 			if (!is_numeric($_gid)) return false;
 		}
 
-		$gid = abs($_gid);	// our gid is negative!
+		$gid = abs($_gid); // our gid is negative!
 
-		$sri = ldap_search($this->ds,$this->group_context,"(&(objectClass=posixGroup)(gidnumber=$gid))",array('memberuid'));
+		$sri = ldap_search($this->ds, $this->group_context, "(&(objectClass=posixGroup)(gidnumber=$gid))", array('memberuid'));
 		$group = ldap_get_entries($this->ds, $sri);
 
 		$members = array();
@@ -1049,7 +1046,7 @@ 
 		{
 			unset($group[0]['memberuid']['count']);
 
-			foreach($group[0]['memberuid'] as $lid)
+			foreach ($group[0]['memberuid'] as $lid)
 			{
 				if (($id = $this->name2id($lid, 'account_lid', 'u')))
 				{
@@ -1066,27 +1063,27 @@ 
 	 * @param array $groups array with gidnumbers
 	 * @param int $account_id uidnumber
 	 */
-	function set_memberships($groups,$account_id)
+	function set_memberships($groups, $account_id)
 	{
 		// remove not longer existing memberships
 		if (($old_memberships = $this->memberships($account_id)))
 		{
 			$old_memberships = array_keys($old_memberships);
-			foreach(array_diff($old_memberships,$groups) as $gid)
+			foreach (array_diff($old_memberships, $groups) as $gid)
 			{
 				if (($members = $this->members($gid)))
 				{
 					unset($members[$account_id]);
-					$this->set_members($members,$gid);
+					$this->set_members($members, $gid);
 				}
 			}
 		}
 		// adding new memberships
-		foreach($old_memberships ? array_diff($groups,$old_memberships) : $groups as $gid)
+		foreach ($old_memberships ? array_diff($groups, $old_memberships) : $groups as $gid)
 		{
 			$members = $this->members($gid);
 			$members[$account_id] = $this->id2name($account_id);
-			$this->set_members($members,$gid);
+			$this->set_members($members, $gid);
 		}
 	}
 
@@ -1100,15 +1097,15 @@ 
 	 * @param boolean $uniqueMember =null should we set the uniqueMember attribute (default detect it)
 	 * @return boolean/array false on failure, array or true otherwise
 	 */
-	function set_members($members, $gid, array $objectclass=null, $use_cn=null)
+	function set_members($members, $gid, array $objectclass = null, $use_cn = null)
 	{
 		if (!($cn = $use_cn) && !($cn = $this->id2name($gid))) return false;
 
 		// do that group is a groupOf(Unique)Names or univentionGroup?
-		if (is_null($objectclass)) $objectclass = $this->id2name($gid,'objectclass');
+		if (is_null($objectclass)) $objectclass = $this->id2name($gid, 'objectclass');
 
 		$to_write = array('memberuid' => array());
-		foreach((array)$members as $key => $member)
+		foreach ((array)$members as $key => $member)
 		{
 			$member_dn = $this->id2name($member, 'account_dn');
 			if (is_numeric($member)) $member = $this->id2name($member);
@@ -1120,7 +1117,7 @@ 
 				{
 					$to_write['member'][] = $member_dn;
 				}
-				if (array_intersect(array('groupofuniquenames','univentiongroup'), $objectclass))
+				if (array_intersect(array('groupofuniquenames', 'univentiongroup'), $objectclass))
 				{
 					$to_write['uniquemember'][] = $member_dn;
 				}
@@ -1131,31 +1128,31 @@ 
 		{
 			$to_write['member'][] = 'uid=dummy'.','.$this->user_context;
 		}
-		if (array_intersect(array('groupofuniquenames','univentiongroup'), $objectclass) && !$to_write['uniquemember'])
+		if (array_intersect(array('groupofuniquenames', 'univentiongroup'), $objectclass) && !$to_write['uniquemember'])
 		{
 			$to_write['uniquemember'][] = 'uid=dummy'.','.$this->user_context;
 		}
 		if ($use_cn) return $to_write;
 
 		// set the member email addresses as forwards
-		if ($this->id2name($gid,'account_email') &&	($objectclass = $this->id2name($gid,'mailAllowed')))
+		if ($this->id2name($gid, 'account_email') && ($objectclass = $this->id2name($gid, 'mailAllowed')))
 		{
 			$forward = $this->group_mail_classes[$objectclass];
-			if (is_array($forward)) list($forward,$extra_attr) = $forward;
+			if (is_array($forward)) list($forward, $extra_attr) = $forward;
 			if ($extra_attr && ($uid = $this->id2name($gid))) $to_write[$extra_attr] = $uid;
 
 			if ($forward)
 			{
 				$to_write[$forward] = array();
-				foreach($members as $key => $member)
+				foreach ($members as $key => $member)
 				{
-					if (($email = $this->id2name($member,'account_email')))	$to_write[$forward][] = $email;
+					if (($email = $this->id2name($member, 'account_email')))	$to_write[$forward][] = $email;
 				}
 			}
 		}
-		if (!ldap_modify($this->ds,'cn='.Api\Ldap::quote($cn).','.$this->group_context,$to_write))
+		if (!ldap_modify($this->ds, 'cn='.Api\Ldap::quote($cn).','.$this->group_context, $to_write))
 		{
-			echo "ldap_modify(,'cn=$cn,$this->group_context',".print_r($to_write,true)."))\n";
+			echo "ldap_modify(,'cn=$cn,$this->group_context',".print_r($to_write, true)."))\n";
 			return false;
 		}
 		return true;
@@ -1168,7 +1165,7 @@ 
 	 * @param string $account_type ='u' (optional, default to 'u')
 	 * @return int|boolean integer account_id (negative for groups) or false if none is free anymore
 	 */
-	protected function _get_nextid($account_type='u')
+	protected function _get_nextid($account_type = 'u')
 	{
 		$min = $this->frontend->config['account_min_id'] ? $this->frontend->config['account_min_id'] : 0;
 		$max = $this->frontend->config['account_max_id'] ? $this->frontend->config['account_max_id'] : 0;
@@ -1190,15 +1187,15 @@ 
 		/* Loop until we find a free id */
 		do
 		{
-			$account_id = (int) self::next_id($type,$min,$max);
+			$account_id = (int)self::next_id($type, $min, $max);
 		}
-		while ($account_id && ($this->frontend->exists($sign * $account_id) ||	// check need to include the sign!
+		while ($account_id && ($this->frontend->exists($sign * $account_id) || // check need to include the sign!
 			$this->frontend->exists(-1 * $sign * $account_id) ||
 			// if sambaadmin is installed, call it to check there's not yet a relative id (last part of SID) with that number
 			// to ease migration to AD or Samba4
 			$GLOBALS['egw_info']['apps']['sambaadmin'] && ExecMethod2('sambaadmin.sosambaadmin.sidExists', $account_id)));
 
-		if	(!$account_id || $max && $account_id > $max)
+		if (!$account_id || $max && $account_id > $max)
 		{
 			return False;
 		}
@@ -1213,14 +1210,14 @@ 
 	 * @param int $max =0 if != 0 maximum id allowed, if it would be exceeded we return false
 	 * @return int|boolean the next id or false if $max given and exceeded
 	 */
-	static function next_id($location,$min=0,$max=0)
+	static function next_id($location, $min = 0, $max = 0)
 	{
 		if (!$location)
 		{
 			return -1;
 		}
 
-		$id = (int)$GLOBALS['egw_info']['server'][$key='last_id_'.$location];
+		$id = (int)$GLOBALS['egw_info']['server'][$key = 'last_id_'.$location];
 
 		if ($max && $id >= $max)
 		{
@@ -1228,10 +1225,10 @@ 
 		}
 		++$id;
 
-		if($id < $min) $id = $min;
+		if ($id < $min) $id = $min;
 
 		Api\Config::save_value($key, $id, 'phpgwapi', true);
-		$GLOBALS['egw_info']['server'][$key='last_id_'.$location] = $id;
+		$GLOBALS['egw_info']['server'][$key = 'last_id_'.$location] = $id;
 
 		return (int)$id;
 	}
@@ -1244,18 +1241,18 @@ 
 	 * @param int $max =0 if != 0 maximum id allowed, if it would be exceeded we return false
 	 * @return int|boolean current id in the next_id table for a particular app/class or -1 for no app and false if $max is exceeded.
 	 */
-	static function last_id($location,$min=0,$max=0)
+	static function last_id($location, $min = 0, $max = 0)
 	{
 		if (!$location)
 		{
 			return -1;
 		}
 
-		$id = (int)$GLOBALS['egw_info']['server'][$key='last_id_'.$location];
+		$id = (int)$GLOBALS['egw_info']['server'][$key = 'last_id_'.$location];
 
 		if (!$id || $id < $min)
 		{
-			return self::next_id($location,$min,$max);
+			return self::next_id($location, $min, $max);
 		}
 		if ($max && $id > $max)
 		{
@@ -1270,6 +1267,6 @@ 
 	function __wakeup()
 	{
 		$this->ds = Api\Ldap::factory(true, $this->frontend->config['ldap_host'],
-			$this->frontend->config['ldap_root_dn'],$this->frontend->config['ldap_root_pw']);
+			$this->frontend->config['ldap_root_dn'], $this->frontend->config['ldap_root_pw']);
 	}
 }

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

@@ -775,7 +775,7 @@ 
 					$test = @$allVals['uid'][0];
 					if (!$this->frontend->config['global_denied_users'][$test] && $allVals['uid'][0])
 					{
-						$account = Array(
+						$account = array(
 							'account_id'        => $allVals['uidnumber'][0],
 							'account_lid'       => Api\Translation::convert($allVals['uid'][0],'utf-8'),
 							'account_type'      => 'u',
@@ -835,7 +835,7 @@ 
 					$test = $allVals['cn'][0];
 					if (!$this->frontend->config['global_denied_groups'][$test] && $allVals['cn'][0])
 					{
-						$accounts[(string)-$allVals['gidnumber'][0]] = Array(
+						$accounts[(string)-$allVals['gidnumber'][0]] = array(
 							'account_id'        => -$allVals['gidnumber'][0],
 							'account_lid'       => Api\Translation::convert($allVals['cn'][0],'utf-8'),
 							'account_type'      => 'g',

Braces +172 added lines, -44 removed lines

@@ -175,7 +175,10 @@ 
 	 */
 	function read($account_id)
 	{
-		if (!(int)$account_id) return false;
+		if (!(int)$account_id)
+		{
+			return false;
+		}
 
 		if ($account_id < 0)
 		{
@@ -238,17 +241,23 @@ 
 					$this->delete($data['account_id']);
 					unset($old['dn']);
 					// removing the namedObject object-class, if it's included
-					if ($key !== false) unset($old['objectclass'][$key]);
+					if ($key !== false)
+					{
+						unset($old['objectclass'][$key]);
+					}
 					$to_write = $old;
 					unset($old);
 				}
 			}
 		}
-		if (!$data['account_id'])	// new account
+		if (!$data['account_id'])
+		{
+			// new account
 		{
 			if (!($data['account_id'] = $data_utf8['account_id'] = $this->_get_nextid($is_group ? 'g' : 'u')))
 			{
 				return false;
+		}
 			}
 		}
 		// check if we need to write the objectclass: new entry or required object classes are missing
@@ -259,11 +268,14 @@ 
 			{
 				$to_write['objectclass'] = $old ? $old['objectclass'] : array();
 			}
-			if (!$old)	// for new accounts add additional addressbook object classes, if supported by server
+			if (!$old)
+			{
+				// for new accounts add additional addressbook object classes, if supported by server
 			{			// as setting them later might loose eg. password, if we are not allowed to read them
 				foreach($this->requiredObjectClasses[$is_group?'group-if-supported':'user-if-supported'] as $additional)
 				{
 					$add = array();
+			}
 					if (is_array($additional))
 					{
 						$add = $additional;
@@ -272,7 +284,10 @@ 
 					if ($this->ldapServerInfo->supportsObjectClass($additional))
 					{
 						$to_write['objectclass'][] = $additional;
-						if ($add) $to_write += $add;
+						if ($add)
+						{
+							$to_write += $add;
+						}
 					}
 				}
 			}
@@ -281,7 +296,10 @@ 
 		}
 		if (!($dn = $old['dn']))
 		{
-			if (!$data['account_lid']) return false;
+			if (!$data['account_lid'])
+			{
+				return false;
+			}
 
 			$dn = $is_group ? 'cn='.$data_utf8['account_lid'].','.$this->group_context :
 				'uid='.$data_utf8['account_lid'].','.$this->user_context;
@@ -302,24 +320,36 @@ 
 			{
 				$extra_attr = false;
 				$keep_objectclass = false;
-				if (is_array($forward)) list($forward,$extra_attr,$keep_objectclass) = $forward;
+				if (is_array($forward))
+				{
+					list($forward,$extra_attr,$keep_objectclass) = $forward;
+				}
 
 				if ($this->ldapServerInfo->supportsObjectClass($objectclass) &&
 					($old && in_array($objectclass,$old['objectclass']) || $data_utf8['account_email'] || $old[static::MAIL_ATTR]))
 				{
-					if ($data_utf8['account_email'])	// setting an email
+					if ($data_utf8['account_email'])
+					{
+						// setting an email
 					{
 						if (!in_array($objectclass,$old ? $old['objectclass'] : $to_write['objectclass']))
 						{
 							if ($old) $to_write['objectclass'] = $old['objectclass'];
+					}
 							$to_write['objectclass'][] = $objectclass;
 						}
-						if ($extra_attr) $to_write[$extra_attr] = $data_utf8['account_lid'];
+						if ($extra_attr)
+						{
+							$to_write[$extra_attr] = $data_utf8['account_lid'];
+						}
 						$to_write[static::MAIL_ATTR] = $data_utf8['account_email'];
 
 						if ($forward)
 						{
-							if (!$members) $members = $this->members($data['account_id']);
+							if (!$members)
+							{
+								$members = $this->members($data['account_id']);
+							}
 							$to_write[$forward] = array();
 							foreach (array_keys($members) as $member)
 							{
@@ -330,11 +360,20 @@ 
 							}
 						}
 					}
-					elseif($old)	// remove the mail and forwards only for existing entries
+					elseif($old)
+					{
+						// remove the mail and forwards only for existing entries
 					{
 						$to_write[static::MAIL_ATTR] = array();
-						if ($forward) $to_write[$forward] = array();
-						if ($extra_attr) $to_write[$extra_attr] = array();
+					}
+						if ($forward)
+						{
+							$to_write[$forward] = array();
+						}
+						if ($extra_attr)
+						{
+							$to_write[$extra_attr] = array();
+						}
 						if (!$keep_objectclass && ($key = array_search($objectclass,$old['objectclass'])))
 						{
 							$to_write['objectclass'] = $old['objectclass'];
@@ -368,7 +407,8 @@ 
 		}
 
 		// remove memberuid when adding a group
-		if(!$old && is_array($to_write['memberuid']) && empty($to_write['memberuid'])) {
+		if(!$old && is_array($to_write['memberuid']) && empty($to_write['memberuid']))
+		{
 			unset($to_write['memberuid']);
 		}
 		// modifying or adding the entry
@@ -405,7 +445,10 @@ 
 	 */
 	function delete($account_id)
 	{
-		if (!(int)$account_id) return false;
+		if (!(int)$account_id)
+		{
+			return false;
+		}
 
 		if ($account_id < 0)
 		{
@@ -418,10 +461,16 @@ 
 
 			$sri = ldap_search($this->ds, $this->user_context, 'uidnumber=' . $account_id);
 		}
-		if (!$sri) return false;
+		if (!$sri)
+		{
+			return false;
+		}
 
 		$allValues = ldap_get_entries($this->ds, $sri);
-		if (!$allValues['count']) return false;
+		if (!$allValues['count'])
+		{
+			return false;
+		}
 
 		return ldap_delete($this->ds, $allValues[0]['dn']);
 	}
@@ -593,14 +642,20 @@ 
 		$utc_diff = date('Z');
 		if (isset($data['account_passwd']) && $data['account_passwd'])
 		{
-			if (preg_match('/^[a-f0-9]{32}$/', $data['account_passwd']))	// md5 --> ldap md5
+			if (preg_match('/^[a-f0-9]{32}$/', $data['account_passwd']))
+			{
+				// md5 --> ldap md5
 			{
 				$data['account_passwd'] = setup_cmd_ldap::hash_sql2ldap($data['account_passwd']);
 			}
-			elseif (!preg_match('/^\\{[a-z5]{3,5}\\}.+/i',$data['account_passwd']))	// if it's not already entcrypted, do so now
+			}
+			elseif (!preg_match('/^\\{[a-z5]{3,5}\\}.+/i',$data['account_passwd']))
+			{
+				// if it's not already entcrypted, do so now
 			{
 				$data['account_passwd'] = Api\Auth::encrypt_ldap($data['account_passwd']);
 			}
+			}
 			$to_write['userpassword'] = $data['account_passwd'];
 			$to_write['shadowlastchange'] = round((time()-$utc_diff) / (24*3600));
 		}
@@ -620,16 +675,28 @@ 
 			unset($to_write['shadowexpire']);	// gives protocoll error otherwise
 		}
 		//error_log(__METHOD__.__LINE__.$data['account_lid'].'#'.$data['account_lastpwd_change'].'#');
-		if ($data['account_lastpwd_change']) $to_write['shadowlastchange'] = round(($data['account_lastpwd_change']-$utc_diff)/(24*3600));
-		if (isset($data['account_lastpwd_change']) && $data['account_lastpwd_change']==0) $to_write['shadowlastchange'] = 0;
+		if ($data['account_lastpwd_change'])
+		{
+			$to_write['shadowlastchange'] = round(($data['account_lastpwd_change']-$utc_diff)/(24*3600));
+		}
+		if (isset($data['account_lastpwd_change']) && $data['account_lastpwd_change']==0)
+		{
+			$to_write['shadowlastchange'] = 0;
+		}
 		// lastlogin and lastlogin from are not availible via the shadowAccount object class
 		// $to_write['phpgwaccountlastlogin'] = $data['lastlogin'];
 		// $to_write['phpgwaccountlastloginfrom'] = $data['lastloginfrom'];
 
 		if ($this->frontend->config['ldap_extra_attributes'])
 		{
-			if (isset($data['homedirectory'])) $to_write['homedirectory']  = $data['homedirectory'];
-			if (isset($data['loginshell'])) $to_write['loginshell'] = $data['loginshell'] ? $data['loginshell'] : array();
+			if (isset($data['homedirectory']))
+			{
+				$to_write['homedirectory']  = $data['homedirectory'];
+			}
+			if (isset($data['loginshell']))
+			{
+				$to_write['loginshell'] = $data['loginshell'] ? $data['loginshell'] : array();
+			}
 		}
 		if (($new_entry || isset($to_write['homedirectory'])) && empty($to_write['homedirectory']))
 		{
@@ -676,8 +743,14 @@ 
 		}
 		// if it's a limited query, check if the unlimited query is cached
 		$start = $param['start'];
-		if (!($maxmatchs = $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'])) $maxmatchs = 15;
-		if (!($offset = $param['offset'])) $offset = $maxmatchs;
+		if (!($maxmatchs = $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']))
+		{
+			$maxmatchs = 15;
+		}
+		if (!($offset = $param['offset']))
+		{
+			$offset = $maxmatchs;
+		}
 		unset($param['start']);
 		unset($param['offset']);
 		$unl_serial = serialize($param);
@@ -748,12 +821,18 @@ 
 					$fullSet = array();
 					foreach ((array)ldap_get_entries($this->ds, $sri) as $key => $entry)
 					{
-						if ($key !== 'count') $fullSet[$entry['uid'][0]] = $entry[$order][0];
+						if ($key !== 'count')
+						{
+							$fullSet[$entry['uid'][0]] = $entry[$order][0];
+						}
 					}
 
-					if (is_numeric($param['type'])) // return only group-members
+					if (is_numeric($param['type']))
+					{
+						// return only group-members
 					{
 						$relevantAccounts = array();
+					}
 						$sri = ldap_search($this->ds,$this->group_context,"(&(objectClass=posixGroup)(gidnumber=" . abs($param['type']) . "))",array('memberuid'));
 						$group = ldap_get_entries($this->ds, $sri);
 						$fullSet = $group[0]['memberuid'] ? array_intersect_key($fullSet, array_flip($group[0]['memberuid'])) : array();
@@ -791,7 +870,10 @@ 
 						//error_log(__METHOD__."() ldap=".array2string($allVals)." --> account=".array2string($account));
 						if ($param['active'] && !$this->frontend->is_active($account))
 						{
-							if (isset($totalcount)) --$totalcount;
+							if (isset($totalcount))
+							{
+								--$totalcount;
+							}
 							continue;
 						}
 						$account['account_fullname'] = Api\Accounts::format_username($account['account_lid'],
@@ -844,7 +926,10 @@ 
 							'account_status'    => 'A',
 							'account_fullname'  => Api\Translation::convert($allVals['cn'][0],'utf-8'),
 						);
-						if (isset($totalcount)) ++$totalcount;
+						if (isset($totalcount))
+						{
+							++$totalcount;
+						}
 					}
 				}
 			}
@@ -945,10 +1030,13 @@ 
 	{
 		$name = Api\Ldap::quote(Api\Translation::convert($_name,Api\Translation::charset(),'utf-8'));
 
-		if ($which == 'account_lid' && $account_type !== 'u') // groups only support account_lid
+		if ($which == 'account_lid' && $account_type !== 'u')
+		{
+			// groups only support account_lid
 		{
 
 			$sri = ldap_search($this->ds, $this->group_context, '(&(cn=' . $name . ')(objectclass=posixgroup))', array('gidNumber'));
+		}
 			$allValues = ldap_get_entries($this->ds, $sri);
 
 			if (@$allValues[0]['gidnumber'][0])
@@ -961,7 +1049,8 @@ 
 			'account_email' => static::MAIL_ATTR,
 			'account_fullname' => 'cn',
 		);
-		if (!isset($to_ldap[$which]) || $account_type === 'g') {
+		if (!isset($to_ldap[$which]) || $account_type === 'g')
+		{
 		    return False;
 		}
 
@@ -1011,13 +1100,19 @@ 
 	 */
 	function memberships($account_id)
 	{
-		if (!(int) $account_id || !($account_lid = $this->id2name($account_id))) return false;
+		if (!(int) $account_id || !($account_lid = $this->id2name($account_id)))
+		{
+			return false;
+		}
 
 		$sri = ldap_search($this->ds,$this->group_context,'(&(objectClass=posixGroup)(memberuid='.Api\Ldap::quote($account_lid).'))',array('cn','gidnumber'));
 		$memberships = array();
 		foreach((array)ldap_get_entries($this->ds, $sri) as $key => $data)
 		{
-			if ($key === 'count') continue;
+			if ($key === 'count')
+			{
+				continue;
+			}
 
 			$memberships[(string) -$data['gidnumber'][0]] = $data['cn'][0];
 		}
@@ -1037,7 +1132,10 @@ 
 		{
 			// try to recover
 			$_gid = $this->name2id($_gid,'account_lid','g');
-			if (!is_numeric($_gid)) return false;
+			if (!is_numeric($_gid))
+			{
+				return false;
+			}
 		}
 
 		$gid = abs($_gid);	// our gid is negative!
@@ -1085,7 +1183,10 @@ 
 		// adding new memberships
 		foreach($old_memberships ? array_diff($groups,$old_memberships) : $groups as $gid)
 		{
-			if (!($members = $this->members($gid))) $members = array();
+			if (!($members = $this->members($gid)))
+			{
+				$members = array();
+			}
 			$members[$account_id] = $this->id2name($account_id);
 			$this->set_members($members,$gid);
 		}
@@ -1103,16 +1204,25 @@ 
 	 */
 	function set_members($members, $gid, array $objectclass=null, $use_cn=null)
 	{
-		if (!($cn = $use_cn) && !($cn = $this->id2name($gid))) return false;
+		if (!($cn = $use_cn) && !($cn = $this->id2name($gid)))
+		{
+			return false;
+		}
 
 		// do that group is a groupOf(Unique)Names or univentionGroup?
-		if (is_null($objectclass)) $objectclass = $this->id2name($gid,'objectclass');
+		if (is_null($objectclass))
+		{
+			$objectclass = $this->id2name($gid,'objectclass');
+		}
 
 		$to_write = array('memberuid' => array());
 		foreach((array)$members as $key => $member)
 		{
 			$member_dn = $this->id2name($member, 'account_dn');
-			if (is_numeric($member)) $member = $this->id2name($member);
+			if (is_numeric($member))
+			{
+				$member = $this->id2name($member);
+			}
 
 			if ($member)
 			{
@@ -1136,21 +1246,33 @@ 
 		{
 			$to_write['uniquemember'][] = 'uid=dummy'.','.$this->user_context;
 		}
-		if ($use_cn) return $to_write;
+		if ($use_cn)
+		{
+			return $to_write;
+		}
 
 		// set the member email addresses as forwards
 		if ($this->id2name($gid,'account_email') &&	($objectclass = $this->id2name($gid,'mailAllowed')))
 		{
 			$forward = $this->group_mail_classes[$objectclass];
-			if (is_array($forward)) list($forward,$extra_attr) = $forward;
-			if ($extra_attr && ($uid = $this->id2name($gid))) $to_write[$extra_attr] = $uid;
+			if (is_array($forward))
+			{
+				list($forward,$extra_attr) = $forward;
+			}
+			if ($extra_attr && ($uid = $this->id2name($gid)))
+			{
+				$to_write[$extra_attr] = $uid;
+			}
 
 			if ($forward)
 			{
 				$to_write[$forward] = array();
 				foreach($members as $key => $member)
 				{
-					if (($email = $this->id2name($member,'account_email')))	$to_write[$forward][] = $email;
+					if (($email = $this->id2name($member,'account_email')))
+					{
+						$to_write[$forward][] = $email;
+					}
 				}
 			}
 		}
@@ -1176,7 +1298,10 @@ 
 
 		// prefer ids above 1000 (below reserved for system users under AD or Linux),
 		// if that's possible within what is configured, or nothing is configured
-		if ($min < 1000 && (!$max || $max > 1000)) $min = 1000;
+		if ($min < 1000 && (!$max || $max > 1000))
+		{
+			$min = 1000;
+		}
 
 		if ($account_type == 'g')
 		{
@@ -1229,7 +1354,10 @@ 
 		}
 		++$id;
 
-		if($id < $min) $id = $min;
+		if($id < $min)
+		{
+			$id = $min;
+		}
 
 		Api\Config::save_value($key, $id, 'phpgwapi', true);
 		$GLOBALS['egw_info']['server'][$key='last_id_'.$location] = $id;

api/src/Accounts/Univention.php

Doc Comments +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 	 * If no account_id is set in data the account is added and the new id is set in $data.
 	 *
 	 * @param array $data array with account-data
-	 * @return int|boolean the account_id or false on error
+	 * @return false|string the account_id or false on error
 	 */
 	function save(&$data)
 	{

Braces +4 added lines, -1 removed lines

@@ -90,7 +90,10 @@
 					catch(Exception $e) {
 						unset($e);
 					}
-					if (empty($hostname)) $hostname = trim(system('hostname -f'));
+					if (empty($hostname))
+					{
+						$hostname = trim(system('hostname -f'));
+					}
 					$params[] = '--set'; $params[] = 'mailHomeServer='.$hostname;
 				}
 				$cmd = self::DIRECTORY_MANAGER_BIN.' '.implode(' ', array_map('escapeshellarg', $params));

Spacing +6 added lines, -7 removed lines

@@ -62,7 +62,7 @@ 
 			if (!$data['account_id'] && $data['account_type'] !== 'g')
 			{
 				$params = array(
-					'users/user','create',
+					'users/user', 'create',
 					'--binddn', $config['ldap_root_dn'],
 					'--bindpwd', 5=>$config['ldap_root_pw'],
 					'--position', $config['ldap_context'],
@@ -87,7 +87,7 @@ 
 						}
 						$hostname = $account->acc_imap_host;
 					}
-					catch(\Exception $e) {
+					catch (\Exception $e) {
 						unset($e);
 					}
 					if (empty($hostname)) $hostname = trim(system('hostname -f'));
@@ -99,14 +99,14 @@ 
 				$output = implode("\n", $output_arr);
 				if ($ret || !preg_match('/^Object created: (uid=.*)$/mui', $output, $matches))
 				{
-					$params[5] = '********';	// mask out password!
+					$params[5] = '********'; // mask out password!
 					$cmd = self::DIRECTORY_MANAGER_BIN.' '.implode(' ', array_map('escapeshellarg', $params));
 					throw new Api\Exception\WrongUserinput($cmd."\nreturned\n".$output);
 				}
 				$data['account_dn'] = $matches[1];
 				$data['account_id'] = $this->name2id($data['account_lid'], 'account_lid', 'u');
 			}
-			elseif($data['account_id'] && ($data['old_loginid'] || ($data['old_loginid'] = $this->id2name($data['account_id']))) &&
+			elseif ($data['account_id'] && ($data['old_loginid'] || ($data['old_loginid'] = $this->id2name($data['account_id']))) &&
 				$data['account_lid'] != $data['old_loginid'] &&
 				($data['account_dn'] = $this->id2name($data['account_id'], 'account_dn')))
 			{
@@ -123,12 +123,11 @@ 
 				$output = implode("\n", $output_arr);
 				if ($ret || !preg_match('/^Object modified: ((uid|cn)=.*)$/mui', $output, $matches))
 				{
-					$params[5] = '********';	// mask out password!
+					$params[5] = '********'; // mask out password!
 					$cmd = self::DIRECTORY_MANAGER_BIN.' '.implode(' ', array_map('escapeshellarg', $params));
 					throw new Api\Exception\WrongUserinput($cmd."\nreturned\n".$output);
 				}
-				$data['account_dn'] = $data['account_type'] !== 'g' ? $matches[1] :
-					// duno why but directory-manager returns old dn for groups ...
+				$data['account_dn'] = $data['account_type'] !== 'g' ? $matches[1] : // duno why but directory-manager returns old dn for groups ...
 					preg_replace('/^cn=[^,]+,/', 'cn='.$data['account_lid'].',', $data['account_dn']);
 			}
 		}

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
 	 */

Spacing +98 added lines, -98 removed lines

@@ -51,15 +51,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
@@ -82,7 +82,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']);
 		}
 	}
 
@@ -96,7 +96,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)
@@ -111,14 +111,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;
 	}
@@ -147,15 +147,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;
 
@@ -169,11 +169,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) &&
@@ -192,24 +192,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();
 		}
@@ -227,7 +227,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))
@@ -247,7 +247,7 @@ 
 			return True;
 		}
 		$rights = 0;
-		foreach($this->data as $value)
+		foreach ($this->data as $value)
 		{
 			if ($value['appname'] == $appname)
 			{
@@ -274,9 +274,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);
 	}
 
 	/**
@@ -287,7 +287,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'];
 
@@ -297,10 +297,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)
@@ -323,9 +323,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);
 	}
 
 	/**************************************************************************\
@@ -344,16 +344,16 @@ 
 	function add_repository($app, $location, $account_id, $rights)
 	{
 		//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 ($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();
 		}
@@ -368,7 +368,7 @@ 
 	 * @param int/boolean $accountid = '' account id, default 0=$this->account_id, or false to delete all entries for $app/$location
 	 * @return int number of rows deleted
 	 */
-	function delete_repository($app, $location, $accountid='')
+	function delete_repository($app, $location, $accountid = '')
 	{
 		static $cache_accountid = array();
 
@@ -378,22 +378,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 (method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+		if (method_exists($GLOBALS['egw'], 'invalidate_session_cache'))	// egw object in setup is limited
 		{
 			$GLOBALS['egw']->invalidate_session_cache();
 		}
 		if ($app == '%' || $app == '%%') unset($where['acl_appname']);
 
-		$this->db->delete(self::TABLE,$where,__LINE__,__FILE__);
+		$this->db->delete(self::TABLE, $where, __LINE__, __FILE__);
 
 		return $this->db->affected_rows();
 	}
@@ -406,15 +406,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();
 	}
 
 	/**
@@ -424,15 +424,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'];
 		}
@@ -447,7 +447,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'];
 
@@ -458,10 +458,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'];
 		}
@@ -480,28 +480,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'];
 			}
@@ -521,21 +521,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'];
 			}
@@ -556,14 +556,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;
@@ -575,14 +575,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')
 			{
@@ -600,38 +600,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;
 	}
@@ -645,29 +645,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;
 				}
@@ -675,17 +675,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;
 						}
@@ -707,21 +707,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__);
 		}
 	}
 
@@ -732,15 +732,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

@@ -111,7 +111,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);
 		}
 
@@ -149,7 +152,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,
@@ -171,7 +177,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)
 		{
@@ -209,10 +218,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;
 	}
 
@@ -240,7 +252,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')
 		{
@@ -289,7 +304,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')
 		{
@@ -353,10 +371,13 @@ 
 		),__LINE__,__FILE__);
 
 		if ($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;
 	}
 
@@ -387,11 +408,17 @@ 
 				$where['acl_account'] = $cache_accountid[$accountid] = get_account_id($accountid,$this->account_id);
 			}
 		}
-		if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+		if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))
+		{
+			// egw object in setup is limited
 		{
 			$GLOBALS['egw']->invalidate_session_cache();
 		}
-		if ($app == '%' || $app == '%%') unset($where['acl_appname']);
+		}
+		if ($app == '%' || $app == '%%')
+		{
+			unset($where['acl_appname']);
+		}
 
 		$this->db->delete(self::TABLE,$where,__LINE__,__FILE__);
 
@@ -408,7 +435,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,
@@ -426,7 +456,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(
@@ -449,7 +482,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)
@@ -553,7 +589,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(
@@ -577,7 +616,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(
@@ -613,7 +655,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();
@@ -647,15 +692,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();
@@ -680,7 +734,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;
@@ -734,7 +792,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(

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

@@ -36,7 +36,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 copy of the db-object
 	 *
@@ -115,7 +115,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_');
@@ -658,7 +658,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,

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 +74 added lines, -76 removed lines

@@ -49,9 +49,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
 	}
 
 	/**
@@ -71,10 +71,10 @@ 
 	 * @param boolean $debug =false
 	 * @return boolean False if $id already exists, else True
 	 */
-	function set_timer($times,$id,$method,$data=null,$account_id=False,$debug=false)
+	function set_timer($times, $id, $method, $data = null, $account_id = False, $debug = false)
 	{
 		if (empty($id) || empty($method) || $this->read($id) ||
-				!($next = $this->next_run($times,$debug)))
+				!($next = $this->next_run($times, $debug)))
 		{
 			return False;
 		}
@@ -107,14 +107,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)
 		{
-			echo "<p>next_run("; print_r($times); echo ",'$debug', " . date('Y-m-d H:i', $now) . ")</p>\n";
-			$debug = True;	// enable syntax-error messages too
+			echo "<p>next_run("; print_r($times); echo ",'$debug', ".date('Y-m-d H:i', $now).")</p>\n";
+			$debug = True; // enable syntax-error messages too
 		}
-		if(is_null($now)) {
+		if (is_null($now)) {
 			$now = time();
 		}
 
@@ -142,7 +142,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,
@@ -158,7 +158,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]))
@@ -176,24 +176,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) { echo "<p>n=$n, $u: isset(times[$u]="; print_r($times[$u]); echo ")=".(isset($times[$u])?'True':'False')."</p>\n"; }
+			if ($this->debug) { echo "<p>n=$n, $u: isset(times[$u]="; print_r($times[$u]); echo ")=".(isset($times[$u]) ? 'True' : 'False')."</p>\n"; }
 			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)
 						{
@@ -210,7 +210,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)))
@@ -225,7 +225,7 @@ 
 						}
 						else
 						{
-							list($min,$max) = $arr = explode('-',$one);
+							list($min, $max) = $arr = explode('-', $one);
 							if (empty($one) || $one == '*')
 							{
 								$min = $min_unit[$u];
@@ -266,20 +266,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) echo "--> already have a $u = ".$found[$u].", future='$future'<br>\n";
-					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;
@@ -302,12 +301,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) echo "<p>Nothing found, exiting !!!</p>\n";
 						return False;
 					}
-					$next = $nexts[count($found)-1];
+					$next = $nexts[count($found) - 1];
 					$over = $found[$next];
 					unset($found[$next]);
 					if ($this->debug) echo "<p>Have to try the next $next, $u's are over for $next=$over !!!</p>\n";
@@ -317,7 +316,7 @@ 
 		}
 		if ($this->debug) { echo "<p>next="; print_r($found); echo "</p>\n"; }
 
-		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']);
 	}
 
 	/**
@@ -339,7 +338,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##')))
@@ -361,7 +360,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(
@@ -377,7 +376,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;
@@ -386,20 +385,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
 				//
@@ -408,7 +407,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]);
 					}
@@ -420,7 +419,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'])
 						{
@@ -435,12 +434,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));
 				}
 				// update job before running it, to cope with jobs taking longer then async-frequency
 				if (($job['next'] = $this->next_run($job['times'])))
@@ -453,16 +451,16 @@ 
 				}
 				try
 				{
-					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;
 	}
@@ -478,7 +476,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;
 
@@ -486,7 +484,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##'";
@@ -500,21 +498,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))
 		{
@@ -531,7 +529,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;
 
@@ -562,7 +560,7 @@ 
 	 */
 	function delete($id)
 	{
-		$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();
 	}
@@ -587,38 +585,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";
 			}
@@ -649,15 +647,15 @@ 
 		}
 		$times = False;
 		$this->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) echo 'line '.++$n.": $line<br>\n";
-				$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} != '#')
@@ -665,12 +663,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];
 					}
@@ -701,29 +699,29 @@ 
 		if ($this->only_fallback && $times !== False) {
 			return 0;
 		}
-		$this->installed();	// find other installed cronlines
+		$this->installed(); // 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)
 		{
 			if (is_array($this->other_cronlines))
 			{
 				foreach ($this->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 +98 added lines, -28 removed lines

@@ -114,7 +114,8 @@ 
 			echo "<p>next_run("; print_r($times); echo ",'$debug', " . date('Y-m-d H:i', $now) . ")</p>\n";
 			$debug = True;	// enable syntax-error messages too
 		}
-		if(is_null($now)) {
+		if(is_null($now))
+		{
 			$now = time();
 		}
 
@@ -179,12 +180,17 @@ 
 		foreach($units as $u => $date_pattern)
 		{
 			++$n;
-			if ($this->debug) { echo "<p>n=$n, $u: isset(times[$u]="; print_r($times[$u]); echo ")=".(isset($times[$u])?'True':'False')."</p>\n"; }
+			if ($this->debug)
+			{
+echo "<p>n=$n, $u: isset(times[$u]="; print_r($times[$u]); echo ")=".(isset($times[$u])?'True':'False')."</p>\n"; }
 			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();
@@ -197,7 +203,10 @@ 
 
 						if (count($arr) != 2 || !is_numeric($min) || !is_numeric($max) || $min > $max)
 						{
-							if ($debug) echo "<p>Syntax error in $u='$t', allowed is 'min-max', min <= max, min='$min', max='$max'</p>\n";
+							if ($debug)
+							{
+								echo "<p>Syntax error in $u='$t', allowed is 'min-max', min <= max, min='$min', max='$max'</p>\n";
+							}
 
 							return False;
 						}
@@ -208,14 +217,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) echo "<p>Syntax error in $u='$t', allowed is a number or '{*|range}/inc', inc='$inc'</p>\n";
+							if ($debug)
+							{
+								echo "<p>Syntax error in $u='$t', allowed is a number or '{*|range}/inc', inc='$inc'</p>\n";
+							}
 
 							return False;
 						}
@@ -233,7 +248,10 @@ 
 							}
 							elseif (count($arr) != 2 || $min > $max)
 							{
-								if ($debug) echo "<p>Syntax error in $u='$t', allowed is '{*|min-max}/inc', min='$min',max='$max', inc='$inc'</p>\n";
+								if ($debug)
+								{
+									echo "<p>Syntax error in $u='$t', allowed is '{*|min-max}/inc', min='$min',max='$max', inc='$inc'</p>\n";
+								}
 								return False;
 							}
 							for ($i = $min; $i <= $max; $i += $inc)
@@ -244,9 +262,13 @@ 
 					}
 				}
 			}
-			elseif ($n < $last_set || $u == 'dow')	// before last value set (or dow) => empty gets enumerated
+			elseif ($n < $last_set || $u == 'dow')
+			{
+				// before last value set (or dow) => empty gets enumerated
 			{
-				for ($i = $min_unit[$u]; $i <= $max_unit[$u]; ++$i)
+				for ($i = $min_unit[$u];
+			}
+			$i <= $max_unit[$u]; ++$i)
 				{
 					$times[$u][$i] = True;
 				}
@@ -256,7 +278,9 @@ 
 				$times[$u][$min_unit[$u]] = True;
 			}
 		}
-		if ($this->debug) { echo "enumerated times=<pre>"; print_r($times); echo "</pre>\n"; }
+		if ($this->debug)
+		{
+echo "enumerated times=<pre>"; print_r($times); echo "</pre>\n"; }
 
 		// now we have the times enumerated, lets find the first not expired one
 		//
@@ -274,7 +298,10 @@ 
 				if (isset($found[$u]))
 				{
 					$future = $future || $found[$u] > $unit_now;
-					if ($this->debug) echo "--> already have a $u = ".$found[$u].", future='$future'<br>\n";
+					if ($this->debug)
+					{
+						echo "--> already have a $u = ".$found[$u].", future='$future'<br>\n";
+					}
 					continue;	// already set
 				}
 				foreach(array_keys($times[$u]) as $unit_value)
@@ -292,30 +319,44 @@ 
 							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) echo "<p>Nothing found, exiting !!!</p>\n";
+						if ($this->debug)
+						{
+							echo "<p>Nothing found, exiting !!!</p>\n";
+						}
 						return False;
 					}
 					$next = $nexts[count($found)-1];
 					$over = $found[$next];
 					unset($found[$next]);
-					if ($this->debug) echo "<p>Have to try the next $next, $u's are over for $next=$over !!!</p>\n";
+					if ($this->debug)
+					{
+						echo "<p>Have to try the next $next, $u's are over for $next=$over !!!</p>\n";
+					}
 					break;
 				}
 			}
 		}
-		if ($this->debug) { echo "<p>next="; print_r($found); echo "</p>\n"; }
+		if ($this->debug)
+		{
+echo "<p>next="; print_r($found); echo "</p>\n"; }
 
 		return mktime($found['hour'],$found['min'],0,$found['month'],$found['day'],$found['year']);
 	}
@@ -377,7 +418,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;
@@ -388,7 +432,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))
 		{
@@ -410,7 +457,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'];
@@ -480,7 +530,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 === '%')
 		{
@@ -533,9 +586,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']),
@@ -600,9 +659,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";							}
 					}
@@ -622,10 +684,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;
 			}
+			}
 		}
 	}
 
@@ -637,7 +702,8 @@ 
 	 */
 	function installed()
 	{
-		if ($this->only_fallback) {
+		if ($this->only_fallback)
+		{
 			return 0;
 		}
 		$this->find_binarys();
@@ -654,7 +720,10 @@ 
 			$n = 0;
 			while ($line = fgets($crontab,256))
 			{
-				if ($this->debug) echo 'line '.++$n.": $line<br>\n";
+				if ($this->debug)
+				{
+					echo 'line '.++$n.": $line<br>\n";
+				}
 				$parts = explode(' ',$line,6);
 
 				if ($line{0} == '#' || count($parts) < 6 || ($parts[5]{0} != '/' && substr($parts[5],0,3) != 'php'))
@@ -698,7 +767,8 @@ 
 	 */
 	function install($times)
 	{
-		if ($this->only_fallback && $times !== False) {
+		if ($this->only_fallback && $times !== False)
+		{
 			return 0;
 		}
 		$this->installed();	// find other installed cronlines

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 +92 added lines, -92 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';
 }
@@ -60,7 +60,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'];
 
@@ -87,29 +87,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;
@@ -123,8 +123,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) &&
@@ -134,15 +134,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'] &&
@@ -159,7 +159,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
 			{
@@ -170,7 +170,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;
@@ -188,7 +188,7 @@ 
 	 */
 	function getLastPwdChange($username)
 	{
-		if (method_exists($this->backend,'getLastPwdChange'))
+		if (method_exists($this->backend, 'getLastPwdChange'))
 		{
 			return $this->backend->getLastPwdChange($username);
 		}
@@ -203,9 +203,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);
 		}
@@ -220,7 +220,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);
 	}
@@ -235,9 +235,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);
 		}
@@ -248,7 +248,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();
 			}
@@ -260,9 +260,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)
 		}
 		return $ret;
 	}
@@ -275,16 +275,16 @@ 
 	static function randomstring($size)
 	{
 		static $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'
 		);
 
 		$s = '';
-		for ($i=0; $i<$size; $i++)
+		for ($i = 0; $i < $size; $i++)
 		{
-			$s .= $random_char[mt_rand(1,61)];
+			$s .= $random_char[mt_rand(1, 61)];
 		}
 		return $s;
 	}
@@ -296,9 +296,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);
 		}
@@ -317,21 +317,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':
@@ -342,24 +342,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':
@@ -372,7 +372,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';
@@ -395,9 +395,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
 	);
 
 	/**
@@ -412,17 +412,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;
 			}
@@ -444,12 +444,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':
@@ -463,7 +463,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);
@@ -476,20 +476,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
@@ -507,7 +507,7 @@ 
 	 * @param string $type =null default $GLOBALS['egw_info']['server']['sql_encryption_type']
 	 * @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))
@@ -515,7 +515,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
@@ -557,28 +557,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';
 		}
@@ -587,7 +587,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';
 		}
@@ -620,7 +620,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'];
@@ -634,11 +634,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');
 		}
@@ -657,7 +657,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)
 				{
@@ -670,15 +670,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');
 			}
@@ -689,7 +689,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)
@@ -707,19 +707,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;
 	}
 
 	/**
@@ -729,14 +729,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;
 	}
 
 	/**
@@ -746,18 +746,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;
 	}
 
 	/**
@@ -768,11 +768,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 +32 added lines, -8 removed lines

@@ -62,7 +62,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);
 
@@ -90,12 +93,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;
@@ -172,7 +181,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;
@@ -446,7 +458,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))
@@ -622,9 +637,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.php

Doc Comments +11 added lines, -9 removed lines

@@ -311,6 +311,8 @@ 
 	 * @param string $path
 	 * @param array &$dav
 	 * @param array &$allow
+	 * @param integer[] $dav
+	 * @param boolean $allow
 	 */
 	function OPTIONS($path, &$dav, &$allow)
 	{
@@ -606,7 +608,7 @@ 
 	 * @param string $path / or /<username>/
 	 * @param int $user
 	 * @param int $depth
-	 * @return string|boolean http status or true|false
+	 * @return boolean http status or true|false
 	 */
 	protected function add_home(array &$files, $path, $user, $depth)
 	{
@@ -738,7 +740,7 @@ 
 	 * @param string $path /<username>/
 	 * @param int $app
 	 * @param int $user
-	 * @return string|boolean http status or true|false
+	 * @return boolean http status or true|false
 	 */
 	protected function add_shared(array &$files, $path, $app, $user)
 	{
@@ -1380,7 +1382,7 @@ 
 	 * @param int|string $id
 	 * @param array $attach array of array with values for keys 'name', 'params', 'value'
 	 * @param boolean $delete_via_put
-	 * @return boolean false on error, eg. invalid managed id, for false an xml-error body has been send
+	 * @return null|false false on error, eg. invalid managed id, for false an xml-error body has been send
 	 */
 	public static function handle_attach($app, $id, $attach, $delete_via_put=false)
 	{
@@ -1584,7 +1586,7 @@ 
 	 * @param string $managed_id
 	 * @param string $app =null app-name to check against path
 	 * @param string|int $id =null id to check agains path
-	 * @return string|boolean "/apps/$app/$id/something" or false if not found or not belonging to given $app/$id
+	 * @return false|string "/apps/$app/$id/something" or false if not found or not belonging to given $app/$id
 	 */
 	static public function managed_id2path($managed_id, $app=null, $id=null)
 	{
@@ -1783,7 +1785,7 @@ 
 	 * MKCOL method handler
 	 *
 	 * @param  array  general parameter passing array
-	 * @return bool   true on success
+	 * @return string   true on success
 	 */
 	function MKCOL($options)
 	{
@@ -1796,7 +1798,7 @@ 
 	 * MOVE method handler
 	 *
 	 * @param  array  general parameter passing array
-	 * @return bool   true on success
+	 * @return string   true on success
 	 */
 	function MOVE($options)
 	{
@@ -1809,7 +1811,7 @@ 
 	 * COPY method handler
 	 *
 	 * @param  array  general parameter passing array
-	 * @return bool   true on success
+	 * @return string   true on success
 	 */
 	function COPY($options, $del=false)
 	{
@@ -1822,7 +1824,7 @@ 
 	 * LOCK method handler
 	 *
 	 * @param  array  general parameter passing array
-	 * @return bool   true on success
+	 * @return string|boolean   true on success
 	 */
 	function LOCK(&$options)
 	{
@@ -1856,7 +1858,7 @@ 
 	 * UNLOCK method handler
 	 *
 	 * @param  array  general parameter passing array
-	 * @return bool   true on success
+	 * @return string   true on success
 	 */
 	function UNLOCK(&$options)
 	{

Braces +260 added lines, -64 removed lines

@@ -222,11 +222,20 @@ 
 	function __construct()
 	{
 		// log which CalDAVTester test is currently running, set as User-Agent header
-		if (substr($_SERVER['HTTP_USER_AGENT'], 0, 14) == 'scripts/tests/') error_log('****** '.$_SERVER['HTTP_USER_AGENT']);
+		if (substr($_SERVER['HTTP_USER_AGENT'], 0, 14) == 'scripts/tests/')
+		{
+			error_log('****** '.$_SERVER['HTTP_USER_AGENT']);
+		}
 
-		if (!$this->debug) $this->debug = (int)$GLOBALS['egw_info']['user']['preferences']['groupdav']['debug_level'];
+		if (!$this->debug)
+		{
+			$this->debug = (int)$GLOBALS['egw_info']['user']['preferences']['groupdav']['debug_level'];
+		}
 
-		if ($this->debug > 2) error_log('groupdav: $_SERVER='.array2string($_SERVER));
+		if ($this->debug > 2)
+		{
+			error_log('groupdav: $_SERVER='.array2string($_SERVER));
+		}
 
 		// setting our own exception handler, to be able to still log the requests
 		set_exception_handler(array(__CLASS__,'exception_handler'));
@@ -254,7 +263,10 @@ 
 				$this->crrnd = true; // Older Apple Addressbook.app does not cope with namespace redundancy
 				break;
 		}
-		if ($this->debug) error_log(__METHOD__."() HTTP_USER_AGENT='$_SERVER[HTTP_USER_AGENT]' --> '$agent' --> client_requires_href_as_url=$this->client_require_href_as_url, crrnd(client refuses redundand namespace declarations)=$this->crrnd");
+		if ($this->debug)
+		{
+			error_log(__METHOD__."() HTTP_USER_AGENT='$_SERVER[HTTP_USER_AGENT]' --> '$agent' --> client_requires_href_as_url=$this->client_require_href_as_url, crrnd(client refuses redundand namespace declarations)=$this->crrnd");
+		}
 
 		// adding EGroupware version to X-Dav-Powered-By header eg. "EGroupware 1.8.001 CalDAV/CardDAV/GroupDAV server"
 		$this->dav_powered_by = str_replace('EGroupware','EGroupware '.$GLOBALS['egw_info']['server']['versions']['phpgwapi'],
@@ -300,7 +312,10 @@ 
 	 */
 	function app_handler($app)
 	{
-		if (isset($this->root[$app]['app'])) $app = $this->root[$app]['app'];
+		if (isset($this->root[$app]['app']))
+		{
+			$app = $this->root[$app]['app'];
+		}
 
 		return Handler::app_handler($app,$this);
 	}
@@ -317,22 +332,34 @@ 
 		unset($allow);	// not used, but required by function signature
 
 		// locking support
-		if (!in_array('2', $dav)) $dav[] = '2';
+		if (!in_array('2', $dav))
+		{
+			$dav[] = '2';
+		}
 
-		if (preg_match('#/(calendar(-[^/]+)?|inbox|outbox)/#', $path))	// eg. /<username>/calendar-<otheruser>/
+		if (preg_match('#/(calendar(-[^/]+)?|inbox|outbox)/#', $path))
+		{
+			// eg. /<username>/calendar-<otheruser>/
 		{
 			$app = 'calendar';
 		}
-		elseif (preg_match('#/addressbook(-[^/]+)?/#', $path))	// eg. /<username>/addressbook-<otheruser>/
+		}
+		elseif (preg_match('#/addressbook(-[^/]+)?/#', $path))
+		{
+			// eg. /<username>/addressbook-<otheruser>/
 		{
 			$app = 'addressbook';
 		}
+		}
 		// CalDAV and CardDAV
 		$dav[] = 'access-control';
 
-		if ($app !== 'addressbook')	// CalDAV
+		if ($app !== 'addressbook')
+		{
+			// CalDAV
 		{
 			$dav[] = 'calendar-access';
+		}
 			$dav[] = 'calendar-auto-schedule';
 			$dav[] = 'calendar-proxy';
 			// required by iOS iCal to use principal-property-search to autocomplete participants (and locations)
@@ -349,9 +376,13 @@ 
 			//$dav[] = 'calendarserver-sharing';
 			//$dav[] = 'calendarserver-sharing-no-scheduling';
 		}
-		if ($app !== 'calendar')	// CardDAV
+		if ($app !== 'calendar')
 		{
-			$dav[] = 'addressbook';	// CardDAV uses "addressbook" NOT "addressbook-access"
+			// CardDAV
+		{
+			$dav[] = 'addressbook';
+		}
+		// CardDAV uses "addressbook" NOT "addressbook-access"
 		}
 		//error_log(__METHOD__."('$path') --> app='$app' --> DAV: ".implode(', ', $dav));
 	}
@@ -365,7 +396,10 @@ 
 	 */
 	function PROPFIND(&$options, &$files, $method='PROPFIND')
 	{
-		if ($this->debug) error_log(__CLASS__."::$method(".array2string($options).')');
+		if ($this->debug)
+		{
+			error_log(__CLASS__."::$method(".array2string($options).')');
+		}
 
 		// make options (readonly) available to all class methods, eg. prop_requested
 		$this->propfind_options = $options;
@@ -374,18 +408,27 @@ 
 		$id = $app = $user = $user_prefix = null;
 		if (!self::_parse_path($options['path'],$id,$app,$user,$user_prefix) && $app && !$user && $user !== 0)
 		{
-			if ($this->debug > 1) error_log(__CLASS__."::$method: user='$user', app='$app', id='$id': 404 not found!");
+			if ($this->debug > 1)
+			{
+				error_log(__CLASS__."::$method: user='$user', app='$app', id='$id': 404 not found!");
+			}
 			return '404 Not Found';
 		}
-		if ($this->debug > 1) error_log(__CLASS__."::$method(path='$options[path]'): user='$user', user_prefix='$user_prefix', app='$app', id='$id'");
+		if ($this->debug > 1)
+		{
+			error_log(__CLASS__."::$method(path='$options[path]'): user='$user', user_prefix='$user_prefix', app='$app', id='$id'");
+		}
 
 		$files = array('files' => array());
 		$path = $user_prefix = $this->_slashify($user_prefix);
 
-		if (!$app)	// user root folder containing apps
+		if (!$app)
+		{
+			// user root folder containing apps
 		{
 			// add root with current users apps
 			$this->add_home($files, $path, $user, $options['depth']);
+		}
 
 			if ($path == '/')
 			{
@@ -417,16 +460,22 @@ 
 		}
 		if ($app != 'principals' && !isset($GLOBALS['egw_info']['user']['apps'][$this->root[$app]['app'] ? $this->root[$app]['app'] : $app]))
 		{
-			if ($this->debug) error_log(__CLASS__."::$method(path=$options[path]) 403 Forbidden: no app rights for '$app'");
+			if ($this->debug)
+			{
+				error_log(__CLASS__."::$method(path=$options[path]) 403 Forbidden: no app rights for '$app'");
+			}
 			return "403 Forbidden: no app rights for '$app'";	// no rights for the given app
 		}
 		if (($handler = self::app_handler($app)))
 		{
-			if ($method != 'REPORT' && !$id)	// no self URL for REPORT requests (only PROPFIND) or propfinds on an id
+			if ($method != 'REPORT' && !$id)
+			{
+				// no self URL for REPORT requests (only PROPFIND) or propfinds on an id
 			{
 				// KAddressbook doubles the folder, if the self URL contains the GroupDAV/CalDAV resourcetypes
 				$files['files'][0] = $this->add_app($app,$app=='addressbook'&&$handler->get_agent()=='kde',$user,
 					$this->_slashify($options['path']));
+			}
 
 				// Hack for iOS 5.0.1 addressbook to stop asking directory gateway permissions with depth != 0
 				// values for depth are 0, 1, "infinit" or not set which has to be interpreted as "infinit"
@@ -436,7 +485,11 @@ 
 					$this->log(__CLASS__."::$method(".array2string($options).') Enabling hack for iOS 5.0.1 addressbook: force Depth: 0 on PROPFIND for directory gateway!');
 					return true;
 				}
-				if (!$options['depth']) return true;	// depth 0 --> show only the self url
+				if (!$options['depth'])
+				{
+					return true;
+				}
+				// depth 0 --> show only the self url
 			}
 			return $handler->propfind($this->_slashify($options['path']),$options,$files,$user,$id);
 		}
@@ -457,7 +510,10 @@ 
 		// resourcetype: collection
 		$props['resourcetype'][] = self::mkprop('collection','');
 
-		if (!isset($props['getcontenttype'])) $props['getcontenttype'] = 'httpd/unix-directory';
+		if (!isset($props['getcontenttype']))
+		{
+			$props['getcontenttype'] = 'httpd/unix-directory';
+		}
 
 		return $this->add_resource($path, $props, $privileges, $supported_privileges);
 	}
@@ -489,11 +545,17 @@ 
 			'resourcetype'     => '',
 		) as $name => $default)
 		{
-			if (!isset($props[$name])) $props[$name] = $default;
+			if (!isset($props[$name]))
+			{
+				$props[$name] = $default;
+			}
 		}
 
 		// if requested add privileges
-		if (is_null($supported_privileges)) $supported_privileges = $this->supported_privileges;
+		if (is_null($supported_privileges))
+		{
+			$supported_privileges = $this->supported_privileges;
+		}
 		if ($this->prop_requested('current-user-privilege-set') === true)
 		{
 			foreach($privileges as $name)
@@ -514,7 +576,10 @@ 
 			$props['owner'] = '';
 		}
 
-		if ($this->debug > 1) error_log(__METHOD__."(path='$path', props=".array2string($props).')');
+		if ($this->debug > 1)
+		{
+			error_log(__METHOD__."(path='$path', props=".array2string($props).')');
+		}
 
 		// convert simple associative properties to HTTP_WebDAV_Server ones
 		foreach($props as $name => &$prop)
@@ -554,7 +619,10 @@ 
 		{
 			foreach($data as $name => $data)
 			{
-				if ($name[0] == '*') continue;
+				if ($name[0] == '*')
+				{
+					continue;
+				}
 				if (is_array($data) && $data['*only*'] && strpos($path, $data['*only*']) === false)
 				{
 					continue;	// wrong path
@@ -668,8 +736,15 @@ 
 		{
 			foreach($this->root as $app => $data)
 			{
-				if (!$GLOBALS['egw_info']['user']['apps'][$data['app'] ? $data['app'] : $app]) continue;	// no rights for the given app
-				if (!empty($data['user-only']) && ($path == '/' || $user < 0)) continue;
+				if (!$GLOBALS['egw_info']['user']['apps'][$data['app'] ? $data['app'] : $app])
+				{
+					continue;
+				}
+				// no rights for the given app
+				if (!empty($data['user-only']) && ($path == '/' || $user < 0))
+				{
+					continue;
+				}
 
 				$files['files'][] = $this->add_app($app,false,$user,$path.$app.'/');
 
@@ -705,7 +780,10 @@ 
 	{
 		if (!isset($GLOBALS['egw_info']['user']['apps']['resources']))
 		{
-			if ($this->debug) error_log(__METHOD__."(path=$path) 403 Forbidden: no app rights for 'resources'");
+			if ($this->debug)
+			{
+				error_log(__METHOD__."(path=$path) 403 Forbidden: no app rights for 'resources'");
+			}
 			return "403 Forbidden: no app rights for 'resources'";	// no rights for the given app
 		}
 		list(,$what) = explode('/', $path);
@@ -744,10 +822,13 @@ 
 	{
 		// currently only show shared calendars/addressbooks for current user and not in the root
 		if ($path == '/' || $user != $GLOBALS['egw_info']['user']['account_id'] ||
-			!isset($GLOBALS['egw_info']['user']['apps'][$app]))	// also avoids principals, inbox and outbox
+			!isset($GLOBALS['egw_info']['user']['apps'][$app]))
+		{
+			// also avoids principals, inbox and outbox
 		{
 			return true;
 		}
+		}
 		$handler = $this->app_handler($app);
 		if (($shared = $handler->get_shared()))
 		{
@@ -755,7 +836,10 @@ 
 			{
 				$file = $this->add_app($app,false,$id,$path.$owner.'/');
 				// mark other users calendar as shared (iOS 5.0.1 AB does NOT display AB marked as shared!)
-				if ($app == 'calendar') $file['props']['resourcetype']['val'][] = self::mkprop(self::CALENDARSERVER,'shared','');
+				if ($app == 'calendar')
+				{
+					$file['props']['resourcetype']['val'][] = self::mkprop(self::CALENDARSERVER,'shared','');
+				}
 				$files[] = $file;
 			}
 		}
@@ -791,7 +875,10 @@ 
 			{
 				$name = $this->accounts->id2name($account,'account_fullname');
 			}
-			if (empty($name)) $name = '#'.$account;
+			if (empty($name))
+			{
+				$name = '#'.$account;
+			}
 		}
 		return $name;
 	}
@@ -807,7 +894,10 @@ 
 	 */
 	protected function add_app($app,$no_extra_types=false,$user=null,$path='/')
 	{
-		if ($this->debug) error_log(__METHOD__."(app='$app', no_extra_types=$no_extra_types, user='$user', path='$path')");
+		if ($this->debug)
+		{
+			error_log(__METHOD__."(app='$app', no_extra_types=$no_extra_types, user='$user', path='$path')");
+		}
 		$user_preferences = $GLOBALS['egw_info']['user']['preferences'];
 		if (is_string($user) && $user[0] == 'r' && ($resource = Principals::read_resource(substr($user, 1))))
 		{
@@ -831,7 +921,10 @@ 
 			$account_lid = $GLOBALS['egw_info']['user']['account_lid'];
 			$principalType = 'users';
 		}
-		if (!isset($displayname)) $displayname = $this->account_name($user);
+		if (!isset($displayname))
+		{
+			$displayname = $this->account_name($user);
+		}
 
 		$props = array(
 			'owner' => array(self::mkprop('href',$this->base_uri.'/principals/'.$principalType.'/'.$account_lid.'/')),
@@ -864,10 +957,13 @@ 
 
 		// rfc 5995 (Use POST to add members to WebDAV collections): we use collection path with add-member query param
 		// leaving it switched off, until further testing, because OS X iCal seem to ignore it and OS X Addressbook uses POST to full URL without ?add-member
-		if ($app && !in_array($app,array('inbox','outbox','principals')))	// not on inbox, outbox or principals
+		if ($app && !in_array($app,array('inbox','outbox','principals')))
+		{
+			// not on inbox, outbox or principals
 		{
 			$props['add-member'][] = self::mkprop('href',$this->base_uri.$path.'?add-member');
 		}
+		}
 
 		// add props modifyable via proppatch from client, eg. calendar-color, see self::$proppatch_props
 		$ns = null;
@@ -961,7 +1057,10 @@ 
 	 */
 	function REPORT(&$options, &$files)
 	{
-		if ($this->debug > 1) error_log(__METHOD__.'('.array2string($options).')');
+		if ($this->debug > 1)
+		{
+			error_log(__METHOD__.'('.array2string($options).')');
+		}
 
 		return $this->PROPFIND($options,$files,'REPORT');
 	}
@@ -984,7 +1083,10 @@ 
 	 */
 	function GET(&$options)
 	{
-		if ($this->debug) error_log(__METHOD__.'('.array2string($options).')');
+		if ($this->debug)
+		{
+			error_log(__METHOD__.'('.array2string($options).')');
+		}
 
 		$id = $app = $user = null;
 		if (!$this->_parse_path($options['path'],$id,$app,$user) || $app == 'principals')
@@ -1220,7 +1322,10 @@ 
 			$_GET['add-member'] = '';	// otherwise we give no Location header
 			return $this->PUT($options);
 		}
-		if ($this->debug) error_log(__METHOD__.'('.array2string($options).')');
+		if ($this->debug)
+		{
+			error_log(__METHOD__.'('.array2string($options).')');
+		}
 
 		$id = $app = $user = null;
 		$this->_parse_path($options['path'],$id,$app,$user);
@@ -1391,7 +1496,11 @@ 
 			error_log(__METHOD__."('$app', $id, ...) no rights to update attachments");
 			return;	// no rights --> nothing to do
 		}
-		if (!is_array($attach)) $attach = array();	// could be PEAR_Error if not set
+		if (!is_array($attach))
+		{
+			$attach = array();
+		}
+		// could be PEAR_Error if not set
 
 		if ($delete_via_put)
 		{
@@ -1436,7 +1545,11 @@ 
 					// reuse valid managed-id --> symlink attachment
 					if (Vfs::file_exists($link))
 					{
-						if (Vfs::readlink($link) === $path) continue;	// no need to recreate identical link
+						if (Vfs::readlink($link) === $path)
+						{
+							continue;
+						}
+						// no need to recreate identical link
 						Vfs::unlink($link);		// symlink will fail, if $link exists
 					}
 					if (!Vfs::symlink($path, $link))
@@ -1476,7 +1589,11 @@ 
 	{
 		$filename = empty($_filename) ? 'attachment' : Vfs::basename($_filename);
 
-		if (strpos($mime, ';')) list($mime) = explode(';', $mime);	// in case it contains eg. charset info
+		if (strpos($mime, ';'))
+		{
+			list($mime) = explode(';', $mime);
+		}
+		// in case it contains eg. charset info
 
 		$ext = !empty($mime) ? MimeMagic::mime2ext($mime) : '';
 
@@ -1495,9 +1612,15 @@ 
 		for($i = 1; $i < 100; ++$i)
 		{
 			$path = Link::vfs_path($app, $id, $filename.($i > 1 ? '-'.$i : '').$ext, true);
-			if (!Vfs::stat($path)) break;
+			if (!Vfs::stat($path))
+			{
+				break;
+			}
+		}
+		if ($i >= 100)
+		{
+			return null;
 		}
-		if ($i >= 100) return null;
 
 		if (!Vfs::file_exists($dir = Vfs::dirname($path)) && !Vfs::mkdir($dir, 0777, STREAM_MKDIR_RECURSIVE))
 		{
@@ -1546,7 +1669,11 @@ 
 			// handle symlinks --> return target size and mime-type
 			if (($target = Vfs::readlink($path)))
 			{
-				if (!($stat = Vfs::stat($target))) continue;	// broken or inaccessible symlink
+				if (!($stat = Vfs::stat($target)))
+				{
+					continue;
+				}
+				// broken or inaccessible symlink
 
 				// check if target is in /apps, probably reused MANAGED-ID --> return it
 				if (substr($target, 0, 6) == '/apps/')
@@ -1638,14 +1765,20 @@ 
 	 */
 	function PROPPATCH(&$options)
 	{
-		if ($this->debug) error_log(__METHOD__."(".array2string($options).')');
+		if ($this->debug)
+		{
+			error_log(__METHOD__."(".array2string($options).')');
+		}
 
 		// parse path in form [/account_lid]/app[/more]
 		$id = $app = $user = $user_prefix = null;
 		self::_parse_path($options['path'],$id,$app,$user,$user_prefix);	// allways returns false if eg. !$id
 		if ($app == 'principals' || $id || $options['path'] == '/')
 		{
-			if ($this->debug > 1) error_log(__METHOD__.": user='$user', app='$app', id='$id': 404 not found!");
+			if ($this->debug > 1)
+			{
+				error_log(__METHOD__.": user='$user', app='$app', id='$id': 404 not found!");
+			}
 			foreach($options['props'] as &$prop)
 			{
 				$prop['status'] = '403 Forbidden';
@@ -1670,11 +1803,14 @@ 
 						self::$proppatch_props[$prop['name']] == $prop['ns'] ? '' : ':'.$prop['ns']);
 				}
 				//error_log("preferences['user']['$app']['$name']=".array2string($GLOBALS['egw_info']['user']['preferences'][$app][$name]).($GLOBALS['egw_info']['user']['preferences'][$app][$name] !== $prop['val'] ? ' !== ':' === ')."prop['val']=".array2string($prop['val']));
-				if ($GLOBALS['egw_info']['user']['preferences'][$app][$name] !== $prop['val'])	// nothing to change otherwise
+				if ($GLOBALS['egw_info']['user']['preferences'][$app][$name] !== $prop['val'])
+				{
+					// nothing to change otherwise
 				{
 					if (isset($prop['val']))
 					{
 						$GLOBALS['egw']->preferences->add($app, $name, $prop['val']);
+				}
 					}
 					else
 					{
@@ -1726,7 +1862,10 @@ 
 			}
 		}
 
-		if ($this->debug) error_log(__METHOD__.'('.array2string($options).')');
+		if ($this->debug)
+		{
+			error_log(__METHOD__.'('.array2string($options).')');
+		}
 
 		$id = $app = $user = $prefix = null;
 		if (!$this->_parse_path($options['path'],$id,$app,$user,$prefix))
@@ -1738,7 +1877,10 @@ 
 			$status = $handler->put($options,$id,$user,$prefix);
 
 			// set default stati: true --> 204 No Content, false --> should be already handled
-			if (is_bool($status)) $status = $status ? '204 No Content' : '400 Something went wrong';
+			if (is_bool($status))
+			{
+				$status = $status ? '204 No Content' : '400 Something went wrong';
+			}
 
 			// check/handle Prefer: return-representation
 			if ($status[0] === '2' || $status === true)
@@ -1762,7 +1904,10 @@ 
 	 */
 	function DELETE($options)
 	{
-		if ($this->debug) error_log(__METHOD__.'('.array2string($options).')');
+		if ($this->debug)
+		{
+			error_log(__METHOD__.'('.array2string($options).')');
+		}
 
 		$id = $app = $user = null;
 		if (!$this->_parse_path($options['path'],$id,$app,$user))
@@ -1773,7 +1918,10 @@ 
 		{
 			$status = $handler->delete($options,$id);
 			// set default stati: true --> 204 No Content, false --> should be already handled
-			if (is_bool($status)) $status = $status ? '204 No Content' : '400 Something went wrong';
+			if (is_bool($status))
+			{
+				$status = $status ? '204 No Content' : '400 Something went wrong';
+			}
 			return $status;
 		}
 		return '501 Not Implemented';
@@ -1787,7 +1935,10 @@ 
 	 */
 	function MKCOL($options)
 	{
-		if ($this->debug) error_log(__METHOD__.'('.array2string($options).')');
+		if ($this->debug)
+		{
+			error_log(__METHOD__.'('.array2string($options).')');
+		}
 
 		return '501 Not Implemented';
 	}
@@ -1800,7 +1951,10 @@ 
 	 */
 	function MOVE($options)
 	{
-		if ($this->debug) error_log(__METHOD__.'('.array2string($options).')');
+		if ($this->debug)
+		{
+			error_log(__METHOD__.'('.array2string($options).')');
+		}
 
 		return '501 Not Implemented';
 	}
@@ -1813,7 +1967,10 @@ 
 	 */
 	function COPY($options, $del=false)
 	{
-		if ($this->debug) error_log('self::'.($del ? 'MOVE' : 'COPY').'('.array2string($options).')');
+		if ($this->debug)
+		{
+			error_log('self::'.($del ? 'MOVE' : 'COPY').'('.array2string($options).')');
+		}
 
 		return '501 Not Implemented';
 	}
@@ -1830,7 +1987,10 @@ 
 		self::_parse_path($options['path'],$id,$app,$user);
 		$path = Vfs::app_entry_lock_path($app,$id);
 
-		if ($this->debug) error_log(__METHOD__.'('.array2string($options).") path=$path");
+		if ($this->debug)
+		{
+			error_log(__METHOD__.'('.array2string($options).") path=$path");
+		}
 
 		// get the app handler, to check if the user has edit access to the entry (required to make locks)
 		$handler = self::app_handler($app);
@@ -1845,10 +2005,13 @@ 
 		// dont know why, but HTTP_WebDAV_Server passes the owner in D:href tags, which get's passed unchanged to checkLock/PROPFIND
 		// that's wrong according to the standard and cadaver does not show it on discover --> strip_tags removes eventual tags
 		if (($ret = Vfs::lock($path,$options['locktoken'],$options['timeout'],strip_tags($options['owner']),
-			$options['scope'],$options['type'],isset($options['update']),false)) && !isset($options['update']))		// false = no ACL check
+			$options['scope'],$options['type'],isset($options['update']),false)) && !isset($options['update']))
+		{
+			// false = no ACL check
 		{
 			return $ret ? '200 OK' : '409 Conflict';
 		}
+		}
 		return $ret;
 	}
 
@@ -1864,7 +2027,10 @@ 
 		self::_parse_path($options['path'],$id,$app,$user);
 		$path = Vfs::app_entry_lock_path($app,$id);
 
-		if ($this->debug) error_log(__METHOD__.'('.array2string($options).") path=$path");
+		if ($this->debug)
+		{
+			error_log(__METHOD__.'('.array2string($options).") path=$path");
+		}
 		return Vfs::unlock($path,$options['token']) ? '204 No Content' : '409 Conflict';
 	}
 
@@ -1893,7 +2059,10 @@ 
 		$id = $app = $user = null;
 		self::_parse_path($options['path'],$id,$app,$user);
 
-		if ($this->debug) error_log(__METHOD__.'('.array2string($options).") path=$options[path]");
+		if ($this->debug)
+		{
+			error_log(__METHOD__.'('.array2string($options).") path=$options[path]");
+		}
 
 		$options['errors'] = array();
 		switch ($app)
@@ -1956,7 +2125,10 @@ 
 			$user = array_shift($parts);
 		}
 
-		if (!isset($app)) $app = array_shift($parts);
+		if (!isset($app))
+		{
+			$app = array_shift($parts);
+		}
 
 		// /addressbook-accounts/
 		if (!$account_id && $app == 'addressbook-accounts')
@@ -2047,7 +2219,10 @@ 
 		}
 		parent::ServeRequest();
 
-		if (self::$request_starttime) self::log_request();
+		if (self::$request_starttime)
+		{
+			self::log_request();
+		}
 	}
 
 	/**
@@ -2103,11 +2278,23 @@ 
 			{
 				$content .= $line."\n";
 			}
-			if (($c = ob_get_flush())) $content .= "\n";
-			if (self::$log_level !== 'f' && strlen($c) > 1536) $c = substr($c,0,1536)."\n*** LOG TRUNKATED\n";
+			if (($c = ob_get_flush()))
+			{
+				$content .= "\n";
+			}
+			if (self::$log_level !== 'f' && strlen($c) > 1536)
+			{
+				$c = substr($c,0,1536)."\n*** LOG TRUNKATED\n";
+			}
 			$content .= $c;
-			if ($extra) $content .= $extra;
-			if ($this->to_log) $content .= "\n### ".implode("\n### ", $this->to_log)."\n";
+			if ($extra)
+			{
+				$content .= $extra;
+			}
+			if ($this->to_log)
+			{
+				$content .= "\n### ".implode("\n### ", $this->to_log)."\n";
+			}
 			$content .= $this->_http_status[0] == '4' && substr($this->_http_status,0,3) != '412' ||
 				$this->_http_status[0] == '5' ? '###' : '***';	// mark failed requests with ###, instead of ***
 			$content .= sprintf(' %s --> "%s" took %5.3f s',$_SERVER['REQUEST_METHOD'].($_SERVER['REQUEST_METHOD']=='REPORT'?' '.$this->propfind_options['root']['name']:'').' '.$_SERVER['PATH_INFO'],$this->_http_status,microtime(true)-self::$request_starttime)."\n\n";
@@ -2165,8 +2352,14 @@ 
 	 */
 	protected static function add_prop(\XMLWriter $xml, $props)
 	{
-		if (is_string($props)) $props = self::mkprop($props, '');
-		if (isset($props['name'])) $props = array($props);
+		if (is_string($props))
+		{
+			$props = self::mkprop($props, '');
+		}
+		if (isset($props['name']))
+		{
+			$props = array($props);
+		}
 
 		foreach($props as $prop)
 		{
@@ -2253,7 +2446,10 @@ 
 	 */
 	static function generate_uid($_appName, $_eventID)
 	{
-		if(empty($_appName) || empty($_eventID)) return false;
+		if(empty($_appName) || empty($_eventID))
+		{
+			return false;
+		}
 
 		return $_appName.'-'.$_eventID.'-'.$GLOBALS['egw_info']['server']['install_id'];
 	}

Indentation +1 added lines, -1 removed lines

@@ -2033,7 +2033,7 @@
 	 *
 	 * Reimplemented to add logging
 	 *
-     * @param  $prefix =null prefix filesystem path with given path, eg. "/webdav" for owncloud 4.5 remote.php
+	 * @param  $prefix =null prefix filesystem path with given path, eg. "/webdav" for owncloud 4.5 remote.php
 	 */
 	function ServeRequest($prefix=null)
 	{

Spacing +185 added lines, -185 removed lines

@@ -117,12 +117,12 @@ 
 		'inbox' => array(
 			'resourcetype' => array(self::CALDAV => 'schedule-inbox'),
 			'app' => 'calendar',
-			'user-only' => true,	// display just in user home
+			'user-only' => true, // display just in user home
 		),
 		'outbox' => array(
 			'resourcetype' => array(self::CALDAV => 'schedule-outbox'),
 			'app' => 'calendar',
-			'user-only' => true,	// display just in user home
+			'user-only' => true, // display just in user home
 		),
 		'infolog' => array(
 			'resourcetype' => array(self::GROUPDAV => 'vtodo-collection', self::CALDAV => 'calendar'),
@@ -229,14 +229,14 @@ 
 		if ($this->debug > 2) error_log('groupdav: $_SERVER='.array2string($_SERVER));
 
 		// setting our own exception handler, to be able to still log the requests
-		set_exception_handler(array(__CLASS__,'exception_handler'));
+		set_exception_handler(array(__CLASS__, 'exception_handler'));
 
 		// crrnd: client refuses redundand namespace declarations
 		// setting redundand namespaces as the default for (Cal|Card|Group)DAV, as the majority of the clients either require or can live with it
 		$this->crrnd = false;
 
 		// identify clients, which do NOT support path AND full url in <D:href> of PROPFIND request
-		switch(($agent = Handler::get_agent()))
+		switch (($agent = Handler::get_agent()))
 		{
 			case 'kde':	// KAddressbook (at least in 3.5 can NOT subscribe / does NOT find addressbook)
 				$this->client_require_href_as_url = true;
@@ -257,12 +257,12 @@ 
 		if ($this->debug) error_log(__METHOD__."() HTTP_USER_AGENT='$_SERVER[HTTP_USER_AGENT]' --> '$agent' --> client_requires_href_as_url=$this->client_require_href_as_url, crrnd(client refuses redundand namespace declarations)=$this->crrnd");
 
 		// adding EGroupware version to X-Dav-Powered-By header eg. "EGroupware 1.8.001 CalDAV/CardDAV/GroupDAV server"
-		$this->dav_powered_by = str_replace('EGroupware','EGroupware '.$GLOBALS['egw_info']['server']['versions']['phpgwapi'],
+		$this->dav_powered_by = str_replace('EGroupware', 'EGroupware '.$GLOBALS['egw_info']['server']['versions']['phpgwapi'],
 			$this->dav_powered_by);
 
 		parent::__construct();
 		// hack to allow to use query parameters in WebDAV, which HTTP_WebDAV_Server interprets as part of the path
-		list($this->_SERVER['REQUEST_URI']) = explode('?',$this->_SERVER['REQUEST_URI']);
+		list($this->_SERVER['REQUEST_URI']) = explode('?', $this->_SERVER['REQUEST_URI']);
 		/*if (substr($this->_SERVER['REQUEST_URI'],-13) == '/;add-member/')
 		{
 			$_GET['add-member'] = '';
@@ -277,15 +277,15 @@ 
 		}
 		else
 		{
-			$this->current_user_principal = (@$_SERVER["HTTPS"] === "on" ? "https:" : "http:") .
-				'//' . $_SERVER['HTTP_HOST'] . $_SERVER['SCRIPT_NAME'] . '/';
+			$this->current_user_principal = (@$_SERVER["HTTPS"] === "on" ? "https:" : "http:").
+				'//'.$_SERVER['HTTP_HOST'].$_SERVER['SCRIPT_NAME'].'/';
 		}
 		$this->current_user_principal .= 'principals/users/'.$GLOBALS['egw_info']['user']['account_lid'].'/';
 
 		// if client requires pathes instead of URLs
 		if (!$this->client_require_href_as_url)
 		{
-			$this->current_user_principal = parse_url($this->current_user_principal,PHP_URL_PATH);
+			$this->current_user_principal = parse_url($this->current_user_principal, PHP_URL_PATH);
 		}
 		$this->accounts = $GLOBALS['egw']->accounts;
 
@@ -302,7 +302,7 @@ 
 	{
 		if (isset($this->root[$app]['app'])) $app = $this->root[$app]['app'];
 
-		return Handler::app_handler($app,$this);
+		return Handler::app_handler($app, $this);
 	}
 
 	/**
@@ -314,7 +314,7 @@ 
 	 */
 	function OPTIONS($path, &$dav, &$allow)
 	{
-		unset($allow);	// not used, but required by function signature
+		unset($allow); // not used, but required by function signature
 
 		// locking support
 		if (!in_array('2', $dav)) $dav[] = '2';
@@ -351,7 +351,7 @@ 
 		}
 		if ($app !== 'calendar')	// CardDAV
 		{
-			$dav[] = 'addressbook';	// CardDAV uses "addressbook" NOT "addressbook-access"
+			$dav[] = 'addressbook'; // CardDAV uses "addressbook" NOT "addressbook-access"
 		}
 		//error_log(__METHOD__."('$path') --> app='$app' --> DAV: ".implode(', ', $dav));
 	}
@@ -363,7 +363,7 @@ 
 	 * @param  array  return array for file properties
 	 * @return bool   true on success
 	 */
-	function PROPFIND(&$options, &$files, $method='PROPFIND')
+	function PROPFIND(&$options, &$files, $method = 'PROPFIND')
 	{
 		if ($this->debug) error_log(__CLASS__."::$method(".array2string($options).')');
 
@@ -372,7 +372,7 @@ 
 
 		// parse path in form [/account_lid]/app[/more]
 		$id = $app = $user = $user_prefix = null;
-		if (!self::_parse_path($options['path'],$id,$app,$user,$user_prefix) && $app && !$user && $user !== 0)
+		if (!self::_parse_path($options['path'], $id, $app, $user, $user_prefix) && $app && !$user && $user !== 0)
 		{
 			if ($this->debug > 1) error_log(__CLASS__."::$method: user='$user', app='$app', id='$id': 404 not found!");
 			return '404 Not Found';
@@ -404,9 +404,9 @@ 
 				$files['files'][] = $this->add_collection('/principals/', array(
 					'displayname' => lang('Accounts'),
 				));
-				foreach($this->accounts->search(array('type' => 'both','order'=>'account_lid')) as $account)
+				foreach ($this->accounts->search(array('type' => 'both', 'order'=>'account_lid')) as $account)
 				{
-					$this->add_home($files, $path.$account['account_lid'].'/', $account['account_id'], $options['depth'] == 'infinity' ? 'infinity' : $options['depth']-1);
+					$this->add_home($files, $path.$account['account_lid'].'/', $account['account_id'], $options['depth'] == 'infinity' ? 'infinity' : $options['depth'] - 1);
 				}
 			}
 			return true;
@@ -418,14 +418,14 @@ 
 		if ($app != 'principals' && !isset($GLOBALS['egw_info']['user']['apps'][$this->root[$app]['app'] ? $this->root[$app]['app'] : $app]))
 		{
 			if ($this->debug) error_log(__CLASS__."::$method(path=$options[path]) 403 Forbidden: no app rights for '$app'");
-			return "403 Forbidden: no app rights for '$app'";	// no rights for the given app
+			return "403 Forbidden: no app rights for '$app'"; // no rights for the given app
 		}
 		if (($handler = self::app_handler($app)))
 		{
 			if ($method != 'REPORT' && !$id)	// no self URL for REPORT requests (only PROPFIND) or propfinds on an id
 			{
 				// KAddressbook doubles the folder, if the self URL contains the GroupDAV/CalDAV resourcetypes
-				$files['files'][0] = $this->add_app($app,$app=='addressbook'&&$handler->get_agent()=='kde',$user,
+				$files['files'][0] = $this->add_app($app, $app == 'addressbook' && $handler->get_agent() == 'kde', $user,
 					$this->_slashify($options['path']));
 
 				// Hack for iOS 5.0.1 addressbook to stop asking directory gateway permissions with depth != 0
@@ -436,9 +436,9 @@ 
 					$this->log(__CLASS__."::$method(".array2string($options).') Enabling hack for iOS 5.0.1 addressbook: force Depth: 0 on PROPFIND for directory gateway!');
 					return true;
 				}
-				if (!$options['depth']) return true;	// depth 0 --> show only the self url
+				if (!$options['depth']) return true; // depth 0 --> show only the self url
 			}
-			return $handler->propfind($this->_slashify($options['path']),$options,$files,$user,$id);
+			return $handler->propfind($this->_slashify($options['path']), $options, $files, $user, $id);
 		}
 		return '501 Not Implemented';
 	}
@@ -452,10 +452,10 @@ 
 	 * @param array $supported_privileges =null default $this->supported_privileges
 	 * @return array with values for keys 'path' and 'props'
 	 */
-	public function add_collection($path, array $props = array(), array $privileges=array('read','read-acl','read-current-user-privilege-set'), array $supported_privileges=null)
+	public function add_collection($path, array $props = array(), array $privileges = array('read', 'read-acl', 'read-current-user-privilege-set'), array $supported_privileges = null)
 	{
 		// resourcetype: collection
-		$props['resourcetype'][] = self::mkprop('collection','');
+		$props['resourcetype'][] = self::mkprop('collection', '');
 
 		if (!isset($props['getcontenttype'])) $props['getcontenttype'] = 'httpd/unix-directory';
 
@@ -471,16 +471,16 @@ 
 	 * @param array $supported_privileges =null default $this->supported_privileges
 	 * @return array with values for keys 'path' and 'props'
 	 */
-	public function add_resource($path, array $props = array(), array $privileges=array('read','read-current-user-privilege-set'), array $supported_privileges=null)
+	public function add_resource($path, array $props = array(), array $privileges = array('read', 'read-current-user-privilege-set'), array $supported_privileges = null)
 	{
 		// props for all collections: current-user-principal and principal-collection-set
 		$props['current-user-principal'] = array(
-			self::mkprop('href',$this->current_user_principal));
+			self::mkprop('href', $this->current_user_principal));
 		$props['principal-collection-set'] = array(
-			self::mkprop('href',$this->base_uri.'/principals/'));
+			self::mkprop('href', $this->base_uri.'/principals/'));
 
 		// required props per WebDAV standard
-		foreach(array(
+		foreach (array(
 			'displayname'      => basename($path),
 			'getetag'          => 'none',
 			'getcontentlength' => '',
@@ -496,7 +496,7 @@ 
 		if (is_null($supported_privileges)) $supported_privileges = $this->supported_privileges;
 		if ($this->prop_requested('current-user-privilege-set') === true)
 		{
-			foreach($privileges as $name)
+			foreach ($privileges as $name)
 			{
 				$props['current-user-privilege-set'][] = self::mkprop('privilege', array(
 					is_array($name) ? self::mkprop($name['ns'], $name['name'], '') : self::mkprop($name, '')));
@@ -504,7 +504,7 @@ 
 		}
 		if ($this->prop_requested('supported-privilege-set') === true)
 		{
-			foreach($supported_privileges as $name => $data)
+			foreach ($supported_privileges as $name => $data)
 			{
 				$props['supported-privilege-set'][] = $this->supported_privilege($name, $data, $path);
 			}
@@ -517,7 +517,7 @@ 
 		if ($this->debug > 1) error_log(__METHOD__."(path='$path', props=".array2string($props).')');
 
 		// convert simple associative properties to HTTP_WebDAV_Server ones
-		foreach($props as $name => &$prop)
+		foreach ($props as $name => &$prop)
 		{
 			if (!is_array($prop) || !isset($prop['name']))
 			{
@@ -544,7 +544,7 @@ 
 	 * @param string $path =null path to match with $data['*only*']
 	 * @return array of self::mkprop() arrays
 	 */
-	protected function supported_privilege($name, $data, $path=null)
+	protected function supported_privilege($name, $data, $path = null)
 	{
 		$props = array();
 		$props[] = self::mkprop('privilege', array(is_array($data) && $data['*ns*'] ?
@@ -552,12 +552,12 @@ 
 		$props[] = self::mkprop('description', is_array($data) ? $data['*description*'] : $data);
 		if (is_array($data))
 		{
-			foreach($data as $name => $data)
+			foreach ($data as $name => $data)
 			{
 				if ($name[0] == '*') continue;
 				if (is_array($data) && $data['*only*'] && strpos($path, $data['*only*']) === false)
 				{
-					continue;	// wrong path
+					continue; // wrong path
 				}
 				$props[] = $this->supported_privilege($name, $data, $path);
 			}
@@ -573,20 +573,20 @@ 
 	 * @param boolean $return_prop =false if true return the property array with values for 'name', 'xmlns', 'attrs', 'children'
 	 * @return boolean|string|array true: $name explicitly requested (or autoindex), "all": allprop or "names": propname requested, false: $name was not requested
 	 */
-	function prop_requested($name, $ns=null, $return_prop=false)
+	function prop_requested($name, $ns = null, $return_prop = false)
 	{
 		if (!is_array($this->propfind_options) || !isset($this->propfind_options['props']))
 		{
-			$ret = true;	// no props set, should happen only in autoindex, we return true to show all available props
+			$ret = true; // no props set, should happen only in autoindex, we return true to show all available props
 		}
 		elseif (!is_array($this->propfind_options['props']))
 		{
-			$ret = $this->propfind_options['props'];	// "all": allprop or "names": propname
+			$ret = $this->propfind_options['props']; // "all": allprop or "names": propname
 		}
 		else
 		{
 			$ret = false;
-			foreach($this->propfind_options['props'] as $prop)
+			foreach ($this->propfind_options['props'] as $prop)
 			{
 				if ($prop['name'] == $name && (is_null($ns) || $prop['xmlns'] == $ns))
 				{
@@ -621,7 +621,7 @@ 
 		$account = $this->accounts->read($account_lid);
 
 		$calendar_user_address_set = array(
-			self::mkprop('href','urn:uuid:'.$account['account_lid']),
+			self::mkprop('href', 'urn:uuid:'.$account['account_lid']),
 		);
 		if ($user < 0)
 		{
@@ -632,29 +632,29 @@ 
 		{
 			$principalType = 'users';
 			$displayname = $account['account_fullname'];
-			$calendar_user_address_set[] = self::mkprop('href','mailto:'.$account['account_email']);
+			$calendar_user_address_set[] = self::mkprop('href', 'mailto:'.$account['account_email']);
 		}
-		$calendar_user_address_set[] = self::mkprop('href',$this->base_uri.'/principals/'.$principalType.'/'.$account['account_lid'].'/');
+		$calendar_user_address_set[] = self::mkprop('href', $this->base_uri.'/principals/'.$principalType.'/'.$account['account_lid'].'/');
 
 		if ($depth && $path == '/')
 		{
 			$displayname = 'EGroupware (Cal|Card|Group)DAV server';
 		}
 
-		$displayname = Translation::convert($displayname, Translation::charset(),'utf-8');
+		$displayname = Translation::convert($displayname, Translation::charset(), 'utf-8');
 		// self url
 		$props = array(
 			'displayname' => $displayname,
-			'owner' => $path == '/' ? '' : array(self::mkprop('href',$this->base_uri.'/principals/'.$principalType.'/'.$account_lid.'/')),
+			'owner' => $path == '/' ? '' : array(self::mkprop('href', $this->base_uri.'/principals/'.$principalType.'/'.$account_lid.'/')),
 		);
 
 		if ($path != '/')
 		{
 			// add props modifyable via proppatch from client, eg. jqcalendar stores it's preferences there
-			foreach((array)$GLOBALS['egw_info']['user']['preferences']['groupdav'] as $name => $value)
+			foreach ((array)$GLOBALS['egw_info']['user']['preferences']['groupdav'] as $name => $value)
 			{
-				list($prop,$prop4path,$ns) = explode(':', $name, 3);
-				if ($prop4path == $path && (!in_array($ns,self::$ns_needs_explicit_named_props) ||
+				list($prop, $prop4path, $ns) = explode(':', $name, 3);
+				if ($prop4path == $path && (!in_array($ns, self::$ns_needs_explicit_named_props) ||
 					isset(self::$proppatch_props[$prop]) && self::$proppatch_props[$prop] === $ns))
 				{
 					$props[] = self::mkprop($ns, $prop, $value);
@@ -666,19 +666,19 @@ 
 
 		if ($depth)
 		{
-			foreach($this->root as $app => $data)
+			foreach ($this->root as $app => $data)
 			{
-				if (!$GLOBALS['egw_info']['user']['apps'][$data['app'] ? $data['app'] : $app]) continue;	// no rights for the given app
+				if (!$GLOBALS['egw_info']['user']['apps'][$data['app'] ? $data['app'] : $app]) continue; // no rights for the given app
 				if (!empty($data['user-only']) && ($path == '/' || $user < 0)) continue;
 
-				$files['files'][] = $this->add_app($app,false,$user,$path.$app.'/');
+				$files['files'][] = $this->add_app($app, false, $user, $path.$app.'/');
 
 				// only add global /addressbook-accounts/ as the one in home-set is added (and controled) by add_shared
 				if ($path == '/' && $app == 'addressbook' &&
 					!$GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'])
 				{
-					$file = $this->add_app($app,false,0,$path.$app.'-accounts/');
-					$file['props']['resourcetype']['val'][] = self::mkprop(self::CALENDARSERVER,'shared','');
+					$file = $this->add_app($app, false, 0, $path.$app.'-accounts/');
+					$file['props']['resourcetype']['val'][] = self::mkprop(self::CALENDARSERVER, 'shared', '');
 					$files['files'][] = $file;
 				}
 				// added shared calendars or addressbooks
@@ -701,12 +701,12 @@ 
 	 * @param int $depth =0
 	 * @return string|boolean http status or true|false
 	 */
-	protected function add_resources_collection(array &$files, $path, $depth=0)
+	protected function add_resources_collection(array &$files, $path, $depth = 0)
 	{
 		if (!isset($GLOBALS['egw_info']['user']['apps']['resources']))
 		{
 			if ($this->debug) error_log(__METHOD__."(path=$path) 403 Forbidden: no app rights for 'resources'");
-			return "403 Forbidden: no app rights for 'resources'";	// no rights for the given app
+			return "403 Forbidden: no app rights for 'resources'"; // no rights for the given app
 		}
 		list(,$what) = explode('/', $path);
 		if (($is_location = ($what == 'locations')))
@@ -719,7 +719,7 @@ 
 		}
 		if ($depth)
 		{
-			foreach(Principals::get_resources() as $resource)
+			foreach (Principals::get_resources() as $resource)
 			{
 				if ($is_location == Principals::resource_is_location($resource))
 				{
@@ -751,11 +751,11 @@ 
 		$handler = $this->app_handler($app);
 		if (($shared = $handler->get_shared()))
 		{
-			foreach($shared as $id => $owner)
+			foreach ($shared as $id => $owner)
 			{
-				$file = $this->add_app($app,false,$id,$path.$owner.'/');
+				$file = $this->add_app($app, false, $id, $path.$owner.'/');
 				// mark other users calendar as shared (iOS 5.0.1 AB does NOT display AB marked as shared!)
-				if ($app == 'calendar') $file['props']['resourcetype']['val'][] = self::mkprop(self::CALENDARSERVER,'shared','');
+				if ($app == 'calendar') $file['props']['resourcetype']['val'][] = self::mkprop(self::CALENDARSERVER, 'shared', '');
 				$files[] = $file;
 			}
 		}
@@ -785,11 +785,11 @@ 
 		{
 			if ($account < 0)
 			{
-				$name = lang('Group').' '.$this->accounts->id2name($account,'account_lid');
+				$name = lang('Group').' '.$this->accounts->id2name($account, 'account_lid');
 			}
 			else
 			{
-				$name = $this->accounts->id2name($account,'account_fullname');
+				$name = $this->accounts->id2name($account, 'account_fullname');
 			}
 			if (empty($name)) $name = '#'.$account;
 		}
@@ -805,7 +805,7 @@ 
 	 * @param string $path ='/'
 	 * @return array with values for keys 'path' and 'props'
 	 */
-	protected function add_app($app,$no_extra_types=false,$user=null,$path='/')
+	protected function add_app($app, $no_extra_types = false, $user = null, $path = '/')
 	{
 		if ($this->debug) error_log(__METHOD__."(app='$app', no_extra_types=$no_extra_types, user='$user', path='$path')");
 		$user_preferences = $GLOBALS['egw_info']['user']['preferences'];
@@ -834,7 +834,7 @@ 
 		if (!isset($displayname)) $displayname = $this->account_name($user);
 
 		$props = array(
-			'owner' => array(self::mkprop('href',$this->base_uri.'/principals/'.$principalType.'/'.$account_lid.'/')),
+			'owner' => array(self::mkprop('href', $this->base_uri.'/principals/'.$principalType.'/'.$account_lid.'/')),
 		);
 
 		switch ($app)
@@ -851,7 +851,7 @@ 
 					$props['displayname'] = lang('All addressbooks');
 					break;
 				}
-				elseif(!$user && !$GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'])
+				elseif (!$user && !$GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'])
 				{
 					unset($props['owner']);
 					$props['displayname'] = lang($app).' '.lang('Accounts');
@@ -864,40 +864,40 @@ 
 
 		// rfc 5995 (Use POST to add members to WebDAV collections): we use collection path with add-member query param
 		// leaving it switched off, until further testing, because OS X iCal seem to ignore it and OS X Addressbook uses POST to full URL without ?add-member
-		if ($app && !in_array($app,array('inbox','outbox','principals')))	// not on inbox, outbox or principals
+		if ($app && !in_array($app, array('inbox', 'outbox', 'principals')))	// not on inbox, outbox or principals
 		{
-			$props['add-member'][] = self::mkprop('href',$this->base_uri.$path.'?add-member');
+			$props['add-member'][] = self::mkprop('href', $this->base_uri.$path.'?add-member');
 		}
 
 		// add props modifyable via proppatch from client, eg. calendar-color, see self::$proppatch_props
 		$ns = null;
-		foreach((array)$GLOBALS['egw_info']['user']['preferences'][$app] as $name => $value)
+		foreach ((array)$GLOBALS['egw_info']['user']['preferences'][$app] as $name => $value)
 		{
 			unset($ns);
-			list($prop,$prop4user,$ns) = explode(':', $name, 3);
+			list($prop, $prop4user, $ns) = explode(':', $name, 3);
 			if ($prop4user == (string)$user && isset(self::$proppatch_props[$prop]) && !isset($ns))
 			{
 				$props[$prop] = self::mkprop(self::$proppatch_props[$prop], $prop, $value);
 				//error_log(__METHOD__."() explicit ".self::$proppatch_props[$prop].":$prop=".array2string($value));
 			}
 			// props in arbitrary namespaces not mentioned in self::$ns_needs_explicit_named_props
-			elseif(isset($ns) && !in_array($ns,self::$ns_needs_explicit_named_props))
+			elseif (isset($ns) && !in_array($ns, self::$ns_needs_explicit_named_props))
 			{
 				$props[] = self::mkprop($ns, $prop, $value);
 				//error_log(__METHOD__."() arbitrary $ns:$prop=".array2string($value));
 			}
 		}
 
-		foreach((array)$this->root[$app] as $prop => $values)
+		foreach ((array)$this->root[$app] as $prop => $values)
 		{
-			switch($prop)
+			switch ($prop)
 			{
 				case 'resourcetype';
 					if (!$no_extra_types)
 					{
-						foreach($this->root[$app]['resourcetype'] as $ns => $type)
+						foreach ($this->root[$app]['resourcetype'] as $ns => $type)
 						{
-							$props['resourcetype'][] = self::mkprop($ns,$type,'');
+							$props['resourcetype'][] = self::mkprop($ns, $type, '');
 						}
 						// add /addressbook/ as directory gateway
 						if ($path == '/addressbook/')
@@ -908,13 +908,13 @@ 
 					break;
 				case 'app':
 				case 'user-only':
-					break;	// no props, already handled
+					break; // no props, already handled
 				default:
 					if (is_array($values))
 					{
-						foreach($values as $ns => $value)
+						foreach ($values as $ns => $value)
 						{
-							$props[$prop] = self::mkprop($ns,$prop,$value);
+							$props[$prop] = self::mkprop($ns, $prop, $value);
 						}
 					}
 					else
@@ -927,20 +927,20 @@ 
 		// add other handler specific properties
 		if (($handler = self::app_handler($app)))
 		{
-			if (method_exists($handler,'extra_properties'))
+			if (method_exists($handler, 'extra_properties'))
 			{
 				$props = $handler->extra_properties($props, $displayname, $this->base_uri, $user, $path);
 			}
 			// add ctag if handler implements it
-			if (method_exists($handler,'getctag') && $this->prop_requested('getctag') === true)
+			if (method_exists($handler, 'getctag') && $this->prop_requested('getctag') === true)
 			{
 				$props['getctag'] = self::mkprop(
-					self::CALENDARSERVER,'getctag',$handler->getctag($path,$user));
+					self::CALENDARSERVER, 'getctag', $handler->getctag($path, $user));
 			}
 			// add sync-token url if handler supports sync-collection report
 			if (isset($props['supported-report-set']['sync-collection']) && $this->prop_requested('sync-token') === true)
 			{
-				$props['sync-token'] = $handler->get_sync_token($path,$user);
+				$props['sync-token'] = $handler->get_sync_token($path, $user);
 			}
 		}
 		if ($handler && !is_null($user))
@@ -963,7 +963,7 @@ 
 	{
 		if ($this->debug > 1) error_log(__METHOD__.'('.array2string($options).')');
 
-		return $this->PROPFIND($options,$files,'REPORT');
+		return $this->PROPFIND($options, $files, 'REPORT');
 	}
 
 	/**
@@ -987,13 +987,13 @@ 
 		if ($this->debug) error_log(__METHOD__.'('.array2string($options).')');
 
 		$id = $app = $user = null;
-		if (!$this->_parse_path($options['path'],$id,$app,$user) || $app == 'principals')
+		if (!$this->_parse_path($options['path'], $id, $app, $user) || $app == 'principals')
 		{
 			return $this->autoindex($options);
 		}
 		if (($handler = self::app_handler($app)))
 		{
-			return $handler->get($options,$id,$user);
+			return $handler->get($options, $id, $user);
 		}
 		error_log(__METHOD__."(".array2string($options).") 501 Not Implemented");
 		return '501 Not Implemented';
@@ -1011,9 +1011,9 @@ 
 			'depth' => 1,
 		);
 		$files = array();
-		if (($ret = $this->PROPFIND($propfind_options,$files)) !== true)
+		if (($ret = $this->PROPFIND($propfind_options, $files)) !== true)
 		{
-			return $ret;	// no collection
+			return $ret; // no collection
 		}
 		header('Content-type: text/html; charset='.Translation::charset());
 		echo "<html>\n<head>\n\t<title>".'EGroupware (Cal|Card|Group)DAV server '.htmlspecialchars($options['path'])."</title>\n";
@@ -1024,10 +1024,10 @@ 
 
 		echo '<h1>(Cal|Card|Group)DAV ';
 		$path = '/groupdav.php';
-		foreach(explode('/',$this->_unslashify($options['path'])) as $n => $name)
+		foreach (explode('/', $this->_unslashify($options['path'])) as $n => $name)
 		{
 			$path .= ($n != 1 ? '/' : '').$name;
-			echo Html::a_href(htmlspecialchars($name.'/'),$path);
+			echo Html::a_href(htmlspecialchars($name.'/'), $path);
 		}
 		echo "</h1>\n";
 
@@ -1047,18 +1047,18 @@ 
 		);
 		$n = 0;
 		$collection_props = null;
-		foreach($files['files'] as $file)
+		foreach ($files['files'] as $file)
 		{
 			if (!isset($collection_props))
 			{
 				$collection_props = $this->props2array($file['props']);
 				echo '<h3>'.lang('Collection listing').': '.htmlspecialchars($collection_props['DAV:displayname'])."</h3>\n";
-				continue;	// own entry --> displaying properies later
+				continue; // own entry --> displaying properies later
 			}
-			if(!$n++)
+			if (!$n++)
 			{
 				echo "<table>\n\t<tr class='th'>\n\t\t<th>#</th>\n\t\t<th>".lang('Name')."</th>";
-				foreach($props2show as $label)
+				foreach ($props2show as $label)
 				{
 					echo "\t\t<th>".lang($label)."</th>\n";
 				}
@@ -1068,9 +1068,9 @@ 
 			//echo $file['path']; _debug_array($props);
 			$class = $class == 'row_on' ? 'row_off' : 'row_on';
 
-			if (substr($file['path'],-1) == '/')
+			if (substr($file['path'], -1) == '/')
 			{
-				$name = basename(substr($file['path'],0,-1)).'/';
+				$name = basename(substr($file['path'], 0, -1)).'/';
 			}
 			else
 			{
@@ -1078,14 +1078,14 @@ 
 			}
 
 			echo "\t<tr class='$class'>\n\t\t<td>$n</td>\n\t\t<td>".
-				Html::a_href(htmlspecialchars($name),'/groupdav.php'.strtr($file['path'], array(
+				Html::a_href(htmlspecialchars($name), '/groupdav.php'.strtr($file['path'], array(
 					'%' => '%25',
 					'#' => '%23',
 					'?' => '%3F',
 				)))."</td>\n";
-			foreach($props2show as $prop => $label)
+			foreach ($props2show as $prop => $label)
 			{
-				echo "\t\t<td>".($prop=='DAV:getlastmodified'&&!empty($props[$prop])?date('Y-m-d H:i:s',$props[$prop]):$props[$prop])."</td>\n";
+				echo "\t\t<td>".($prop == 'DAV:getlastmodified' && !empty($props[$prop]) ? date('Y-m-d H:i:s', $props[$prop]) : $props[$prop])."</td>\n";
 			}
 			echo "\t</tr>\n";
 		}
@@ -1099,7 +1099,7 @@ 
 		}
 		echo '<h3>'.lang('Properties')."</h3>\n";
 		echo "<table>\n\t<tr class='th'><th>".lang('Namespace')."</th><th>".lang('Name')."</th><th>".lang('Value')."</th></tr>\n";
-		foreach($collection_props as $name => $value)
+		foreach ($collection_props as $name => $value)
 		{
 			$class = $class == 'row_on' ? 'row_off' : 'row_on';
 			$parts = explode(':', $name);
@@ -1147,11 +1147,11 @@ 
 				'wrap'            => 0,
 			));
 		}
-		if (($href=preg_match('/\<(D:)?href\>[^<]+\<\/(D:)?href\>/i',$value)))
+		if (($href = preg_match('/\<(D:)?href\>[^<]+\<\/(D:)?href\>/i', $value)))
 		{
-			$value = preg_replace('/\<(D:)?href\>('.preg_quote($this->base_uri.'/','/').')?([^<]+)\<\/(D:)?href\>/i','<\\1href><a href="\\2\\3">\\3</a></\\4href>',$value);
+			$value = preg_replace('/\<(D:)?href\>('.preg_quote($this->base_uri.'/', '/').')?([^<]+)\<\/(D:)?href\>/i', '<\\1href><a href="\\2\\3">\\3</a></\\4href>', $value);
 		}
-		$ret = $value[0] == '<'  || strpos($value, "\n") !== false ? '<pre>'.htmlspecialchars($value).'</pre>' : htmlspecialchars($value);
+		$ret = $value[0] == '<' || strpos($value, "\n") !== false ? '<pre>'.htmlspecialchars($value).'</pre>' : htmlspecialchars($value);
 
 		if ($href)
 		{
@@ -1169,10 +1169,10 @@ 
 	protected function props2array(array $props)
 	{
 		$arr = array();
-		foreach($props as $prop)
+		foreach ($props as $prop)
 		{
 			$ns_hash = array('DAV:' => 'D');
-			switch($prop['ns'])
+			switch ($prop['ns'])
 			{
 				case 'DAV:';
 					$ns = 'DAV';
@@ -1191,10 +1191,10 @@ 
 			}
 			if (is_array($prop['val']))
 			{
-				$prop['val'] = $this->_hierarchical_prop_encode($prop['val'], $prop['ns'], $ns_defs='', $ns_hash);
+				$prop['val'] = $this->_hierarchical_prop_encode($prop['val'], $prop['ns'], $ns_defs = '', $ns_hash);
 				// hack to show real namespaces instead of not (visibly) defined shortcuts
 				unset($ns_hash['DAV:']);
-				$value = strtr($v=$this->prop_value($prop['val']),array_flip($ns_hash));
+				$value = strtr($v = $this->prop_value($prop['val']), array_flip($ns_hash));
 			}
 			else
 			{
@@ -1217,13 +1217,13 @@ 
 		// POST to the collection URL plus a UID like name component (like for regular PUT) to create new entrys
 		if (isset($_GET['add-member']) || Handler::get_agent() == 'cfnetwork')
 		{
-			$_GET['add-member'] = '';	// otherwise we give no Location header
+			$_GET['add-member'] = ''; // otherwise we give no Location header
 			return $this->PUT($options);
 		}
 		if ($this->debug) error_log(__METHOD__.'('.array2string($options).')');
 
 		$id = $app = $user = null;
-		$this->_parse_path($options['path'],$id,$app,$user);
+		$this->_parse_path($options['path'], $id, $app, $user);
 
 		if (($handler = self::app_handler($app)))
 		{
@@ -1239,12 +1239,12 @@ 
 				if (isset($options['stream']))
 				{
 					$options['content'] = '';
-					while(!feof($options['stream']))
+					while (!feof($options['stream']))
 					{
-						$options['content'] .= fread($options['stream'],8192);
+						$options['content'] .= fread($options['stream'], 8192);
 					}
 				}
-				return $handler->post($options,$id,$user);
+				return $handler->post($options, $id, $user);
 			}
 		}
 		return '501 Not Implemented';
@@ -1283,7 +1283,7 @@ 
 			return '403 Forbidden';
 		}
 
-		switch($action)
+		switch ($action)
 		{
 			case 'attachment-add':
 				$matches = null;
@@ -1295,8 +1295,8 @@ 
 				}
 				$path = null;
 				if (!($to = self::fopen_attachment($handler->app, $handler->get_id($entry), $filename, $this->_SERVER['CONTENT_TYPE'], $path)) ||
-					isset($options['stream']) && ($copied=stream_copy_to_stream($options['stream'], $to)) === false ||
-					isset($options['content']) && ($copied=fwrite($to, $options['content'])) === false)
+					isset($options['stream']) && ($copied = stream_copy_to_stream($options['stream'], $to)) === false ||
+					isset($options['content']) && ($copied = fwrite($to, $options['content'])) === false)
 				{
 					return '403 Forbidden';
 				}
@@ -1339,8 +1339,8 @@ 
 						}
 					}
 					if (!($to = Vfs::fopen($path, 'w')) ||
-						isset($options['stream']) && ($copied=stream_copy_to_stream($options['stream'], $to)) === false ||
-						isset($options['content']) && ($copied=fwrite($to, $options['content'])) === false)
+						isset($options['stream']) && ($copied = stream_copy_to_stream($options['stream'], $to)) === false ||
+						isset($options['content']) && ($copied = fwrite($to, $options['content'])) === false)
 					{
 						self::xml_error(self::mkprop(self::CALDAV, 'valid-managed-id-parameter', ''));
 						return '403 Forbidden';
@@ -1382,23 +1382,23 @@ 
 	 * @param boolean $delete_via_put
 	 * @return boolean false on error, eg. invalid managed id, for false an xml-error body has been send
 	 */
-	public static function handle_attach($app, $id, $attach, $delete_via_put=false)
+	public static function handle_attach($app, $id, $attach, $delete_via_put = false)
 	{
 		//error_log(__METHOD__."('$app', $id, attach=".array2string($attach).", delete_via_put=".array2string($delete_via_put).')');
 
 		if (!Link::file_access($app, $id, Acl::EDIT))
 		{
 			error_log(__METHOD__."('$app', $id, ...) no rights to update attachments");
-			return;	// no rights --> nothing to do
+			return; // no rights --> nothing to do
 		}
-		if (!is_array($attach)) $attach = array();	// could be PEAR_Error if not set
+		if (!is_array($attach)) $attach = array(); // could be PEAR_Error if not set
 
 		if ($delete_via_put)
 		{
-			foreach(Vfs::find(Link::vfs_path($app, $id, '', true), array('type' => 'F')) as $path)
+			foreach (Vfs::find(Link::vfs_path($app, $id, '', true), array('type' => 'F')) as $path)
 			{
 				$found = false;
-				foreach($attach as $key => $attr)
+				foreach ($attach as $key => $attr)
 				{
 					if ($attr['params']['MANAGED-ID'] === self::path2managed_id($path))
 					{
@@ -1415,7 +1415,7 @@ 
 			}
 		}
 		// turn inline attachments into managed ones
-		foreach($attach as $key => $attr)
+		foreach ($attach as $key => $attr)
 		{
 			if (!empty($attr['params']['FMTTYPE']))
 			{
@@ -1428,7 +1428,7 @@ 
 						self::xml_error(self::mkprop(self::CALDAV, 'valid-managed-id', ''));
 						return false;
 					}
-					if($path == ($link = Link::vfs_path($app, $id, Vfs::basename($path))))
+					if ($path == ($link = Link::vfs_path($app, $id, Vfs::basename($path))))
 					{
 						error_log(__METHOD__."('$app', $id, ...) trying to modify existing MANAGED-ID --> ignored! ".array2string($attr));
 						continue;
@@ -1436,8 +1436,8 @@ 
 					// reuse valid managed-id --> symlink attachment
 					if (Vfs::file_exists($link))
 					{
-						if (Vfs::readlink($link) === $path) continue;	// no need to recreate identical link
-						Vfs::unlink($link);		// symlink will fail, if $link exists
+						if (Vfs::readlink($link) === $path) continue; // no need to recreate identical link
+						Vfs::unlink($link); // symlink will fail, if $link exists
 					}
 					if (!Vfs::symlink($path, $link))
 					{
@@ -1445,7 +1445,7 @@ 
 					}
 					continue;
 				}
-				if (!($to = self::fopen_attachment($app, $id, $filename=$attr['params']['FILENAME'], $attr['params']['FMTTYPE'], $path)) ||
+				if (!($to = self::fopen_attachment($app, $id, $filename = $attr['params']['FILENAME'], $attr['params']['FMTTYPE'], $path)) ||
 					// Horde Icalendar does NOT decode automatic
 					(/*$copied=*/fwrite($to, $attr['params']['ENCODING'] == 'BASE64' ? base64_decode($attr['value']) : $attr['value'])) === false)
 				{
@@ -1472,16 +1472,16 @@ 
 	 * @param string &$path =null on return path opened
 	 * @return resource
 	 */
-	protected static function fopen_attachment($app, $id, $_filename, $mime=null, &$path=null)
+	protected static function fopen_attachment($app, $id, $_filename, $mime = null, &$path = null)
 	{
 		$filename = empty($_filename) ? 'attachment' : Vfs::basename($_filename);
 
-		if (strpos($mime, ';')) list($mime) = explode(';', $mime);	// in case it contains eg. charset info
+		if (strpos($mime, ';')) list($mime) = explode(';', $mime); // in case it contains eg. charset info
 
 		$ext = !empty($mime) ? MimeMagic::mime2ext($mime) : '';
 
 		$matches = null;
-		if (!$ext || substr($filename, -strlen($ext)-1) == '.'.$ext ||
+		if (!$ext || substr($filename, -strlen($ext) - 1) == '.'.$ext ||
 			preg_match('/\.([^.]+)$/', $filename, $matches) && MimeMagic::ext2mime($matches[1]) == $mime)
 		{
 			$parts = explode('.', $filename);
@@ -1492,7 +1492,7 @@ 
 		{
 			$ext = '.'.$ext;
 		}
-		for($i = 1; $i < 100; ++$i)
+		for ($i = 1; $i < 100; ++$i)
 		{
 			$path = Link::vfs_path($app, $id, $filename.($i > 1 ? '-'.$i : '').$ext, true);
 			if (!Vfs::stat($path)) break;
@@ -1538,7 +1538,7 @@ 
 	 */
 	public static function add_attach($app, $id, array &$attributes, array &$parameters)
 	{
-		foreach(Vfs::find(Link::vfs_path($app, $id, '', true), array(
+		foreach (Vfs::find(Link::vfs_path($app, $id, '', true), array(
 			'type' => 'F',
 			'need_mime' => true,
 		), true) as $path => $stat)
@@ -1546,7 +1546,7 @@ 
 			// handle symlinks --> return target size and mime-type
 			if (($target = Vfs::readlink($path)))
 			{
-				if (!($stat = Vfs::stat($target))) continue;	// broken or inaccessible symlink
+				if (!($stat = Vfs::stat($target))) continue; // broken or inaccessible symlink
 
 				// check if target is in /apps, probably reused MANAGED-ID --> return it
 				if (substr($target, 0, 6) == '/apps/')
@@ -1558,7 +1558,7 @@ 
 			$parameters['ATTACH'][] = array(
 				'MANAGED-ID' => self::path2managed_id($path),
 				'FMTTYPE'    => $stat['mime'],
-				'SIZE'       => (string)$stat['size'],	// Horde_Icalendar renders int as empty string
+				'SIZE'       => (string)$stat['size'], // Horde_Icalendar renders int as empty string
 				'FILENAME'   => Vfs::basename($path),
 			);
 			// if we have attachments, set X-attribute to enable deleting them by put
@@ -1586,7 +1586,7 @@ 
 	 * @param string|int $id =null id to check agains path
 	 * @return string|boolean "/apps/$app/$id/something" or false if not found or not belonging to given $app/$id
 	 */
-	static public function managed_id2path($managed_id, $app=null, $id=null)
+	static public function managed_id2path($managed_id, $app = null, $id = null)
 	{
 		$path = base64_decode($managed_id);
 
@@ -1596,7 +1596,7 @@ 
 		}
 		elseif (!empty($app) && !empty($id))
 		{
-			list(,,$a,$i) = explode('/', $path);
+			list(,, $a, $i) = explode('/', $path);
 			if ($a !== $app || $i !== (string)$id)
 			{
 				$path = false;
@@ -1624,7 +1624,7 @@ 
 		'displayname' => self::DAV,
 		'calendar-description' => self::CALDAV,
 		'addressbook-description' => self::CARDDAV,
-		'calendar-color' => self::ICAL,	// only mentioned that old prefs still work
+		'calendar-color' => self::ICAL, // only mentioned that old prefs still work
 		'calendar-order' => self::ICAL,
 		'default-alarm-vevent-date' => self::CALDAV,
 		'default-alarm-vevent-datetime' => self::CALDAV,
@@ -1642,11 +1642,11 @@ 
 
 		// parse path in form [/account_lid]/app[/more]
 		$id = $app = $user = $user_prefix = null;
-		self::_parse_path($options['path'],$id,$app,$user,$user_prefix);	// allways returns false if eg. !$id
+		self::_parse_path($options['path'], $id, $app, $user, $user_prefix); // allways returns false if eg. !$id
 		if ($app == 'principals' || $id || $options['path'] == '/')
 		{
 			if ($this->debug > 1) error_log(__METHOD__.": user='$user', app='$app', id='$id': 404 not found!");
-			foreach($options['props'] as &$prop)
+			foreach ($options['props'] as &$prop)
 			{
 				$prop['status'] = '403 Forbidden';
 			}
@@ -1654,10 +1654,10 @@ 
 		}
 		// store selected props in preferences, eg. calendar-color, see self::$proppatch_props
 		$need_save = array();
-		foreach($options['props'] as &$prop)
+		foreach ($options['props'] as &$prop)
 		{
 			if ((isset(self::$proppatch_props[$prop['name']]) && self::$proppatch_props[$prop['name']] === $prop['xmlns'] ||
-				!in_array($prop['xmlns'],self::$ns_needs_explicit_named_props)))
+				!in_array($prop['xmlns'], self::$ns_needs_explicit_named_props)))
 			{
 				if (!$app)
 				{
@@ -1686,7 +1686,7 @@ 
 			}
 			else
 			{
-				$prop['status'] = '409 Conflict';	// could also be "403 Forbidden"
+				$prop['status'] = '409 Conflict'; // could also be "403 Forbidden"
 			}
 		}
 		if ($need_save)
@@ -1695,7 +1695,7 @@ 
 			// call calendar-hook, if default-alarms are changed, to sync them to calendar prefs
 			if (class_exists('calendar_hooks'))
 			{
-				foreach($need_save as $name)
+				foreach ($need_save as $name)
 				{
 					list($name) = explode(':', $name);
 					if (in_array($name, array('default-alarm-vevent-date', 'default-alarm-vevent-datetime')))
@@ -1720,22 +1720,22 @@ 
 		if (isset($options['stream']))
 		{
 			$options['content'] = '';
-			while(!feof($options['stream']))
+			while (!feof($options['stream']))
 			{
-				$options['content'] .= fread($options['stream'],8192);
+				$options['content'] .= fread($options['stream'], 8192);
 			}
 		}
 
 		if ($this->debug) error_log(__METHOD__.'('.array2string($options).')');
 
 		$id = $app = $user = $prefix = null;
-		if (!$this->_parse_path($options['path'],$id,$app,$user,$prefix))
+		if (!$this->_parse_path($options['path'], $id, $app, $user, $prefix))
 		{
 			return '404 Not Found';
 		}
 		if (($handler = self::app_handler($app)))
 		{
-			$status = $handler->put($options,$id,$user,$prefix);
+			$status = $handler->put($options, $id, $user, $prefix);
 
 			// set default stati: true --> 204 No Content, false --> should be already handled
 			if (is_bool($status)) $status = $status ? '204 No Content' : '400 Something went wrong';
@@ -1765,13 +1765,13 @@ 
 		if ($this->debug) error_log(__METHOD__.'('.array2string($options).')');
 
 		$id = $app = $user = null;
-		if (!$this->_parse_path($options['path'],$id,$app,$user))
+		if (!$this->_parse_path($options['path'], $id, $app, $user))
 		{
 			return '404 Not Found';
 		}
 		if (($handler = self::app_handler($app)))
 		{
-			$status = $handler->delete($options,$id);
+			$status = $handler->delete($options, $id);
 			// set default stati: true --> 204 No Content, false --> should be already handled
 			if (is_bool($status)) $status = $status ? '204 No Content' : '400 Something went wrong';
 			return $status;
@@ -1811,7 +1811,7 @@ 
 	 * @param  array  general parameter passing array
 	 * @return bool   true on success
 	 */
-	function COPY($options, $del=false)
+	function COPY($options, $del = false)
 	{
 		if ($this->debug) error_log('self::'.($del ? 'MOVE' : 'COPY').'('.array2string($options).')');
 
@@ -1827,8 +1827,8 @@ 
 	function LOCK(&$options)
 	{
 		$id = $app = $user = null;
-		self::_parse_path($options['path'],$id,$app,$user);
-		$path = Vfs::app_entry_lock_path($app,$id);
+		self::_parse_path($options['path'], $id, $app, $user);
+		$path = Vfs::app_entry_lock_path($app, $id);
 
 		if ($this->debug) error_log(__METHOD__.'('.array2string($options).") path=$path");
 
@@ -1836,16 +1836,16 @@ 
 		$handler = self::app_handler($app);
 
 		// TODO recursive locks on directories not supported yet
-		if (!$id || !empty($options['depth']) || !$handler->check_access(Acl::EDIT,$id))
+		if (!$id || !empty($options['depth']) || !$handler->check_access(Acl::EDIT, $id))
 		{
 			return '409 Conflict';
 		}
-		$options['timeout'] = time()+300; // 5min. hardcoded
+		$options['timeout'] = time() + 300; // 5min. hardcoded
 
 		// dont know why, but HTTP_WebDAV_Server passes the owner in D:href tags, which get's passed unchanged to checkLock/PROPFIND
 		// that's wrong according to the standard and cadaver does not show it on discover --> strip_tags removes eventual tags
-		if (($ret = Vfs::lock($path,$options['locktoken'],$options['timeout'],strip_tags($options['owner']),
-			$options['scope'],$options['type'],isset($options['update']),false)) && !isset($options['update']))		// false = no ACL check
+		if (($ret = Vfs::lock($path, $options['locktoken'], $options['timeout'], strip_tags($options['owner']),
+			$options['scope'], $options['type'], isset($options['update']), false)) && !isset($options['update']))		// false = no ACL check
 		{
 			return $ret ? '200 OK' : '409 Conflict';
 		}
@@ -1861,11 +1861,11 @@ 
 	function UNLOCK(&$options)
 	{
 		$id = $app = $user = null;
-		self::_parse_path($options['path'],$id,$app,$user);
-		$path = Vfs::app_entry_lock_path($app,$id);
+		self::_parse_path($options['path'], $id, $app, $user);
+		$path = Vfs::app_entry_lock_path($app, $id);
 
 		if ($this->debug) error_log(__METHOD__.'('.array2string($options).") path=$path");
-		return Vfs::unlock($path,$options['token']) ? '204 No Content' : '409 Conflict';
+		return Vfs::unlock($path, $options['token']) ? '204 No Content' : '409 Conflict';
 	}
 
 	/**
@@ -1877,7 +1877,7 @@ 
 	function checkLock($path)
 	{
 		$id = $app = $user = null;
-		self::_parse_path($path,$id,$app,$user);
+		self::_parse_path($path, $id, $app, $user);
 
 		return Vfs::checkLock(Vfs::app_entry_lock_path($app, $id));
 	}
@@ -1891,7 +1891,7 @@ 
 	function ACL(&$options)
 	{
 		$id = $app = $user = null;
-		self::_parse_path($options['path'],$id,$app,$user);
+		self::_parse_path($options['path'], $id, $app, $user);
 
 		if ($this->debug) error_log(__METHOD__.'('.array2string($options).") path=$options[path]");
 
@@ -1921,7 +1921,7 @@ 
 	 * @param string &$user_prefix =null
 	 * @return boolean true on success, false on error
 	 */
-	function _parse_path($path,&$id,&$app,&$user,&$user_prefix=null)
+	function _parse_path($path, &$id, &$app, &$user, &$user_prefix = null)
 	{
 		if ($this->debug)
 		{
@@ -1950,7 +1950,7 @@ 
 			}
 		}
 		elseif (($account_id = $this->accounts->name2id($parts[0], 'account_lid')) ||
-			($account_id = $this->accounts->name2id($parts[0]=urldecode($parts[0]))))
+			($account_id = $this->accounts->name2id($parts[0] = urldecode($parts[0]))))
 		{
 			// /$user/$app/...
 			$user = array_shift($parts);
@@ -1974,7 +1974,7 @@ 
 			{
 				$account_id = 0;
 			}
-			elseif($app == 'resource' || $app == 'location')
+			elseif ($app == 'resource' || $app == 'location')
 			{
 				if (!Principals::read_resource($res_id = (int)$username))
 				{
@@ -1984,7 +1984,7 @@ 
 				$app = 'calendar';
 			}
 			elseif (!($account_id = $this->accounts->name2id($username, 'account_lid')) &&
-					!($account_id = $this->accounts->name2id($username=urldecode($username))))
+					!($account_id = $this->accounts->name2id($username = urldecode($username))))
 			{
 				return false;
 			}
@@ -2009,11 +2009,11 @@ 
 		$id = array_pop($parts);
 
 		$ok = ($id || isset($_GET['add-member']) && $_SERVER['REQUEST_METHOD'] == 'POST') &&
-			($user || $user === 0) && in_array($app,array('addressbook','calendar','infolog','principals'));
+			($user || $user === 0) && in_array($app, array('addressbook', 'calendar', 'infolog', 'principals'));
 
 		if ($this->debug)
 		{
-			error_log(__METHOD__."('$path') returning " . ($ok ? 'true' : 'false') . ": id='$id', app='$app', user='$user', user_prefix='$user_prefix'");
+			error_log(__METHOD__."('$path') returning ".($ok ? 'true' : 'false').": id='$id', app='$app', user='$user', user_prefix='$user_prefix'");
 		}
 		return $ok;
 	}
@@ -2035,9 +2035,9 @@ 
 	 *
      * @param  $prefix =null prefix filesystem path with given path, eg. "/webdav" for owncloud 4.5 remote.php
 	 */
-	function ServeRequest($prefix=null)
+	function ServeRequest($prefix = null)
 	{
-		if ((self::$log_level=$GLOBALS['egw_info']['user']['preferences']['groupdav']['debug_level']) === 'r' ||
+		if ((self::$log_level = $GLOBALS['egw_info']['user']['preferences']['groupdav']['debug_level']) === 'r' ||
 			self::$log_level === 'f' || $this->debug)
 		{
 			self::$request_starttime = microtime(true);
@@ -2057,7 +2057,7 @@ 
 	 *
 	 * @param string $extra ='' extra text to add below request-log, eg. exception thrown
 	 */
-	protected function log_request($extra='')
+	protected function log_request($extra = '')
 	{
 		if (self::$request_starttime)
 		{
@@ -2065,7 +2065,7 @@ 
 			{
 				$msg_file = $GLOBALS['egw_info']['server']['files_dir'];
 				$msg_file .= '/groupdav';
-				if (!file_exists($msg_file) && !mkdir($msg_file,0700))
+				if (!file_exists($msg_file) && !mkdir($msg_file, 0700))
 				{
 					error_log(__METHOD__."() Could NOT create directory '$msg_file'!");
 					return;
@@ -2078,19 +2078,19 @@ 
 				}
 				else
 				{
-					$msg_file .= str_replace('/','!',$_SERVER['HTTP_USER_AGENT']).'.log';
+					$msg_file .= str_replace('/', '!', $_SERVER['HTTP_USER_AGENT']).'.log';
 				}
 				$content = '*** '.$_SERVER['REMOTE_ADDR'].' '.date('c')."\n";
 			}
 			$content .= $_SERVER['REQUEST_METHOD'].' '.$_SERVER['REQUEST_URI'].' HTTP/1.1'."\n";
 			// reconstruct headers
-			foreach($_SERVER as $name => $value)
+			foreach ($_SERVER as $name => $value)
 			{
-				list($type,$name) = explode('_',$name,2);
+				list($type, $name) = explode('_', $name, 2);
 				if ($type == 'HTTP' || $type == 'CONTENT')
 				{
-					$content .= str_replace(' ','-',ucwords(strtolower(($type=='HTTP'?'':$type.' ').str_replace('_',' ',$name)))).
-						': '.($name=='AUTHORIZATION'?'Basic ***************':$value)."\n";
+					$content .= str_replace(' ', '-', ucwords(strtolower(($type == 'HTTP' ? '' : $type.' ').str_replace('_', ' ', $name)))).
+						': '.($name == 'AUTHORIZATION' ? 'Basic ***************' : $value)."\n";
 				}
 			}
 			$content .= "\n";
@@ -2101,29 +2101,29 @@ 
 			$content .= 'HTTP/1.1 '.$this->_http_status."\n";
 			$content .= 'Date: '.str_replace('+0000', 'GMT', gmdate('r'))."\n";
 			$content .= 'Server: '.$_SERVER['SERVER_SOFTWARE']."\n";
-			foreach(headers_list() as $line)
+			foreach (headers_list() as $line)
 			{
 				$content .= $line."\n";
 			}
 			if (($c = ob_get_flush())) $content .= "\n";
-			if (self::$log_level !== 'f' && strlen($c) > 1536) $c = substr($c,0,1536)."\n*** LOG TRUNKATED\n";
+			if (self::$log_level !== 'f' && strlen($c) > 1536) $c = substr($c, 0, 1536)."\n*** LOG TRUNKATED\n";
 			$content .= $c;
 			if ($extra) $content .= $extra;
 			if ($this->to_log) $content .= "\n### ".implode("\n### ", $this->to_log)."\n";
-			$content .= $this->_http_status[0] == '4' && substr($this->_http_status,0,3) != '412' ||
-				$this->_http_status[0] == '5' ? '###' : '***';	// mark failed requests with ###, instead of ***
-			$content .= sprintf(' %s --> "%s" took %5.3f s',$_SERVER['REQUEST_METHOD'].($_SERVER['REQUEST_METHOD']=='REPORT'?' '.$this->propfind_options['root']['name']:'').' '.$_SERVER['PATH_INFO'],$this->_http_status,microtime(true)-self::$request_starttime)."\n\n";
+			$content .= $this->_http_status[0] == '4' && substr($this->_http_status, 0, 3) != '412' ||
+				$this->_http_status[0] == '5' ? '###' : '***'; // mark failed requests with ###, instead of ***
+			$content .= sprintf(' %s --> "%s" took %5.3f s', $_SERVER['REQUEST_METHOD'].($_SERVER['REQUEST_METHOD'] == 'REPORT' ? ' '.$this->propfind_options['root']['name'] : '').' '.$_SERVER['PATH_INFO'], $this->_http_status, microtime(true) - self::$request_starttime)."\n\n";
 
-			if ($msg_file && ($f = fopen($msg_file,'a')))
+			if ($msg_file && ($f = fopen($msg_file, 'a')))
 			{
-				flock($f,LOCK_EX);
-				fwrite($f,$content);
-				flock($f,LOCK_UN);
+				flock($f, LOCK_EX);
+				fwrite($f, $content);
+				flock($f, LOCK_UN);
 				fclose($f);
 			}
 			else
 			{
-				foreach(explode("\n",$content) as $line)
+				foreach (explode("\n", $content) as $line)
 				{
 					error_log($line);
 				}
@@ -2137,7 +2137,7 @@ 
 	 * @param string|array $xml_error string with name for empty element in DAV NS or array with props
 	 * @param string $human_readable =null human readable error message
 	 */
-	public static function xml_error($xml_error, $human_readable=null)
+	public static function xml_error($xml_error, $human_readable = null)
 	{
 		header('Content-type: application/xml; charset=utf-8');
 
@@ -2154,7 +2154,7 @@ 
 			$xml->writeElement('responsedescription', $human_readable);
 		}
 
-		$xml->endElement();	// DAV:error
+		$xml->endElement(); // DAV:error
 		$xml->endDocument();
 		echo $xml->outputMemory();
 	}
@@ -2170,7 +2170,7 @@ 
 		if (is_string($props)) $props = self::mkprop($props, '');
 		if (isset($props['name'])) $props = array($props);
 
-		foreach($props as $prop)
+		foreach ($props as $prop)
 		{
 			if (isset($prop['ns']) && $prop['ns'] !== 'DAV:')
 			{
@@ -2222,7 +2222,7 @@ 
 	{
 		// logging exception as regular egw_execption_hander does
 		$headline = null;
-		_egw_log_exception($e,$headline);
+		_egw_log_exception($e, $headline);
 
 		// exception handler sending message back to the client as basic auth message
 		$error = str_replace(array("\r", "\n"), array('', ' | '), $e->getMessage());
@@ -2233,7 +2233,7 @@ 
 		// if our own logging is active, log the request plus a trace, if enabled in server-config
 		if (self::$request_starttime && isset(self::$instance))
 		{
-			self::$instance->_http_status = '401 Unauthorized';	// to correctly log it
+			self::$instance->_http_status = '401 Unauthorized'; // to correctly log it
 			if ($GLOBALS['egw_info']['server']['exception_show_trace'])
 			{
 				self::$instance->log_request("\n".$e->getTraceAsString()."\n");
@@ -2255,7 +2255,7 @@ 
 	 */
 	static function generate_uid($_appName, $_eventID)
 	{
-		if(empty($_appName) || empty($_eventID)) return false;
+		if (empty($_appName) || empty($_eventID)) return false;
 
 		return $_appName.'-'.$_eventID.'-'.$GLOBALS['egw_info']['server']['install_id'];
 	}