EGroupware / egroupware

phpgwapi/inc/class.groupdav_handler.inc.php

Doc Comments +9 added lines, -18 removed lines

@@ -147,7 +147,7 @@ 
 	 *
 	 * @param string $path
 	 * @param array $filter
-	 * @param array|boolean $start false=return all or array(start,num)
+	 * @param integer[] $start false=return all or array(start,num)
 	 * @param int &$total
 	 * @return array with "files" array with values for keys path and props
 	 */
@@ -158,7 +158,6 @@ 
 	 *
 	 * @param array &$options
 	 * @param int $id
-	 * @param int $user=null account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
 	abstract function get(&$options,$id,$user=null);
@@ -168,7 +167,6 @@ 
 	 *
 	 * @param array &$options
 	 * @param int $id
-	 * @param int $user=null account_id of owner, default null
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
 	abstract function put(&$options,$id,$user=null);
@@ -186,7 +184,6 @@ 
 	 * Read an entry
 	 *
 	 * @param string|int $id
-	 * @param string $path=null implementation can use it, used in call from _common_get_put_delete
 	 * @return array|boolean array with entry, false if no read rights, null if $id does not exist
 	 */
 	abstract function read($id /*,$path=null*/);
@@ -214,10 +211,8 @@ 
 	/**
 	 * Add extra properties for collections
 	 *
-	 * @param array $props=array() regular props by the groupdav handler
 	 * @param string $displayname
-	 * @param string $base_uri=null base url of handler
-	 * @param int $user=null account_id of owner of collection
+	 * @param string $base_uri base url of handler
 	 * @return array
 	 */
 	public function extra_properties(array $props=array(), $displayname, $base_uri=null, $user=null)
@@ -228,8 +223,7 @@ 
 	/**
 	 * Get the etag for an entry, can be reimplemented for other algorithm or field names
 	 *
-	 * @param array|int $event array with event or cal_id
-	 * @return string|boolean string with etag or false
+	 * @return false|string string with etag or false
 	 */
 	function get_etag($entry)
 	{
@@ -268,7 +262,7 @@ 
 	 * @param array &$options
 	 * @param int|string &$id on return self::$path_extension got removed
 	 * @param boolean &$return_no_access=false if set to true on call, instead of '403 Forbidden' the entry is returned and $return_no_access===false
-	 * @param boolean $ignore_if_match=false if true, ignore If-Match precondition
+	 * @param boolean $ignore_if_match if true, ignore If-Match precondition
 	 * @return array|string entry on success, string with http-error-code on failure, null for PUT on an unknown id
 	 */
 	function _common_get_put_delete($method,&$options,&$id,&$return_no_access=false,$ignore_if_match=false)
@@ -343,7 +337,6 @@ 
 	 *
 	 * @param array $options
 	 * @param int $id
-	 * @param int $user=null account_id
 	 * @return string|boolean http status of get or null if no representation was requested
 	 */
 	public function check_return_representation($options, $id, $user=null)
@@ -416,7 +409,7 @@ 
 	/**
 	 * Identify know GroupDAV agents by HTTP_USER_AGENT header
 	 *
-	 * @return string|boolean agent name or false
+	 * @return string|false agent name or false
 	 */
 	static function get_agent()
 	{
@@ -503,7 +496,6 @@ 
 	 * Priviledges are for the collection, not the resources / entries!
 	 *
 	 * @param string $path path of collection
-	 * @param int $user=null owner of the collection, default current user
 	 * @return array with privileges
 	 */
 	public function current_user_privileges($path, $user=null)
@@ -556,8 +548,8 @@ 
 	 * @param int|array $entry id or array of new created entry
 	 * @param string $path
 	 * @param int|string $retval
-	 * @param boolean $path_attr_is_name=true true: path_attr is ca(l|rd)dav_name, false: id (GroupDAV needs Location header)
-	 * @param string $etag=null etag, to not calculate it again (if != null)
+	 * @param boolean $path_attr_is_name true: path_attr is ca(l|rd)dav_name, false: id (GroupDAV needs Location header)
+	 * @param string $etag
 	 */
 	function put_response_headers($entry, $path, $retval, $path_attr_is_name=true, $etag=null)
 	{
@@ -655,7 +647,7 @@ 
 	 *
 	 * base_uri of WebDAV class can be both, depending on EGroupware config
 	 *
-	 * @param boolean $full_uri=true
+	 * @param boolean $full_uri
 	 * @return string eg. https://domain.com/egroupware/groupdav.php
 	 */
 	public function base_uri($full_uri=true)
@@ -726,7 +718,6 @@ 
 	 *
 	 * @param string $path
 	 * @param int $user parameter necessary to call getctag, if no $token specified
-	 * @param int $token=null modification time, default call getctag($path, $user) to fetch it
 	 * @return string
 	 */
 	public function get_sync_token($path, $user, $token=null)
@@ -822,7 +813,7 @@ 
 	 *
 	 * @param groupdav_handler $handler
 	 * @param array $filter filter for propfind call
-	 * @param array $files=array() extra files/responses to return too
+	 * @param string $path
 	 */
 	public function __construct(groupdav_handler $handler, $path, array $filter,array &$files=array())
 	{

Spacing +58 added lines, -58 removed lines

@@ -140,7 +140,7 @@ 
 	 * @param int $user account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	abstract function propfind($path,&$options,&$files,$user);
+	abstract function propfind($path, &$options, &$files, $user);
 
 	/**
 	 * Propfind callback, if interator is used
@@ -151,7 +151,7 @@ 
 	 * @param int &$total
 	 * @return array with "files" array with values for keys path and props
 	 */
-	function &propfind_callback($path, array $filter,$start,&$total) { }
+	function &propfind_callback($path, array $filter, $start, &$total) { }
 
 	/**
 	 * Handle get request for an applications entry
@@ -161,7 +161,7 @@ 
 	 * @param int $user=null account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	abstract function get(&$options,$id,$user=null);
+	abstract function get(&$options, $id, $user = null);
 
 	/**
 	 * Handle get request for an applications entry
@@ -171,7 +171,7 @@ 
 	 * @param int $user=null account_id of owner, default null
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	abstract function put(&$options,$id,$user=null);
+	abstract function put(&$options, $id, $user = null);
 
 	/**
 	 * Handle get request for an applications entry
@@ -180,7 +180,7 @@ 
 	 * @param int $id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	abstract function delete(&$options,$id);
+	abstract function delete(&$options, $id);
 
 	/**
 	 * Read an entry
@@ -209,7 +209,7 @@ 
 	 * @param array|int $entry entry-array or id
 	 * @return boolean null if entry does not exist, false if no access, true if access permitted
 	 */
-	abstract function check_access($acl,$entry);
+	abstract function check_access($acl, $entry);
 
 	/**
 	 * Add extra properties for collections
@@ -220,7 +220,7 @@ 
 	 * @param int $user=null account_id of owner of collection
 	 * @return array
 	 */
-	public function extra_properties(array $props=array(), $displayname, $base_uri=null, $user=null)
+	public function extra_properties(array $props = array(), $displayname, $base_uri = null, $user = null)
 	{
 		return $props;
 	}
@@ -253,7 +253,7 @@ 
 	 */
 	static function etag2value($etag)
 	{
-		list(,$val) = explode(':',$etag,2);
+		list(,$val) = explode(':', $etag, 2);
 
 		return $val;
 	}
@@ -271,18 +271,18 @@ 
 	 * @param boolean $ignore_if_match=false if true, ignore If-Match precondition
 	 * @return array|string entry on success, string with http-error-code on failure, null for PUT on an unknown id
 	 */
-	function _common_get_put_delete($method,&$options,&$id,&$return_no_access=false,$ignore_if_match=false)
+	function _common_get_put_delete($method, &$options, &$id, &$return_no_access = false, $ignore_if_match = false)
 	{
-		if (self::$path_extension) $id = basename($id,self::$path_extension);
+		if (self::$path_extension) $id = basename($id, self::$path_extension);
 
 		if ($this->app != 'principals' && !$GLOBALS['egw_info']['user']['apps'][$this->app])
 		{
 			if ($this->debug) error_log(__METHOD__."($method,,$id) 403 Forbidden: no app rights for '$this->app'");
-			return '403 Forbidden';		// no app rights
+			return '403 Forbidden'; // no app rights
 		}
 		$extra_acl = $this->method2acl[$method];
 		if ($id && !($entry = $this->read($id, $options['path'])) && ($method != 'PUT' || $entry === false) ||
-			($extra_acl != EGW_ACL_READ && $this->check_access($extra_acl,$entry) === false))
+			($extra_acl != EGW_ACL_READ && $this->check_access($extra_acl, $entry) === false))
 		{
 			if ($return_no_access && !is_null($entry))
 			{
@@ -291,7 +291,7 @@ 
 			}
 			else
 			{
-				if ($this->debug) error_log(__METHOD__."($method,,$id) 403 Forbidden/404 Not Found: read($id)==".($entry===false?'false':'null'));
+				if ($this->debug) error_log(__METHOD__."($method,,$id) 403 Forbidden/404 Not Found: read($id)==".($entry === false ? 'false' : 'null'));
 				return !is_null($entry) ? '403 Forbidden' : '404 Not Found';
 			}
 		}
@@ -321,7 +321,7 @@ 
 				if ($if_none_match[0] == '"') $if_none_match = substr($if_none_match, 1, -1);
 
 				// if an IF_NONE_MATCH is given, check if we need to send a new export, or the current one is still up-to-date
-				if (in_array($method, array('GET','HEAD')) && $etag === $if_none_match)
+				if (in_array($method, array('GET', 'HEAD')) && $etag === $if_none_match)
 				{
 					if ($this->debug) error_log(__METHOD__."($method,,$id) HTTP_IF_NONE_MATCH='$_SERVER[HTTP_IF_NONE_MATCH]', etag='$etag': 304 Not Modified");
 					return '304 Not Modified';
@@ -346,7 +346,7 @@ 
 	 * @param int $user=null account_id
 	 * @return string|boolean http status of get or null if no representation was requested
 	 */
-	public function check_return_representation($options, $id, $user=null)
+	public function check_return_representation($options, $id, $user = null)
 	{
 		//error_log(__METHOD__."(, $id, $user) start ".function_backtrace());
 		if (isset($_SERVER['HTTP_PREFER']) && in_array('return=representation', preg_split('/, ?/', $_SERVER['HTTP_PREFER'])))
@@ -400,7 +400,7 @@ 
 	{
 		static $handler_cache = array();
 
-		if (!array_key_exists($app,$handler_cache))
+		if (!array_key_exists($app, $handler_cache))
 		{
 			$class = $app.'_groupdav';
 			if (!class_exists($class) && !class_exists($class = 'groupdav_'.$app)) return null;
@@ -427,29 +427,29 @@ 
 			$agent = false;
 			// identify the agent (GroupDAV client) from the HTTP_USER_AGENT header
 			$user_agent = strtolower($_SERVER['HTTP_USER_AGENT']);
-			foreach(array(
-				'carddav-sync'      => 'carddav-sync',	// dmfs.org CardDAV client for Android: CardDAV-Sync (Android) (like iOS/5.0.1 (9A405) dataaccessd/1.0) gzip
-				'iphone'            => 'iphone',	// Apple iPhone iCal
-				'davkit'            => 'davkit',	// Apple iCal 10.6
-				'coredav'           => 'coredav',	// Apple iCal 10.7
-				'calendarstore'     => 'calendarstore',	// Apple iCal 5.0.1 under OS X 10.7.2
-				'calendaragent/'    => 'calendaragent',	// Apple iCal OS X 10.8*: Mac OS X/10.8.2 (12C54) CalendarAgent/55
-				'dataaccess'        => 'dataaccess',	// Apple addressbook iPhone
-				'cfnetwork'         => 'cfnetwork',	// Apple Addressbook 10.6/7
-				'addressbook/'      => 'cfnetwork',	// Apple Addressbook OS X 10.8*: Mac OS X/10.8.2 (12C54) AddressBook/1167
-				'bionicmessage.net' => 'funambol',	// funambol GroupDAV connector from bionicmessage.net
-				'zideone'           => 'zideone',	// zideone outlook plugin
-				'lightning'         => 'lightning',	// Lighting (incl. SOGo connector for addressbook)
-				'webkit'			=> 'webkit',	// Webkit Browser (also reports KHTML!)
-				'akonadi'			=> 'akonadi',	// new KDE PIM framework (also reports KHTML!)
-				'khtml'             => 'kde',		// KDE clients
+			foreach (array(
+				'carddav-sync'      => 'carddav-sync', // dmfs.org CardDAV client for Android: CardDAV-Sync (Android) (like iOS/5.0.1 (9A405) dataaccessd/1.0) gzip
+				'iphone'            => 'iphone', // Apple iPhone iCal
+				'davkit'            => 'davkit', // Apple iCal 10.6
+				'coredav'           => 'coredav', // Apple iCal 10.7
+				'calendarstore'     => 'calendarstore', // Apple iCal 5.0.1 under OS X 10.7.2
+				'calendaragent/'    => 'calendaragent', // Apple iCal OS X 10.8*: Mac OS X/10.8.2 (12C54) CalendarAgent/55
+				'dataaccess'        => 'dataaccess', // Apple addressbook iPhone
+				'cfnetwork'         => 'cfnetwork', // Apple Addressbook 10.6/7
+				'addressbook/'      => 'cfnetwork', // Apple Addressbook OS X 10.8*: Mac OS X/10.8.2 (12C54) AddressBook/1167
+				'bionicmessage.net' => 'funambol', // funambol GroupDAV connector from bionicmessage.net
+				'zideone'           => 'zideone', // zideone outlook plugin
+				'lightning'         => 'lightning', // Lighting (incl. SOGo connector for addressbook)
+				'webkit'			=> 'webkit', // Webkit Browser (also reports KHTML!)
+				'akonadi'			=> 'akonadi', // new KDE PIM framework (also reports KHTML!)
+				'khtml'             => 'kde', // KDE clients
 				'neon'              => 'neon',
-				'ical4ol'			=> 'ical4ol',	// iCal4OL client
-				'evolution'         => 'evolution',	// Evolution
-				'thunderbird'       => 'thunderbird',	// SOGo connector for addressbook, no Lightning installed
+				'ical4ol'			=> 'ical4ol', // iCal4OL client
+				'evolution'         => 'evolution', // Evolution
+				'thunderbird'       => 'thunderbird', // SOGo connector for addressbook, no Lightning installed
 			) as $pattern => $name)
 			{
-				if (strpos($user_agent,$pattern) !== false)
+				if (strpos($user_agent, $pattern) !== false)
 				{
 					$agent = $name;
 					break;
@@ -506,7 +506,7 @@ 
 	 * @param int $user=null owner of the collection, default current user
 	 * @return array with privileges
 	 */
-	public function current_user_privileges($path, $user=null)
+	public function current_user_privileges($path, $user = null)
 	{
 		static $grants;
 		if (is_null($grants))
@@ -515,24 +515,24 @@ 
 		}
 		$priviledes = array('read-current-user-privilege-set' => 'read-current-user-privilege-set');
 
-		if (is_null($user) || $grants[$user] & EGW_ACL_READ)
+		if (is_null($user) || $grants[$user]&EGW_ACL_READ)
 		{
 			$priviledes['read'] = 'read';
 			// allows on all calendars/addressbooks to write properties, as we store them on a per-user basis
 			// and only allow to modify explicit named properties in CalDAV, CardDAV or Calendarserver name-space
 			$priviledes['write-properties'] = 'write-properties';
 		}
-		if (is_null($user) || $grants[$user] & EGW_ACL_ADD)
+		if (is_null($user) || $grants[$user]&EGW_ACL_ADD)
 		{
-			$priviledes['bind'] = 'bind';	// PUT for new resources
+			$priviledes['bind'] = 'bind'; // PUT for new resources
 		}
-		if (is_null($user) || $grants[$user] & EGW_ACL_EDIT)
+		if (is_null($user) || $grants[$user]&EGW_ACL_EDIT)
 		{
-			$priviledes['write-content'] = 'write-content';	// otherwise iOS calendar does not allow to add events
+			$priviledes['write-content'] = 'write-content'; // otherwise iOS calendar does not allow to add events
 		}
-		if (is_null($user) || $grants[$user] & EGW_ACL_DELETE)
+		if (is_null($user) || $grants[$user]&EGW_ACL_DELETE)
 		{
-			$priviledes['unbind'] = 'unbind';	// DELETE
+			$priviledes['unbind'] = 'unbind'; // DELETE
 		}
 		// copy/move of existing resources might require write-properties, thought we do not support an explicit PROPATCH
 		//error_log(__METHOD__."('$path', ".array2string($user).') returning '.array2string($priviledes).' '.function_backtrace());
@@ -559,7 +559,7 @@ 
 	 * @param boolean $path_attr_is_name=true true: path_attr is ca(l|rd)dav_name, false: id (GroupDAV needs Location header)
 	 * @param string $etag=null etag, to not calculate it again (if != null)
 	 */
-	function put_response_headers($entry, $path, $retval, $path_attr_is_name=true, $etag=null)
+	function put_response_headers($entry, $path, $retval, $path_attr_is_name = true, $etag = null)
 	{
 		//error_log(__METHOD__."(".array2string($entry).", '$path', ".array2string($retval).", path_attr_is_name=$path_attr_is_name, etag=".array2string($etag).")");
 		// we should not return an etag here, as EGroupware never stores ical/vcard byte-by-byte
@@ -620,7 +620,7 @@ 
 		{
 			$props['getetag'] = $this->get_etag($entry);
 		}
-		foreach(array(
+		foreach (array(
 			'getcontenttype' => 'text/calendar',
 			'getlastmodified' => $entry['modified'],
 			'displayname' => $entry['title'],
@@ -658,7 +658,7 @@ 
 	 * @param boolean $full_uri=true
 	 * @return string eg. https://domain.com/egroupware/groupdav.php
 	 */
-	public function base_uri($full_uri=true)
+	public function base_uri($full_uri = true)
 	{
 		static $uri;
 		static $path;
@@ -668,7 +668,7 @@ 
 			$uri = $path = $this->groupdav->base_uri;
 			if ($uri[0] == '/')
 			{
-				$uri = ($_SERVER["HTTPS"] === "on" ? "https:" : "http:") .'//' . $_SERVER['HTTP_HOST'] . $uri;
+				$uri = ($_SERVER["HTTPS"] === "on" ? "https:" : "http:").'//'.$_SERVER['HTTP_HOST'].$uri;
 			}
 			else
 			{
@@ -692,7 +692,7 @@ 
 	 * @param int $user parameter necessary to call getctag, if no $token specified
 	 * @return string
 	 */
-	public function get_sync_collection_token($path, $user=null, $more_results=null)
+	public function get_sync_collection_token($path, $user = null, $more_results = null)
 	{
 		//error_log(__METHOD__."('$path', $user, more_results=$more_results) this->sync_collection_token=".$this->sync_collection_token);
 		if ($more_results)
@@ -706,7 +706,7 @@ 
 ';
 			if ($this->groupdav->crrnd)
 			{
-				$error = str_replace(array('<D:', '</D:'),  array('<', '</'), $error);
+				$error = str_replace(array('<D:', '</D:'), array('<', '</'), $error);
 			}
 			echo $error;
 		}
@@ -729,7 +729,7 @@ 
 	 * @param int $token=null modification time, default call getctag($path, $user) to fetch it
 	 * @return string
 	 */
-	public function get_sync_token($path, $user, $token=null)
+	public function get_sync_token($path, $user, $token = null)
 	{
 		if (!isset($token)) $token = $this->getctag($path, $user);
 
@@ -800,7 +800,7 @@ 
 	 *
 	 * @var int
 	 */
-	protected $start=0;
+	protected $start = 0;
 
 	/**
 	 * Number of entries queried from callback in one call
@@ -824,7 +824,7 @@ 
 	 * @param array $filter filter for propfind call
 	 * @param array $files=array() extra files/responses to return too
 	 */
-	public function __construct(groupdav_handler $handler, $path, array $filter,array &$files=array())
+	public function __construct(groupdav_handler $handler, $path, array $filter, array &$files = array())
 	{
 		if ($this->debug) error_log(__METHOD__."('$path', ".array2string($filter).",)");
 		$this->path    = $path;
@@ -855,7 +855,7 @@ 
 		$current = current($this->files);
 
 		if ($this->debug) error_log(__METHOD__."() returning ".array2string($current['path']));
-		return $current['path'];	// we return path as key
+		return $current['path']; // we return path as key
 	}
 
 	/**
@@ -875,11 +875,11 @@ 
 			return false;
 		}
 		// try query further files via propfind callback of handler and store result in $this->files
-		$this->files = $this->handler->propfind_callback($this->path,$this->filter,array($this->start,self::CHUNK_SIZE));
+		$this->files = $this->handler->propfind_callback($this->path, $this->filter, array($this->start, self::CHUNK_SIZE));
 		if (!is_array($this->files) || !($entries = count($this->files)))
 		{
 			if ($this->debug) error_log(__METHOD__."() returning FALSE (no more entries)");
-			return false;	// no further entries
+			return false; // no further entries
 		}
 		$this->start += self::CHUNK_SIZE;
 		reset($this->files);
@@ -898,7 +898,7 @@ 
 
 		$this->start = 0;
 		$this->files = $this->common_files;
-		if (!$this->files) $this->next();	// otherwise valid will return false and nothing get returned
+		if (!$this->files) $this->next(); // otherwise valid will return false and nothing get returned
 		reset($this->files);
 	}
 
@@ -907,7 +907,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function valid ()
+	public function valid()
 	{
 		if ($this->debug) error_log(__METHOD__."() returning ".array2string(current($this->files) !== false));
 		return current($this->files) !== false;

Braces +109 added lines, -27 removed lines

@@ -119,7 +119,10 @@ 
 	function __construct($app, groupdav $groupdav)
 	{
 		$this->app = $app;
-		if (!is_null($parent->debug)) $this->debug = $groupdav->debug;
+		if (!is_null($parent->debug))
+		{
+			$this->debug = $groupdav->debug;
+		}
 		$this->base_uri = $groupdav->base_uri;
 		$this->groupdav = $groupdav;
 
@@ -273,11 +276,17 @@ 
 	 */
 	function _common_get_put_delete($method,&$options,&$id,&$return_no_access=false,$ignore_if_match=false)
 	{
-		if (self::$path_extension) $id = basename($id,self::$path_extension);
+		if (self::$path_extension)
+		{
+			$id = basename($id,self::$path_extension);
+		}
 
 		if ($this->app != 'principals' && !$GLOBALS['egw_info']['user']['apps'][$this->app])
 		{
-			if ($this->debug) error_log(__METHOD__."($method,,$id) 403 Forbidden: no app rights for '$this->app'");
+			if ($this->debug)
+			{
+				error_log(__METHOD__."($method,,$id) 403 Forbidden: no app rights for '$this->app'");
+			}
 			return '403 Forbidden';		// no app rights
 		}
 		$extra_acl = $this->method2acl[$method];
@@ -286,12 +295,18 @@ 
 		{
 			if ($return_no_access && !is_null($entry))
 			{
-				if ($this->debug) error_log(__METHOD__."($method,,$id,$return_no_access) \$entry=".array2string($entry).", \$return_no_access set to false");
+				if ($this->debug)
+				{
+					error_log(__METHOD__."($method,,$id,$return_no_access) \$entry=".array2string($entry).", \$return_no_access set to false");
+				}
 				$return_no_access = false;
 			}
 			else
 			{
-				if ($this->debug) error_log(__METHOD__."($method,,$id) 403 Forbidden/404 Not Found: read($id)==".($entry===false?'false':'null'));
+				if ($this->debug)
+				{
+					error_log(__METHOD__."($method,,$id) 403 Forbidden/404 Not Found: read($id)==".($entry===false?'false':'null'));
+				}
 				return !is_null($entry) ? '403 Forbidden' : '404 Not Found';
 			}
 		}
@@ -304,11 +319,17 @@ 
 			{
 				$this->http_if_match = $_SERVER['HTTP_IF_MATCH'];
 				// strip of quotes around etag, if they exist, that way we allow etag with and without quotes
-				if ($this->http_if_match[0] == '"') $this->http_if_match = substr($this->http_if_match, 1, -1);
+				if ($this->http_if_match[0] == '"')
+				{
+					$this->http_if_match = substr($this->http_if_match, 1, -1);
+				}
 
 				if ($this->http_if_match !== $etag)
 				{
-					if ($this->debug) error_log(__METHOD__."($method,path=$options[path],$id) HTTP_IF_MATCH='$_SERVER[HTTP_IF_MATCH]', etag='$etag': 412 Precondition failed".array2string($entry));
+					if ($this->debug)
+					{
+						error_log(__METHOD__."($method,path=$options[path],$id) HTTP_IF_MATCH='$_SERVER[HTTP_IF_MATCH]', etag='$etag': 412 Precondition failed".array2string($entry));
+					}
 					// honor Prefer: return=representation for 412 too (no need for client to explicitly reload)
 					$this->check_return_representation($options, $id);
 					return '412 Precondition Failed';
@@ -318,17 +339,26 @@ 
 			{
 				$if_none_match = $_SERVER['HTTP_IF_NONE_MATCH'];
 				// strip of quotes around etag, if they exist, that way we allow etag with and without quotes
-				if ($if_none_match[0] == '"') $if_none_match = substr($if_none_match, 1, -1);
+				if ($if_none_match[0] == '"')
+				{
+					$if_none_match = substr($if_none_match, 1, -1);
+				}
 
 				// if an IF_NONE_MATCH is given, check if we need to send a new export, or the current one is still up-to-date
 				if (in_array($method, array('GET','HEAD')) && $etag === $if_none_match)
 				{
-					if ($this->debug) error_log(__METHOD__."($method,,$id) HTTP_IF_NONE_MATCH='$_SERVER[HTTP_IF_NONE_MATCH]', etag='$etag': 304 Not Modified");
+					if ($this->debug)
+					{
+						error_log(__METHOD__."($method,,$id) HTTP_IF_NONE_MATCH='$_SERVER[HTTP_IF_NONE_MATCH]', etag='$etag': 304 Not Modified");
+					}
 					return '304 Not Modified';
 				}
 				if ($method == 'PUT' && ($if_none_match == '*' || $if_none_match == $etag))
 				{
-					if ($this->debug) error_log(__METHOD__."($method,,$id) HTTP_IF_NONE_MATCH='$_SERVER[HTTP_IF_NONE_MATCH]', etag='$etag': 412 Precondition failed");
+					if ($this->debug)
+					{
+						error_log(__METHOD__."($method,,$id) HTTP_IF_NONE_MATCH='$_SERVER[HTTP_IF_NONE_MATCH]', etag='$etag': 412 Precondition failed");
+					}
 					// honor Prefer: return=representation for 412 too (no need for client to explicitly reload)
 					$this->check_return_representation($options, $id);
 					return '412 Precondition Failed';
@@ -367,7 +397,10 @@ 
 
 			if (($ret = $this->get($options, $id ? $id : $this->new_id, $user)) && !empty($options['data']))
 			{
-				if (!$this->groupdav->use_compression()) header('Content-Length: '.$this->groupdav->bytes($options['data']));
+				if (!$this->groupdav->use_compression())
+				{
+					header('Content-Length: '.$this->groupdav->bytes($options['data']));
+				}
 				header('Content-Type: '.$options['mimetype']);
 				echo $options['data'];
 			}
@@ -403,12 +436,18 @@ 
 		if (!array_key_exists($app,$handler_cache))
 		{
 			$class = $app.'_groupdav';
-			if (!class_exists($class) && !class_exists($class = 'groupdav_'.$app)) return null;
+			if (!class_exists($class) && !class_exists($class = 'groupdav_'.$app))
+			{
+				return null;
+			}
 
 			$handler_cache[$app] = new $class($app, $groupdav);
 		}
 
-		if ($debug) error_log(__METHOD__."('$app')");
+		if ($debug)
+		{
+			error_log(__METHOD__."('$app')");
+		}
 
 		return $handler_cache[$app];
 	}
@@ -466,7 +505,10 @@ 
 					case 'cfnetwork':
 						if (preg_match('/address%20book\/([0-9.]+)/', $user_agent, $matches))
 						{
-							if ((int)$matches[1] < 868) $agent .= '_old';
+							if ((int)$matches[1] < 868)
+							{
+								$agent .= '_old';
+							}
 						}
 						break;
 					case 'kde':
@@ -482,7 +524,10 @@ 
 			}
 		}
 
-		if ($debug) error_log(__METHOD__."GroupDAV client: $agent");
+		if ($debug)
+		{
+			error_log(__METHOD__."GroupDAV client: $agent");
+		}
 
 		return $agent;
 	}
@@ -567,7 +612,10 @@ 
 		// --> as all clients dislike not getting an ETag for a PUT, we sending it again even not storing byte-by-byte
 		//if (get_class($this) == 'addressbook_groupdav' && in_array(self::get_agent(),array('thunderbird','lightning')))
 		{
-			if (is_null($etag)) $etag = $this->get_etag($entry);
+			if (is_null($etag))
+			{
+				$etag = $this->get_etag($entry);
+			}
 			header('ETag: "'.$etag.'"');
 		}
 
@@ -731,7 +779,10 @@ 
 	 */
 	public function get_sync_token($path, $user, $token=null)
 	{
-		if (!isset($token)) $token = $this->getctag($path, $user);
+		if (!isset($token))
+		{
+			$token = $this->getctag($path, $user);
+		}
 
 		// never return current time, as more modifications might happen due to second granularity --> return 1sec less
 		if ($token >= (int)$GLOBALS['egw_info']['flags']['page_start_time'])
@@ -826,7 +877,10 @@ 
 	 */
 	public function __construct(groupdav_handler $handler, $path, array $filter,array &$files=array())
 	{
-		if ($this->debug) error_log(__METHOD__."('$path', ".array2string($filter).",)");
+		if ($this->debug)
+		{
+			error_log(__METHOD__."('$path', ".array2string($filter).",)");
+		}
 		$this->path    = $path;
 		$this->handler = $handler;
 		$this->filter  = $filter;
@@ -841,7 +895,10 @@ 
 	 */
 	public function current()
 	{
-		if ($this->debug) error_log(__METHOD__."() returning ".array2string(current($this->files)));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."() returning ".array2string(current($this->files)));
+		}
 		return current($this->files);
 	}
 
@@ -854,7 +911,10 @@ 
 	{
 		$current = current($this->files);
 
-		if ($this->debug) error_log(__METHOD__."() returning ".array2string($current['path']));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."() returning ".array2string($current['path']));
+		}
 		return $current['path'];	// we return path as key
 	}
 
@@ -865,26 +925,38 @@ 
 	{
 		if (next($this->files) !== false)
 		{
-			if ($this->debug) error_log(__METHOD__."() returning TRUE");
+			if ($this->debug)
+			{
+				error_log(__METHOD__."() returning TRUE");
+			}
 			return true;
 		}
 		// check if previous query gave less then CHUNK_SIZE entries --> we're done
 		if ($this->start && count($this->files) < self::CHUNK_SIZE)
 		{
-			if ($this->debug) error_log(__METHOD__."() returning FALSE (no more entries)");
+			if ($this->debug)
+			{
+				error_log(__METHOD__."() returning FALSE (no more entries)");
+			}
 			return false;
 		}
 		// try query further files via propfind callback of handler and store result in $this->files
 		$this->files = $this->handler->propfind_callback($this->path,$this->filter,array($this->start,self::CHUNK_SIZE));
 		if (!is_array($this->files) || !($entries = count($this->files)))
 		{
-			if ($this->debug) error_log(__METHOD__."() returning FALSE (no more entries)");
+			if ($this->debug)
+			{
+				error_log(__METHOD__."() returning FALSE (no more entries)");
+			}
 			return false;	// no further entries
 		}
 		$this->start += self::CHUNK_SIZE;
 		reset($this->files);
 
-		if ($this->debug) error_log(__METHOD__."() this->start=$this->start, entries=$entries, count(this->files)=".count($this->files)." returning ".array2string(current($this->files) !== false));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."() this->start=$this->start, entries=$entries, count(this->files)=".count($this->files)." returning ".array2string(current($this->files) !== false));
+		}
 
 		return current($this->files) !== false;
 	}
@@ -894,11 +966,18 @@ 
 	 */
 	public function rewind()
 	{
-		if ($this->debug) error_log(__METHOD__."()");
+		if ($this->debug)
+		{
+			error_log(__METHOD__."()");
+		}
 
 		$this->start = 0;
 		$this->files = $this->common_files;
-		if (!$this->files) $this->next();	// otherwise valid will return false and nothing get returned
+		if (!$this->files)
+		{
+			$this->next();
+		}
+		// otherwise valid will return false and nothing get returned
 		reset($this->files);
 	}
 
@@ -909,7 +988,10 @@ 
 	 */
 	public function valid ()
 	{
-		if ($this->debug) error_log(__METHOD__."() returning ".array2string(current($this->files) !== false));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."() returning ".array2string(current($this->files) !== false));
+		}
 		return current($this->files) !== false;
 	}
 }

phpgwapi/inc/class.groupdav_principals.inc.php

Doc Comments +14 added lines, -29 removed lines

@@ -78,7 +78,7 @@ 
 	 * Currently we return all reports independed of path
 	 *
 	 * @param string $path eg. '/principals/'
-	 * @param array $reports=null
+	 * @param array $reports
 	 * @return array HTTP_WebDAV_Server::mkprop('supported-report-set', ...)
 	 */
 	protected function supported_report_set($path, array $reports=null)
@@ -246,7 +246,7 @@ 
 	 * @param array &$options
 	 * @param array &$files
 	 * @param int $user account_id
-	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
+	 * @return boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
 	function expand_property_report($path,&$options,&$files,$user)
 	{
@@ -559,7 +559,6 @@ 
 	 *
 	 * @param string $value value to test
 	 * @param string $match criteria/sub-string
-	 * @param string $match_type='contains' 'starts-with', 'ends-with' or 'equals'
 	 */
 	private static function match($value, $match, $match_type='contains')
 	{
@@ -972,8 +971,7 @@ 
 	 * Convert CalDAV principal URL to a calendar uid
 	 *
 	 * @param string $url
-	 * @param string|array $only_type=null allowed types, return false for other (valid) types, eg. "users", "groups" or "resources", default all
-	 * @param string $cn=null common name to be stored in case of an "e" uid
+	 * @param string|array $only_type allowed types, return false for other (valid) types, eg. "users", "groups" or "resources", default all
 	 * @return int|string|boolean integer account_id, string calendar uid or false if not a supported uid
 	 */
 	static public function url2uid($url, $only_type=null, $cn=null)
@@ -1118,7 +1116,7 @@ 
 	 * Add collection of a single resource to a collection
 	 *
 	 * @param array $resource
-	 * @param boolean $is_location=null
+	 * @param boolean $is_location
 	 * @return array with values for keys 'path' and 'props'
 	 */
 	protected function add_principal_resource(array $resource, $is_location=null)
@@ -1169,7 +1167,7 @@ 
 	 * Check if resource is a location
 	 *
 	 * @param array|int $resource
-	 * @return boolean
+	 * @return null|boolean
 	 */
 	public static function resource_is_location($resource)
 	{
@@ -1233,7 +1231,6 @@ 
 	/**
 	 * Get all resources (we cache the resources here, to only query them once per request)
 	 *
-	 * @param int $user=null account_if of user, or null for current user
 	 * @return array of array with values for res_id, cat_id and name (no other values1)
 	 */
 	public static function get_resources($user=null)
@@ -1283,7 +1280,6 @@ 
 	 * Add a collection
 	 *
 	 * @param string $path
-	 * @param array $props=array() extra properties 'resourcetype' is added anyway, name => value pairs or name => HTTP_WebDAV_Server([namespace,]name,value)
 	 * @return array with values for keys 'path' and 'props'
 	 */
 	protected function add_collection($path, array $props = array())
@@ -1299,8 +1295,7 @@ 
 	 * Add a principal collection
 	 *
 	 * @param string $principal relative to principal-collection-set, eg. "users/username"
-	 * @param array $props=array() extra properties 'resourcetype' is added anyway
-	 * @param string $principal_url=null include given principal url, relative to principal-collection-set, default $principal
+	 * @param string $principal_url include given principal url, relative to principal-collection-set, default $principal
 	 * @return array with values for keys 'path' and 'props'
 	 */
 	protected function add_principal($principal, array $props = array(), $principal_url=null)
@@ -1327,8 +1322,7 @@ 
 	 *
 	 * @param string $principal relative to principal-collection-set, eg. "users/username"
 	 * @param string $type eg. 'calendar-proxy-read' or 'calendar-proxy-write'
-	 * @param array $proxys=array()
-	 * @param array $resource=null resource to use (to not query it multiple times from the database)
+	 * @param array $resource resource to use (to not query it multiple times from the database)
 	 * @return array with values for 'path' and 'props'
 	 */
 	protected function add_proxys($principal, $type, array $proxys=array(), array $resource=null)
@@ -1405,9 +1399,8 @@ 
 	 * Create a named property with set or principal-urls
 	 *
 	 * @param string $prop egw. 'group-member-set' or 'membership'
-	 * @param array $accounts=array() account_id => account_lid pairs
-	 * @param string|array $app_proxys=null applications for which proxys should be added
 	 * @param int $account who is the proxy
+	 * @param string[] $add_proxys
 	 * @return array with href props
 	 */
 	protected function principal_set($prop, array $accounts=array(), $add_proxys=null, $account=null)
@@ -1445,7 +1438,6 @@ 
 	 * Get proxy-groups for given user $account: users or groups who GRANT proxy rights to $account
 	 *
 	 * @param int $account who is the proxy
-	 * @param string|array $app_proxys=null applications for which proxys should be added
 	 * @return array with href props
 	 */
 	protected function get_resource_proxy_groups($account)
@@ -1489,7 +1481,6 @@ 
 	 * Get proxy-groups for given user $account: users or groups who GRANT proxy rights to $account
 	 *
 	 * @param int $account who is the proxy
-	 * @param string|array $app_proxys=null applications for which proxys should be added
 	 * @return array with href props
 	 */
 	protected function get_calendar_proxy_groups($account, $app='calendar')
@@ -1515,7 +1506,7 @@ 
 	 * @param string $name name of group or empty
 	 * @param string $rest rest of path behind account-name
 	 * @param array $options
-	 * @param boolean $do_locations=false false: /principal/resources, true: /principals/locations
+	 * @param boolean $do_locations false: /principal/resources, true: /principals/locations
 	 * @return array|string array with files or HTTP error code
 	 */
 	protected function propfind_resources($name,$rest,array $options,$do_locations=false)
@@ -1583,8 +1574,6 @@ 
 	/**
 	 * Do propfind of /principals/
 	 *
-	 * @param string $name name of group or empty
-	 * @param string $rest name of rest of path behind group-name
 	 * @param array $options
 	 * @return array|string array with files or HTTP error code
 	 */
@@ -1614,8 +1603,7 @@ 
 	 *
 	 * @param array &$options
 	 * @param int $id
-	 * @param int $user=null account_id
-	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
+	 * @return boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
 	function get(&$options,$id,$user=null)
 	{
@@ -1627,8 +1615,7 @@ 
 	 *
 	 * @param array &$options
 	 * @param int $id
-	 * @param int $user=null account_id of owner, default null
-	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
+	 * @return boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
 	function put(&$options,$id,$user=null)
 	{
@@ -1640,7 +1627,7 @@ 
 	 *
 	 * @param array &$options
 	 * @param int $id
-	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
+	 * @return boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
 	function delete(&$options,$id)
 	{
@@ -1663,7 +1650,7 @@ 
 	 *
 	 * @param int $acl EGW_ACL_READ, EGW_ACL_EDIT or EGW_ACL_DELETE
 	 * @param array/int $entry entry-array or id
-	 * @return boolean null if entry does not exist, false if no access, true if access permitted
+	 * @return null|boolean null if entry does not exist, false if no access, true if access permitted
 	 */
 	function check_access($acl,$entry)
 	{
@@ -1681,7 +1668,6 @@ 
 	/**
 	 * Get the etag for an entry, can be reimplemented for other algorithm or field names
 	 *
-	 * @param array/int $event array with event or cal_id
 	 * @return string/boolean string with etag or false
 	 */
 	function get_etag($account)
@@ -1705,8 +1691,7 @@ 
 	 * Privileges are for the collection, not the resources / entries!
 	 *
 	 * @param string $path path of collection
-	 * @param int $user=null owner of the collection, default current user
-	 * @return array with privileges
+	 * @return string[] with privileges
 	 */
 	public function current_user_privileges($path, $user=null)
 	{

Spacing +171 added lines, -172 removed lines

@@ -81,17 +81,16 @@ 
 	 * @param array $reports=null
 	 * @return array HTTP_WebDAV_Server::mkprop('supported-report-set', ...)
 	 */
-	protected function supported_report_set($path, array $reports=null)
+	protected function supported_report_set($path, array $reports = null)
 	{
 		if (is_null($reports)) $reports = $this->supported_reports;
 
 		$supported = array();
-		foreach($reports as $name => $data)
+		foreach ($reports as $name => $data)
 		{
-			$supported[$name] = HTTP_WebDAV_Server::mkprop('supported-report',array(
-				HTTP_WebDAV_Server::mkprop('report',array(
-					!$data['ns'] ? HTTP_WebDAV_Server::mkprop($name, '') :
-						HTTP_WebDAV_Server::mkprop($data['ns'], $name, '')))));
+			$supported[$name] = HTTP_WebDAV_Server::mkprop('supported-report', array(
+				HTTP_WebDAV_Server::mkprop('report', array(
+					!$data['ns'] ? HTTP_WebDAV_Server::mkprop($name, '') : HTTP_WebDAV_Server::mkprop($data['ns'], $name, '')))));
 		}
 		return $supported;
 	}
@@ -105,7 +104,7 @@ 
 	 * @param int $user account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function propfind($path,&$options,&$files,$user)
+	function propfind($path, &$options, &$files, $user)
 	{
 		if (($report = isset($_GET['report']) ? $_GET['report'] : $options['root']['name']) && $report != 'propfind')
 		{
@@ -117,7 +116,7 @@ 
 			$this->groupdav->log(__METHOD__."('$path', ".array2string($options).",, $user) not implemented report, returning 501 Not Implemented");
 			return '501 Not Implemented';
 		}
-		list(,$principals,$type,$name,$rest) = explode('/',$path,5);
+		list(,$principals, $type, $name, $rest) = explode('/', $path, 5);
 		// /principals/users/$name/
 		//            /users/$name/calendar-proxy-read/
 		//            /users/$name/calendar-proxy-write/
@@ -126,19 +125,19 @@ 
 		//            /locations/$resource/
 		//            /__uids__/$uid/.../
 
-		switch($type)
+		switch ($type)
 		{
 			case 'users':
-				$files['files'] = $this->propfind_users($name,$rest,$options);
+				$files['files'] = $this->propfind_users($name, $rest, $options);
 				break;
 			case 'groups':
-				$files['files'] = $this->propfind_groups($name,$rest,$options);
+				$files['files'] = $this->propfind_groups($name, $rest, $options);
 				break;
 			case 'resources':
-				$files['files'] = $this->propfind_resources($name,$rest,$options,false);
+				$files['files'] = $this->propfind_resources($name, $rest, $options, false);
 				break;
 			case 'locations':
-				$files['files'] = $this->propfind_resources($name,$rest,$options,true);
+				$files['files'] = $this->propfind_resources($name, $rest, $options, true);
 				break;
 			/*case '__uids__':
 				$files['files'] = $this->propfind_uids($name,$rest,$options);
@@ -248,11 +247,11 @@ 
 	 * @param int $user account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function expand_property_report($path,&$options,&$files,$user)
+	function expand_property_report($path, &$options, &$files, $user)
 	{
 		//error_log(__METHOD__."('$path', ".array2string($options).",, $user)");
 		$requested_props = $options['other'];
-		while(($requested_prop = array_shift($requested_props)))
+		while (($requested_prop = array_shift($requested_props)))
 		{
 			if ($requested_prop['name'] != 'property' || $requested_prop['depth'] != 1) continue;
 
@@ -260,11 +259,11 @@ 
 			$prop_name = $requested_prop['attrs']['name'];
 			$prop_path = $path;
 			// calendarserver has some special property-names for expansion
-			switch($prop_name)
+			switch ($prop_name)
 			{
 				case 'calendar-proxy-read-for':
 				case 'calendar-proxy-write-for':
-					$prop_path = $path . substr($prop_name, 0, -4).'/';
+					$prop_path = $path.substr($prop_name, 0, -4).'/';
 					$prop_name = 'group-member-set';
 					$prop_ns = groupdav::DAV;
 					break;
@@ -284,14 +283,14 @@ 
 				'xmlns' => $prop_ns,
 			));
 			$prop_files = array();
-			$this->groupdav->options = $options;	// also modify global variable
+			$this->groupdav->options = $options; // also modify global variable
 			if (empty($prop_name) || $this->propfind($prop_path, $options, $prop_files, $user) !== true)
 			{
 				$this->groupdav->log('### NO expand-property report for '.$requested_prop['attrs']['name']);
 				continue;
 			}
 			// find prop to expand
-			foreach($prop_files['files'][0]['props'] as $name => $expand_prop)
+			foreach ($prop_files['files'][0]['props'] as $name => $expand_prop)
 			{
 				if ($expand_prop['name'] === $prop_name) break;
 			}
@@ -305,7 +304,7 @@ 
 			// requested properties of each href are in depth=2 properties
 			// set them as regular propfind properties to $options['props']
 			$options2 = array('props' => 'all');
-			while(($prop = array_shift($requested_props)) && $prop['depth'] >= 2)
+			while (($prop = array_shift($requested_props)) && $prop['depth'] >= 2)
 			{
 				if ($prop['name'] == 'property' && $prop['depth'] == 2)
 				{
@@ -321,10 +320,10 @@ 
 			}
 			// put back evtl. read top-level property
 			if ($prop && $prop['depth'] == 1) array_unshift($requested_props, $prop);
-			$this->groupdav->options = $options2;	// also modify global variable
+			$this->groupdav->options = $options2; // also modify global variable
 
 			// run regular profind to get requested 2.-level properties for each href
-			foreach($expand_prop['val'] as $key => &$prop_val)
+			foreach ($expand_prop['val'] as $key => &$prop_val)
 			{
 				list(,$expand_path) = explode($this->groupdav->base_uri, $prop_val['val']);
 				//error_log(__METHOD__."('$path', ..., $user) calling propfind('$expand_path', ".array2string($options2).', '.array2string($prop_val).", $user)");
@@ -419,23 +418,23 @@ 
 	 * @param int $user account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function principal_property_search_report($path,&$options,&$files,$user)
+	function principal_property_search_report($path, &$options, &$files, $user)
 	{
 		//error_log(__METHOD__."('$path', ".array2string($options).",, $user)");
 
 		// cant find the test attribute to root principal-property-search element in WebDAV rfc, but iPhones use it ...
-		$anyof = !empty($options['root']['attrs']['test']) && $options['root']['attrs']['test'] == 'anyof';	// "allof" (default) or "anyof"
+		$anyof = !empty($options['root']['attrs']['test']) && $options['root']['attrs']['test'] == 'anyof'; // "allof" (default) or "anyof"
 
 		// parse property-search prop(s) contained in $options['other']
-		foreach($options['other'] as $n => $prop)
+		foreach ($options['other'] as $n => $prop)
 		{
-			switch($prop['name'])
+			switch ($prop['name'])
 			{
 				case 'apply-to-principal-collection-set':	// optinal prop to apply search on principal-collection-set == '/principals/'
 					$path = '/principals/';
 					break;
 				case 'property-search':
-					$property_search = $n;	// should be 1
+					$property_search = $n; // should be 1
 					break;
 				case 'prop':
 					if (isset($property_search))
@@ -465,7 +464,7 @@ 
 			return '400 Bad Request';
 		}
 		// make sure search property is included in toplevel props (can be missing and defaults to property-search/prop's)
-		foreach($search_props as $prop)
+		foreach ($search_props as $prop)
 		{
 			if (!$this->groupdav->prop_requested($prop['name'], $prop['xmlns']))
 			{
@@ -478,7 +477,7 @@ 
 			// but interprets returning all principals (all have a matching calendar-home-set) as NOT supporting CalDAV scheduling
 			// --> search only current user's principal
 			if ($prop['name'] == 'calendar-home-set' && stripos($_SERVER['HTTP_USER_AGENT'], 'Lightning') !== false &&
-				substr($search_props[0]['match'],-13) == '/groupdav.php')
+				substr($search_props[0]['match'], -13) == '/groupdav.php')
 			{
 				$path = '/principals/users/'.$GLOBALS['egw_info']['user']['account_lid'].'/';
 				$this->groupdav->log('Enabling hack for Lightning prior 1.1.1 for searching calendar-home-set matching "/groupdav.php": limiting search to '.$path);
@@ -487,7 +486,7 @@ 
 		// check type attribute to limit search on a certain tree
 		if (isset($options['root']['attrs']['type']))
 		{
-			switch($options['root']['attrs']['type'])
+			switch ($options['root']['attrs']['type'])
 			{
 				case 'INDIVIDUAL':
 					$path = '/principals/users/';
@@ -514,7 +513,7 @@ 
 			return $ret;
 		}
 		// now filter out not matching "files"
-		foreach($files['files'] as $n => $resource)
+		foreach ($files['files'] as $n => $resource)
 		{
 			if (count(explode('/', $resource['path'])) < 5)	// hack to only return principals, not the collections itself
 			{
@@ -523,15 +522,15 @@ 
 			}
 			// match with $search_props
 			$matches = 0;
-			foreach($search_props as $search_prop)
+			foreach ($search_props as $search_prop)
 			{
 				// search resource for $search_prop
-				foreach($resource['props'] as $prop) if ($prop['name'] === $search_prop['name']) break;
+				foreach ($resource['props'] as $prop) if ($prop['name'] === $search_prop['name']) break;
 				if ($prop['name'] === $search_prop['name'])	// search_prop NOT found
 				{
-					foreach((array)$prop['val'] as $value)
+					foreach ((array)$prop['val'] as $value)
 					{
-						if (is_array($value)) $value = $value['val'];	// eg. href prop
+						if (is_array($value)) $value = $value['val']; // eg. href prop
 						if (self::match($value, $search_prop['match'], $search_prop['match-type']) !== false)	// prop does match
 						{
 							++$matches;
@@ -543,7 +542,7 @@ 
 				if ($anyof && $matches || $matches == count($search_props))
 				{
 					//error_log("$resource[path]: anyof=$anyof, $matches matches --> keep");
-					continue 2;	// enough matches --> keep
+					continue 2; // enough matches --> keep
 				}
 			}
 			//error_log("$resource[path]: anyof=$anyof, $matches matches --> skip");
@@ -561,9 +560,9 @@ 
 	 * @param string $match criteria/sub-string
 	 * @param string $match_type='contains' 'starts-with', 'ends-with' or 'equals'
 	 */
-	private static function match($value, $match, $match_type='contains')
+	private static function match($value, $match, $match_type = 'contains')
 	{
-		switch($match_type)
+		switch ($match_type)
 		{
 			case 'equals':
 				return $value === $match;
@@ -633,7 +632,7 @@ 
 	 * @param int $user account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function principal_search_property_set_report($path,&$options,&$files,$user)
+	function principal_search_property_set_report($path, &$options, &$files, $user)
 	{
 		static $search_props = array(
 			// from iOS iCal
@@ -655,7 +654,7 @@ 
 		$xml->startDocument('1.0', 'UTF-8');
 		$xml->startElementNs(null, 'principal-search-property-set', 'DAV:');
 
-		foreach($search_props as $name => $data)
+		foreach ($search_props as $name => $data)
 		{
 			$xml->startElement('principal-search-property');
 			$xml->startElement('prop');
@@ -667,16 +666,16 @@ 
 			{
 				$xml->writeElement($name);
 			}
-			$xml->endElement();	// prop
+			$xml->endElement(); // prop
 
 			$xml->startElement('description');
 			$xml->writeAttribute('xml:lang', 'en');
 			$xml->text(is_array($data) ? $data['description'] : $data);
-			$xml->endElement();	// description
+			$xml->endElement(); // description
 
-			$xml->endElement();	// principal-search-property
+			$xml->endElement(); // principal-search-property
 		}
-		$xml->endElement();	// principal-search-property-set
+		$xml->endElement(); // principal-search-property-set
 		$xml->endDocument();
 		echo $xml->outputMemory();
 
@@ -711,7 +710,7 @@ 
 	 * @param int $user account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function acl_principal_prop_set_report($path,&$options,&$files,$user)
+	function acl_principal_prop_set_report($path, &$options, &$files, $user)
 	{
 		//error_log(__METHOD__."('$path', ".array2string($options).",, $user)");
 
@@ -730,13 +729,13 @@ 
 			return $ret;
 		}
 		// now filter out not matching "files"
-		foreach($files['files'] as $n => $resource)
+		foreach ($files['files'] as $n => $resource)
 		{
-			foreach($resource['props']['resourcetype']['val'] as $prop)
+			foreach ($resource['props']['resourcetype']['val'] as $prop)
 			{
 				if ($prop['name'] == 'principal') continue 2;
 			}
-			unset($files['files'][$n]);	// not a principal --> do not return
+			unset($files['files'][$n]); // not a principal --> do not return
 		}
 		// we should not return it
 		unset($options['props']['resourcetype']);
@@ -752,7 +751,7 @@ 
 	 * @param array $options
 	 * @return array|string array with files or HTTP error code
 	 */
-	protected function propfind_users($name,$rest,array $options)
+	protected function propfind_users($name, $rest, array $options)
 	{
 		//error_log(__METHOD__."($name,$rest,".array2string($options).')');
 		if (empty($name))
@@ -771,7 +770,7 @@ 
 				else
 				{
 					// add all users (account_selection == groupmembers is handled by accounts->search())
-					foreach($this->accounts->search(array('type' => 'accounts','order' => 'account_lid')) as $account)
+					foreach ($this->accounts->search(array('type' => 'accounts', 'order' => 'account_lid')) as $account)
 					{
 						$files[] = $this->add_account($account);
 					}
@@ -780,15 +779,15 @@ 
 		}
 		else
 		{
-			if (!($id = $this->accounts->name2id($name,'account_lid','u')) ||
+			if (!($id = $this->accounts->name2id($name, 'account_lid', 'u')) ||
 				!($account = $this->accounts->read($id)) ||
 				!$this->accounts->visible($name))
 			{
 				$this->groupdav->log(__METHOD__."('$name', ...) account '$name' NOT found OR not visible to you (check account-selection preference)!");
 				return '404 Not Found';
 			}
-			while (substr($rest,-1) == '/') $rest = substr($rest,0,-1);
-			switch((string)$rest)
+			while (substr($rest, -1) == '/') $rest = substr($rest, 0, -1);
+			switch ((string)$rest)
 			{
 				case '':
 					$files[] = $this->add_account($account);
@@ -818,7 +817,7 @@ 
 	 * @param array $options
 	 * @return array|string array with files or HTTP error code
 	 */
-	protected function propfind_groups($name,$rest,array $options)
+	protected function propfind_groups($name, $rest, array $options)
 	{
 		//echo "<p>".__METHOD__."($name,$rest,".array2string($options).")</p>\n";
 		if (empty($name))
@@ -830,11 +829,11 @@ 
 			if ($options['depth'])
 			{
 				// only show own groups, if account-selection is groupmembers or none
-				$type = in_array($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'], array('groupmembers','none')) ?
+				$type = in_array($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'], array('groupmembers', 'none')) ?
 					'owngroups' : 'groups';
 
 				// add all groups or only membergroups
-				foreach($this->accounts->search(array('type' => $type,'order' => 'account_lid')) as $account)
+				foreach ($this->accounts->search(array('type' => $type, 'order' => 'account_lid')) as $account)
 				{
 					$files[] = $this->add_group($account);
 				}
@@ -842,16 +841,16 @@ 
 		}
 		else
 		{
-			if (!($id = $this->accounts->name2id($name,'account_lid','g')) ||
+			if (!($id = $this->accounts->name2id($name, 'account_lid', 'g')) ||
 				!($account = $this->accounts->read($id)) ||
 				// do NOT allow other groups, if account-selection is groupmembers or none
-				in_array($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'], array('groupmembers','none')) &&
-				!in_array($account['account_id'], $this->accounts->memberships($GLOBALS['egw_info']['user']['account_id'],true)))
+				in_array($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'], array('groupmembers', 'none')) &&
+				!in_array($account['account_id'], $this->accounts->memberships($GLOBALS['egw_info']['user']['account_id'], true)))
 			{
 				return '404 Not Found';
 			}
-			while (substr($rest,-1) == '/') $rest = substr($rest,0,-1);
-			switch((string)$rest)
+			while (substr($rest, -1) == '/') $rest = substr($rest, 0, -1);
+			switch ((string)$rest)
 			{
 				case '':
 					$files[] = $this->add_group($account);
@@ -882,10 +881,10 @@ 
 	{
 		$addressbooks = array();
 		$addressbook_home_set = $GLOBALS['egw_info']['user']['preferences']['groupdav']['addressbook-home-set'];
-		if (empty($addressbook_home_set)) $addressbook_home_set = 'P';	// personal addressbook
-		$addressbook_home_set = explode(',',$addressbook_home_set);
+		if (empty($addressbook_home_set)) $addressbook_home_set = 'P'; // personal addressbook
+		$addressbook_home_set = explode(',', $addressbook_home_set);
 		// replace symbolic id's with real nummeric id's
-		foreach(array(
+		foreach (array(
 			'P' => $GLOBALS['egw_info']['user']['account_id'],
 			'G' => $GLOBALS['egw_info']['user']['account_primary_group'],
 			'U' => '0',
@@ -896,13 +895,13 @@ 
 				$addressbook_home_set[$key] = $id;
 			}
 		}
-		if (in_array('O',$addressbook_home_set))	// "all in one" from groupdav.php/addressbook/
+		if (in_array('O', $addressbook_home_set))	// "all in one" from groupdav.php/addressbook/
 		{
 			$addressbooks[] = '/';
 		}
-		foreach(ExecMethod('addressbook.addressbook_bo.get_addressbooks',EGW_ACL_READ) as $id => $label)
+		foreach (ExecMethod('addressbook.addressbook_bo.get_addressbooks', EGW_ACL_READ) as $id => $label)
 		{
-			if ((in_array('A',$addressbook_home_set) || in_array((string)$id,$addressbook_home_set)) &&
+			if ((in_array('A', $addressbook_home_set) || in_array((string)$id, $addressbook_home_set)) &&
 				is_numeric($id) && ($owner = $this->accounts->id2name($id)))
 			{
 				$addressbooks[] = '/'.$owner.'/';
@@ -926,45 +925,45 @@ 
 		$calendars[] = HTTP_WebDAV_Server::mkprop('href',
 			$this->base_uri.'/'.$account['account_lid'].'/');
 
-		$displayname = translation::convert($account['account_fullname'], translation::charset(),'utf-8');
+		$displayname = translation::convert($account['account_fullname'], translation::charset(), 'utf-8');
 
 		return $this->add_principal('users/'.$account['account_lid'], array(
 			'getetag' => $this->get_etag($account),
 			'displayname' => $displayname,
 			// CalDAV
-			'calendar-home-set' => HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-home-set',$calendars),
+			'calendar-home-set' => HTTP_WebDAV_Server::mkprop(groupdav::CALDAV, 'calendar-home-set', $calendars),
 			// CalDAV scheduling
-			'schedule-outbox-URL' => HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'schedule-outbox-URL',array(
-				HTTP_WebDAV_Server::mkprop('href',$this->base_uri.'/'.$account['account_lid'].'/outbox/'))),
-			'schedule-inbox-URL' => HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'schedule-inbox-URL',array(
-				HTTP_WebDAV_Server::mkprop('href',$this->base_uri.'/'.$account['account_lid'].'/inbox/'))),
-			'calendar-user-address-set' => HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-user-address-set',array(
-				HTTP_WebDAV_Server::mkprop('href','mailto:'.$account['account_email']),
-				HTTP_WebDAV_Server::mkprop('href',$this->base_uri(true).'/principals/users/'.$account['account_lid'].'/'),
-				HTTP_WebDAV_Server::mkprop('href',$this->base_uri(false).'/principals/users/'.$account['account_lid'].'/'),
-				HTTP_WebDAV_Server::mkprop('href','urn:uuid:'.common::generate_uid('accounts', $account['account_id'])),
+			'schedule-outbox-URL' => HTTP_WebDAV_Server::mkprop(groupdav::CALDAV, 'schedule-outbox-URL', array(
+				HTTP_WebDAV_Server::mkprop('href', $this->base_uri.'/'.$account['account_lid'].'/outbox/'))),
+			'schedule-inbox-URL' => HTTP_WebDAV_Server::mkprop(groupdav::CALDAV, 'schedule-inbox-URL', array(
+				HTTP_WebDAV_Server::mkprop('href', $this->base_uri.'/'.$account['account_lid'].'/inbox/'))),
+			'calendar-user-address-set' => HTTP_WebDAV_Server::mkprop(groupdav::CALDAV, 'calendar-user-address-set', array(
+				HTTP_WebDAV_Server::mkprop('href', 'mailto:'.$account['account_email']),
+				HTTP_WebDAV_Server::mkprop('href', $this->base_uri(true).'/principals/users/'.$account['account_lid'].'/'),
+				HTTP_WebDAV_Server::mkprop('href', $this->base_uri(false).'/principals/users/'.$account['account_lid'].'/'),
+				HTTP_WebDAV_Server::mkprop('href', 'urn:uuid:'.common::generate_uid('accounts', $account['account_id'])),
 			)),
-			'calendar-user-type' => HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-user-type','INDIVIDUAL'),
+			'calendar-user-type' => HTTP_WebDAV_Server::mkprop(groupdav::CALDAV, 'calendar-user-type', 'INDIVIDUAL'),
 			// Calendarserver
-			'email-address-set' => HTTP_WebDAV_Server::mkprop(groupdav::CALENDARSERVER,'email-address-set',array(
-				HTTP_WebDAV_Server::mkprop(groupdav::CALENDARSERVER,'email-address',$account['account_email']))),
-			'last-name' => HTTP_WebDAV_Server::mkprop(groupdav::CALENDARSERVER,'last-name',$account['account_lastname']),
-			'first-name' => HTTP_WebDAV_Server::mkprop(groupdav::CALENDARSERVER,'first-name',$account['account_firstname']),
-			'record-type' => HTTP_WebDAV_Server::mkprop(groupdav::CALENDARSERVER,'record-type','users'),
+			'email-address-set' => HTTP_WebDAV_Server::mkprop(groupdav::CALENDARSERVER, 'email-address-set', array(
+				HTTP_WebDAV_Server::mkprop(groupdav::CALENDARSERVER, 'email-address', $account['account_email']))),
+			'last-name' => HTTP_WebDAV_Server::mkprop(groupdav::CALENDARSERVER, 'last-name', $account['account_lastname']),
+			'first-name' => HTTP_WebDAV_Server::mkprop(groupdav::CALENDARSERVER, 'first-name', $account['account_firstname']),
+			'record-type' => HTTP_WebDAV_Server::mkprop(groupdav::CALENDARSERVER, 'record-type', 'users'),
 			// WebDAV ACL and CalDAV proxy
 			'group-membership' => $this->principal_set('group-membership', $this->accounts->memberships($account['account_id']),
-				array('calendar', 'resources'), $account['account_id']),	// add proxy-rights
+				array('calendar', 'resources'), $account['account_id']), // add proxy-rights
 			'alternate-URI-set' => array(
-				HTTP_WebDAV_Server::mkprop('href','mailto:'.$account['account_email'])),
+				HTTP_WebDAV_Server::mkprop('href', 'mailto:'.$account['account_email'])),
 			// CardDAV
-			'addressbook-home-set' => HTTP_WebDAV_Server::mkprop(groupdav::CARDDAV,'addressbook-home-set',$addressbooks),
-			'principal-address' => HTTP_WebDAV_Server::mkprop(groupdav::CARDDAV,'principal-address',
+			'addressbook-home-set' => HTTP_WebDAV_Server::mkprop(groupdav::CARDDAV, 'addressbook-home-set', $addressbooks),
+			'principal-address' => HTTP_WebDAV_Server::mkprop(groupdav::CARDDAV, 'principal-address',
 				$GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'] ? '' : array(
-				HTTP_WebDAV_Server::mkprop('href',$this->base_uri.'/addressbook-accounts/'.$account['person_id'].'.vcf'))),
+				HTTP_WebDAV_Server::mkprop('href', $this->base_uri.'/addressbook-accounts/'.$account['person_id'].'.vcf'))),
 			// CardDAV directory
-			'directory-gateway' => HTTP_WebDAV_Server::mkprop(groupdav::CARDDAV, 'directory-gateway',array(
+			'directory-gateway' => HTTP_WebDAV_Server::mkprop(groupdav::CARDDAV, 'directory-gateway', array(
 				HTTP_WebDAV_Server::mkprop('href', $this->base_uri.'/addressbook/'))),
-			'resource-id' => array(HTTP_WebDAV_Server::mkprop('href','urn:uuid:'.common::generate_uid('accounts', $account['account_id']))),
+			'resource-id' => array(HTTP_WebDAV_Server::mkprop('href', 'urn:uuid:'.common::generate_uid('accounts', $account['account_id']))),
 		));
 	}
 
@@ -976,7 +975,7 @@ 
 	 * @param string $cn=null common name to be stored in case of an "e" uid
 	 * @return int|string|boolean integer account_id, string calendar uid or false if not a supported uid
 	 */
-	static public function url2uid($url, $only_type=null, $cn=null)
+	static public function url2uid($url, $only_type = null, $cn = null)
 	{
 		if (!$only_type) $only_type = array('users', 'groups', 'resources', 'locations', 'mailto');
 
@@ -990,17 +989,17 @@ 
 		}
 		if (empty($rest)) return false;
 
-		switch(strtolower($schema))
+		switch (strtolower($schema))
 		{
 			case 'http':
 			case 'https':
 				list(,$rest) = explode('/groupdav.php/principals/', $url);
 				list($type, $name) = explode('/', $rest);
-				switch($type)
+				switch ($type)
 				{
 					case 'users':
 					case 'groups':
-						$uid = $GLOBALS['egw']->accounts->name2id($name, 'account_lid', $type[0]);	// u=users, g=groups
+						$uid = $GLOBALS['egw']->accounts->name2id($name, 'account_lid', $type[0]); // u=users, g=groups
 						break;
 					case 'resources':
 					case 'locations':
@@ -1017,9 +1016,9 @@ 
 				}
 				// search contacts for email
 				if ((list($data) = $GLOBALS['egw']->contacts->search(array('email' => $rest, 'email_home' => $rest),
-					array('id','egw_addressbook.account_id as account_id','n_fn'),
+					array('id', 'egw_addressbook.account_id as account_id', 'n_fn'),
 					'egw_addressbook.account_id IS NOT NULL DESC, n_fn IS NOT NULL DESC',
-					'','',false,'OR')))
+					'', '', false, 'OR')))
 				{
 					// found an addressbook entry
 					$uid = $data['account_id'] ? (int)$data['account_id'] : 'c'.$data['id'];
@@ -1052,7 +1051,7 @@ 
 					{
 						static $calendar_bo;
 						if (is_null($calendar_bo)) $calendar_bo = new calendar_bo();
-						foreach($calendar_bo->resources as $letter => $info)
+						foreach ($calendar_bo->resources as $letter => $info)
 						{
 							if ($info['app'] == $type || $info['app'] == 'resources' && $type == 'location')
 							{
@@ -1065,7 +1064,7 @@ 
 				break;
 
 			default:
-				if (isset($GLOBALS['groupdav']) && is_a($GLOBALS['groupdav'],'groupdav'))
+				if (isset($GLOBALS['groupdav']) && is_a($GLOBALS['groupdav'], 'groupdav'))
 				{
 					$GLOBALS['groupdav']->log(__METHOD__."('$url') unsupported principal URL '$url'!");
 				}
@@ -1083,7 +1082,7 @@ 
 	 */
 	protected function add_group(array $account)
 	{
-		$displayname = translation::convert(lang('Group').' '.$account['account_lid'],	translation::charset(), 'utf-8');
+		$displayname = translation::convert(lang('Group').' '.$account['account_lid'], translation::charset(), 'utf-8');
 
 		// only return current user, if account-selection == 'none'
 		if ($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] == 'none')
@@ -1098,19 +1097,19 @@ 
 		return $this->add_principal('groups/'.$account['account_lid'], array(
 			'getetag' => $this->get_etag($account),
 			'displayname' => $displayname,
-			'calendar-home-set' => HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-home-set',array(
-				HTTP_WebDAV_Server::mkprop('href',$this->base_uri.'/'.$account['account_lid'].'/'))),
-			'addressbook-home-set' => HTTP_WebDAV_Server::mkprop(groupdav::CARDDAV,'addressbook-home-set',array(
-				HTTP_WebDAV_Server::mkprop('href',$this->base_uri.'/'.$account['account_lid'].'/'))),
-			'calendar-user-address-set' => HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-user-address-set',array(
-				HTTP_WebDAV_Server::mkprop('href',$this->base_uri(true).'/principals/groups/'.$account['account_lid'].'/'),
-				HTTP_WebDAV_Server::mkprop('href',$this->base_uri(false).'/principals/groups/'.$account['account_lid'].'/'),
-				HTTP_WebDAV_Server::mkprop('href','urn:uuid:'.common::generate_uid('accounts', $account['account_id'])),
+			'calendar-home-set' => HTTP_WebDAV_Server::mkprop(groupdav::CALDAV, 'calendar-home-set', array(
+				HTTP_WebDAV_Server::mkprop('href', $this->base_uri.'/'.$account['account_lid'].'/'))),
+			'addressbook-home-set' => HTTP_WebDAV_Server::mkprop(groupdav::CARDDAV, 'addressbook-home-set', array(
+				HTTP_WebDAV_Server::mkprop('href', $this->base_uri.'/'.$account['account_lid'].'/'))),
+			'calendar-user-address-set' => HTTP_WebDAV_Server::mkprop(groupdav::CALDAV, 'calendar-user-address-set', array(
+				HTTP_WebDAV_Server::mkprop('href', $this->base_uri(true).'/principals/groups/'.$account['account_lid'].'/'),
+				HTTP_WebDAV_Server::mkprop('href', $this->base_uri(false).'/principals/groups/'.$account['account_lid'].'/'),
+				HTTP_WebDAV_Server::mkprop('href', 'urn:uuid:'.common::generate_uid('accounts', $account['account_id'])),
 			)),
-			'record-type' => HTTP_WebDAV_Server::mkprop(groupdav::CALENDARSERVER,'record-type','groups'),
-			'calendar-user-type' => HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-user-type','GROUP'),
+			'record-type' => HTTP_WebDAV_Server::mkprop(groupdav::CALENDARSERVER, 'record-type', 'groups'),
+			'calendar-user-type' => HTTP_WebDAV_Server::mkprop(groupdav::CALDAV, 'calendar-user-type', 'GROUP'),
 			'group-member-set' => $this->principal_set('group-member-set', $groupmembers),
-			'resource-id' => array(HTTP_WebDAV_Server::mkprop('href','urn:uuid:'.common::generate_uid('accounts', $account['account_id']))),
+			'resource-id' => array(HTTP_WebDAV_Server::mkprop('href', 'urn:uuid:'.common::generate_uid('accounts', $account['account_id']))),
 		));
 	}
 
@@ -1121,25 +1120,25 @@ 
 	 * @param boolean $is_location=null
 	 * @return array with values for keys 'path' and 'props'
 	 */
-	protected function add_principal_resource(array $resource, $is_location=null)
+	protected function add_principal_resource(array $resource, $is_location = null)
 	{
 		$name = $this->resource2name($resource, $is_location, $displayname);
 
 		return $this->add_principal($name, array(
 			'getetag' => $this->get_resource_etag($resource),
 			'displayname' => $displayname,
-			'calendar-user-address-set' => HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-user-address-set',array(
-				HTTP_WebDAV_Server::mkprop('href',$this->base_uri(true).'/principals/'.$name.'/'),
-				HTTP_WebDAV_Server::mkprop('href',$this->base_uri(false).'/principals/'.$name.'/'),
-				HTTP_WebDAV_Server::mkprop('href','urn:uuid:'.common::generate_uid('resources', $resource['res_id'])),
+			'calendar-user-address-set' => HTTP_WebDAV_Server::mkprop(groupdav::CALDAV, 'calendar-user-address-set', array(
+				HTTP_WebDAV_Server::mkprop('href', $this->base_uri(true).'/principals/'.$name.'/'),
+				HTTP_WebDAV_Server::mkprop('href', $this->base_uri(false).'/principals/'.$name.'/'),
+				HTTP_WebDAV_Server::mkprop('href', 'urn:uuid:'.common::generate_uid('resources', $resource['res_id'])),
 			)),
-			'record-type' => HTTP_WebDAV_Server::mkprop(groupdav::CALENDARSERVER,'record-type',$is_location ? 'locations' : 'resources'),
-			'calendar-user-type' => HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-user-type',$is_location ? 'ROOM' : 'RESOURCE'),
-			'resource-id' => array(HTTP_WebDAV_Server::mkprop('href','urn:uuid:'.common::generate_uid('resources', $resource['res_id']))),
+			'record-type' => HTTP_WebDAV_Server::mkprop(groupdav::CALENDARSERVER, 'record-type', $is_location ? 'locations' : 'resources'),
+			'calendar-user-type' => HTTP_WebDAV_Server::mkprop(groupdav::CALDAV, 'calendar-user-type', $is_location ? 'ROOM' : 'RESOURCE'),
+			'resource-id' => array(HTTP_WebDAV_Server::mkprop('href', 'urn:uuid:'.common::generate_uid('resources', $resource['res_id']))),
 			// Calendarserver also reports empty email-address-set, thought iCal still does not show resources (only locations)
-			'email-address-set' => HTTP_WebDAV_Server::mkprop(groupdav::CALENDARSERVER,'email-address-set',''),
-			'calendar-home-set' => HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-home-set',array(
-				HTTP_WebDAV_Server::mkprop('href',$this->base_uri.'/'.$name.'/'))),
+			'email-address-set' => HTTP_WebDAV_Server::mkprop(groupdav::CALENDARSERVER, 'email-address-set', ''),
+			'calendar-home-set' => HTTP_WebDAV_Server::mkprop(groupdav::CALDAV, 'calendar-home-set', array(
+				HTTP_WebDAV_Server::mkprop('href', $this->base_uri.'/'.$name.'/'))),
 		));
 	}
 
@@ -1151,7 +1150,7 @@ 
 	 * @param string &$displayname=null on return displayname of resource
 	 * @return string eg. "locations/123-some-room" or "resouces/345-some-device"
 	 */
-	public static function resource2name($resource, &$is_location=null, &$displayname=null)
+	public static function resource2name($resource, &$is_location = null, &$displayname = null)
 	{
 		if (!is_array($resource) && !($resource = self::read_resource($resource)))
 		{
@@ -1159,10 +1158,10 @@ 
 		}
 		if (is_null($is_location)) $is_location = self::resource_is_location($resource);
 
-		$displayname = translation::convert($resource['name'],	translation::charset(), 'utf-8');
+		$displayname = translation::convert($resource['name'], translation::charset(), 'utf-8');
 
 		return ($is_location ? 'locations/' : 'resources/').$resource['res_id'].'-'.
-			preg_replace('/[^a-z0-9]+/i','-', translation::to_ascii($resource['name']));
+			preg_replace('/[^a-z0-9]+/i', '-', translation::to_ascii($resource['name']));
 	}
 
 	/**
@@ -1194,7 +1193,7 @@ 
 	 */
 	public static function read_resource($res_id)
 	{
-		static $cache;	// some per-request caching
+		static $cache; // some per-request caching
 
 		if (isset(self::$all_resources) && isset(self::$all_resources[$res_id]))
 		{
@@ -1236,7 +1235,7 @@ 
 	 * @param int $user=null account_if of user, or null for current user
 	 * @return array of array with values for res_id, cat_id and name (no other values1)
 	 */
-	public static function get_resources($user=null)
+	public static function get_resources($user = null)
 	{
 		if (!isset(self::$all_resources))
 		{
@@ -1244,17 +1243,17 @@ 
 
 			self::$all_resources = array();
 			$query = array(
-				'show_bookable' => true,	// ignore non-bookable resources
+				'show_bookable' => true, // ignore non-bookable resources
 				'filter2' => -3,
 				'start' => 0,
-				'num_rows' => 10000,	// return all aka first 10000 entries
+				'num_rows' => 10000, // return all aka first 10000 entries
 			);
 			if (self::$resources->get_rows($query, $rows, $readonlys))
 			{
 				//_debug_array($rows);
-				foreach($rows as $resource)
+				foreach ($rows as $resource)
 				{
-					self::$all_resources[$resource['res_id']] = array_intersect_key($resource, array('res_id'=>true,'cat_id'=>true,'name'=>true));
+					self::$all_resources[$resource['res_id']] = array_intersect_key($resource, array('res_id'=>true, 'cat_id'=>true, 'name'=>true));
 				}
 			}
 		}
@@ -1303,19 +1302,19 @@ 
 	 * @param string $principal_url=null include given principal url, relative to principal-collection-set, default $principal
 	 * @return array with values for keys 'path' and 'props'
 	 */
-	protected function add_principal($principal, array $props = array(), $principal_url=null)
+	protected function add_principal($principal, array $props = array(), $principal_url = null)
 	{
 		$props['resourcetype'][] = HTTP_WebDAV_Server::mkprop('principal', '');
 
 		// required props per WebDAV ACL
-		foreach(array('alternate-URI-set', 'group-membership') as $name)
+		foreach (array('alternate-URI-set', 'group-membership') as $name)
 		{
-			if (!isset($props[$name])) $props[$name] = HTTP_WebDAV_Server::mkprop($name,'');
+			if (!isset($props[$name])) $props[$name] = HTTP_WebDAV_Server::mkprop($name, '');
 		}
 		if (!$principal_url) $principal_url = $principal;
 
 		$props['principal-URL'] = array(
-			HTTP_WebDAV_Server::mkprop('href',$this->base_uri.'/principals/'.$principal.'/'));
+			HTTP_WebDAV_Server::mkprop('href', $this->base_uri.'/principals/'.$principal.'/'));
 
 		return $this->add_collection('/principals/'.$principal.'/', $props);
 	}
@@ -1331,20 +1330,20 @@ 
 	 * @param array $resource=null resource to use (to not query it multiple times from the database)
 	 * @return array with values for 'path' and 'props'
 	 */
-	protected function add_proxys($principal, $type, array $proxys=array(), array $resource=null)
+	protected function add_proxys($principal, $type, array $proxys = array(), array $resource = null)
 	{
 		list($app,,$what) = explode('-', $type);
 
 		$proxys = array();
-		list($account_type,$account) = explode('/', $principal);
+		list($account_type, $account) = explode('/', $principal);
 
-		switch($account_type)
+		switch ($account_type)
 		{
 			case 'users':
 			case 'groups':
 				$account = $location = $this->accounts->name2id($account, 'account_lid', $account_type[0]);
 				$right = $what == 'write' ? EGW_ACL_EDIT : EGW_ACL_READ;
-				$mask = $what == 'write' ? EGW_ACL_EDIT : EGW_ACL_EDIT|EGW_ACL_READ;	// do NOT report write+read in read
+				$mask = $what == 'write' ? EGW_ACL_EDIT : EGW_ACL_EDIT|EGW_ACL_READ; // do NOT report write+read in read
 				break;
 
 			case 'locations':
@@ -1356,18 +1355,18 @@ 
 				}
 				$location = 'L'.$resource['cat_id'];
 				$right = $what == 'write' ? EGW_ACL_DIRECT_BOOKING : EGW_ACL_CALREAD;
-				$mask = $what == 'write' ? EGW_ACL_DIRECT_BOOKING : EGW_ACL_DIRECT_BOOKING|EGW_ACL_CALREAD;	// do NOT report write+read in read
+				$mask = $what == 'write' ? EGW_ACL_DIRECT_BOOKING : EGW_ACL_DIRECT_BOOKING|EGW_ACL_CALREAD; // do NOT report write+read in read
 				break;
 		}
 		static $principal2grants = array();
-		$grants =& $principal2grants[$principal];
+		$grants = & $principal2grants[$principal];
 		if (!isset($grants))
 		{
-			switch($app)
+			switch ($app)
 			{
 				case 'resources':
 					$grants = $this->get_resource_rights();
-					$grants = (array)$grants[$location];	// returns array($location => $grants)
+					$grants = (array)$grants[$location]; // returns array($location => $grants)
 					break;
 
 				case 'calendar':
@@ -1377,9 +1376,9 @@ 
 			}
 			//echo "<p>type=$type --> app=$app, what=$what --> right=$right, mask=$mask, account=$account, location=$location --> grants=".array2string($grants)."</p>\n";
 		}
-		foreach($grants as $account_id => $rights)
+		foreach ($grants as $account_id => $rights)
 		{
-			if ($account_id !== 'run' && $account_id != $account && ($rights & $mask) == $right &&
+			if ($account_id !== 'run' && $account_id != $account && ($rights&$mask) == $right &&
 				($account_lid = $this->accounts->id2name($account_id)))
 			{
 				// ignore "broken" grants (eg. negative account_id for a user), as they lead to further errors (no members)
@@ -1410,10 +1409,10 @@ 
 	 * @param int $account who is the proxy
 	 * @return array with href props
 	 */
-	protected function principal_set($prop, array $accounts=array(), $add_proxys=null, $account=null)
+	protected function principal_set($prop, array $accounts = array(), $add_proxys = null, $account = null)
 	{
 		$set = array();
-		foreach($accounts as $account_id => $account_lid)
+		foreach ($accounts as $account_id => $account_lid)
 		{
 			if ($this->accounts->visible($account_lid))	// only add visible accounts, gives error in iCal otherwise
 			{
@@ -1422,11 +1421,11 @@ 
 		}
 		if ($add_proxys)
 		{
-			foreach((array)$add_proxys as $app)
+			foreach ((array)$add_proxys as $app)
 			{
 				if (!isset($GLOBALS['egw_info']['user']['apps'][$app])) continue;
 
-				switch($app)
+				switch ($app)
 				{
 					case 'resources':
 						$proxy_groups = $this->get_resource_proxy_groups($account);
@@ -1458,11 +1457,11 @@ 
 			// get location grants for $account (incl. his memberships)
 			$memberships = $GLOBALS['egw']->accounts->memberships($account, true);
 			$location_grants = array();
-			foreach($all_location_grants as $location => $grants)
+			foreach ($all_location_grants as $location => $grants)
 			{
-				foreach($grants as $account_id => $rights)
+				foreach ($grants as $account_id => $rights)
 				{
-					if (($rights & (EGW_ACL_CALREAD|EGW_ACL_DIRECT_BOOKING)) &&	// we only care for these rights
+					if (($rights&(EGW_ACL_CALREAD|EGW_ACL_DIRECT_BOOKING)) && // we only care for these rights
 						($account_id == $account || in_array($account_id, $memberships)))
 					{
 						if (!isset($location_grants[$location])) $location_grants[$location] = 0;
@@ -1471,13 +1470,13 @@ 
 				}
 			}
 			// now add proxy-groups for all resources user has rights to
-			foreach($resources as $resource)
+			foreach ($resources as $resource)
 			{
 				$rights = $location_grants['L'.$resource['cat_id']];
 				if (isset($rights))
 				{
 					$set[] = HTTP_WebDAV_Server::mkprop('href', $this->base_uri.'/principals/'.$this->resource2name($resource).
-						'/calendar-proxy-'.($rights & EGW_ACL_DIRECT_BOOKING ? 'write' : 'read').'/');
+						'/calendar-proxy-'.($rights&EGW_ACL_DIRECT_BOOKING ? 'write' : 'read').'/');
 				}
 			}
 		}
@@ -1492,18 +1491,18 @@ 
 	 * @param string|array $app_proxys=null applications for which proxys should be added
 	 * @return array with href props
 	 */
-	protected function get_calendar_proxy_groups($account, $app='calendar')
+	protected function get_calendar_proxy_groups($account, $app = 'calendar')
 	{
 		$set = array();
-		foreach($this->acl->get_grants($app, $app != 'addressbook', $account) as $account_id => $rights)
+		foreach ($this->acl->get_grants($app, $app != 'addressbook', $account) as $account_id => $rights)
 		{
-			if ($account_id != $account && ($rights & EGW_ACL_READ) &&
+			if ($account_id != $account && ($rights&EGW_ACL_READ) &&
 				($account_lid = $this->accounts->id2name($account_id)) &&
 				$this->accounts->visible($account_lid))	// only add visible accounts, gives error in iCal otherwise
 			{
 				$set[] = HTTP_WebDAV_Server::mkprop('href', $this->base_uri.'/principals/'.
 					($account_id < 0 ? 'groups/' : 'users/').
-					$account_lid.'/'.$app.'-proxy-'.($rights & EGW_ACL_EDIT ? 'write' : 'read').'/');
+					$account_lid.'/'.$app.'-proxy-'.($rights&EGW_ACL_EDIT ? 'write' : 'read').'/');
 			}
 		}
 		return $set;
@@ -1518,7 +1517,7 @@ 
 	 * @param boolean $do_locations=false false: /principal/resources, true: /principals/locations
 	 * @return array|string array with files or HTTP error code
 	 */
-	protected function propfind_resources($name,$rest,array $options,$do_locations=false)
+	protected function propfind_resources($name, $rest, array $options, $do_locations = false)
 	{
 		if (!isset($GLOBALS['egw_info']['user']['apps']['resources']))
 		{
@@ -1540,7 +1539,7 @@ 
 				if (($resources = $this->get_resources()))
 				{
 					//_debug_array($resources);
-					foreach($resources as $resource)
+					foreach ($resources as $resource)
 					{
 						if (($is_location = self::resource_is_location($resource)) == $do_locations)
 						{
@@ -1557,8 +1556,8 @@ 
 				return '404 Not Found';
 			}
 			$path = ($is_location ? 'locations/' : 'resources/').$name;
-			while (substr($rest,-1) == '/') $rest = substr($rest,0,-1);
-			switch((string)$rest)
+			while (substr($rest, -1) == '/') $rest = substr($rest, 0, -1);
+			switch ((string)$rest)
 			{
 				case '':
 					$files[] = $this->add_principal_resource($resource);
@@ -1597,12 +1596,12 @@ 
 		if ($options['depth'])
 		{
 			if (is_numeric($options['depth'])) --$options['depth'];
-			$files = array_merge($files,$this->propfind_users('','',$options));
-			$files = array_merge($files,$this->propfind_groups('','',$options));
+			$files = array_merge($files, $this->propfind_users('', '', $options));
+			$files = array_merge($files, $this->propfind_groups('', '', $options));
 			if ($GLOBALS['egw_info']['user']['apps']['resources'])
 			{
-				$files = array_merge($files,$this->propfind_resources('','',$options,false));	// resources
-				$files = array_merge($files,$this->propfind_resources('','',$options,true));	// locations
+				$files = array_merge($files, $this->propfind_resources('', '', $options, false)); // resources
+				$files = array_merge($files, $this->propfind_resources('', '', $options, true)); // locations
 			}
 			//$files = array_merge($files,$this->propfind_uids('','',$options));
 		}
@@ -1617,7 +1616,7 @@ 
 	 * @param int $user=null account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function get(&$options,$id,$user=null)
+	function get(&$options, $id, $user = null)
 	{
 		return false;
 	}
@@ -1630,7 +1629,7 @@ 
 	 * @param int $user=null account_id of owner, default null
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function put(&$options,$id,$user=null)
+	function put(&$options, $id, $user = null)
 	{
 		return false;
 	}
@@ -1642,7 +1641,7 @@ 
 	 * @param int $id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function delete(&$options,$id)
+	function delete(&$options, $id)
 	{
 		return false;
 	}
@@ -1665,13 +1664,13 @@ 
 	 * @param array/int $entry entry-array or id
 	 * @return boolean null if entry does not exist, false if no access, true if access permitted
 	 */
-	function check_access($acl,$entry)
+	function check_access($acl, $entry)
 	{
 		if ($acl != EGW_ACL_READ)
 		{
 			return false;
 		}
-		if (!is_array($entry) && !$this->accounts->name2id($entry,'account_lid','u'))
+		if (!is_array($entry) && !$this->accounts->name2id($entry, 'account_lid', 'u'))
 		{
 			return null;
 		}
@@ -1708,7 +1707,7 @@ 
 	 * @param int $user=null owner of the collection, default current user
 	 * @return array with privileges
 	 */
-	public function current_user_privileges($path, $user=null)
+	public function current_user_privileges($path, $user = null)
 	{
 		return array('read', 'read-current-user-privilege-set');
 	}

Braces +123 added lines, -31 removed lines

@@ -41,7 +41,10 @@ 
 	{
 		parent::__construct($app, $groupdav);
 
-		if (!isset(self::$resources)) self::$resources = new resources_bo();
+		if (!isset(self::$resources))
+		{
+			self::$resources = new resources_bo();
+		}
 	}
 
 	/**
@@ -83,7 +86,10 @@ 
 	 */
 	protected function supported_report_set($path, array $reports=null)
 	{
-		if (is_null($reports)) $reports = $this->supported_reports;
+		if (is_null($reports))
+		{
+			$reports = $this->supported_reports;
+		}
 
 		$supported = array();
 		foreach($reports as $name => $data)
@@ -254,7 +260,10 @@ 
 		$requested_props = $options['other'];
 		while(($requested_prop = array_shift($requested_props)))
 		{
-			if ($requested_prop['name'] != 'property' || $requested_prop['depth'] != 1) continue;
+			if ($requested_prop['name'] != 'property' || $requested_prop['depth'] != 1)
+			{
+				continue;
+			}
 
 			$prop_ns = $requested_prop['attrs']['namespace'];
 			$prop_name = $requested_prop['attrs']['name'];
@@ -293,7 +302,10 @@ 
 			// find prop to expand
 			foreach($prop_files['files'][0]['props'] as $name => $expand_prop)
 			{
-				if ($expand_prop['name'] === $prop_name) break;
+				if ($expand_prop['name'] === $prop_name)
+				{
+					break;
+				}
 			}
 			if ($expand_prop['name'] !== $prop_name || !is_array($expand_prop['val']) ||
 				$expand_prop['val'] && $expand_prop['val'][0]['name'] !== 'href')
@@ -309,10 +321,13 @@ 
 			{
 				if ($prop['name'] == 'property' && $prop['depth'] == 2)
 				{
-					if (!is_array($options2['props']))	// is "all" initially
+					if (!is_array($options2['props']))
+					{
+						// is "all" initially
 					{
 						$options2['props'] = array();
 					}
+					}
 					$options2['props'][] = array(
 						'name' => $prop['attrs']['name'],
 						'xmlns' => isset($prop['attrs']['namespace']) ? $prop['attrs']['namespace'] : $prop['xmlns'],
@@ -320,7 +335,10 @@ 
 				}
 			}
 			// put back evtl. read top-level property
-			if ($prop && $prop['depth'] == 1) array_unshift($requested_props, $prop);
+			if ($prop && $prop['depth'] == 1)
+			{
+				array_unshift($requested_props, $prop);
+			}
 			$this->groupdav->options = $options2;	// also modify global variable
 
 			// run regular profind to get requested 2.-level properties for each href
@@ -516,9 +534,12 @@ 
 		// now filter out not matching "files"
 		foreach($files['files'] as $n => $resource)
 		{
-			if (count(explode('/', $resource['path'])) < 5)	// hack to only return principals, not the collections itself
+			if (count(explode('/', $resource['path'])) < 5)
+			{
+				// hack to only return principals, not the collections itself
 			{
 				unset($files['files'][$n]);
+			}
 				continue;
 			}
 			// match with $search_props
@@ -526,15 +547,25 @@ 
 			foreach($search_props as $search_prop)
 			{
 				// search resource for $search_prop
-				foreach($resource['props'] as $prop) if ($prop['name'] === $search_prop['name']) break;
-				if ($prop['name'] === $search_prop['name'])	// search_prop NOT found
+				foreach($resource['props'] as $prop)
+				{
+					if ($prop['name'] === $search_prop['name']) break;
+				}
+				if ($prop['name'] === $search_prop['name'])
+				{
+					// search_prop NOT found
 				{
 					foreach((array)$prop['val'] as $value)
 					{
-						if (is_array($value)) $value = $value['val'];	// eg. href prop
-						if (self::match($value, $search_prop['match'], $search_prop['match-type']) !== false)	// prop does match
+						if (is_array($value)) $value = $value['val'];
+				}
+				// eg. href prop
+						if (self::match($value, $search_prop['match'], $search_prop['match-type']) !== false)
+						{
+							// prop does match
 						{
 							++$matches;
+						}
 							//error_log("$matches: $resource[path]: $search_prop[name]=".array2string($prop['name'] !== $search_prop['name'] ? null : $prop['val'])." does match '$search_prop[match]'");
 							break;
 						}
@@ -734,7 +765,10 @@ 
 		{
 			foreach($resource['props']['resourcetype']['val'] as $prop)
 			{
-				if ($prop['name'] == 'principal') continue 2;
+				if ($prop['name'] == 'principal')
+				{
+					continue 2;
+				}
 			}
 			unset($files['files'][$n]);	// not a principal --> do not return
 		}
@@ -787,7 +821,10 @@ 
 				$this->groupdav->log(__METHOD__."('$name', ...) account '$name' NOT found OR not visible to you (check account-selection preference)!");
 				return '404 Not Found';
 			}
-			while (substr($rest,-1) == '/') $rest = substr($rest,0,-1);
+			while (substr($rest,-1) == '/')
+			{
+				$rest = substr($rest,0,-1);
+			}
 			switch((string)$rest)
 			{
 				case '':
@@ -850,7 +887,10 @@ 
 			{
 				return '404 Not Found';
 			}
-			while (substr($rest,-1) == '/') $rest = substr($rest,0,-1);
+			while (substr($rest,-1) == '/')
+			{
+				$rest = substr($rest,0,-1);
+			}
 			switch((string)$rest)
 			{
 				case '':
@@ -882,7 +922,11 @@ 
 	{
 		$addressbooks = array();
 		$addressbook_home_set = $GLOBALS['egw_info']['user']['preferences']['groupdav']['addressbook-home-set'];
-		if (empty($addressbook_home_set)) $addressbook_home_set = 'P';	// personal addressbook
+		if (empty($addressbook_home_set))
+		{
+			$addressbook_home_set = 'P';
+		}
+		// personal addressbook
 		$addressbook_home_set = explode(',',$addressbook_home_set);
 		// replace symbolic id's with real nummeric id's
 		foreach(array(
@@ -896,10 +940,13 @@ 
 				$addressbook_home_set[$key] = $id;
 			}
 		}
-		if (in_array('O',$addressbook_home_set))	// "all in one" from groupdav.php/addressbook/
+		if (in_array('O',$addressbook_home_set))
+		{
+			// "all in one" from groupdav.php/addressbook/
 		{
 			$addressbooks[] = '/';
 		}
+		}
 		foreach(ExecMethod('addressbook.addressbook_bo.get_addressbooks',EGW_ACL_READ) as $id => $label)
 		{
 			if ((in_array('A',$addressbook_home_set) || in_array((string)$id,$addressbook_home_set)) &&
@@ -978,7 +1025,10 @@ 
 	 */
 	static public function url2uid($url, $only_type=null, $cn=null)
 	{
-		if (!$only_type) $only_type = array('users', 'groups', 'resources', 'locations', 'mailto');
+		if (!$only_type)
+		{
+			$only_type = array('users', 'groups', 'resources', 'locations', 'mailto');
+		}
 
 		if ($url[0] == '/')
 		{
@@ -988,7 +1038,10 @@ 
 		{
 			list($schema, $rest) = explode(':', $url, 2);
 		}
-		if (empty($rest)) return false;
+		if (empty($rest))
+		{
+			return false;
+		}
 
 		switch(strtolower($schema))
 		{
@@ -1035,9 +1088,12 @@ 
 			case 'urn':
 				list($urn_type, $uid) = explode(':', $rest, 2);
 				list($type, $id, $install_id) = explode('-', $uid);
-				if ($type == 'accounts' && empty($id))	// groups have a negative id, eg. "urn:uuid:accounts--1-..."
+				if ($type == 'accounts' && empty($id))
+				{
+					// groups have a negative id, eg. "urn:uuid:accounts--1-..."
 				{
 					list($type, $nul, $id, $install_id) = explode('-', $uid);
+				}
 					$id = -$id;
 				}
 				// own urn
@@ -1051,7 +1107,10 @@ 
 					else
 					{
 						static $calendar_bo;
-						if (is_null($calendar_bo)) $calendar_bo = new calendar_bo();
+						if (is_null($calendar_bo))
+						{
+							$calendar_bo = new calendar_bo();
+						}
 						foreach($calendar_bo->resources as $letter => $info)
 						{
 							if ($info['app'] == $type || $info['app'] == 'resources' && $type == 'location')
@@ -1157,7 +1216,10 @@ 
 		{
 			return null;
 		}
-		if (is_null($is_location)) $is_location = self::resource_is_location($resource);
+		if (is_null($is_location))
+		{
+			$is_location = self::resource_is_location($resource);
+		}
 
 		$displayname = translation::convert($resource['name'],	translation::charset(), 'utf-8');
 
@@ -1203,7 +1265,10 @@ 
 
 		if (!isset($cache[$res_id]))
 		{
-			if (!isset(self::$resources)) self::$resources = new resources_bo();
+			if (!isset(self::$resources))
+			{
+				self::$resources = new resources_bo();
+			}
 
 			if (!($cache[$res_id] = self::$resources->read($res_id)))
 			{
@@ -1240,7 +1305,10 @@ 
 	{
 		if (!isset(self::$all_resources))
 		{
-			if (!isset(self::$resources)) self::$resources = new resources_bo($user);
+			if (!isset(self::$resources))
+			{
+				self::$resources = new resources_bo($user);
+			}
 
 			self::$all_resources = array();
 			$query = array(
@@ -1310,9 +1378,15 @@ 
 		// required props per WebDAV ACL
 		foreach(array('alternate-URI-set', 'group-membership') as $name)
 		{
-			if (!isset($props[$name])) $props[$name] = HTTP_WebDAV_Server::mkprop($name,'');
+			if (!isset($props[$name]))
+			{
+				$props[$name] = HTTP_WebDAV_Server::mkprop($name,'');
+			}
+		}
+		if (!$principal_url)
+		{
+			$principal_url = $principal;
 		}
-		if (!$principal_url) $principal_url = $principal;
 
 		$props['principal-URL'] = array(
 			HTTP_WebDAV_Server::mkprop('href',$this->base_uri.'/principals/'.$principal.'/'));
@@ -1415,16 +1489,22 @@ 
 		$set = array();
 		foreach($accounts as $account_id => $account_lid)
 		{
-			if ($this->accounts->visible($account_lid))	// only add visible accounts, gives error in iCal otherwise
+			if ($this->accounts->visible($account_lid))
+			{
+				// only add visible accounts, gives error in iCal otherwise
 			{
 				$set[] = HTTP_WebDAV_Server::mkprop('href', $this->base_uri.'/principals/'.($account_id < 0 ? 'groups/' : 'users/').$account_lid.'/');
 			}
+			}
 		}
 		if ($add_proxys)
 		{
 			foreach((array)$add_proxys as $app)
 			{
-				if (!isset($GLOBALS['egw_info']['user']['apps'][$app])) continue;
+				if (!isset($GLOBALS['egw_info']['user']['apps'][$app]))
+				{
+					continue;
+				}
 
 				switch($app)
 				{
@@ -1465,7 +1545,10 @@ 
 					if (($rights & (EGW_ACL_CALREAD|EGW_ACL_DIRECT_BOOKING)) &&	// we only care for these rights
 						($account_id == $account || in_array($account_id, $memberships)))
 					{
-						if (!isset($location_grants[$location])) $location_grants[$location] = 0;
+						if (!isset($location_grants[$location]))
+						{
+							$location_grants[$location] = 0;
+						}
 						$location_grants[$location] |= $rights;
 					}
 				}
@@ -1499,12 +1582,15 @@ 
 		{
 			if ($account_id != $account && ($rights & EGW_ACL_READ) &&
 				($account_lid = $this->accounts->id2name($account_id)) &&
-				$this->accounts->visible($account_lid))	// only add visible accounts, gives error in iCal otherwise
+				$this->accounts->visible($account_lid))
+			{
+				// only add visible accounts, gives error in iCal otherwise
 			{
 				$set[] = HTTP_WebDAV_Server::mkprop('href', $this->base_uri.'/principals/'.
 					($account_id < 0 ? 'groups/' : 'users/').
 					$account_lid.'/'.$app.'-proxy-'.($rights & EGW_ACL_EDIT ? 'write' : 'read').'/');
 			}
+			}
 		}
 		return $set;
 	}
@@ -1557,7 +1643,10 @@ 
 				return '404 Not Found';
 			}
 			$path = ($is_location ? 'locations/' : 'resources/').$name;
-			while (substr($rest,-1) == '/') $rest = substr($rest,0,-1);
+			while (substr($rest,-1) == '/')
+			{
+				$rest = substr($rest,0,-1);
+			}
 			switch((string)$rest)
 			{
 				case '':
@@ -1596,7 +1685,10 @@ 
 
 		if ($options['depth'])
 		{
-			if (is_numeric($options['depth'])) --$options['depth'];
+			if (is_numeric($options['depth']))
+			{
+				--$options['depth'];
+			}
 			$files = array_merge($files,$this->propfind_users('','',$options));
 			$files = array_merge($files,$this->propfind_groups('','',$options));
 			if ($GLOBALS['egw_info']['user']['apps']['resources'])

phpgwapi/inc/class.historylog.inc.php

Doc Comments +2 added lines

@@ -112,6 +112,8 @@
 
 	/**
 	 * Static function to add a history record
+	 * @param string $field_code
+	 * @param string $new_value
 	 */
 	public static function static_add($appname, $id, $user, $field_code, $new_value, $old_value = '')
 	{

Spacing +67 added lines, -67 removed lines

@@ -57,7 +57,7 @@ 
 	 * @param string $appname app name this instance operates on
 	 * @return historylog
 	 */
-	function historylog($appname='',$user=null)
+	function historylog($appname = '', $user = null)
 	{
 		$this->appname = $appname ? $appname : $GLOBALS['egw_info']['flags']['currentapp'];
 		$this->user = !is_null($user) ? $user : $GLOBALS['egw_info']['user']['account_id'];
@@ -87,7 +87,7 @@ 
 		{
 			$where['history_record_id'] = $record_id;
 		}
-		$this->db->delete(self::TABLE,$where,__LINE__,__FILE__);
+		$this->db->delete(self::TABLE, $where, __LINE__, __FILE__);
 
 		return $this->db->affected_rows();
 	}
@@ -100,11 +100,11 @@ 
 	 * @param string $new_value new value
 	 * @param string $old_value old value
 	 */
-	function add($status,$record_id,$new_value,$old_value)
+	function add($status, $record_id, $new_value, $old_value)
 	{
 		if ($new_value != $old_value)
 		{
-			$this->db->insert(self::TABLE,array(
+			$this->db->insert(self::TABLE, array(
 				'history_record_id' => $record_id,
 				'history_appname'   => $this->appname,
 				'history_owner'     => $this->user,
@@ -113,7 +113,7 @@ 
 				'history_old_value' => $old_value,
 				'history_timestamp' => time(),
 				'sessionid' => $GLOBALS['egw']->session->sessionid_access_log,
-			),false,__LINE__,__FILE__);
+			), false, __LINE__, __FILE__);
 		}
 	}
 
@@ -124,7 +124,7 @@ 
 	{
 		if ($new_value != $old_value)
 		{
-			$GLOBALS['egw']->db->insert(self::TABLE,array(
+			$GLOBALS['egw']->db->insert(self::TABLE, array(
 				'history_record_id' => $id,
 				'history_appname'   => $appname,
 				'history_owner'     => (int)$user,
@@ -133,7 +133,7 @@ 
 				'history_old_value' => $old_value,
 				'history_timestamp' => time(),
 				'sessionid' => $GLOBALS['egw']->session->sessionid_access_log,
-			),false,__LINE__,__FILE__);
+			), false, __LINE__, __FILE__);
 		}
 	}
 
@@ -147,11 +147,11 @@ 
 	 * @return array of arrays with keys id, record_id, appname, owner (account_id), status, new_value, old_value,
 	 * 	timestamp (Y-m-d H:i:s in servertime), user_ts (timestamp in user-time)
 	 */
-	function search($filter,$order='history_id',$sort='DESC',$limit=null)
+	function search($filter, $order = 'history_id', $sort = 'DESC', $limit = null)
 	{
 		if (!is_array($filter)) $filter = is_numeric($filter) ? array('history_record_id' => $filter) : array();
 
-		if (!$order || !preg_match('/^[a-z0-9_]+$/i',$order) || !preg_match('/^(asc|desc)?$/i',$sort))
+		if (!$order || !preg_match('/^[a-z0-9_]+$/i', $order) || !preg_match('/^(asc|desc)?$/i', $sort))
 		{
 			$orderby = 'ORDER BY history_id DESC';
 		}
@@ -159,9 +159,9 @@ 
 		{
 			$orderby = "ORDER BY $order $sort";
 		}
-		foreach($filter as $col => $value)
+		foreach ($filter as $col => $value)
 		{
-			if (!is_numeric($col) && substr($col,0,8) != 'history_')
+			if (!is_numeric($col) && substr($col, 0, 8) != 'history_')
 			{
 				$filter['history_'.$col] = $value;
 				unset($filter[$col]);
@@ -173,11 +173,11 @@ 
 		if (!$filter['history_record_id']) return array();
 
 		$rows = array();
-		foreach($this->db->select(self::TABLE, '*', $filter, __LINE__, __FILE__,
+		foreach ($this->db->select(self::TABLE, '*', $filter, __LINE__, __FILE__,
 			isset($limit) ? 0 : false, $orderby, 'phpgwapi', $limit) as $row)
 		{
 			$row['user_ts'] = $this->db->from_timestamp($row['history_timestamp']) + 3600 * $GLOBALS['egw_info']['user']['preferences']['common']['tz_offset'];
-			$rows[] = egw_db::strip_array_keys($row,'history_');
+			$rows[] = egw_db::strip_array_keys($row, 'history_');
 		}
 		return $rows;
 	}
@@ -192,8 +192,8 @@ 
 		$rows = array();
 		$filter['history_appname'] = $query['appname'];
 		$filter['history_record_id'] = $query['record_id'];
-		if(is_array($query['colfilter'])) {
-			foreach($query['colfilter'] as $column => $value) {
+		if (is_array($query['colfilter'])) {
+			foreach ($query['colfilter'] as $column => $value) {
 				$filter[$column] = $value;
 			}
 		}
@@ -203,20 +203,20 @@ 
 		}
 		else
 		{
-			$total = $GLOBALS['egw']->db->select(self::TABLE,'COUNT(*)',$filter,__LINE__,__FILE__,false,'','phpgwapi',0)->fetchColumn();
+			$total = $GLOBALS['egw']->db->select(self::TABLE, 'COUNT(*)', $filter, __LINE__, __FILE__, false, '', 'phpgwapi', 0)->fetchColumn();
 		}
 		// filter out private (or no longer defined) custom fields
 		if ($filter['history_appname'])
 		{
 			$to_or[] = "history_status NOT LIKE '#%'";
 			// explicitly allow "##" used to store iCal/vCard X-attributes
-			if (in_array($filter['history_appname'], array('calendar','infolog','addressbook')))
+			if (in_array($filter['history_appname'], array('calendar', 'infolog', 'addressbook')))
 			{
 				$to_or[] = "history_status LIKE '##%'";
 			}
 			if (($cfs = egw_customfields::get($filter['history_appname'])))
 			{
-				$to_or[] =  'history_status IN ('.implode(',', array_map(function($str)
+				$to_or[] = 'history_status IN ('.implode(',', array_map(function($str)
 				{
 					return $GLOBALS['egw']->db->quote('#'.$str);
 				}, array_keys($cfs))).')';
@@ -225,40 +225,40 @@ 
 		}
 		$_query = array(array(
 			'table' => self::TABLE,
-			'cols' => array('history_id', 'history_record_id','history_appname','history_owner','history_status','history_new_value', 'history_timestamp','history_old_value'),
+			'cols' => array('history_id', 'history_record_id', 'history_appname', 'history_owner', 'history_status', 'history_new_value', 'history_timestamp', 'history_old_value'),
 			'where' => $filter,
 		));
 
 		// Add in files, if possible
-		if($GLOBALS['egw_info']['user']['apps']['filemanager'] &&
-			$file = sqlfs_stream_wrapper::url_stat("/apps/{$query['appname']}/{$query['record_id']}",STREAM_URL_STAT_LINK))
+		if ($GLOBALS['egw_info']['user']['apps']['filemanager'] &&
+			$file = sqlfs_stream_wrapper::url_stat("/apps/{$query['appname']}/{$query['record_id']}", STREAM_URL_STAT_LINK))
 		{
 			$_query[] = array(
 				'table' => sqlfs_stream_wrapper::TABLE,
-				'cols' =>array('fs_id', 'fs_dir', "'filemanager'",'COALESCE(fs_modifier,fs_creator)',"'~file~'",'fs_name','fs_modified', 'fs_mime'),
+				'cols' =>array('fs_id', 'fs_dir', "'filemanager'", 'COALESCE(fs_modifier,fs_creator)', "'~file~'", 'fs_name', 'fs_modified', 'fs_mime'),
 				'where' => array('fs_dir' => $file['ino'])
 			);
 		}
 		$new_file_id = array();
-		foreach($GLOBALS['egw']->db->union(
+		foreach ($GLOBALS['egw']->db->union(
 			$_query,
 			__LINE__, __FILE__,
-			' ORDER BY ' . ($query['order'] ? $query['order'] : 'history_timestamp') . ' ' . ($query['sort'] ? $query['sort'] : 'DESC'),
+			' ORDER BY '.($query['order'] ? $query['order'] : 'history_timestamp').' '.($query['sort'] ? $query['sort'] : 'DESC'),
 			$query['start'],
 			$query['num_rows']
 		) as $row) {
 			$row['user_ts'] = $GLOBALS['egw']->db->from_timestamp($row['history_timestamp']) + 3600 * $GLOBALS['egw_info']['user']['preferences']['common']['tz_offset'];
 
 			// Explode multi-part values
-			foreach(array('history_new_value','history_old_value') as $field)
+			foreach (array('history_new_value', 'history_old_value') as $field)
 			{
-				if(strpos($row[$field],bo_tracking::ONE2N_SEPERATOR) !== false)
+				if (strpos($row[$field], bo_tracking::ONE2N_SEPERATOR) !== false)
 				{
-					$row[$field] = explode(bo_tracking::ONE2N_SEPERATOR,$row[$field]);
+					$row[$field] = explode(bo_tracking::ONE2N_SEPERATOR, $row[$field]);
 				}
 			}
 			// Get information needed for proper display
-			if($row['history_appname'] == 'filemanager')
+			if ($row['history_appname'] == 'filemanager')
 			{
 				$new_version = $new_file_id[$row['history_new_value']];
 				$new_file_id[$row['history_new_value']] = count($rows);
@@ -274,12 +274,12 @@ 
 					'mime' => $row['history_old_value']
 				);
 				$row['history_old_value'] = '';
-				if($new_version !== null)
+				if ($new_version !== null)
 				{
 					$rows[$new_version]['old_value'] = $row['history_new_value'];
 				}
 			}
-			$rows[] = egw_db::strip_array_keys($row,'history_');
+			$rows[] = egw_db::strip_array_keys($row, 'history_');
 		}
 		if ($mysql_calc_rows)
 		{
@@ -300,13 +300,13 @@ 
 	 * @param int $record_id id of the record in $this->appname (set by the constructor)
 	 * @return array of arrays with keys id, record_id, owner (account_lid!), status, new_value, old_value, datetime (timestamp in servertime)
 	 */
-	function return_array($filter_out,$only_show,$_orderby,$sort, $record_id)
+	function return_array($filter_out, $only_show, $_orderby, $sort, $record_id)
 	{
 		if (!is_numeric($record_id))
 		{
 			return array();
 		}
-		if (!$_orderby || !preg_match('/^[a-z0-9_]+$/i',$_orderby) || !preg_match('/^(asc|desc)?$/i',$sort))
+		if (!$_orderby || !preg_match('/^[a-z0-9_]+$/i', $_orderby) || !preg_match('/^(asc|desc)?$/i', $sort))
 		{
 			$orderby = 'ORDER BY history_timestamp,history_id';
 		}
@@ -321,7 +321,7 @@ 
 		);
 		if (is_array($filter_out))
 		{
-			foreach($filter_out as $_filter)
+			foreach ($filter_out as $_filter)
 			{
 				$where[] = 'history_status != '.$this->db->quote($_filter);
 			}
@@ -329,20 +329,20 @@ 
 		if (is_array($only_show) && count($only_show))
 		{
 			$to_or = array();
-			foreach($only_show as $_filter)
+			foreach ($only_show as $_filter)
 			{
 				$to_or[] = 'history_status = '.$this->db->quote($_filter);
 			}
-			$where[] = '('.implode(' OR ',$to_or).')';
+			$where[] = '('.implode(' OR ', $to_or).')';
 		}
 
-		foreach($this->db->select(self::TABLE,'*',$where,__LINE__,__FILE__,false,$orderby) as $row)
+		foreach ($this->db->select(self::TABLE, '*', $where, __LINE__, __FILE__, false, $orderby) as $row)
 		{
 			$return_values[] = array(
 				'id'         => $row['history_id'],
 				'record_id'  => $row['history_record_id'],
 				'owner'      => $row['history_owner'] ? $GLOBALS['egw']->accounts->id2name($row['history_owner']) : lang('eGroupWare'),
-				'status'     => str_replace(' ','',$row['history_status']),
+				'status'     => str_replace(' ', '', $row['history_status']),
 				'new_value'  => $row['history_new_value'],
 				'old_value'  => $row['history_old_value'],
 				'datetime'   => $this->db->from_timestamp($row['history_timestamp']),
@@ -361,45 +361,45 @@ 
 	 * @param int $record_id id of the record in $this->appname (set by the constructor)
 	 * @return string the html
 	 */
-	function return_html($filter_out,$orderby,$sort, $record_id)
+	function return_html($filter_out, $orderby, $sort, $record_id)
 	{
-		$this->template   =& CreateObject('phpgwapi.Template',EGW_TEMPLATE_DIR);
-		$this->nextmatchs =& CreateObject('phpgwapi.nextmatchs');
+		$this->template   = & CreateObject('phpgwapi.Template', EGW_TEMPLATE_DIR);
+		$this->nextmatchs = & CreateObject('phpgwapi.nextmatchs');
 
-		$this->template->set_file('_history','history_list.tpl');
+		$this->template->set_file('_history', 'history_list.tpl');
 
-		$this->template->set_block('_history','row_no_history');
-		$this->template->set_block('_history','list');
-		$this->template->set_block('_history','row');
+		$this->template->set_block('_history', 'row_no_history');
+		$this->template->set_block('_history', 'list');
+		$this->template->set_block('_history', 'row');
 
-		$this->template->set_var('lang_user',lang('User'));
-		$this->template->set_var('lang_date',lang('Date'));
-		$this->template->set_var('lang_action',lang('Action'));
-		$this->template->set_var('lang_new_value',lang('New Value'));
+		$this->template->set_var('lang_user', lang('User'));
+		$this->template->set_var('lang_date', lang('Date'));
+		$this->template->set_var('lang_action', lang('Action'));
+		$this->template->set_var('lang_new_value', lang('New Value'));
 
-		$this->template->set_var('th_bg',$GLOBALS['egw_info']['theme']['th_bg']);
-		$this->template->set_var('sort_date',lang('Date'));
-		$this->template->set_var('sort_owner',lang('User'));
-		$this->template->set_var('sort_status',lang('Status'));
-		$this->template->set_var('sort_new_value',lang('New value'));
-		$this->template->set_var('sort_old_value',lang('Old value'));
+		$this->template->set_var('th_bg', $GLOBALS['egw_info']['theme']['th_bg']);
+		$this->template->set_var('sort_date', lang('Date'));
+		$this->template->set_var('sort_owner', lang('User'));
+		$this->template->set_var('sort_status', lang('Status'));
+		$this->template->set_var('sort_new_value', lang('New value'));
+		$this->template->set_var('sort_old_value', lang('Old value'));
 
-		$values = $this->return_array($filter_out,array(),$orderby,$sort,$record_id);
+		$values = $this->return_array($filter_out, array(), $orderby, $sort, $record_id);
 
 		if (!is_array($values))
 		{
-			$this->template->set_var('tr_color',$GLOBALS['egw_info']['theme']['row_off']);
-			$this->template->set_var('lang_no_history',lang('No history for this record'));
-			$this->template->fp('rows','row_no_history');
-			return $this->template->fp('out','list');
+			$this->template->set_var('tr_color', $GLOBALS['egw_info']['theme']['row_off']);
+			$this->template->set_var('lang_no_history', lang('No history for this record'));
+			$this->template->fp('rows', 'row_no_history');
+			return $this->template->fp('out', 'list');
 		}
 
-		foreach($values as $value)
+		foreach ($values as $value)
 		{
 			$this->nextmatchs->template_alternate_row_color($this->template);
 
-			$this->template->set_var('row_date',$GLOBALS['egw']->common->show_date($value['datetime']));
-			$this->template->set_var('row_owner',$value['owner']);
+			$this->template->set_var('row_date', $GLOBALS['egw']->common->show_date($value['datetime']));
+			$this->template->set_var('row_owner', $value['owner']);
 
 			if ($this->alternate_handlers[$value['status']])
 			{
@@ -411,14 +411,14 @@ 
 			}
 			else
 			{
-				$this->template->set_var('row_new_value',$value['new_value']);
-				$this->template->set_var('row_old_value',$value['old_value']);
+				$this->template->set_var('row_new_value', $value['new_value']);
+				$this->template->set_var('row_old_value', $value['old_value']);
 			}
 
-			$this->template->set_var('row_status',$this->types[$value['status']]);
+			$this->template->set_var('row_status', $this->types[$value['status']]);
 
-			$this->template->fp('rows','row',True);
+			$this->template->fp('rows', 'row', True);
 		}
-		return $this->template->fp('out','list');
+		return $this->template->fp('out', 'list');
 	}
 }

Braces +20 added lines, -7 removed lines

@@ -149,7 +149,10 @@ 
 	 */
 	function search($filter,$order='history_id',$sort='DESC',$limit=null)
 	{
-		if (!is_array($filter)) $filter = is_numeric($filter) ? array('history_record_id' => $filter) : array();
+		if (!is_array($filter))
+		{
+			$filter = is_numeric($filter) ? array('history_record_id' => $filter) : array();
+		}
 
 		if (!$order || !preg_match('/^[a-z0-9_]+$/i',$order) || !preg_match('/^(asc|desc)?$/i',$sort))
 		{
@@ -167,10 +170,16 @@ 
 				unset($filter[$col]);
 			}
 		}
-		if (!isset($filter['history_appname'])) $filter['history_appname'] = $this->appname;
+		if (!isset($filter['history_appname']))
+		{
+			$filter['history_appname'] = $this->appname;
+		}
 
 		// do not try to read all history entries of an app
-		if (!$filter['history_record_id']) return array();
+		if (!$filter['history_record_id'])
+		{
+			return array();
+		}
 
 		$rows = array();
 		foreach($this->db->select(self::TABLE, '*', $filter, __LINE__, __FILE__,
@@ -187,13 +196,16 @@ 
 	 *
 	 * Similar to search(), except this one can take a start and a number of records
 	 */
-	public static function get_rows(&$query, &$rows) {
+	public static function get_rows(&$query, &$rows)
+	{
 		$filter = array();
 		$rows = array();
 		$filter['history_appname'] = $query['appname'];
 		$filter['history_record_id'] = $query['record_id'];
-		if(is_array($query['colfilter'])) {
-			foreach($query['colfilter'] as $column => $value) {
+		if(is_array($query['colfilter']))
+		{
+			foreach($query['colfilter'] as $column => $value)
+			{
 				$filter[$column] = $value;
 			}
 		}
@@ -246,7 +258,8 @@ 
 			' ORDER BY ' . ($query['order'] ? $query['order'] : 'history_timestamp') . ' ' . ($query['sort'] ? $query['sort'] : 'DESC'),
 			$query['start'],
 			$query['num_rows']
-		) as $row) {
+		) as $row)
+		{
 			$row['user_ts'] = $GLOBALS['egw']->db->from_timestamp($row['history_timestamp']) + 3600 * $GLOBALS['egw_info']['user']['preferences']['common']['tz_offset'];
 
 			// Explode multi-part values

phpgwapi/inc/class.hooks.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -270,7 +270,7 @@
 	 *
 	 * @param string $appname Application 'name'
 	 * @param string $location is required, the hook itself
-	 * @return boolean|int false on error, true if new hooks are supplied and registed or number of removed hooks
+	 * @return boolean false on error, true if new hooks are supplied and registed or number of removed hooks
 	 */
 	function register_single_app_hook($appname, $location)
 	{

Indentation +1 added lines, -1 removed lines

@@ -266,7 +266,7 @@
 	/**
 	 * Add or/update a single application hook
 	 *
- 	 * setup file of app will be included and the hook required will be added/or updated
+	 * setup file of app will be included and the hook required will be added/or updated
 	 *
 	 * @param string $appname Application 'name'
 	 * @param string $location is required, the hook itself

Spacing +43 added lines, -43 removed lines

@@ -53,12 +53,12 @@ 
 	 *
 	 * @param egw_db $db =null database class, if null we use $GLOBALS['egw']->db
 	 */
-	function __construct($db=null)
+	function __construct($db = null)
 	{
-		$this->db = $db ? $db : $GLOBALS['egw']->db;	// this is to allow setup to set the db
+		$this->db = $db ? $db : $GLOBALS['egw']->db; // this is to allow setup to set the db
 
 		// sort hooks by app-order
-		foreach($this->db->select($this->table,'hook_appname,hook_location,hook_filename',false,__LINE__,__FILE__,false,'ORDER BY app_order','phpgwapi',0,'JOIN egw_applications ON hook_appname=app_name') as $row)
+		foreach ($this->db->select($this->table, 'hook_appname,hook_location,hook_filename', false, __LINE__, __FILE__, false, 'ORDER BY app_order', 'phpgwapi', 0, 'JOIN egw_applications ON hook_appname=app_name') as $row)
 		{
 			$this->locations[$row['hook_location']][$row['hook_appname']] = $row['hook_filename'];
 		}
@@ -71,7 +71,7 @@ 
 	 * @param egw_db $db
 	 * @deprecated use __construct()
 	 */
-	function hooks($db=null)
+	function hooks($db = null)
 	{
 		self::__construct($db);
 	}
@@ -97,22 +97,22 @@ 
 		$location = is_array($args) ? (isset($args['hook_location']) ? $args['hook_location'] : $args['location']) : $args;
 
 		$hooks = $this->locations[$location];
-		if (!isset($hooks) || empty($hooks)) return array();	// not a single app implements that hook
+		if (!isset($hooks) || empty($hooks)) return array(); // not a single app implements that hook
 
 		$apps = array_keys($hooks);
 		if (!$no_permission_check)
 		{
 			// on install of a new egroupware both hook-apps and user apps may be empty/not set
-			$apps = array_intersect((array)$apps,array_keys((array)$GLOBALS['egw_info']['user']['apps']));
+			$apps = array_intersect((array)$apps, array_keys((array)$GLOBALS['egw_info']['user']['apps']));
 		}
 		if ($order)
 		{
-			$apps = array_unique(array_merge((array)$order,$apps));
+			$apps = array_unique(array_merge((array)$order, $apps));
 		}
 		$results = array();
-		foreach((array)$apps as $appname)
+		foreach ((array)$apps as $appname)
 		{
-			$results[$appname] = $this->single($args,$appname,$no_permission_check);
+			$results[$appname] = $this->single($args, $appname, $no_permission_check);
 		}
 		return $results;
 	}
@@ -128,7 +128,7 @@ 
 	 * @param boolean $try_unregistered =false If true, try to include old file-hook anyway (for setup)
 	 * @return mixed False if no hook exists, True if old hook exists and whatever the new method-hook returns (can be True or False too!).
 	 */
-	function single($args, $appname = '', $no_permission_check = False,$try_unregistered = False)
+	function single($args, $appname = '', $no_permission_check = False, $try_unregistered = False)
 	{
 		//echo "<p>hooks::single(".array2string($args).",'$appname','$no_permission_check','$try_unregistered')</p>\n";
 		if (!is_array($args)) $args = array('location' => $args);
@@ -148,20 +148,20 @@ 
 		/* First include the ordered apps hook file */
 		if (isset($this->locations[$location][$appname]) || $try_unregistered)
 		{
-			$parts = explode('.',$method = $this->locations[$location][$appname]);
+			$parts = explode('.', $method = $this->locations[$location][$appname]);
 
-			if (strpos($method,'::') !== false || count($parts) == 3 && $parts[1] != 'inc' && $parts[2] != 'php')
+			if (strpos($method, '::') !== false || count($parts) == 3 && $parts[1] != 'inc' && $parts[2] != 'php')
 			{
 				// new style hook with method string or static method (eg. 'class::method')
 				try
 				{
-					return ExecMethod($method,$args);
+					return ExecMethod($method, $args);
 				}
-				catch(egw_exception_assertion_failed $e)
+				catch (egw_exception_assertion_failed $e)
 				{
-					if (substr($e->getMessage(),-19) == '.inc.php not found!')
+					if (substr($e->getMessage(), -19) == '.inc.php not found!')
 					{
-						return false;	// fail gracefully if hook class-file does not exists (like the old hooks do, eg. if app got removed)
+						return false; // fail gracefully if hook class-file does not exists (like the old hooks do, eg. if app got removed)
 					}
 					throw $e;
 				}
@@ -171,9 +171,9 @@ 
 			{
 				$method = 'hook_'.$location.'.inc.php';
 			}
-			$f = EGW_SERVER_ROOT . $SEP . $appname . $SEP . 'inc' . $SEP . $method;
+			$f = EGW_SERVER_ROOT.$SEP.$appname.$SEP.'inc'.$SEP.$method;
 			if (file_exists($f) &&
-				( $GLOBALS['egw_info']['user']['apps'][$appname] || (($no_permission_check || $location == 'config' || $appname == 'phpgwapi') && $appname)) )
+				($GLOBALS['egw_info']['user']['apps'][$appname] || (($no_permission_check || $location == 'config' || $appname == 'phpgwapi') && $appname)))
 			{
 				include($f);
 				return True;
@@ -227,20 +227,20 @@ 
 	 * @param array $hooks =null hooks to register, eg $setup_info[$app]['hooks'] or not used for only deregister the hooks
 	 * @return boolean|int false on error, true if new hooks are supplied and registed or number of removed hooks
 	 */
-	function register_hooks($appname,$hooks=null)
+	function register_hooks($appname, $hooks = null)
 	{
-		if(!$appname)
+		if (!$appname)
 		{
 			return False;
 		}
-		$this->db->delete($this->table,array('hook_appname' => $appname),__LINE__,__FILE__);
+		$this->db->delete($this->table, array('hook_appname' => $appname), __LINE__, __FILE__);
 
 		if (!is_array($hooks) || !count($hooks))	// only deregister
 		{
 			return $this->db->affected_rows();
 		}
 		//echo "<p>ADDING hooks for: $appname</p>";
-		foreach($hooks as $key => $hook)
+		foreach ($hooks as $key => $hook)
 		{
 			if (!is_numeric($key))	// new method-hook
 			{
@@ -252,12 +252,12 @@ 
 				$location = $hook;
 				$filename = "hook_$hook.inc.php";
 			}
-			$this->db->insert($this->table,array(
+			$this->db->insert($this->table, array(
 				'hook_filename' => $filename,
-			),array(
+			), array(
 				'hook_appname'  => $appname,
 				'hook_location' => $location,
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 			$this->locations[$location][$appname] = $filename;
 		}
 		return True;
@@ -274,24 +274,24 @@ 
 	 */
 	function register_single_app_hook($appname, $location)
 	{
-		if(!$appname || empty($location))
+		if (!$appname || empty($location))
 		{
 			return False;
 		}
 		$SEP = filesystem_separator();
 		// now register the rest again
-		$f = EGW_SERVER_ROOT . $SEP . $appname . $SEP . 'setup' . $SEP . 'setup.inc.php';
+		$f = EGW_SERVER_ROOT.$SEP.$appname.$SEP.'setup'.$SEP.'setup.inc.php';
 		$setup_info = array($appname => array());
-		if(@file_exists($f)) include($f);
+		if (@file_exists($f)) include($f);
 		// some apps have setup_info for more then themselfs (eg. phpgwapi for groupdav)
 		$hdata = array();
-		foreach($setup_info as $appname => $data)
+		foreach ($setup_info as $appname => $data)
 		{
 			if ($data['hooks'])
 			{
 				if ($hdata[$appname])
 				{
-					$hdata[$appname]['hooks'] = array_merge($hdata[$appname]['hooks'],$data['hooks']);
+					$hdata[$appname]['hooks'] = array_merge($hdata[$appname]['hooks'], $data['hooks']);
 				}
 				else
 				{
@@ -300,21 +300,21 @@ 
 			}
 		}
 		//error_log(__METHOD__.__LINE__.array2string($hdata));
-		foreach((array)$hdata as $appname => $data)
+		foreach ((array)$hdata as $appname => $data)
 		{
-			if (array_key_exists($location,$data['hooks'])) $method = $data['hooks'][$location];
+			if (array_key_exists($location, $data['hooks'])) $method = $data['hooks'][$location];
 		}
 		if (!empty($method))
 		{
 			//echo "<p>ADDING hooks for: $appname</p>";
-			$this->db->insert($this->table,array(
+			$this->db->insert($this->table, array(
 				'hook_appname'  => $appname,
 				'hook_filename' => $method,
 				'hook_location' => $location,
-			),array(
+			), array(
 				'hook_appname'  => $appname,
 				'hook_location' => $location,
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 			$this->locations[$location][$appname] = $method;
 			return True;
 		}
@@ -327,7 +327,7 @@ 
 	function register_all_hooks()
 	{
 		// deleting hooks, to get ride of no longer existing apps
-		$this->db->delete($this->table,'1=1',__LINE__,__FILE__);
+		$this->db->delete($this->table, '1=1', __LINE__, __FILE__);
 
 		// if we run in setup, we need to read installed apps first
 		if (!$GLOBALS['egw_info']['apps'])
@@ -337,22 +337,22 @@ 
 		}
 
 		// now register all apps using just filesystem data
-		foreach(array_keys($GLOBALS['egw_info']['apps']) as $appname)
+		foreach (array_keys($GLOBALS['egw_info']['apps']) as $appname)
 		{
 			if ($appname[0] == '.' || !is_dir(EGW_SERVER_ROOT.'/'.$appname)) continue;
 
-			$f = EGW_SERVER_ROOT . '/' . $appname . '/setup/setup.inc.php';
+			$f = EGW_SERVER_ROOT.'/'.$appname.'/setup/setup.inc.php';
 			$setup_info = array($appname => array());
-			if(@file_exists($f)) include($f);
+			if (@file_exists($f)) include($f);
 			// some apps have setup_info for more then themselfs (eg. phpgwapi for groupdav)
 			$hdata = array();
-			foreach($setup_info as $appname => $data)
+			foreach ($setup_info as $appname => $data)
 			{
 				if ($data['hooks'])
 				{
 					if ($hdata[$appname])
 					{
-						$hdata[$appname]['hooks'] = array_merge($hdata[$appname]['hooks'],$data['hooks']);
+						$hdata[$appname]['hooks'] = array_merge($hdata[$appname]['hooks'], $data['hooks']);
 					}
 					else
 					{
@@ -360,9 +360,9 @@ 
 					}
 				}
 			}
-			foreach((array)$hdata as $appname => $data)
+			foreach ((array)$hdata as $appname => $data)
 			{
-				if ($data['hooks']) $this->register_hooks($appname,$data['hooks']);
+				if ($data['hooks']) $this->register_hooks($appname, $data['hooks']);
 			}
 		}
 	}

Braces +37 added lines, -9 removed lines

@@ -97,7 +97,11 @@ 
 		$location = is_array($args) ? (isset($args['hook_location']) ? $args['hook_location'] : $args['location']) : $args;
 
 		$hooks = $this->locations[$location];
-		if (!isset($hooks) || empty($hooks)) return array();	// not a single app implements that hook
+		if (!isset($hooks) || empty($hooks))
+		{
+			return array();
+		}
+		// not a single app implements that hook
 
 		$apps = array_keys($hooks);
 		if (!$no_permission_check)
@@ -131,7 +135,10 @@ 
 	function single($args, $appname = '', $no_permission_check = False,$try_unregistered = False)
 	{
 		//echo "<p>hooks::single(".array2string($args).",'$appname','$no_permission_check','$try_unregistered')</p>\n";
-		if (!is_array($args)) $args = array('location' => $args);
+		if (!is_array($args))
+		{
+			$args = array('location' => $args);
+		}
 		$location = isset($args['hook_location']) ? $args['hook_location'] : $args['location'];
 
 		if (!$appname)
@@ -235,16 +242,22 @@ 
 		}
 		$this->db->delete($this->table,array('hook_appname' => $appname),__LINE__,__FILE__);
 
-		if (!is_array($hooks) || !count($hooks))	// only deregister
+		if (!is_array($hooks) || !count($hooks))
+		{
+			// only deregister
 		{
 			return $this->db->affected_rows();
 		}
+		}
 		//echo "<p>ADDING hooks for: $appname</p>";
 		foreach($hooks as $key => $hook)
 		{
-			if (!is_numeric($key))	// new method-hook
+			if (!is_numeric($key))
+			{
+				// new method-hook
 			{
 				$location = $key;
+			}
 				$filename = $hook;
 			}
 			else
@@ -282,7 +295,10 @@ 
 		// now register the rest again
 		$f = EGW_SERVER_ROOT . $SEP . $appname . $SEP . 'setup' . $SEP . 'setup.inc.php';
 		$setup_info = array($appname => array());
-		if(@file_exists($f)) include($f);
+		if(@file_exists($f))
+		{
+			include($f);
+		}
 		// some apps have setup_info for more then themselfs (eg. phpgwapi for groupdav)
 		$hdata = array();
 		foreach($setup_info as $appname => $data)
@@ -302,7 +318,10 @@ 
 		//error_log(__METHOD__.__LINE__.array2string($hdata));
 		foreach((array)$hdata as $appname => $data)
 		{
-			if (array_key_exists($location,$data['hooks'])) $method = $data['hooks'][$location];
+			if (array_key_exists($location,$data['hooks']))
+			{
+				$method = $data['hooks'][$location];
+			}
 		}
 		if (!empty($method))
 		{
@@ -339,11 +358,17 @@ 
 		// now register all apps using just filesystem data
 		foreach(array_keys($GLOBALS['egw_info']['apps']) as $appname)
 		{
-			if ($appname[0] == '.' || !is_dir(EGW_SERVER_ROOT.'/'.$appname)) continue;
+			if ($appname[0] == '.' || !is_dir(EGW_SERVER_ROOT.'/'.$appname))
+			{
+				continue;
+			}
 
 			$f = EGW_SERVER_ROOT . '/' . $appname . '/setup/setup.inc.php';
 			$setup_info = array($appname => array());
-			if(@file_exists($f)) include($f);
+			if(@file_exists($f))
+			{
+				include($f);
+			}
 			// some apps have setup_info for more then themselfs (eg. phpgwapi for groupdav)
 			$hdata = array();
 			foreach($setup_info as $appname => $data)
@@ -362,7 +387,10 @@ 
 			}
 			foreach((array)$hdata as $appname => $data)
 			{
-				if ($data['hooks']) $this->register_hooks($appname,$data['hooks']);
+				if ($data['hooks'])
+				{
+					$this->register_hooks($appname,$data['hooks']);
+				}
 			}
 		}
 	}

phpgwapi/inc/class.html.inc.php

Doc Comments +5 added lines, -7 removed lines

@@ -308,7 +308,7 @@ 
 	 *
 	 * @param string $name	string with name of the submitted var which holds the key of the selected item form array
 	 * @param string|array $key key(s) of already selected item(s) from $arr, eg. '1' or '1,2' or array with keys
-	 * @param array $arr array with items to select, eg. $arr = array ( 'y' => 'yes','n' => 'no','m' => 'maybe');
+	 * @param integer $arr array with items to select, eg. $arr = array ( 'y' => 'yes','n' => 'no','m' => 'maybe');
 	 * @param boolean $no_lang NOT run the labels of the options through lang(), default false=use lang()
 	 * @param string $options additional options (e.g. 'width')
 	 * @param int $multiple number of lines for a multiselect, default 0 = no multiselect, < 0 sets size without multiple
@@ -396,7 +396,7 @@ 
 	 *
 	 * @param string $name	string with name of the submitted var which holds the key of the selected item form array
 	 * @param string|array $key key(s) of already selected item(s) from $arr, eg. '1' or '1,2' or array with keys
-	 * @param array $arr array with items to select, eg. $arr = array ( 'y' => 'yes','n' => 'no','m' => 'maybe');
+	 * @param integer $arr array with items to select, eg. $arr = array ( 'y' => 'yes','n' => 'no','m' => 'maybe');
 	 * @param boolean $no_lang NOT run the labels of the options through lang(), default false=use lang()
 	 * @param string $options additional options (e.g. 'width')
 	 * @param int $multiple number of lines for a multiselect, default 3
@@ -482,7 +482,7 @@ 
 	 * @param string $value value
 	 * @param string $label label
 	 * @param mixed $selected value or array of values of options to mark as selected
-	 * @param boolean $no_lang NOT running the label through lang(), default false=use lang()
+	 * @param integer $no_lang NOT running the label through lang(), default false=use lang()
 	 * @param string $extra extra text, e.g.: style="", default: ''
 	 * @return string html
 	 */
@@ -555,7 +555,6 @@ 
 	 *
 	 * @param string $name name attr. of the tag
 	 * @param string $value default
-	 * @param boolean $ignore_empty if true all empty, zero (!) or unset values, plus filer=none
 	 * @param boolean $double_encoding =false do we want double encoding or not, default no
 	 * @param string html
 	 */
@@ -913,7 +912,6 @@ 
 	 * @param array $hidden_vars array with name-value pairs for hidden input fields
 	 * @param string $url eGW relative URL, will be run through the link function
 	 * @param string|array $url_vars parameters for the URL, send to link static function too
-	 * @param string $options attributes for the tag, default ''=none
 	 * @param string $form_name name of the form, defaul ''=none
 	 * @param string $method method of the form, default 'POST'
 	 * @return string html
@@ -1209,7 +1207,7 @@ 
 	 * Example: formatOptions('100%,,1','width,height,border') = ' width="100%" border="1"'
 	 *
 	 * @param mixed $options String (or Array) with option-values eg. '100%,,1'
-	 * @param mixed $names String (or Array) with the option-names eg. 'WIDTH,HEIGHT,BORDER'
+	 * @param string $names String (or Array) with the option-names eg. 'WIDTH,HEIGHT,BORDER'
 	 * @return string with options/attributes
 	 */
 	static function formatOptions($options,$names)
@@ -1312,7 +1310,7 @@ 
 	 * @author Lars Kneschke <lars-AT-kneschke.de> original code in felamimail
 	 * @param array $_folders array of folders: pairs path => node (string label or array with keys: label, (optional) image, (optional) title, (optional) checked)
 	 * @param string $_selected path of selected folder
-	 * @param mixed $_topFolder =false node of topFolder or false for none
+	 * @param boolean $_topFolder =false node of topFolder or false for none
 	 * @param string $_onNodeSelect ='alert' js static function to call if node gets selected
 	 * @param string $tree ='foldertree' id of the div and name of the variable containing the tree object
 	 * @param string $_divClass ='' css class of the div

Indentation +49 added lines, -49 removed lines

@@ -112,16 +112,16 @@ 
 	}
 
 	/**
-	* Created an input-field with an attached color-picker
-	*
-	* Please note: it need to be called before the call to egw_header() !!!
-	*
-	* @param string $name the name of the input-field
-	* @param string $value ='' the actual value for the input-field, default ''
-	* @param string $title ='' tooltip/title for the picker-activation-icon
-	* @param string $options ='' options for input
-	* @return string the html
-	*/
+	 * Created an input-field with an attached color-picker
+	 *
+	 * Please note: it need to be called before the call to egw_header() !!!
+	 *
+	 * @param string $name the name of the input-field
+	 * @param string $value ='' the actual value for the input-field, default ''
+	 * @param string $title ='' tooltip/title for the picker-activation-icon
+	 * @param string $options ='' options for input
+	 * @return string the html
+	 */
 	static function inputColor($name,$value='',$title='',$options='')
 	{
 		$options .= ' id="'.htmlspecialchars($id=str_replace(array('[',']'),array('_',''),$name).'_colorpicker').'"';
@@ -137,16 +137,16 @@ 
 	}
 
 	/**
-	* Handles tooltips via the wz_tooltip class from Walter Zorn
-	*
-	* @param string $text text or html for the tooltip, all chars allowed, they will be quoted approperiate
-	* @param boolean $do_lang (default False) should the text be run though lang()
-	* @param array $options param/value pairs, eg. 'TITLE' => 'I am the title'. Some common parameters:
-	*  title (string) gives extra title-row, width (int,'auto') , padding (int), above (bool), bgcolor (color), bgimg (URL)
-	*  For a complete list and description see http://www.walterzorn.com/tooltip/tooltip_e.htm
-	* @param boolean $return_as_attributes true to return array(onmouseover, onmouseout) attributes
-	* @return string|array to be included in any tag, like '<p'.html::tooltip('Hello <b>Ralf</b>').'>Text with tooltip</p>'
-	*/
+	 * Handles tooltips via the wz_tooltip class from Walter Zorn
+	 *
+	 * @param string $text text or html for the tooltip, all chars allowed, they will be quoted approperiate
+	 * @param boolean $do_lang (default False) should the text be run though lang()
+	 * @param array $options param/value pairs, eg. 'TITLE' => 'I am the title'. Some common parameters:
+	 *  title (string) gives extra title-row, width (int,'auto') , padding (int), above (bool), bgcolor (color), bgimg (URL)
+	 *  For a complete list and description see http://www.walterzorn.com/tooltip/tooltip_e.htm
+	 * @param boolean $return_as_attributes true to return array(onmouseover, onmouseout) attributes
+	 * @return string|array to be included in any tag, like '<p'.html::tooltip('Hello <b>Ralf</b>').'>Text with tooltip</p>'
+	 */
 	static function tooltip($text,$do_lang=False,$options=False, $return_as_attributes=false)
 	{
 		// tell egw_framework to include wz_tooltip.js
@@ -594,20 +594,20 @@ 
 	}
 
 	/**
-	* this static function is a wrapper for fckEditor to create some reuseable layouts
-	*
-	* @param string $_name name and id of the input-field
-	* @param string $_content of the tinymce (will be run through htmlspecialchars !!!), default ''
-	* @param string $_mode display mode of the tinymce editor can be: simple, extended or advanced
-	* @param array  $_options (toolbar_expanded true/false)
-	* @param string $_height ='400px'
-	* @param string $_width ='100%'
-	* @param string $_start_path ='' if passed activates the browser for image at absolute path passed
-	* @param boolean $_purify =true run $_content through htmlpurifier before handing it to fckEditor
-	* @param mixed (boolean/string) $_focusToBody=false USED only for CKEDIOR true means yes, focus on top, you may specify TOP or BOTTOM (to focus on the end of the editor area)
-	* @param string $_executeJSAfterInit ='' Javascript to be executed after InstanceReady of CKEditor
-	* @return string the necessary html for the textarea
-	*/
+	 * this static function is a wrapper for fckEditor to create some reuseable layouts
+	 *
+	 * @param string $_name name and id of the input-field
+	 * @param string $_content of the tinymce (will be run through htmlspecialchars !!!), default ''
+	 * @param string $_mode display mode of the tinymce editor can be: simple, extended or advanced
+	 * @param array  $_options (toolbar_expanded true/false)
+	 * @param string $_height ='400px'
+	 * @param string $_width ='100%'
+	 * @param string $_start_path ='' if passed activates the browser for image at absolute path passed
+	 * @param boolean $_purify =true run $_content through htmlpurifier before handing it to fckEditor
+	 * @param mixed (boolean/string) $_focusToBody=false USED only for CKEDIOR true means yes, focus on top, you may specify TOP or BOTTOM (to focus on the end of the editor area)
+	 * @param string $_executeJSAfterInit ='' Javascript to be executed after InstanceReady of CKEditor
+	 * @return string the necessary html for the textarea
+	 */
 	static function fckEditor($_name, $_content, $_mode, $_options=array('toolbar_expanded' =>'true'),
 		$_height='400px', $_width='100%',$_start_path='',$_purify=true, $_focusToBody=false, $_executeJSAfterInit='')
 	{
@@ -678,21 +678,21 @@ 
 	}
 
 	/**
-	* this static function is a wrapper for tinymce to create some reuseable layouts
-	*
-	* Please note: if you did not run init_tinymce already you this static function need to be called before the call to phpgw_header() !!!
-	*
-	* @param string $_name name and id of the input-field
-	* @param string $_mode display mode of the tinymce editor can be: simple, extended or advanced
-	* @param string $_content ='' of the tinymce (will be run through htmlspecialchars !!!), default ''
-	* @param string $_height ='400px'
-	* @param string $_width ='100%'
-	* @param boolean $_purify =true
-	* @param string $_border ='0px' NOT used for CKEditor
-	* @param mixed (boolean/string) $_focusToBody=false USED only for CKEDIOR true means yes, focus on top, you may specify TOP or BOTTOM (to focus on the end of the editor area)
-	* @param string $_executeJSAfterInit ='' Javascript to be executed after InstanceReady of CKEditor
-	* @return string the necessary html for the textarea
-	*/
+	 * this static function is a wrapper for tinymce to create some reuseable layouts
+	 *
+	 * Please note: if you did not run init_tinymce already you this static function need to be called before the call to phpgw_header() !!!
+	 *
+	 * @param string $_name name and id of the input-field
+	 * @param string $_mode display mode of the tinymce editor can be: simple, extended or advanced
+	 * @param string $_content ='' of the tinymce (will be run through htmlspecialchars !!!), default ''
+	 * @param string $_height ='400px'
+	 * @param string $_width ='100%'
+	 * @param boolean $_purify =true
+	 * @param string $_border ='0px' NOT used for CKEditor
+	 * @param mixed (boolean/string) $_focusToBody=false USED only for CKEDIOR true means yes, focus on top, you may specify TOP or BOTTOM (to focus on the end of the editor area)
+	 * @param string $_executeJSAfterInit ='' Javascript to be executed after InstanceReady of CKEditor
+	 * @return string the necessary html for the textarea
+	 */
 	static function fckEditorQuick($_name, $_mode, $_content='', $_height='400px', $_width='100%',$_purify=true, $_border='0px',$_focusToBody=false,$_executeJSAfterInit='')
 	{
 		if (!self::htmlarea_availible() || $_mode == 'ascii')

Spacing +238 added lines, -239 removed lines

@@ -63,11 +63,11 @@ 
 	{
 		// should be Ok for all HTML 4 compatible browsers
 		$parts = $all_parts = null;
-		if(!preg_match('/compatible; ([a-z]+)[\/ ]+([0-9.]+)/i',$_SERVER['HTTP_USER_AGENT'],$parts))
+		if (!preg_match('/compatible; ([a-z]+)[\/ ]+([0-9.]+)/i', $_SERVER['HTTP_USER_AGENT'], $parts))
 		{
-			preg_match_all('/([a-z]+)\/([0-9.]+)/i',$_SERVER['HTTP_USER_AGENT'],$all_parts,PREG_SET_ORDER);
+			preg_match_all('/([a-z]+)\/([0-9.]+)/i', $_SERVER['HTTP_USER_AGENT'], $all_parts, PREG_SET_ORDER);
 			$parts = array_pop($all_parts);
-			foreach($all_parts as $p)
+			foreach ($all_parts as $p)
 			{
 				if ($p[1] == 'Chrome' && $parts[1] != 'Edge')
 				{
@@ -76,12 +76,12 @@ 
 				}
 			}
 		}
-		list(,self::$user_agent,self::$ua_version) = $parts;
+		list(,self::$user_agent, self::$ua_version) = $parts;
 		if ((self::$user_agent = strtolower(self::$user_agent)) == 'version') self::$user_agent = 'opera';
 		// IE no longer reports MSIE, but "Trident/7.0; rv:11.0"
-		if (self::$user_agent=='trident')
+		if (self::$user_agent == 'trident')
 		{
-			self::$user_agent='msie';
+			self::$user_agent = 'msie';
 			$matches = null;
 			self::$ua_version = preg_match('|Trident/[0-9.]+; rv:([0-9.]+)|i', $_SERVER['HTTP_USER_AGENT'], $matches) ?
 				$matches[1] : 11.0;
@@ -122,11 +122,11 @@ 
 	* @param string $options ='' options for input
 	* @return string the html
 	*/
-	static function inputColor($name,$value='',$title='',$options='')
+	static function inputColor($name, $value = '', $title = '', $options = '')
 	{
-		$options .= ' id="'.htmlspecialchars($id=str_replace(array('[',']'),array('_',''),$name).'_colorpicker').'"';
+		$options .= ' id="'.htmlspecialchars($id = str_replace(array('[', ']'), array('_', ''), $name).'_colorpicker').'"';
 		$onclick = "javascript:egw_openWindowCentered2('".self::$api_js_url.'/colorpicker/select_color.html?id='.urlencode($id)."&color='+encodeURIComponent(document.getElementById('$id').value),'colorPicker',240,187);";
-		if (preg_match('/^#[0-9A-F]{6}$/i',$value))
+		if (preg_match('/^#[0-9A-F]{6}$/i', $value))
 		{
 			$options .= ' style="background-color: '.$value.'"';
 		}
@@ -147,30 +147,30 @@ 
 	* @param boolean $return_as_attributes true to return array(onmouseover, onmouseout) attributes
 	* @return string|array to be included in any tag, like '<p'.html::tooltip('Hello <b>Ralf</b>').'>Text with tooltip</p>'
 	*/
-	static function tooltip($text,$do_lang=False,$options=False, $return_as_attributes=false)
+	static function tooltip($text, $do_lang = False, $options = False, $return_as_attributes = false)
 	{
 		// tell egw_framework to include wz_tooltip.js
 		$GLOBALS['egw_info']['flags']['include_wz_tooltip'] = true;
 
 		if ($do_lang) $text = lang($text);
 
-		$ttip = 'Tip(\''.str_replace(array("\n","\r","'",'"'),array('','',"\\'",'&quot;'),$text).'\'';
+		$ttip = 'Tip(\''.str_replace(array("\n", "\r", "'", '"'), array('', '', "\\'", '&quot;'), $text).'\'';
 
 		$sticky = false;
 		if (is_array($options))
 		{
-			foreach($options as $option => $value)
+			foreach ($options as $option => $value)
 			{
 				$option = strtoupper($option);
 				if ($option == 'STICKY') $sticky = (bool)$value;
 
-				switch(gettype($value))
+				switch (gettype($value))
 				{
 					case 'boolean':
 						$value = $value ? 'true' : 'false';
 						break;
 					case 'string':
-						if (stripos($value,"'")===false) $value = "'$value'";
+						if (stripos($value, "'") === false) $value = "'$value'";
 						break;
 				}
 				$ttip .= ','.$option.','.$value;
@@ -180,8 +180,7 @@ 
 
 		$untip = 'UnTip()';
 
-		return $return_as_attributes ? array($ttip, $untip) :
-			' onmouseover="'.self::htmlspecialchars($ttip).'" onmouseout="'.$untip.'"';
+		return $return_as_attributes ? array($ttip, $untip) : ' onmouseover="'.self::htmlspecialchars($ttip).'" onmouseout="'.$untip.'"';
 	}
 
 	/**
@@ -192,7 +191,7 @@ 
 	 */
 	static function activate_links($content)
 	{
-		if (!$content || strlen($content) < 20) return $content;	// performance
+		if (!$content || strlen($content) < 20) return $content; // performance
 
 		// Exclude everything which is already a link
 		$NotAnchor = '(?<!"|href=|href\s=\s|href=\s|href\s=)';
@@ -205,73 +204,73 @@ 
 
 		//  First match things beginning with http:// (or other protocols)
 		$optBracket0 = '(<|&lt;)';
-		$Protocol = '(http:\/\/|(ftp:\/\/|https:\/\/))';	// only http:// gets removed, other protocolls are shown
+		$Protocol = '(http:\/\/|(ftp:\/\/|https:\/\/))'; // only http:// gets removed, other protocolls are shown
 		$Domain = '([\w-]+\.[\w-.]+)';
 		$Subdir = '([\w\-\.,@?^=%&;:\/~\+#]*[\w\-\@?^=%&\/~\+#])?';
 		$optBracket = '';
 		$optBracket = '(>|&gt;)';
-		$Expr = '/' .$optBracket0. $NotAnchor . $Protocol . $Domain . $Subdir . $optBracket . '/i';
+		$Expr = '/'.$optBracket0.$NotAnchor.$Protocol.$Domain.$Subdir.$optBracket.'/i';
 		// use preg_replace_callback as we experienced problems with https links
-		$result2 = preg_replace_callback( $Expr, function ($match) {
+		$result2 = preg_replace_callback($Expr, function($match) {
 				//error_log(__METHOD__.__LINE__.array2string($match));
-				return $match[1]."<a href=\"".($match[2]&&!$match[3]?$match[2]:'').($match[3]?$match[3]:'').$match[4].$match[5]."\" target=\"_blank\">".$match[4].$match[5]."</a>".$match[6];
-			}, $result );
+				return $match[1]."<a href=\"".($match[2] && !$match[3] ? $match[2] : '').($match[3] ? $match[3] : '').$match[4].$match[5]."\" target=\"_blank\">".$match[4].$match[5]."</a>".$match[6];
+			}, $result);
 //error_log(__METHOD__.__LINE__.array2string($Expr));
 //error_log(__METHOD__.__LINE__.array2string($result2));
 		//  First match things beginning with http:// (or other protocols)
-		$Protocol = '(http:\/\/|(ftp:\/\/|https:\/\/))';	// only http:// gets removed, other protocolls are shown
+		$Protocol = '(http:\/\/|(ftp:\/\/|https:\/\/))'; // only http:// gets removed, other protocolls are shown
 		$Domain = '([\w-]+\.[\w-.]+)';
 		$Subdir = '([\w\-\.,@?^=%&;:\/~\+#]*[\w\-\@?^=%&\/~\+#])?';
 		$optStuff = '(&quot;|&quot|;)?';
-		$Expr = '/' . $NotAnchor . $Protocol . $Domain . $Subdir . $optStuff . '/i';
+		$Expr = '/'.$NotAnchor.$Protocol.$Domain.$Subdir.$optStuff.'/i';
 		// use preg_replace_callback as we experienced problems with https links
-		$result3 = preg_replace_callback( $Expr, function ($match) {
-				$additionalQuote="";//at the end, ...
+		$result3 = preg_replace_callback($Expr, function($match) {
+				$additionalQuote = ""; //at the end, ...
 				// only one &quot at the end is found. chance is, it is not belonging to the URL
-				if ($match[5]==';' && (strlen($match[4])-6) >=0 && strpos($match[4],'&quot',strlen($match[4])-6)!==false && strpos(substr($match[4],0,strlen($match[4])-6),'&quot')===false)
+				if ($match[5] == ';' && (strlen($match[4]) - 6) >= 0 && strpos($match[4], '&quot', strlen($match[4]) - 6) !== false && strpos(substr($match[4], 0, strlen($match[4]) - 6), '&quot') === false)
 				{
-					$match[4] = substr($match[4],0,strpos($match[4],'&quot',strlen($match[4])-6));
+					$match[4] = substr($match[4], 0, strpos($match[4], '&quot', strlen($match[4]) - 6));
 					$additionalQuote = "&quot;";
 				}
 				// if there is quoted stuff within the URL then we have at least one more &quot; in match[4], so chance is the last &quot is matched by the one within
-				if ($match[5]==';' && (strlen($match[4])-6) >=0 && strpos($match[4],'&quot',strlen($match[4])-6)!==false && strpos(substr($match[4],0,strlen($match[4])-6),'&quot')!==false)
+				if ($match[5] == ';' && (strlen($match[4]) - 6) >= 0 && strpos($match[4], '&quot', strlen($match[4]) - 6) !== false && strpos(substr($match[4], 0, strlen($match[4]) - 6), '&quot') !== false)
 				{
 					$match[4] .= $match[5];
 				}
-				if ($match[5]==';'&&$match[4]=="&quot")
+				if ($match[5] == ';' && $match[4] == "&quot")
 				{
-					$match[4] ='';
+					$match[4] = '';
 					$additionalQuote = "&quot;";
 				}
 				//error_log(__METHOD__.__LINE__.array2string($match));
-				return "<a href=\"".($match[1]&&!$match[2]?$match[1]:'').($match[2]?$match[2]:'').$match[3].$match[4]."\" target=\"_blank\">".$match[3].$match[4]."</a>$additionalQuote";
-			}, $result2 );
+				return "<a href=\"".($match[1] && !$match[2] ? $match[1] : '').($match[2] ? $match[2] : '').$match[3].$match[4]."\" target=\"_blank\">".$match[3].$match[4]."</a>$additionalQuote";
+			}, $result2);
 //error_log(__METHOD__.__LINE__.array2string($Expr));
 //error_log(__METHOD__.__LINE__.array2string($result3));
 		//  Now match things beginning with www.
 		$optBracket0 = '(<|&lt;)?';
-		$NotHTTP = '(?<!:\/\/|" target=\"_blank\">)';	//	avoid running again on http://www links already handled above
+		$NotHTTP = '(?<!:\/\/|" target=\"_blank\">)'; //	avoid running again on http://www links already handled above
 		$Domain2 = 'www(\.[\w-.]+)';
 		$Subdir2 = '([\w\-\.,@?^=%&:\/~\+#]*[\w\-\@?^=%&\/~\+#])?';
 		$optBracket = '(>|&gt;|&gt|;)?';
-		$Expr = '/' .$optBracket0. $NotAnchor . $NotHTTP . $Domain2 . $Subdir2 .$optBracket. '/i';
+		$Expr = '/'.$optBracket0.$NotAnchor.$NotHTTP.$Domain2.$Subdir2.$optBracket.'/i';
 		//$Expr = '/' . $NotAnchor . $NotHTTP . $Domain . $Subdir . $optBracket . '/i';
 		// use preg_replace_callback as we experienced problems with links such as <www.example.tld/pfad/zu/einer/pdf-Datei.pdf>
-		$result4 = preg_replace_callback( $Expr, function ($match) {
+		$result4 = preg_replace_callback($Expr, function($match) {
 				//error_log(__METHOD__.__LINE__.array2string($match));
-				if ($match[4]==';' && (strlen($match[3])-4) >=0 && strpos($match[3],'&gt',strlen($match[3])-4)!==false)
+				if ($match[4] == ';' && (strlen($match[3]) - 4) >= 0 && strpos($match[3], '&gt', strlen($match[3]) - 4) !== false)
 				{
-					$match[3] = substr($match[3],0,strpos($match[3],'&gt',strlen($match[3])-4));
+					$match[3] = substr($match[3], 0, strpos($match[3], '&gt', strlen($match[3]) - 4));
 					$match[4] = "&gt;";
 				}
-				if ($match[4]==';'&&$match[3]=="&gt")
+				if ($match[4] == ';' && $match[3] == "&gt")
 				{
-					$match[3] ='';
+					$match[3] = '';
 					$match[4] = "&gt;";
 				}
 				//error_log(__METHOD__.__LINE__.array2string($match));
 				return $match[1]."<a href=\"http://www".$match[2].$match[3]."\" target=\"_blank\">"."www".$match[2].$match[3]."</a>".$match[4];
-			}, $result3 );
+			}, $result3);
 
 		//return preg_replace( $Expr, "<a href=\"http://www$1$2\" target=\"_blank\">www$1$2</a>$3 ", $result );
 //error_log(__METHOD__.__LINE__.array2string($Expr));
@@ -291,12 +290,12 @@ 
 	 * @param boolean $double_encoding =false do we want double encoding or not, default no
 	 * @return string
 	 */
-	static function htmlspecialchars($str, $double_encoding=false)
+	static function htmlspecialchars($str, $double_encoding = false)
 	{
 		//if (!is_scalar($str) && !is_null($str)) error_log(__METHOD__.'('.array2string($str).') '.function_backtrace());
 		// as EGroupware supports only utf-8 we should not need to worry about wrong charsets
 		//if (is_array($str)) error_log(__METHOD__.__LINE__.' string expected -> array given:'.array2string($str).'->'.function_backtrace());
-		return htmlspecialchars($str,ENT_COMPAT,self::$charset,$double_encoding);
+		return htmlspecialchars($str, ENT_COMPAT, self::$charset, $double_encoding);
 		// we need '&#' unchanged, so we translate it back -> this is provided by 4th param = false -> do not doubleencode
 		//$str = str_replace(array('&amp;#','&amp;nbsp;','&amp;lt;','&amp;gt;'),array('&#','&nbsp;','&lt;','&gt;'),$str);
 
@@ -315,36 +314,36 @@ 
 	 * @param boolean $enhanced Use enhanced selectbox with search.  Null for default yes if more than 12 options.
 	 * @return string to set for a template or to echo into html page
 	 */
-	static function select($name, $key, $arr=0,$no_lang=false,$options='',$multiple=0,$enhanced=null)
+	static function select($name, $key, $arr = 0, $no_lang = false, $options = '', $multiple = 0, $enhanced = null)
 	{
-		if(is_null($enhanced)) $enhanced = false;	//disabled by default (count($arr) > self::SELECT_ENHANCED_ROW_COUNT);
+		if (is_null($enhanced)) $enhanced = false; //disabled by default (count($arr) > self::SELECT_ENHANCED_ROW_COUNT);
 
 		if (!is_array($arr))
 		{
-			$arr = array('no','yes');
+			$arr = array('no', 'yes');
 		}
 		if ((int)$multiple > 0)
 		{
 			$options .= ' multiple="1" size="'.(int)$multiple.'"';
-			if (substr($name,-2) != '[]')
+			if (substr($name, -2) != '[]')
 			{
 				$name .= '[]';
 			}
 		}
-		elseif($multiple < 0)
+		elseif ($multiple < 0)
 		{
 			$options .= ' size="'.abs($multiple).'"';
 		}
 		// fix width for MSIE < 9 in/for selectboxes
 		if (self::$user_agent == 'msie' && self::$ua_version < 9)
 		{
-			if (stripos($options,'onfocus="') === false)
+			if (stripos($options, 'onfocus="') === false)
 			{
 				$options .= ' onfocus="window.dropdown_menu_hack(this);" ';
 			}
 			else
 			{
-				$options = str_ireplace('onfocus="','onfocus="window.dropdown_menu_hack(this);',$options);
+				$options = str_ireplace('onfocus="', 'onfocus="window.dropdown_menu_hack(this);', $options);
 			}
 		}
 		$out = "<select name=\"$name\" $options>\n";
@@ -352,14 +351,14 @@ 
 		if (!is_array($key))
 		{
 			// explode on ',' only if multiple values expected and the key contains just numbers and commas
-			$key = $multiple > 0 && preg_match('/^[,0-9]+$/',$key) ? explode(',',$key) : array($key);
+			$key = $multiple > 0 && preg_match('/^[,0-9]+$/', $key) ? explode(',', $key) : array($key);
 		}
-		foreach($arr as $k => $data)
+		foreach ($arr as $k => $data)
 		{
 			if (!is_array($data) || count($data) == 2 && isset($data['label']) && isset($data['title']))
 			{
-				$out .= self::select_option($k,is_array($data)?$data['label']:$data,$key,$no_lang,
-					is_array($data)?$data['title']:'');
+				$out .= self::select_option($k, is_array($data) ? $data['label'] : $data, $key, $no_lang,
+					is_array($data) ? $data['title'] : '');
 			}
 			else
 			{
@@ -370,19 +369,19 @@ 
 				}
 				$out .= '<optgroup label="'.self::htmlspecialchars($no_lang || $k == '' ? $k : lang($k))."\">\n";
 
-				foreach($data as $k => $label)
+				foreach ($data as $k => $label)
 				{
-					$out .= self::select_option($k,is_array($label)?$label['label']:$label,$key,$no_lang,
-						is_array($label)?$label['title']:'');
+					$out .= self::select_option($k, is_array($label) ? $label['label'] : $label, $key, $no_lang,
+						is_array($label) ? $label['title'] : '');
 				}
 				$out .= "</optgroup>\n";
 			}
 		}
 		$out .= "</select>\n";
 
-		if($enhanced) {
+		if ($enhanced) {
 			egw_framework::validate_file('/phpgwapi/js/jquery/chosen/chosen.jquery.js');
-			egw_framework::includeCSS('/phpgwapi/js/jquery/chosen/chosen.css',null,false);
+			egw_framework::includeCSS('/phpgwapi/js/jquery/chosen/chosen.css', null, false);
 			$out .= "<script>var lab = egw_LAB || \$LAB; lab.wait(function() {\$j(function() {if(\$j().chosen) \$j('select[name=\"$name\"]').chosen({width: '100%'});});})</script>\n";
 		}
 		return $out;
@@ -404,39 +403,39 @@ 
 	 * @param string $style ='' extra style settings like "width: 100%", default '' none
 	 * @return string to set for a template or to echo into html page
 	 */
-	static function checkbox_multiselect($name, $key, $arr=0,$no_lang=false,$options='',$multiple=3,$selected_first=true,$style='',$enhanced = null)
+	static function checkbox_multiselect($name, $key, $arr = 0, $no_lang = false, $options = '', $multiple = 3, $selected_first = true, $style = '', $enhanced = null)
 	{
 		//echo "<p align=right>checkbox_multiselect('$name',".array2string($key).",".array2string($arr).",$no_lang,'$options',$multiple,$selected_first,'$style')</p>\n";
-		if(is_null($enhanced)) $enhanced = (count($arr) > self::SELECT_ENHANCED_ROW_COUNT);
+		if (is_null($enhanced)) $enhanced = (count($arr) > self::SELECT_ENHANCED_ROW_COUNT);
 
 		if (!is_array($arr))
 		{
-			$arr = array('no','yes');
+			$arr = array('no', 'yes');
 		}
 		if ((int)$multiple <= 0) $multiple = 1;
 
-		if (substr($name,-2) != '[]')
+		if (substr($name, -2) != '[]')
 		{
 			$name .= '[]';
 		}
-		$base_name = substr($name,0,-2);
+		$base_name = substr($name, 0, -2);
 
-		if($enhanced) return self::select($name, $key, $arr,$no_lang,$options." style=\"$style\" ",$multiple,$enhanced);
+		if ($enhanced) return self::select($name, $key, $arr, $no_lang, $options." style=\"$style\" ", $multiple, $enhanced);
 
 		if (!is_array($key))
 		{
 			// explode on ',' only if multiple values expected and the key contains just numbers and commas
-			$key = preg_match('/^[,0-9]+$/',$key) ? explode(',',$key) : array($key);
+			$key = preg_match('/^[,0-9]+$/', $key) ? explode(',', $key) : array($key);
 		}
 		$html = '';
-		$options_no_id = preg_replace('/id="[^"]+"/i','',$options);
+		$options_no_id = preg_replace('/id="[^"]+"/i', '', $options);
 
 		if ($selected_first)
 		{
 			$selected = $not_selected = array();
-			foreach($arr as $val => $label)
+			foreach ($arr as $val => $label)
 			{
-				if (in_array((string)$val,$key))
+				if (in_array((string)$val, $key))
 				{
 					$selected[$val] = $label;
 				}
@@ -448,7 +447,7 @@ 
 			$arr = $selected + $not_selected;
 		}
 		$max_len = 0;
-		foreach($arr as $val => $label)
+		foreach ($arr as $val => $label)
 		{
 			if (is_array($label))
 			{
@@ -464,16 +463,16 @@ 
 
 			if (strlen($label) > $max_len) $max_len = strlen($label);
 
-			$html .= self::label(self::checkbox($name,in_array((string)$val,$key),$val,$options_no_id.
+			$html .= self::label(self::checkbox($name, in_array((string)$val, $key), $val, $options_no_id.
 				' id="'.$base_name.'['.$val.']'.'"').self::htmlspecialchars($label),
-				$base_name.'['.$val.']','',($title ? 'title="'.self::htmlspecialchars($title).'" ':''))."<br />\n";
+				$base_name.'['.$val.']', '', ($title ? 'title="'.self::htmlspecialchars($title).'" ' : ''))."<br />\n";
 		}
-		if ($style && substr($style,-1) != ';') $style .= '; ';
-		if (strpos($style,'height')===false) $style .= 'height: '.(1.7*$multiple).'em; ';
-		if (strpos($style,'width')===false)  $style .= 'width: '.(4+$max_len*($max_len < 15 ? 0.65 : 0.6)).'em; ';
+		if ($style && substr($style, -1) != ';') $style .= '; ';
+		if (strpos($style, 'height') === false) $style .= 'height: '.(1.7 * $multiple).'em; ';
+		if (strpos($style, 'width') === false)  $style .= 'width: '.(4 + $max_len * ($max_len < 15 ? 0.65 : 0.6)).'em; ';
 		$style .= 'background-color: white; overflow: auto; border: lightgray 2px inset; text-align: left;';
 
-		return self::div($html,$options,'',$style);
+		return self::div($html, $options, '', $style);
 	}
 
 	/**
@@ -486,23 +485,23 @@ 
 	 * @param string $extra extra text, e.g.: style="", default: ''
 	 * @return string html
 	 */
-	static function select_option($value,$label,$selected,$no_lang=0,$title='',$extra='')
+	static function select_option($value, $label, $selected, $no_lang = 0, $title = '', $extra = '')
 	{
 		// the following compares strict as strings, to archive: '0' == 0 != ''
 		// the first non-strict search via array_search, is for performance reasons, to not always search the whole array with php
-		if (($found = ($key = array_search($value,$selected)) !== false) && (string) $value !== (string) $selected[$key])
+		if (($found = ($key = array_search($value, $selected)) !== false) && (string)$value !== (string)$selected[$key])
 		{
 			$found = false;
-			foreach($selected as $sel)
+			foreach ($selected as $sel)
 			{
-				if (($found = (((string) $value) === ((string) $selected[$key])))) break;
+				if (($found = (((string)$value) === ((string)$selected[$key])))) break;
 			}
 			unset($sel);
 		}
-		return '<option value="'.self::htmlspecialchars($value).'"'.($found  ? ' selected="selected"' : '') .
-			($title ? ' title="'.self::htmlspecialchars($no_lang ? $title : lang($title)).'"' : '') .
-			($extra ? ' ' . $extra : '') . '>'.
-			self::htmlspecialchars($no_lang || $label == '' ? $label : lang($label)) . "</option>\n";
+		return '<option value="'.self::htmlspecialchars($value).'"'.($found ? ' selected="selected"' : '').
+			($title ? ' title="'.self::htmlspecialchars($no_lang ? $title : lang($title)).'"' : '').
+			($extra ? ' '.$extra : '').'>'.
+			self::htmlspecialchars($no_lang || $label == '' ? $label : lang($label))."</option>\n";
 	}
 
 	/**
@@ -514,7 +513,7 @@ 
 	 * @param string $style css-styles attribute, default ''=none
 	 * @return string html
 	 */
-	static function div($content,$options='',$class='',$style='')
+	static function div($content, $options = '', $class = '', $style = '')
 	{
 		if ($class) $options .= ' class="'.$class.'"';
 		if ($style) $options .= ' style="'.$style.'"';
@@ -530,13 +529,13 @@ 
 	 * @param boolean $ignore_empty if true all empty, zero (!) or unset values, plus filer=none
 	 * @param string html
 	 */
-	static function input_hidden($vars,$value='',$ignore_empty=True)
+	static function input_hidden($vars, $value = '', $ignore_empty = True)
 	{
 		if (!is_array($vars))
 		{
-			$vars = array( $vars => $value );
+			$vars = array($vars => $value);
 		}
-		foreach($vars as $name => $value)
+		foreach ($vars as $name => $value)
 		{
 			if (is_array($value))
 			{
@@ -559,9 +558,9 @@ 
 	 * @param boolean $double_encoding =false do we want double encoding or not, default no
 	 * @param string html
 	 */
-	static function textarea($name,$value='',$options='',$double_encoding=false)
+	static function textarea($name, $value = '', $options = '', $double_encoding = false)
 	{
-		return "<textarea name=\"$name\" $options>".self::htmlspecialchars($value,$double_encoding)."</textarea>\n";
+		return "<textarea name=\"$name\" $options>".self::htmlspecialchars($value, $double_encoding)."</textarea>\n";
 	}
 
 	/**
@@ -584,7 +583,7 @@ 
 	 *
 	 * creates a textarea inputfield for the htmlarea js-widget (returns the necessary html and js)
 	 */
-	static function htmlarea($name,$content='',$style='',$base_href=''/*,$plugins='',$custom_toolbar='',$set_width_height_in_config=false*/)
+	static function htmlarea($name, $content = '', $style = '', $base_href = ''/*,$plugins='',$custom_toolbar='',$set_width_height_in_config=false*/)
 	{
 		/*if (!self::htmlarea_availible())
 		{
@@ -608,16 +607,16 @@ 
 	* @param string $_executeJSAfterInit ='' Javascript to be executed after InstanceReady of CKEditor
 	* @return string the necessary html for the textarea
 	*/
-	static function fckEditor($_name, $_content, $_mode, $_options=array('toolbar_expanded' =>'true'),
-		$_height='400px', $_width='100%',$_start_path='',$_purify=true, $_focusToBody=false, $_executeJSAfterInit='')
+	static function fckEditor($_name, $_content, $_mode, $_options = array('toolbar_expanded' =>'true'),
+		$_height = '400px', $_width = '100%', $_start_path = '', $_purify = true, $_focusToBody = false, $_executeJSAfterInit = '')
 	{
 		if (!self::htmlarea_availible() || $_mode == 'ascii')
 		{
-			return self::textarea($_name,$_content,'style="width: '.$_width.'; height: '.$_height.';" id="'.htmlspecialchars($_name).'"');
+			return self::textarea($_name, $_content, 'style="width: '.$_width.'; height: '.$_height.';" id="'.htmlspecialchars($_name).'"');
 		}
 
 		//include the ckeditor js file
-		egw_framework::validate_file('ckeditor','ckeditor','phpgwapi');
+		egw_framework::validate_file('ckeditor', 'ckeditor', 'phpgwapi');
 
 		// run content through htmlpurifier
 		if ($_purify && !empty($_content))
@@ -634,13 +633,13 @@ 
 		// User preferences
 		$font = $GLOBALS['egw_info']['user']['preferences']['common']['rte_font'];
 		$font_size = egw_ckeditor_config::font_size_from_prefs();
-		$font_span = '<span '.($font||$font_size?'style=\"':'').($font?'font-family:'.$font.'; ':'').($font_size?'font-size:'.$font_size.'; ':'').'\">';
+		$font_span = '<span '.($font || $font_size ? 'style=\"' : '').($font ? 'font-family:'.$font.'; ' : '').($font_size ? 'font-size:'.$font_size.'; ' : '').'\">';
 		if (empty($font) && empty($font_size)) $font_span = '';
 
 		// we need to enable double encoding here, as ckEditor has to undo one level of encoding
 		// otherwise < and > chars eg. from html markup entered in regular (not source) input, will turn into html!
 		//error_log(__METHOD__.__LINE__.' '.self::$user_agent.','.self::$ua_version);
-		return self::textarea($_name,$_content,'id="'.htmlspecialchars($_name).'"',true).	// true = double encoding
+		return self::textarea($_name, $_content, 'id="'.htmlspecialchars($_name).'"', true).// true = double encoding
 '
 <script type="text/javascript">
 window.CKEDITOR_BASEPATH="'.$GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/js/ckeditor/";
@@ -653,22 +652,22 @@ 
 		function (ev)
 		{
 			//alert("CKEditorLoad:"+"'.$_focusToBody.'");
-'.($_focusToBody?'
+'.($_focusToBody ? '
 			ev.editor.focus();':'').'
 			var d = ev.editor.document;
 			var r = new CKEDITOR.dom.range(d);
 			r.collapse(true);
 			r.selectNodeContents(d.getBody());
-			r.collapse('.($_focusToBody==='BOTTOM'?'false':'true').');
-			r.select();'.($font_span?'
+			r.collapse('.($_focusToBody === 'BOTTOM' ? 'false' : 'true').');
+			r.select();'.($font_span ? '
 			//this stuff is needed, as the above places the caret just before the span tag
 			var sN = r.startContainer.getNextSourceNode();
 			//FF is selecting the span with getNextSourceNode, other browsers need to fetch it with getNext
 			r.selectNodeContents(((typeof sN.getName==="function") && sN.getName()=="span"?r.startContainer.getNextSourceNode():r.startContainer.getNextSourceNode().getNext()));
 			r.collapse(true);
-			r.select();'.'':'').'
+			r.select();'.'' : '').'
 			ev.editor.resize("100%", '.str_replace('px', '', $pxheight).');
-'.($_executeJSAfterInit?$_executeJSAfterInit:'').'
+'.($_executeJSAfterInit ? $_executeJSAfterInit : '').'
 		}
 	);'.
 	(trim($_content) == '' && $font_span ? 'CKEDITOR.instances["'.$_name.'"].setData("'.$font_span.'&#8203;</span>");' : '').
@@ -693,16 +692,16 @@ 
 	* @param string $_executeJSAfterInit ='' Javascript to be executed after InstanceReady of CKEditor
 	* @return string the necessary html for the textarea
 	*/
-	static function fckEditorQuick($_name, $_mode, $_content='', $_height='400px', $_width='100%',$_purify=true, $_border='0px',$_focusToBody=false,$_executeJSAfterInit='')
+	static function fckEditorQuick($_name, $_mode, $_content = '', $_height = '400px', $_width = '100%', $_purify = true, $_border = '0px', $_focusToBody = false, $_executeJSAfterInit = '')
 	{
 		if (!self::htmlarea_availible() || $_mode == 'ascii')
 		{
 			//TODO: use self::textarea
-			return "<textarea name=\"$_name\" style=\"".($_width?" width:".$_width.';':" width:100%;").($_height?" height:".$_height.';':" height:400px;").($_border?" border:".$_border.';':" border:0px;")."\">$_content</textarea>";
+			return "<textarea name=\"$_name\" style=\"".($_width ? " width:".$_width.';' : " width:100%;").($_height ? " height:".$_height.';' : " height:400px;").($_border ? " border:".$_border.';' : " border:0px;")."\">$_content</textarea>";
 		}
 		else
 		{
-			return self::fckEditor($_name, $_content, $_mode, array(), $_height, $_width,'',$_purify,$_focusToBody,$_executeJSAfterInit);
+			return self::fckEditor($_name, $_content, $_mode, array(), $_height, $_width, '', $_purify, $_focusToBody, $_executeJSAfterInit);
 		}
 	}
 
@@ -714,7 +713,7 @@ 
 	 * @param string $type type, default ''=not specified = text
 	 * @param string $options attributes for the tag, default ''=none
 	 */
-	static function input($name,$value='',$type='',$options='' )
+	static function input($name, $value = '', $type = '', $options = '')
 	{
 		switch ((string)$type)
 		{
@@ -743,12 +742,12 @@ 
 		'cancelled' => '/no(&|\]|$)/',
 		'ok'     => '/ok(&|\]|$)/',
 		'close'  => '/close(&|\]|$)/',
-		'add'    => '/(add(&|\]|$)|create)/',	// customfields use create*
+		'add'    => '/(add(&|\]|$)|create)/', // customfields use create*
 	);
 
 	static protected $default_classes = array(
-		'et2_button_cancel'   => '/cancel(&|\]|$)/',	// yellow
-		'et2_button_question' => '/(yes|no)(&|\]|$)/',	// yellow
+		'et2_button_cancel'   => '/cancel(&|\]|$)/', // yellow
+		'et2_button_question' => '/(yes|no)(&|\]|$)/', // yellow
 		'et2_button_delete'   => '/delete(&|\]|$)/'		// red
 	);
 
@@ -765,7 +764,7 @@ 
 	 * @param string $buttontype which type of html button (button|submit), default ='submit'
 	 * @return string html
 	 */
-	static function submit_button($name,$label,$onClick='',$no_lang=false,$options='',$image='',$app='phpgwapi', $buttontype='submit')
+	static function submit_button($name, $label, $onClick = '', $no_lang = false, $options = '', $image = '', $app = 'phpgwapi', $buttontype = 'submit')
 	{
 		// workaround for idots and IE button problem (wrong cursor-image)
 		if (self::$user_agent == 'msie')
@@ -777,11 +776,11 @@ 
 
 		if ($image != '')
 		{
-			$image = str_replace(array('.gif','.GIF','.png','.PNG'),'',$image);
+			$image = str_replace(array('.gif', '.GIF', '.png', '.PNG'), '', $image);
 
-			if (!($path = common::image($app,$image)))
+			if (!($path = common::image($app, $image)))
 			{
-				$path = $image;		// name may already contain absolut path
+				$path = $image; // name may already contain absolut path
 			}
 			$image = ' src="'.$path.'"';
 			$classes[] = 'image_button';
@@ -790,11 +789,11 @@ 
 		{
 			$label = lang($label);
 		}
-		if (($accesskey = @strstr($label,'&')) && $accesskey[1] != ' ' &&
-			(($pos = strpos($accesskey,';')) === false || $pos > 5))
+		if (($accesskey = @strstr($label, '&')) && $accesskey[1] != ' ' &&
+			(($pos = strpos($accesskey, ';')) === false || $pos > 5))
 		{
-			$label_u = str_replace('&'.$accesskey[1],'<u>'.$accesskey[1].'</u>',$label);
-			$label = str_replace('&','',$label);
+			$label_u = str_replace('&'.$accesskey[1], '<u>'.$accesskey[1].'</u>', $label);
+			$label = str_replace('&', '', $label);
 			$options .= ' accesskey="'.$accesskey[1].'" '.$options;
 		}
 		else
@@ -802,10 +801,10 @@ 
 			$accesskey = '';
 			$label_u = $label;
 		}
-		if ($onClick) $options .= ' onclick="'.str_replace('"','\\"',$onClick).'"';
+		if ($onClick) $options .= ' onclick="'.str_replace('"', '\\"', $onClick).'"';
 
 		// add default background-image to get et2 like buttons
-		foreach(self::$default_background_images as $img => $reg_exp)
+		foreach (self::$default_background_images as $img => $reg_exp)
 		{
 			if (preg_match($reg_exp, $name) && ($url = common::image($GLOBALS['egw_info']['flags']['currentapp'], $img)))
 			{
@@ -815,7 +814,7 @@ 
 			}
 		}
 		// add default class for cancel, delete or yes/no buttons
-		foreach(self::$default_classes as $class => $reg_exp)
+		foreach (self::$default_classes as $class => $reg_exp)
 		{
 			if (preg_match($reg_exp, $name))
 			{
@@ -849,20 +848,20 @@ 
 	 * @param array|string $vars query or array ('name' => 'value', ...) with query
 	 * @return string absolut link already run through $phpgw->link
 	 */
-	static function link($_url,$vars='')
+	static function link($_url, $vars = '')
 	{
 		//echo "<p>html::link(url='$url',vars='"; print_r($vars); echo "')</p>\n";
 		if (!is_array($vars))
 		{
-			parse_str($vars,$vars);
+			parse_str($vars, $vars);
 		}
-		list($url,$v) = explode('?', $_url);	// url may contain additional vars
+		list($url, $v) = explode('?', $_url); // url may contain additional vars
 		if ($v)
 		{
-			parse_str($v,$v);
+			parse_str($v, $v);
 			$vars += $v;
 		}
-		return egw::link($url,$vars);
+		return egw::link($url, $vars);
 	}
 
 	/**
@@ -874,9 +873,9 @@ 
 	 * @param string $options attributes for the tag, default ''=none
 	 * @return string html
 	 */
-	static function checkbox($name,$checked=false,$value='True',$options='')
+	static function checkbox($name, $checked = false, $value = 'True', $options = '')
 	{
-		return '<input type="checkbox" name="'.$name.'" value="'.self::htmlspecialchars($value).'"' .($checked ? ' checked="1"' : '') . "$options />\n";
+		return '<input type="checkbox" name="'.$name.'" value="'.self::htmlspecialchars($value).'"'.($checked ? ' checked="1"' : '')."$options />\n";
 	}
 
 	/**
@@ -891,7 +890,7 @@ 
 	 * @param string $method method of the form, default 'POST'
 	 * @return string html
 	 */
-	static function form($content,$hidden_vars,$_url,$url_vars='',$name='',$options='',$method='POST')
+	static function form($content, $hidden_vars, $_url, $url_vars = '', $name = '', $options = '', $method = 'POST')
 	{
 		$url = $_url ? self::link($_url, $url_vars) : $_SERVER['PHP_SELF'].'?'.$_SERVER['QUERY_STRING'];
 		$html = "<form method=\"$method\" ".($name != '' ? "name=\"$name\" " : '')."action=\"$url\" $options>\n";
@@ -918,9 +917,9 @@ 
 	 * @param string $method method of the form, default 'POST'
 	 * @return string html
 	 */
-	static function form_1button($name,$label,$hidden_vars,$url,$url_vars='',$form_name='',$method='POST')
+	static function form_1button($name, $label, $hidden_vars, $url, $url_vars = '', $form_name = '', $method = 'POST')
 	{
-		return self::form(self::submit_button($name,$label),$hidden_vars,$url,$url_vars,$form_name,' style="display: inline-block"',$method);
+		return self::form(self::submit_button($name, $label), $hidden_vars, $url, $url_vars, $form_name, ' style="display: inline-block"', $method);
 	}
 
 	const THEAD = 1;
@@ -953,34 +952,34 @@ 
 	 * @param boolean $no_table_tr dont return the table- and outmost tr-tabs, default false=return table+tr
 	 * @return string with html-code of the table
 	 */
-	static function table($rows,$options = '',$no_table_tr=False)
+	static function table($rows, $options = '', $no_table_tr = False)
 	{
 		$html = $no_table_tr ? '' : "<table $options>\n";
 
 		$part = 0;
-		foreach($rows as $key => $row)
+		foreach ($rows as $key => $row)
 		{
 			if (!is_array($row))
 			{
-				continue;					// parameter
+				continue; // parameter
 			}
 			// get the current part from the optional 'h' or 'f' prefix of the key
 			$p = $key[0] == 'h' ? html::THEAD : ($key[0] == 'f' ? html::TFOOT : html::TBODY);
 			if ($part < $p && ($part || $p < self::TBODY))	// add only allowed and neccessary transitions
 			{
 				if ($part) $html .= '</'.self::$part2tag[$part].">\n";
-				$html .= '<'.self::$part2tag[$part=$p].">\n";
+				$html .= '<'.self::$part2tag[$part = $p].">\n";
 			}
 			$html .= $no_table_tr && $key == 1 ? '' : "\t<tr ".$rows['.'.$key].">\n";
 
-			foreach($row as $key => $cell)
+			foreach ($row as $key => $cell)
 			{
 				if ($key[0] == '.')
 				{
-					continue;				// parameter
+					continue; // parameter
 				}
-				$table_pos = strpos($cell,'<table');
-				$td_pos = strpos($cell,'<td');
+				$table_pos = strpos($cell, '<table');
+				$td_pos = strpos($cell, '<td');
 				if ($td_pos !== False && ($table_pos === False || $td_pos < $table_pos))
 				{
 					$html .= $cell;
@@ -1004,7 +1003,7 @@ 
 
 		if ($no_table_tr)
 		{
-			$html = substr($html,0,-16);
+			$html = substr($html, 0, -16);
 		}
 		return $html;
 	}
@@ -1016,12 +1015,12 @@ 
 	 * @param boolean $no_script if true generate a submit-button if javascript is off
 	 * @return string html
 	 */
-	static function sbox_submit( $sbox,$no_script=false )
+	static function sbox_submit($sbox, $no_script = false)
 	{
-		$html = str_replace('<select','<select onchange="this.form.submit()" ',$sbox);
+		$html = str_replace('<select', '<select onchange="this.form.submit()" ', $sbox);
 		if ($no_script)
 		{
-			$html .= '<noscript>'.self::submit_button('send','>').'</noscript>';
+			$html .= '<noscript>'.self::submit_button('send', '>').'</noscript>';
 		}
 		return $html;
 	}
@@ -1037,11 +1036,11 @@ 
 	 * @param string $height height, default 5px
 	 * @return string html
 	 */
-	static function progressbar($_percent, $_title='',$options='',$width='',$color='',$height='' )
+	static function progressbar($_percent, $_title = '', $options = '', $width = '', $color = '', $height = '')
 	{
 		$percent = (int)$_percent;
 		if (!$width) $width = '30px';
-		if (!$height)$height= '5px';
+		if (!$height)$height = '5px';
 		if (!$color) $color = '#D00000';
 		$title = $_title ? self::htmlspecialchars($_title) : $percent.'%';
 
@@ -1051,7 +1050,7 @@ 
 		}
 		return '<div class="onlyPrint">'.$title.'</div><div class="noPrint" title="'.$title.'" '.$options.
 			' style="height: '.$height.'; width: '.$width.'; border: 1px solid black; padding: 1px; text-align: left;'.
-			(@stristr($options,'onclick="') ? ' cursor: pointer;' : '').'">'."\n\t".
+			(@stristr($options, 'onclick="') ? ' cursor: pointer;' : '').'">'."\n\t".
 			'<div style="height: '.$height.'; width: '.$percent.'%; background: '.$color.';"></div>'."\n</div>\n";
 	}
 
@@ -1069,32 +1068,32 @@ 
 	 * @param string $options further options for the tag, default '' = none
 	 * @return string the html
 	 */
-	static function image( $app,$name,$title='',$options='' )
+	static function image($app, $name, $title = '', $options = '')
 	{
 		if (is_array($name))	// menuaction and other get-vars
 		{
-			$name = $GLOBALS['egw']->link('/index.php',$name);
+			$name = $GLOBALS['egw']->link('/index.php', $name);
 		}
-		if (substr($name,0,5) == 'vfs:/')	// vfs pseudo protocoll
+		if (substr($name, 0, 5) == 'vfs:/')	// vfs pseudo protocoll
 		{
-			$name = egw::link(egw_vfs::download_url(substr($name,4)));
+			$name = egw::link(egw_vfs::download_url(substr($name, 4)));
 		}
-		if ($name[0] == '/' || substr($name,0,7) == 'http://' || substr($name,0,8) == 'https://' || stripos($name,'etemplate/thumbnail.php') )
+		if ($name[0] == '/' || substr($name, 0, 7) == 'http://' || substr($name, 0, 8) == 'https://' || stripos($name, 'etemplate/thumbnail.php'))
 		{
-			if (!($name[0] == '/' || substr($name,0,7) == 'http://' || substr($name,0,8) == 'https://')) $name = '/'.$name;
+			if (!($name[0] == '/' || substr($name, 0, 7) == 'http://' || substr($name, 0, 8) == 'https://')) $name = '/'.$name;
 			$url = $name;
 		}
 		else	// no URL, so try searching the image
 		{
-			$name = str_replace(array('.gif','.GIF','.png','.PNG'),'',$name);
+			$name = str_replace(array('.gif', '.GIF', '.png', '.PNG'), '', $name);
 
-			if (!($url = $GLOBALS['egw']->common->image($app,$name)))
+			if (!($url = $GLOBALS['egw']->common->image($app, $name)))
 			{
-				$url = $name;		// name may already contain absolut path
+				$url = $name; // name may already contain absolut path
 			}
-			if($GLOBALS['egw_info']['server']['webserver_url'])
+			if ($GLOBALS['egw_info']['server']['webserver_url'])
 			{
-				list(,$path) = explode($GLOBALS['egw_info']['server']['webserver_url'],$url);
+				list(,$path) = explode($GLOBALS['egw_info']['server']['webserver_url'], $url);
 
 				if (!is_null($path)) $path = EGW_SERVER_ROOT.$path;
 			}
@@ -1103,12 +1102,12 @@ 
 				$path = EGW_SERVER_ROOT.$url;
 			}
 
-			if (is_null($path) || (!@is_readable($path) && stripos($path,'webdav.php')===false))
+			if (is_null($path) || (!@is_readable($path) && stripos($path, 'webdav.php') === false))
 			{
 				// if the image-name is a percentage, use a progressbar
-				if (substr($name,-1) == '%' && is_numeric($percent = substr($name,0,-1)))
+				if (substr($name, -1) == '%' && is_numeric($percent = substr($name, 0, -1)))
 				{
-					return self::progressbar($percent,$title);
+					return self::progressbar($percent, $title);
 				}
 				return $title;
 			}
@@ -1119,12 +1118,12 @@ 
 		}
 
 		// This block makes pngfix.js useless, adding a check on disable_pngfix to have pngfix.js do its thing
-		if (self::$user_agent == 'msie' && self::$ua_version < 7.0 && substr($url,-4) == '.png' && ($GLOBALS['egw_info']['user']['preferences']['common']['disable_pngfix'] || !isset($GLOBALS['egw_info']['user']['preferences']['common']['disable_pngfix'])))
+		if (self::$user_agent == 'msie' && self::$ua_version < 7.0 && substr($url, -4) == '.png' && ($GLOBALS['egw_info']['user']['preferences']['common']['disable_pngfix'] || !isset($GLOBALS['egw_info']['user']['preferences']['common']['disable_pngfix'])))
 		{
 			$extra_styles = "display: inline-block; filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='$url',sizingMethod='image'); width: 1px; height: 1px;";
-			if (false!==strpos($options,'style="'))
+			if (false !== strpos($options, 'style="'))
 			{
-				$options = str_replace('style="','style="'.$extra_styles, $options);
+				$options = str_replace('style="', 'style="'.$extra_styles, $options);
 			}
 			else
 			{
@@ -1144,24 +1143,24 @@ 
 	 * @param string $options attributes for the tag, default ''=none
 	 * @return string the html
 	 */
-	static function a_href( $content,$url,$vars='',$options='')
+	static function a_href($content, $url, $vars = '', $options = '')
 	{
 		if (is_array($url))
 		{
 			$vars = $url;
 			$url = '/index.php';
 		}
-		elseif (strpos($url,'/')===false &&
-			count(explode('.',$url)) >= 3 &&
-			!(strpos($url,'mailto:')!==false ||
-			strpos($url,'://')!==false ||
-			strpos($url,'javascript:')!==false))
+		elseif (strpos($url, '/') === false &&
+			count(explode('.', $url)) >= 3 &&
+			!(strpos($url, 'mailto:') !== false ||
+			strpos($url, '://') !== false ||
+			strpos($url, 'javascript:') !== false))
 		{
 			$url = "/index.php?menuaction=$url";
 		}
 		if ($url[0] == '/')		// link relative to eGW
 		{
-			$url = self::link($url,$vars);
+			$url = self::link($url, $vars);
 		}
 		//echo "<p>html::a_href('".self::htmlspecialchars($content)."','$url',".print_r($vars,True).") = ".self::link($url,$vars)."</p>";
 		return '<a href="'.self::htmlspecialchars($url).'" '.$options.'>'.$content.'</a>';
@@ -1196,7 +1195,7 @@ 
 	 * @param string $options attributes for the tag, default ''=none
 	 * @return string the html
 	 */
-	static function hr($width='',$options='')
+	static function hr($width = '', $options = '')
 	{
 		if ($width) $options .= " width=\"$width\"";
 
@@ -1212,12 +1211,12 @@ 
 	 * @param mixed $names String (or Array) with the option-names eg. 'WIDTH,HEIGHT,BORDER'
 	 * @return string with options/attributes
 	 */
-	static function formatOptions($options,$names)
+	static function formatOptions($options, $names)
 	{
-		if (!is_array($options)) $options = explode(',',$options);
-		if (!is_array($names))   $names   = explode(',',$names);
+		if (!is_array($options)) $options = explode(',', $options);
+		if (!is_array($names))   $names   = explode(',', $names);
 
-		foreach($options as $n => $val)
+		foreach ($options as $n => $val)
 		{
 			if ($val != '' && $names[$n] != '')
 			{
@@ -1271,7 +1270,7 @@ 
 	 * @param string $options attributes for the tag, default ''=none
 	 * @return string the html
 	 */
-	static function label($content,$id='',$accesskey='',$options='')
+	static function label($content, $id = '', $accesskey = '', $options = '')
 	{
 		if ($id != '')
 		{
@@ -1292,7 +1291,7 @@ 
 	 * @param string $options attributes for the tag, default ''=none
 	 * @return string the html
 	 */
-	static function fieldset($content,$legend='',$options='')
+	static function fieldset($content, $legend = '', $options = '')
 	{
 		$html = "<fieldset $options>".($legend ? '<legend>'.self::htmlspecialchars($legend).'</legend>' : '')."\n";
 
@@ -1326,9 +1325,9 @@ 
 	 *
 	 * @return string the html code, to be added into the template
 	 */
-	static function tree($_folders,$_selected,$_topFolder=false,$_onNodeSelect="null",$tree='foldertree',$_divClass='',
-		$_leafImage='',$_onCheckHandler=false,$delimiter='/',$folderImageDir=null,$autoLoading=null,$dataMode='JSON',
-		$dragndrop=false)
+	static function tree($_folders, $_selected, $_topFolder = false, $_onNodeSelect = "null", $tree = 'foldertree', $_divClass = '',
+		$_leafImage = '', $_onCheckHandler = false, $delimiter = '/', $folderImageDir = null, $autoLoading = null, $dataMode = 'JSON',
+		$dragndrop = false)
 	{
 		$webserver_url = $GLOBALS['egw_info']['server']['webserver_url'];
 		if (empty($folderImageDir))
@@ -1351,7 +1350,7 @@ 
 			//error_log(__METHOD__."() setting templated image-path: $folderImageDir");
 		}
 
-		static $tree_initialised=false;
+		static $tree_initialised = false;
 		if (!$tree_initialised)
 		{
 			egw_framework::includeCSS('/phpgwapi/js/dhtmlxtree/codebase/dhtmlxtree.css');
@@ -1361,16 +1360,16 @@ 
 			$tree_initialised = true;
 			if (!$_folders && !$autoLoading) return null;
 		}
-		$html = self::div("\n",'id="'.$tree.'"',$_divClass).$html;
+		$html = self::div("\n", 'id="'.$tree.'"', $_divClass).$html;
 		$html .= "<script type='text/javascript'>\n";
 		$html .= "var $tree;";
 		$html .= "egw_LAB.wait(function() {";
 		$html .= "$tree = new dhtmlXTreeObject('$tree','100%','100%',0);\n";
-		$html .= "$tree.parentObject.style.overflow='auto';\n";	// dhtmlXTree constructor has hidden hardcoded
+		$html .= "$tree.parentObject.style.overflow='auto';\n"; // dhtmlXTree constructor has hidden hardcoded
 		if (translation::charset() == 'utf-8') $html .= "if ($tree.setEscapingMode) $tree.setEscapingMode('utf8');\n";
 		$html .= "$tree.setImagePath('$folderImageDir/dhtmlxtree/');\n";
 
-		if($_onCheckHandler)
+		if ($_onCheckHandler)
 		{
 			$html .= "$tree.enableCheckBoxes(1);\n";
 			$html .= "$tree.setOnCheckHandler('$_onCheckHandler');\n";
@@ -1381,7 +1380,7 @@ 
 		if ($autoLoading)
 		{
 			$autoLoading = is_array($autoLoading) ?
-				egw::link('/index.php',$autoLoading) : egw::link($autoLoading);
+				egw::link('/index.php', $autoLoading) : egw::link($autoLoading);
 			$html .= "$tree.setXMLAutoLoading('$autoLoading');\n";
 			if ($dataMode != 'XML') $html .= "$tree.setDataMode('$dataMode');\n";
 
@@ -1422,7 +1421,7 @@ 
 		}
 		if (is_string($_folders))
 		{
-			switch($dataMode)
+			switch ($dataMode)
 			{
 				case 'JSON':
 					$html .= "$tree.loadJSONObject($_folders);\n"; break;
@@ -1433,10 +1432,10 @@ 
 		else
 		{
 			// evtl. remove leading delimiter
-			if ($_selected[0] == $delimiter) $_selected = substr($_selected,1);
+			if ($_selected[0] == $delimiter) $_selected = substr($_selected, 1);
 
 			$n = 0;
-			foreach($_folders as $path => $data)
+			foreach ($_folders as $path => $data)
 			{
 				if (!is_array($data))
 				{
@@ -1448,10 +1447,10 @@ 
 				if ($_leafImage)
 				{
 					$image1 = $image2 = $image3 = "'".$_leafImage."'";
-					if (($next_item = array_slice($_folders, $n+1, 1, true)))
+					if (($next_item = array_slice($_folders, $n + 1, 1, true)))
 					{
 						list($next_path) = each($next_item);
-						if (substr($next_path,0,strlen($path)+1) == $path.'/')
+						if (substr($next_path, 0, strlen($path) + 1) == $path.'/')
 						{
 							$image1 = $image2 = $image3 = '0';
 						}
@@ -1462,22 +1461,22 @@ 
 					$image1 = $image2 = $image3 = "'".$data['image']."'";
 				}
 				// evtl. remove leading delimiter
-				if ($path[0] == $delimiter) $path = substr($path,1);
-				$folderParts = explode($delimiter,$path);
+				if ($path[0] == $delimiter) $path = substr($path, 1);
+				$folderParts = explode($delimiter, $path);
 
 				//get rightmost folderpart
 				$label = array_pop($folderParts);
 				if (isset($data['label'])) $label = $data['label'];
 
 				// the rest of the array is the name of the parent
-				$parentName = implode((array)$folderParts,$delimiter);
-				if(empty($parentName)) $parentName = $top;
+				$parentName = implode((array)$folderParts, $delimiter);
+				if (empty($parentName)) $parentName = $top;
 
 				$entryOptions = !isset($data['child']) || $data['child'] ? 'CHILD' : '';
 				if ($_onCheckHandler && $_selected)	// check selected items on multi selection
 				{
-					if (!is_array($_selected)) $_selected = explode(',',$_selected);
-					if (array_search("$path",$_selected)!==false) $entryOptions .= ',CHECKED';
+					if (!is_array($_selected)) $_selected = explode(',', $_selected);
+					if (array_search("$path", $_selected) !== false) $entryOptions .= ',CHECKED';
 					//echo "<p>path=$path, _selected=".print_r($_selected,true).": $entryOptions</p>\n";
 				}
 				// highlight current item
@@ -1497,7 +1496,7 @@ 
 		$html .= "$tree.closeAllItems(0);\n";
 		if ($_selected)
 		{
-			foreach(is_array($_selected)?$_selected:array($_selected) as $path)
+			foreach (is_array($_selected) ? $_selected : array($_selected) as $path)
 			{
 				$html .= "$tree.openItem('".addslashes($path)."');\n";
 			}
@@ -1522,15 +1521,15 @@ 
 	 *		or to restrict the attribute's values
 	 * @param boolean $_force =null - force the config passed to be used without merging to the default
 	 */
-	static function purify($html,$config=null,$spec=array(),$_force=false)
+	static function purify($html, $config = null, $spec = array(), $_force = false)
 	{
-		$defaultConfig = array('valid_xhtml'=>1,'safe'=>1);
+		$defaultConfig = array('valid_xhtml'=>1, 'safe'=>1);
 
-		if (empty($html)) return $html;	// no need to process further
+		if (empty($html)) return $html; // no need to process further
 		if (!empty($config) && is_string($config))
 		{
 			//error_log(__METHOD__.__LINE__.$config);
-			$config = json_decode($config,true);
+			$config = json_decode($config, true);
 			if (is_null($config)) error_log(__METHOD__.__LINE__." decoding of config failed; standard will be applied");
 		}
 
@@ -1540,15 +1539,15 @@ 
 
 		// Check for "blank" = just user preference span - for some reason we can't match on the entity, so approximate
 		$regex = '#^<span style="font-family:'.$font.';font-size:'.$font_size.';">.?</span>$#us';
-		if(preg_match($regex,$html))
+		if (preg_match($regex, $html))
 		{
 			return '';
 		}
 		$htmLawed = new egw_htmLawed();
-		if (is_array($config) && $_force===false) $config = array_merge($defaultConfig, $config);
+		if (is_array($config) && $_force === false) $config = array_merge($defaultConfig, $config);
 		if (empty($config)) $config = $defaultConfig;
 		//error_log(__METHOD__.__LINE__.array2string($config));
-		return $htmLawed->egw_htmLawed($html,$config,$spec);
+		return $htmLawed->egw_htmLawed($html, $config, $spec);
 	}
 
 	/**
@@ -1569,7 +1568,7 @@ 
 	 * @param boolean $force_download =true send content-disposition attachment header
 	 * @param boolean $no_content_type =false do not send actual content-type and content-length header, just content-disposition
 	 */
-	public static function safe_content_header(&$content, $path, &$mime='', &$length=0, $nocache=true, $force_download=true, $no_content_type=false)
+	public static function safe_content_header(&$content, $path, &$mime = '', &$length = 0, $nocache = true, $force_download = true, $no_content_type = false)
 	{
 		// change old/aliased mime-types to new one, eg. image/pdf to application/pdf
 		$mime = mime_magic::fix_mime_type($mime);
@@ -1584,7 +1583,7 @@ 
 			if (html::$user_agent == 'chrome' || html::$user_agent == 'msie' && html::$ua_version >= 8)
 			{
 				$mime = 'text/plain';
-				header('X-Content-Type-Options: nosniff');	// stop IE & Chrome from content-type sniffing
+				header('X-Content-Type-Options: nosniff'); // stop IE & Chrome from content-type sniffing
 			}
 			// for the rest we change mime-type to text/html and let code below handle it safely
 			// this stops Safari and Firefox from using it as src attribute in a script tag
@@ -1596,7 +1595,7 @@ 
 				{
 					$data = fread($content, $length);
 					fclose($content);
-					$content =& $data;
+					$content = & $data;
 					unset($data);
 				}
 				$content = '<pre>'.$content;
@@ -1610,12 +1609,12 @@ 
 			if (html::$user_agent == 'chrome' && html::$ua_version >= 24 ||
 				// mobile FF 24 on Android does NOT honor CSP!
 				html::$user_agent == 'firefox' && !html::$ua_mobile && html::$ua_version >= 24 ||
-				html::$user_agent == 'safari' && !html::$ua_mobile && html::$ua_version >= 536 ||	// OS X
+				html::$user_agent == 'safari' && !html::$ua_mobile && html::$ua_version >= 536 || // OS X
 				html::$user_agent == 'safari' && html::$ua_mobile && html::$ua_version >= 9537)	// iOS 7
 			{
-				$csp = "script-src 'none'";	// forbid to execute any javascript
+				$csp = "script-src 'none'"; // forbid to execute any javascript
 				header("Content-Security-Policy: $csp");
-				header("X-Webkit-CSP: $csp");	// Chrome: <= 24, Safari incl. iOS
+				header("X-Webkit-CSP: $csp"); // Chrome: <= 24, Safari incl. iOS
 				//header("X-Content-Security-Policy: $csp");	// FF <= 22
 				//error_log(__METHOD__."('$options[path]') ".html::$user_agent.'/'.html::$ua_version.(html::$ua_mobile?'/mobile':'').": using Content-Security-Policy: $csp");
 			}
@@ -1648,25 +1647,25 @@ 
 	 * @param boolean $nocache =true send headers to disallow browser/proxies to cache the download
 	 * @param boolean $forceDownload =true send headers to handle as attachment/download
 	 */
-	public static function content_header($fn,$mime='',$length=0,$nocache=True,$forceDownload=true)
+	public static function content_header($fn, $mime = '', $length = 0, $nocache = True, $forceDownload = true)
 	{
 		// if no mime-type is given or it's the default binary-type, guess it from the extension
-		if(empty($mime) || $mime == 'application/octet-stream')
+		if (empty($mime) || $mime == 'application/octet-stream')
 		{
 			$mime = mime_magic::filename2mime($fn);
 		}
-		if($fn)
+		if ($fn)
 		{
 			// Show this for all
-			self::content_disposition_header($fn,$forceDownload);
+			self::content_disposition_header($fn, $forceDownload);
 			header('Content-type: '.$mime);
 
-			if($length)
+			if ($length)
 			{
 				header('Content-length: '.$length);
 			}
 
-			if($nocache)
+			if ($nocache)
 			{
 				header('Pragma: no-cache');
 				header('Pragma: public');
@@ -1682,7 +1681,7 @@ 
 	 * @param string $fn filename
 	 * @param boolean $forceDownload =true send headers to handle as attachment/download
 	 */
-	public static function content_disposition_header($fn,$forceDownload=true)
+	public static function content_disposition_header($fn, $forceDownload = true)
 	{
 		if ($forceDownload)
 		{
@@ -1705,30 +1704,30 @@ 
 	static function splithtmlByPRE($html)
 	{
 		$searchFor = '<pre ';
-		$pos = stripos($html,$searchFor);
-		if ($pos===false)
+		$pos = stripos($html, $searchFor);
+		if ($pos === false)
 		{
 			$searchFor = '<pre>';
-			$pos = stripos($html,$searchFor);
+			$pos = stripos($html, $searchFor);
 		}
 		if ($pos === false)
 		{
 			return $html;
 		}
-		$html2ret[] = substr($html,0,$pos);
-		while ($pos!==false)
+		$html2ret[] = substr($html, 0, $pos);
+		while ($pos !== false)
 		{
-			$endofpre = stripos($html,'</pre>',$pos);
-			$length = $endofpre-$pos+6;
-			$html2ret[] = substr($html,$pos,$length);
+			$endofpre = stripos($html, '</pre>', $pos);
+			$length = $endofpre - $pos + 6;
+			$html2ret[] = substr($html, $pos, $length);
 			$searchFor = '<pre ';
-			$pos = stripos($html,$searchFor, $endofpre+6);
-			if ($pos===false)
+			$pos = stripos($html, $searchFor, $endofpre + 6);
+			if ($pos === false)
 			{
 				$searchFor = '<pre>';
-				$pos = stripos($html,$searchFor, $endofpre+6);
+				$pos = stripos($html, $searchFor, $endofpre + 6);
 			}
-			$html2ret[] = ($pos ? substr($html,$endofpre+6,$pos-($endofpre+6)): substr($html,$endofpre+6));
+			$html2ret[] = ($pos ? substr($html, $endofpre + 6, $pos - ($endofpre + 6)) : substr($html, $endofpre + 6));
 			//$pos=false;
 		}
 		//error_log(__METHOD__.__LINE__.array2string($html2ret));
@@ -1744,16 +1743,16 @@ 
 	 */
 	static function getStyles(&$html)
 	{
-		$ct=0;
+		$ct = 0;
 		$newStyle = null;
-		if (stripos($html,'<style')!==false)  $ct = preg_match_all('#<style(?:\s.*)?>(.+)</style>#isU', $html, $newStyle);
-		if ($ct>0)
+		if (stripos($html, '<style') !== false)  $ct = preg_match_all('#<style(?:\s.*)?>(.+)</style>#isU', $html, $newStyle);
+		if ($ct > 0)
 		{
 			//error_log(__METHOD__.__LINE__.array2string($newStyle[0]));
-			$style2buffer = implode('',$newStyle[0]);
+			$style2buffer = implode('', $newStyle[0]);
 			// only replace what we have found, we use it here, as we use the same routine in translation::replaceTagsCompletley
 			// no need to do the extra routine
-			$html = str_ireplace($newStyle[0],'',$html);
+			$html = str_ireplace($newStyle[0], '', $html);
 		}
 		if ($style2buffer)
 		{
@@ -1761,7 +1760,7 @@ 
 			$test = json_encode($style2buffer);
 			//error_log(__METHOD__.__LINE__.'#'.$test.'# ->'.strlen($style2buffer).' Error:'.json_last_error());
 			//if (json_last_error() != JSON_ERROR_NONE && strlen($style2buffer)>0)
-			if ($test=="null" && strlen($style2buffer)>0)
+			if ($test == "null" && strlen($style2buffer) > 0)
 			{
 				// this should not be needed, unless something fails with charset detection/ wrong charset passed
 				error_log(__METHOD__.__LINE__.' Found Invalid sequence for utf-8 in CSS:'.$style2buffer.' Carset Detected:'.translation::detect_encoding($style2buffer));
@@ -1771,19 +1770,19 @@ 
 		$style .= $style2buffer;
 		// clean out comments and stuff
 		$search = array(
-			'@url\(http:\/\/[^\)].*?\)@si',  // url calls e.g. in style definitions
+			'@url\(http:\/\/[^\)].*?\)@si', // url calls e.g. in style definitions
 //			'@<!--[\s\S]*?[ \t\n\r]*-->@',   // Strip multi-line comments including CDATA
 //			'@<!--[\s\S]*?[ \t\n\r]*--@',    // Strip broken multi-line comments including CDATA
 		);
-		$style = preg_replace($search,"",$style);
+		$style = preg_replace($search, "", $style);
 
 		// CSS Security
 		// http://code.google.com/p/browsersec/wiki/Part1#Cascading_stylesheets
-		$css = preg_replace('/(javascript|expession|-moz-binding)/i','',$style);
-		if (stripos($css,'script')!==false) translation::replaceTagsCompletley($css,'script'); // Strip out script that may be included
+		$css = preg_replace('/(javascript|expession|-moz-binding)/i', '', $style);
+		if (stripos($css, 'script') !== false) translation::replaceTagsCompletley($css, 'script'); // Strip out script that may be included
 		// we need this, as styledefinitions are enclosed with curly brackets; and template stuff tries to replace everything between curly brackets that is having no horizontal whitespace
 		// as the comments as <!-- styledefinition --> in stylesheet are outdated, and ck-editor does not understand it, we remove it
-		$css_no_comment = str_replace(array(':','<!--','-->'),array(': ','',''),$css);
+		$css_no_comment = str_replace(array(':', '<!--', '-->'), array(': ', '', ''), $css);
 		//error_log(__METHOD__.__LINE__.$css);
 		// we already removed what we have found, above, as we used pretty much the same routine as in translation::replaceTagsCompletley
 		// no need to do the extra routine

Braces +233 added lines, -60 removed lines

@@ -77,7 +77,10 @@ 
 			}
 		}
 		list(,self::$user_agent,self::$ua_version) = $parts;
-		if ((self::$user_agent = strtolower(self::$user_agent)) == 'version') self::$user_agent = 'opera';
+		if ((self::$user_agent = strtolower(self::$user_agent)) == 'version')
+		{
+			self::$user_agent = 'opera';
+		}
 		// IE no longer reports MSIE, but "Trident/7.0; rv:11.0"
 		if (self::$user_agent=='trident')
 		{
@@ -152,7 +155,10 @@ 
 		// tell egw_framework to include wz_tooltip.js
 		$GLOBALS['egw_info']['flags']['include_wz_tooltip'] = true;
 
-		if ($do_lang) $text = lang($text);
+		if ($do_lang)
+		{
+			$text = lang($text);
+		}
 
 		$ttip = 'Tip(\''.str_replace(array("\n","\r","'",'"'),array('','',"\\'",'"'),$text).'\'';
 
@@ -162,7 +168,10 @@ 
 			foreach($options as $option => $value)
 			{
 				$option = strtoupper($option);
-				if ($option == 'STICKY') $sticky = (bool)$value;
+				if ($option == 'STICKY')
+				{
+					$sticky = (bool)$value;
+				}
 
 				switch(gettype($value))
 				{
@@ -170,7 +179,10 @@ 
 						$value = $value ? 'true' : 'false';
 						break;
 					case 'string':
-						if (stripos($value,"'")===false) $value = "'$value'";
+						if (stripos($value,"'")===false)
+						{
+							$value = "'$value'";
+						}
 						break;
 				}
 				$ttip .= ','.$option.','.$value;
@@ -192,7 +204,11 @@ 
 	 */
 	static function activate_links($content)
 	{
-		if (!$content || strlen($content) < 20) return $content;	// performance
+		if (!$content || strlen($content) < 20)
+		{
+			return $content;
+		}
+		// performance
 
 		// Exclude everything which is already a link
 		$NotAnchor = '(?<!"|href=|href\s=\s|href=\s|href\s=)';
@@ -212,7 +228,8 @@ 
 		$optBracket = '(>|&gt;)';
 		$Expr = '/' .$optBracket0. $NotAnchor . $Protocol . $Domain . $Subdir . $optBracket . '/i';
 		// use preg_replace_callback as we experienced problems with https links
-		$result2 = preg_replace_callback( $Expr, function ($match) {
+		$result2 = preg_replace_callback( $Expr, function ($match)
+		{
 				//error_log(__METHOD__.__LINE__.array2string($match));
 				return $match[1]."<a href=\"".($match[2]&&!$match[3]?$match[2]:'').($match[3]?$match[3]:'').$match[4].$match[5]."\" target=\"_blank\">".$match[4].$match[5]."</a>".$match[6];
 			}, $result );
@@ -225,7 +242,8 @@ 
 		$optStuff = '(&quot;|&quot|;)?';
 		$Expr = '/' . $NotAnchor . $Protocol . $Domain . $Subdir . $optStuff . '/i';
 		// use preg_replace_callback as we experienced problems with https links
-		$result3 = preg_replace_callback( $Expr, function ($match) {
+		$result3 = preg_replace_callback( $Expr, function ($match)
+		{
 				$additionalQuote="";//at the end, ...
 				// only one &quot at the end is found. chance is, it is not belonging to the URL
 				if ($match[5]==';' && (strlen($match[4])-6) >=0 && strpos($match[4],'&quot',strlen($match[4])-6)!==false && strpos(substr($match[4],0,strlen($match[4])-6),'&quot')===false)
@@ -257,7 +275,8 @@ 
 		$Expr = '/' .$optBracket0. $NotAnchor . $NotHTTP . $Domain2 . $Subdir2 .$optBracket. '/i';
 		//$Expr = '/' . $NotAnchor . $NotHTTP . $Domain . $Subdir . $optBracket . '/i';
 		// use preg_replace_callback as we experienced problems with links such as <www.example.tld/pfad/zu/einer/pdf-Datei.pdf>
-		$result4 = preg_replace_callback( $Expr, function ($match) {
+		$result4 = preg_replace_callback( $Expr, function ($match)
+		{
 				//error_log(__METHOD__.__LINE__.array2string($match));
 				if ($match[4]==';' && (strlen($match[3])-4) >=0 && strpos($match[3],'&gt',strlen($match[3])-4)!==false)
 				{
@@ -317,7 +336,11 @@ 
 	 */
 	static function select($name, $key, $arr=0,$no_lang=false,$options='',$multiple=0,$enhanced=null)
 	{
-		if(is_null($enhanced)) $enhanced = false;	//disabled by default (count($arr) > self::SELECT_ENHANCED_ROW_COUNT);
+		if(is_null($enhanced))
+		{
+			$enhanced = false;
+		}
+		//disabled by default (count($arr) > self::SELECT_ENHANCED_ROW_COUNT);
 
 		if (!is_array($arr))
 		{
@@ -380,7 +403,8 @@ 
 		}
 		$out .= "</select>\n";
 
-		if($enhanced) {
+		if($enhanced)
+		{
 			egw_framework::validate_file('/phpgwapi/js/jquery/chosen/chosen.jquery.js');
 			egw_framework::includeCSS('/phpgwapi/js/jquery/chosen/chosen.css',null,false);
 			$out .= "<script>var lab = egw_LAB || \$LAB; lab.wait(function() {\$j(function() {if(\$j().chosen) \$j('select[name=\"$name\"]').chosen({width: '100%'});});})</script>\n";
@@ -407,13 +431,19 @@ 
 	static function checkbox_multiselect($name, $key, $arr=0,$no_lang=false,$options='',$multiple=3,$selected_first=true,$style='',$enhanced = null)
 	{
 		//echo "<p align=right>checkbox_multiselect('$name',".array2string($key).",".array2string($arr).",$no_lang,'$options',$multiple,$selected_first,'$style')</p>\n";
-		if(is_null($enhanced)) $enhanced = (count($arr) > self::SELECT_ENHANCED_ROW_COUNT);
+		if(is_null($enhanced))
+		{
+			$enhanced = (count($arr) > self::SELECT_ENHANCED_ROW_COUNT);
+		}
 
 		if (!is_array($arr))
 		{
 			$arr = array('no','yes');
 		}
-		if ((int)$multiple <= 0) $multiple = 1;
+		if ((int)$multiple <= 0)
+		{
+			$multiple = 1;
+		}
 
 		if (substr($name,-2) != '[]')
 		{
@@ -421,7 +451,10 @@ 
 		}
 		$base_name = substr($name,0,-2);
 
-		if($enhanced) return self::select($name, $key, $arr,$no_lang,$options." style=\"$style\" ",$multiple,$enhanced);
+		if($enhanced)
+		{
+			return self::select($name, $key, $arr,$no_lang,$options." style=\"$style\" ",$multiple,$enhanced);
+		}
 
 		if (!is_array($key))
 		{
@@ -459,18 +492,36 @@ 
 			{
 				$title = '';
 			}
-			if ($label && !$no_lang) $label = lang($label);
-			if ($title && !$no_lang) $title = lang($title);
+			if ($label && !$no_lang)
+			{
+				$label = lang($label);
+			}
+			if ($title && !$no_lang)
+			{
+				$title = lang($title);
+			}
 
-			if (strlen($label) > $max_len) $max_len = strlen($label);
+			if (strlen($label) > $max_len)
+			{
+				$max_len = strlen($label);
+			}
 
 			$html .= self::label(self::checkbox($name,in_array((string)$val,$key),$val,$options_no_id.
 				' id="'.$base_name.'['.$val.']'.'"').self::htmlspecialchars($label),
 				$base_name.'['.$val.']','',($title ? 'title="'.self::htmlspecialchars($title).'" ':''))."<br />\n";
 		}
-		if ($style && substr($style,-1) != ';') $style .= '; ';
-		if (strpos($style,'height')===false) $style .= 'height: '.(1.7*$multiple).'em; ';
-		if (strpos($style,'width')===false)  $style .= 'width: '.(4+$max_len*($max_len < 15 ? 0.65 : 0.6)).'em; ';
+		if ($style && substr($style,-1) != ';')
+		{
+			$style .= '; ';
+		}
+		if (strpos($style,'height')===false)
+		{
+			$style .= 'height: '.(1.7*$multiple).'em; ';
+		}
+		if (strpos($style,'width')===false)
+		{
+			$style .= 'width: '.(4+$max_len*($max_len < 15 ? 0.65 : 0.6)).'em; ';
+		}
 		$style .= 'background-color: white; overflow: auto; border: lightgray 2px inset; text-align: left;';
 
 		return self::div($html,$options,'',$style);
@@ -495,7 +546,10 @@ 
 			$found = false;
 			foreach($selected as $sel)
 			{
-				if (($found = (((string) $value) === ((string) $selected[$key])))) break;
+				if (($found = (((string) $value) === ((string) $selected[$key]))))
+				{
+					break;
+				}
 			}
 			unset($sel);
 		}
@@ -516,8 +570,14 @@ 
 	 */
 	static function div($content,$options='',$class='',$style='')
 	{
-		if ($class) $options .= ' class="'.$class.'"';
-		if ($style) $options .= ' style="'.$style.'"';
+		if ($class)
+		{
+			$options .= ' class="'.$class.'"';
+		}
+		if ($style)
+		{
+			$options .= ' style="'.$style.'"';
+		}
 
 		return "<div $options>\n".($content ? "$content</div>\n" : '');
 	}
@@ -542,10 +602,13 @@ 
 			{
 				$value = json_encode($value);
 			}
-			if (!$ignore_empty || $value && !($name == 'filter' && $value == 'none'))	// dont need to send all the empty vars
+			if (!$ignore_empty || $value && !($name == 'filter' && $value == 'none'))
+			{
+				// dont need to send all the empty vars
 			{
 				$html .= "<input type=\"hidden\" name=\"$name\" value=\"".self::htmlspecialchars($value)."\" />\n";
 			}
+			}
 		}
 		return $html;
 	}
@@ -621,7 +684,9 @@ 
 
 		// run content through htmlpurifier
 		if ($_purify && !empty($_content))
-			$_content = self::purify($_content);
+		{
+					$_content = self::purify($_content);
+		}
 
 		// By default the editor start expanded
 		$expanded = isset($_options['toolbar_expanded']) ?
@@ -635,7 +700,10 @@ 
 		$font = $GLOBALS['egw_info']['user']['preferences']['common']['rte_font'];
 		$font_size = egw_ckeditor_config::font_size_from_prefs();
 		$font_span = '<span '.($font||$font_size?'style=\"':'').($font?'font-family:'.$font.'; ':'').($font_size?'font-size:'.$font_size.'; ':'').'\">';
-		if (empty($font) && empty($font_size)) $font_span = '';
+		if (empty($font) && empty($font_size))
+		{
+			$font_span = '';
+		}
 
 		// we need to enable double encoding here, as ckEditor has to undo one level of encoding
 		// otherwise < and > chars eg. from html markup entered in regular (not source) input, will turn into html!
@@ -802,7 +870,10 @@ 
 			$accesskey = '';
 			$label_u = $label;
 		}
-		if ($onClick) $options .= ' onclick="'.str_replace('"','\\"',$onClick).'"';
+		if ($onClick)
+		{
+			$options .= ' onclick="'.str_replace('"','\\"',$onClick).'"';
+		}
 
 		// add default background-image to get et2 like buttons
 		foreach(self::$default_background_images as $img => $reg_exp)
@@ -966,9 +1037,12 @@ 
 			}
 			// get the current part from the optional 'h' or 'f' prefix of the key
 			$p = $key[0] == 'h' ? html::THEAD : ($key[0] == 'f' ? html::TFOOT : html::TBODY);
-			if ($part < $p && ($part || $p < self::TBODY))	// add only allowed and neccessary transitions
+			if ($part < $p && ($part || $p < self::TBODY))
+			{
+				// add only allowed and neccessary transitions
 			{
 				if ($part) $html .= '</'.self::$part2tag[$part].">\n";
+			}
 				$html .= '<'.self::$part2tag[$part=$p].">\n";
 			}
 			$html .= $no_table_tr && $key == 1 ? '' : "\t<tr ".$rows['.'.$key].">\n";
@@ -996,10 +1070,13 @@ 
 		{
 			echo "<p>".function_backtrace()."</p>\n";
 		}
-		if ($part)	// close current part
+		if ($part)
+		{
+			// close current part
 		{
 			$html .= "</".self::$part2tag[$part].">\n";
 		}
+		}
 		$html .= "</table>\n";
 
 		if ($no_table_tr)
@@ -1040,9 +1117,18 @@ 
 	static function progressbar($_percent, $_title='',$options='',$width='',$color='',$height='' )
 	{
 		$percent = (int)$_percent;
-		if (!$width) $width = '30px';
-		if (!$height)$height= '5px';
-		if (!$color) $color = '#D00000';
+		if (!$width)
+		{
+			$width = '30px';
+		}
+		if (!$height)
+		{
+			$height= '5px';
+		}
+		if (!$color)
+		{
+			$color = '#D00000';
+		}
 		$title = $_title ? self::htmlspecialchars($_title) : $percent.'%';
 
 		if (self::$netscape4)
@@ -1071,17 +1157,26 @@ 
 	 */
 	static function image( $app,$name,$title='',$options='' )
 	{
-		if (is_array($name))	// menuaction and other get-vars
+		if (is_array($name))
+		{
+			// menuaction and other get-vars
 		{
 			$name = $GLOBALS['egw']->link('/index.php',$name);
 		}
-		if (substr($name,0,5) == 'vfs:/')	// vfs pseudo protocoll
+		}
+		if (substr($name,0,5) == 'vfs:/')
+		{
+			// vfs pseudo protocoll
 		{
 			$name = egw::link(egw_vfs::download_url(substr($name,4)));
 		}
+		}
 		if ($name[0] == '/' || substr($name,0,7) == 'http://' || substr($name,0,8) == 'https://' || stripos($name,'etemplate/thumbnail.php') )
 		{
-			if (!($name[0] == '/' || substr($name,0,7) == 'http://' || substr($name,0,8) == 'https://')) $name = '/'.$name;
+			if (!($name[0] == '/' || substr($name,0,7) == 'http://' || substr($name,0,8) == 'https://'))
+			{
+				$name = '/'.$name;
+			}
 			$url = $name;
 		}
 		else	// no URL, so try searching the image
@@ -1096,7 +1191,10 @@ 
 			{
 				list(,$path) = explode($GLOBALS['egw_info']['server']['webserver_url'],$url);
 
-				if (!is_null($path)) $path = EGW_SERVER_ROOT.$path;
+				if (!is_null($path))
+				{
+					$path = EGW_SERVER_ROOT.$path;
+				}
 			}
 			else
 			{
@@ -1159,10 +1257,13 @@ 
 		{
 			$url = "/index.php?menuaction=$url";
 		}
-		if ($url[0] == '/')		// link relative to eGW
+		if ($url[0] == '/')
+		{
+			// link relative to eGW
 		{
 			$url = self::link($url,$vars);
 		}
+		}
 		//echo "<p>html::a_href('".self::htmlspecialchars($content)."','$url',".print_r($vars,True).") = ".self::link($url,$vars)."</p>";
 		return '<a href="'.self::htmlspecialchars($url).'" '.$options.'>'.$content.'</a>';
 	}
@@ -1198,7 +1299,10 @@ 
 	 */
 	static function hr($width='',$options='')
 	{
-		if ($width) $options .= " width=\"$width\"";
+		if ($width)
+		{
+			$options .= " width=\"$width\"";
+		}
 
 		return "<hr $options />\n";
 	}
@@ -1214,8 +1318,14 @@ 
 	 */
 	static function formatOptions($options,$names)
 	{
-		if (!is_array($options)) $options = explode(',',$options);
-		if (!is_array($names))   $names   = explode(',',$names);
+		if (!is_array($options))
+		{
+			$options = explode(',',$options);
+		}
+		if (!is_array($names))
+		{
+			$names   = explode(',',$names);
+		}
 
 		foreach($options as $n => $val)
 		{
@@ -1357,9 +1467,15 @@ 
 			egw_framework::includeCSS('/phpgwapi/js/dhtmlxtree/codebase/dhtmlxtree.css');
 			egw_framework::validate_file('/phpgwapi/js/dhtmlxtree/codebase/dhtmlxcommon.js');
 			egw_framework::validate_file('/phpgwapi/js/dhtmlxtree/sources/dhtmlxtree.js');
-			if ($autoLoading && $dataMode != 'XML') egw_framework::validate_file('/phpgwapi/js/dhtmlxtree/sources/ext/dhtmlxtree_json.js');
+			if ($autoLoading && $dataMode != 'XML')
+			{
+				egw_framework::validate_file('/phpgwapi/js/dhtmlxtree/sources/ext/dhtmlxtree_json.js');
+			}
 			$tree_initialised = true;
-			if (!$_folders && !$autoLoading) return null;
+			if (!$_folders && !$autoLoading)
+			{
+				return null;
+			}
 		}
 		$html = self::div("\n",'id="'.$tree.'"',$_divClass).$html;
 		$html .= "<script type='text/javascript'>\n";
@@ -1367,7 +1483,10 @@ 
 		$html .= "egw_LAB.wait(function() {";
 		$html .= "$tree = new dhtmlXTreeObject('$tree','100%','100%',0);\n";
 		$html .= "$tree.parentObject.style.overflow='auto';\n";	// dhtmlXTree constructor has hidden hardcoded
-		if (translation::charset() == 'utf-8') $html .= "if ($tree.setEscapingMode) $tree.setEscapingMode('utf8');\n";
+		if (translation::charset() == 'utf-8')
+		{
+			$html .= "if ($tree.setEscapingMode) $tree.setEscapingMode('utf8');\n";
+		}
 		$html .= "$tree.setImagePath('$folderImageDir/dhtmlxtree/');\n";
 
 		if($_onCheckHandler)
@@ -1376,19 +1495,28 @@ 
 			$html .= "$tree.setOnCheckHandler('$_onCheckHandler');\n";
 		}
 
-		if ($dragndrop) $html .= "$tree.enableDragAndDrop(true);\n";
+		if ($dragndrop)
+		{
+			$html .= "$tree.enableDragAndDrop(true);\n";
+		}
 
 		if ($autoLoading)
 		{
 			$autoLoading = is_array($autoLoading) ?
 				egw::link('/index.php',$autoLoading) : egw::link($autoLoading);
 			$html .= "$tree.setXMLAutoLoading('$autoLoading');\n";
-			if ($dataMode != 'XML') $html .= "$tree.setDataMode('$dataMode');\n";
+			if ($dataMode != 'XML')
+			{
+				$html .= "$tree.setDataMode('$dataMode');\n";
+			}
 
 			// if no folders given, use xml url to load root, incl. setting of selected folder
 			if (!$_folders)
 			{
-				if ($_selected) $autoLoading .= '&selected='.urlencode($_selected);
+				if ($_selected)
+				{
+					$autoLoading .= '&selected='.urlencode($_selected);
+				}
 				unset($_selected);
 				$html .= "$tree.loadXML('$autoLoading');\n";
 				$html .= "});";
@@ -1433,7 +1561,10 @@ 
 		else
 		{
 			// evtl. remove leading delimiter
-			if ($_selected[0] == $delimiter) $_selected = substr($_selected,1);
+			if ($_selected[0] == $delimiter)
+			{
+				$_selected = substr($_selected,1);
+			}
 
 			$n = 0;
 			foreach($_folders as $path => $data)
@@ -1462,22 +1593,37 @@ 
 					$image1 = $image2 = $image3 = "'".$data['image']."'";
 				}
 				// evtl. remove leading delimiter
-				if ($path[0] == $delimiter) $path = substr($path,1);
+				if ($path[0] == $delimiter)
+				{
+					$path = substr($path,1);
+				}
 				$folderParts = explode($delimiter,$path);
 
 				//get rightmost folderpart
 				$label = array_pop($folderParts);
-				if (isset($data['label'])) $label = $data['label'];
+				if (isset($data['label']))
+				{
+					$label = $data['label'];
+				}
 
 				// the rest of the array is the name of the parent
 				$parentName = implode((array)$folderParts,$delimiter);
-				if(empty($parentName)) $parentName = $top;
+				if(empty($parentName))
+				{
+					$parentName = $top;
+				}
 
 				$entryOptions = !isset($data['child']) || $data['child'] ? 'CHILD' : '';
-				if ($_onCheckHandler && $_selected)	// check selected items on multi selection
+				if ($_onCheckHandler && $_selected)
+				{
+					// check selected items on multi selection
 				{
 					if (!is_array($_selected)) $_selected = explode(',',$_selected);
-					if (array_search("$path",$_selected)!==false) $entryOptions .= ',CHECKED';
+				}
+					if (array_search("$path",$_selected)!==false)
+					{
+						$entryOptions .= ',CHECKED';
+					}
 					//echo "<p>path=$path, _selected=".print_r($_selected,true).": $entryOptions</p>\n";
 				}
 				// highlight current item
@@ -1526,12 +1672,19 @@ 
 	{
 		$defaultConfig = array('valid_xhtml'=>1,'safe'=>1);
 
-		if (empty($html)) return $html;	// no need to process further
+		if (empty($html))
+		{
+			return $html;
+		}
+		// no need to process further
 		if (!empty($config) && is_string($config))
 		{
 			//error_log(__METHOD__.__LINE__.$config);
 			$config = json_decode($config,true);
-			if (is_null($config)) error_log(__METHOD__.__LINE__." decoding of config failed; standard will be applied");
+			if (is_null($config))
+			{
+				error_log(__METHOD__.__LINE__." decoding of config failed; standard will be applied");
+			}
 		}
 
 		// User preferences
@@ -1545,8 +1698,14 @@ 
 			return '';
 		}
 		$htmLawed = new egw_htmLawed();
-		if (is_array($config) && $_force===false) $config = array_merge($defaultConfig, $config);
-		if (empty($config)) $config = $defaultConfig;
+		if (is_array($config) && $_force===false)
+		{
+			$config = array_merge($defaultConfig, $config);
+		}
+		if (empty($config))
+		{
+			$config = $defaultConfig;
+		}
 		//error_log(__METHOD__.__LINE__.array2string($config));
 		return $htmLawed->egw_htmLawed($html,$config,$spec);
 	}
@@ -1611,9 +1770,13 @@ 
 				// mobile FF 24 on Android does NOT honor CSP!
 				html::$user_agent == 'firefox' && !html::$ua_mobile && html::$ua_version >= 24 ||
 				html::$user_agent == 'safari' && !html::$ua_mobile && html::$ua_version >= 536 ||	// OS X
-				html::$user_agent == 'safari' && html::$ua_mobile && html::$ua_version >= 9537)	// iOS 7
+				html::$user_agent == 'safari' && html::$ua_mobile && html::$ua_version >= 9537)
+			{
+				// iOS 7
 			{
-				$csp = "script-src 'none'";	// forbid to execute any javascript
+				$csp = "script-src 'none'";
+			}
+			// forbid to execute any javascript
 				header("Content-Security-Policy: $csp");
 				header("X-Webkit-CSP: $csp");	// Chrome: <= 24, Safari incl. iOS
 				//header("X-Content-Security-Policy: $csp");	// FF <= 22
@@ -1627,7 +1790,10 @@ 
 		}
 		if ($no_content_type)
 		{
-			if ($force_download) self::content_disposition_header(egw_vfs::basename($path), $force_download);
+			if ($force_download)
+			{
+				self::content_disposition_header(egw_vfs::basename($path), $force_download);
+			}
 		}
 		else
 		{
@@ -1746,7 +1912,10 @@ 
 	{
 		$ct=0;
 		$newStyle = null;
-		if (stripos($html,'<style')!==false)  $ct = preg_match_all('#<style(?:\s.*)?>(.+)</style>#isU', $html, $newStyle);
+		if (stripos($html,'<style')!==false)
+		{
+			$ct = preg_match_all('#<style(?:\s.*)?>(.+)</style>#isU', $html, $newStyle);
+		}
 		if ($ct>0)
 		{
 			//error_log(__METHOD__.__LINE__.array2string($newStyle[0]));
@@ -1780,7 +1949,11 @@ 
 		// CSS Security
 		// http://code.google.com/p/browsersec/wiki/Part1#Cascading_stylesheets
 		$css = preg_replace('/(javascript|expession|-moz-binding)/i','',$style);
-		if (stripos($css,'script')!==false) translation::replaceTagsCompletley($css,'script'); // Strip out script that may be included
+		if (stripos($css,'script')!==false)
+		{
+			translation::replaceTagsCompletley($css,'script');
+		}
+		// Strip out script that may be included
 		// we need this, as styledefinitions are enclosed with curly brackets; and template stuff tries to replace everything between curly brackets that is having no horizontal whitespace
 		// as the comments as <!-- styledefinition --> in stylesheet are outdated, and ck-editor does not understand it, we remove it
 		$css_no_comment = str_replace(array(':','<!--','-->'),array(': ','',''),$css);

phpgwapi/inc/class.ischedule_client.inc.php

Doc Comments +4 added lines, -11 removed lines

@@ -68,8 +68,7 @@ 
 	/**
 	 * Constructor
 	 *
-	 * @param string|array $recipients=null recipient email-address(es)
-	 * @param string $url=null ischedule url, if it should NOT be discovered
+	 * @param string|array $recipients recipient email-address(es)
 	 * @throws Exception in case of an error or discovery failure
 	 */
 	public function __construct($recipients, $url=null)
@@ -121,8 +120,7 @@ 
 	 * @param string|array $recipients (array of) mailto urls (from same domain!)
 	 * @param int $start starttime
 	 * @param int $end endtime
-	 * @param string $uid=null
-	 * @param string $originator=null default current user's email
+	 * @param string $originator default current user's email
 	 * @return array with values for keys 'schedule-response' or 'error'
 	 * @throws Exception if discovery of recipient(s) fails
 	 */
@@ -190,7 +188,7 @@ 
 	 * Set originator and (optional) DKIM private key
 	 *
 	 * @param string $originator
-	 * @param string $dkim_private_key=null
+	 * @param string $dkim_private_key
 	 * @throws Exception for invalid / not an email originator
 	 */
 	public function setOriginator($originator, $dkim_private_key=null)
@@ -279,8 +277,7 @@ 
 	 *
 	 * @param string $content
 	 * @param string $content_type
-	 * @param boolean $debug=false true echo request before posting
-	 * @param int $max_redirect=3 maximum number of redirect before failing
+	 * @param int $max_redirect maximum number of redirect before failing
 	 * @return string
 	 * @throws Exception with http status code and message, if server responds other then 2xx
 	 */
@@ -366,10 +363,7 @@ 
 	 *
 	 * @param array $headers name => value pairs, names as in $sign_headers
 	 * @param string $body
-	 * @param string $selector='calendar'
-	 * @param string $sign_headers='iSchedule-Version:Content-Type:Originator:Recipient'
 	 * @param int $expires seconds the signature is valid, default 300
-	 * @param boolean $fold=false true: return folded signature, false: return a single line
 	 * @return string DKIM-Signature: ...
 	 */
 	public function dkim_sign(array $headers, $body, $selector='calendar',$sign_headers=self::DKIM_HEADERS,$expires=300,$fold=false)
@@ -418,7 +412,6 @@ 
 	/**
 	 * Query capabilities of iSchedule server
 	 *
-	 * @param string $name=null name of capability to return, default null to return internal array with all capabilities
 	 * @return mixed
 	 * @throws Exception in case of an error or discovery failure
 	 */

Indentation +19 added lines, -19 removed lines

@@ -316,15 +316,15 @@ 
 		$header_string .= $this->dkim_sign($headers, $content)."\r\n";
 
 		$opts = array('http' =>
-		    array(
-		        'method'  => 'POST',
-		        'header'  => $header_string,
-		    	'user_agent' => $user_agent,
-		    	//'follow_location' => 1,	// default 1=follow, but only for GET, not POST!
-		        //'timeout' => $timeout,	// max timeout in seconds (float)
-		        'content' => $content,
-		    	'ignore_errors' => true,	// return response, even for http-status != 2xx
-		    )
+			array(
+				'method'  => 'POST',
+				'header'  => $header_string,
+				'user_agent' => $user_agent,
+				//'follow_location' => 1,	// default 1=follow, but only for GET, not POST!
+				//'timeout' => $timeout,	// max timeout in seconds (float)
+				'content' => $content,
+				'ignore_errors' => true,	// return response, even for http-status != 2xx
+			)
 		);
 
 		if ($debug) echo "POST $this->url HTTP/1.1\n$header_string\n$content\n";
@@ -388,19 +388,19 @@ 
 		// generate DKIM signature according to iSchedule spec
 		$dkim = $mds->getDKIM(implode(':', $header_names), $header_values, $body, 'ischedule-relaxed/simple', 'rsa-sha256',
 			"DKIM-Signature: ".
-	                "v=1; ".          // DKIM Version
-	                "a=\$a; ".        // The algorithm used to generate the signature "rsa-sha1"
+					"v=1; ".          // DKIM Version
+					"a=\$a; ".        // The algorithm used to generate the signature "rsa-sha1"
 					"q=private-exchange:dns/txt:http/well-known; ".	// how to fetch public key: dns/txt, http/well-known or private-exchange
 					"x=".(time()+$expires)."; ".        // how long request will be valid as timestamp
 					// end iSchedule specific
-	                "s=\$s; ".        // The selector subdividing the namespace for the "d=" (domain) tag
-	                "d=\$d; ".        // The domain of the signing entity
-	                "l=\$l; ".        // Canonicalizated Body length count
-	                "t=\$t; ".        // Signature Timestamp
-	                "c=\$c; ".        // Message (Headers/Body) Canonicalization "relaxed/relaxed"
-	                "h=\$h; ".        // Signed header fields
-	                "bh=\$bh;\r\n\t". // The hash of the canonicalized body part of the message
-	                "b=");             // The signature data (Empty because we will calculate it later));
+					"s=\$s; ".        // The selector subdividing the namespace for the "d=" (domain) tag
+					"d=\$d; ".        // The domain of the signing entity
+					"l=\$l; ".        // Canonicalizated Body length count
+					"t=\$t; ".        // Signature Timestamp
+					"c=\$c; ".        // Message (Headers/Body) Canonicalization "relaxed/relaxed"
+					"h=\$h; ".        // Signed header fields
+					"bh=\$bh;\r\n\t". // The hash of the canonicalized body part of the message
+					"b=");             // The signature data (Empty because we will calculate it later));
 
 		// as we do http, no need to fold dkim, in fact recommendation is not to
 		if (!$fold) $dkim = str_replace(array(";\r\n\t", "\r\n\t"), array('; ', ''), $dkim);

Spacing +37 added lines, -37 removed lines

@@ -72,7 +72,7 @@ 
 	 * @param string $url=null ischedule url, if it should NOT be discovered
 	 * @throws Exception in case of an error or discovery failure
 	 */
-	public function __construct($recipients, $url=null)
+	public function __construct($recipients, $url = null)
 	{
 		$this->recipients = (array)$recipients;
 		$this->originator = 'mailto:'.$GLOBALS['egw_info']['user']['account_email'];
@@ -126,24 +126,24 @@ 
 	 * @return array with values for keys 'schedule-response' or 'error'
 	 * @throws Exception if discovery of recipient(s) fails
 	 */
-	public static function freebusy_request($recipients, $start, $end, $uid=null, $originator=null)
+	public static function freebusy_request($recipients, $start, $end, $uid = null, $originator = null)
 	{
 		$client = new ischedule_client($recipients);
 		if ($originator) $client->setOriginator($originator);
 
 		$vcal = new Horde_iCalendar;
-		$vcal->setAttribute('PRODID','-//EGroupware//NONSGML EGroupware Calendar '.$GLOBALS['egw_info']['apps']['calendar']['version'].'//'.
+		$vcal->setAttribute('PRODID', '-//EGroupware//NONSGML EGroupware Calendar '.$GLOBALS['egw_info']['apps']['calendar']['version'].'//'.
 			strtoupper($GLOBALS['egw_info']['user']['preferences']['common']['lang']));
-		$vcal->setAttribute('VERSION','2.0');
-		$vcal->setAttribute('METHOD',$method='REQUEST');
+		$vcal->setAttribute('VERSION', '2.0');
+		$vcal->setAttribute('METHOD', $method = 'REQUEST');
 
-		$vfreebusy = Horde_iCalendar::newComponent($component='VFREEBUSY', $vcal);
+		$vfreebusy = Horde_iCalendar::newComponent($component = 'VFREEBUSY', $vcal);
 		if ($uid) $vfreebusy->setAttribute('UID', $uid);
 		$vfreebusy->setAttribute('DTSTAMP', time());
 		$vfreebusy->setAttribute('DTSTART', $start);
 		$vfreebusy->setAttribute('DTEND', $end);
 		$vfreebusy->setAttribute('ORGANIZER', $client->originator);
-		foreach($client->recipients as $recipient)
+		foreach ($client->recipients as $recipient)
 		{
 			$vfreebusy->setAttribute('ATTENDEE', $recipient);
 		}
@@ -193,7 +193,7 @@ 
 	 * @param string $dkim_private_key=null
 	 * @throws Exception for invalid / not an email originator
 	 */
-	public function setOriginator($originator, $dkim_private_key=null)
+	public function setOriginator($originator, $dkim_private_key = null)
 	{
 		if (!preg_match(self::EMAIL_PREG, $originator))
 		{
@@ -224,10 +224,10 @@ 
 		if (isset(self::$domain2url[$domain])) return self::$domain2url[$domain];
 
 		$d = $domain;
-		for($n = 0; $n < 3; ++$n)
+		for ($n = 0; $n < 3; ++$n)
 		{
-			if (!($records = dns_get_record($host='_ischedules._tcp.'.$d, DNS_SRV+DNS_TXT)) &&
-				!($records = dns_get_record($host='_ischedule._tcp.'.$d, DNS_SRV+DNS_TXT)))
+			if (!($records = dns_get_record($host = '_ischedules._tcp.'.$d, DNS_SRV + DNS_TXT)) &&
+				!($records = dns_get_record($host = '_ischedule._tcp.'.$d, DNS_SRV + DNS_TXT)))
 			{
 				// try without subdomain(s)
 				$parts = explode('.', $d);
@@ -240,9 +240,9 @@ 
 
 		$path = '/.well-known/ischedule';
 
-		foreach($records as $record)
+		foreach ($records as $record)
 		{
-			switch($record['type'])
+			switch ($record['type'])
 			{
 				case 'SRV':
 					// for multiple SRV records we use the one with smallest priority and heighest weight
@@ -284,7 +284,7 @@ 
 	 * @return string
 	 * @throws Exception with http status code and message, if server responds other then 2xx
 	 */
-	public function post_msg($content, $content_type, $debug=false, $max_redirect=3)
+	public function post_msg($content, $content_type, $debug = false, $max_redirect = 3)
 	{
 		if (empty($this->dkim_private_key))
 		{
@@ -301,14 +301,14 @@ 
 			'Content-Type' => $content_type,
 			'Originator' => $this->originator,
 			'Recipient' => $this->recipients,
-			'Cache-Control' => 'no-cache, no-transform',	// required by iSchedule spec
+			'Cache-Control' => 'no-cache, no-transform', // required by iSchedule spec
 			'User-Agent' => $user_agent,
 			'Content-Length' => bytes($content),
 		);
 		$header_string = '';
-		foreach($headers as $name => $value)
+		foreach ($headers as $name => $value)
 		{
-			foreach((array)$value as $val)
+			foreach ((array)$value as $val)
 			{
 				$header_string .= $name.': '.$val."\r\n";
 			}
@@ -323,7 +323,7 @@ 
 		    	//'follow_location' => 1,	// default 1=follow, but only for GET, not POST!
 		        //'timeout' => $timeout,	// max timeout in seconds (float)
 		        'content' => $content,
-		    	'ignore_errors' => true,	// return response, even for http-status != 2xx
+		    	'ignore_errors' => true, // return response, even for http-status != 2xx
 		    )
 		);
 
@@ -336,7 +336,7 @@ 
 		{
 			if ($max_redirect && $code[0] === '3')
 			{
-				foreach($http_response_header as $header)
+				foreach ($http_response_header as $header)
 				{
 					if (stripos($header, 'location:') === 0)
 					{
@@ -348,7 +348,7 @@ 
 						}
 						$this->url = $location;
 						// follow redirect
-						return $this->post_msg($content, $content_type, $debug, $max_redirect-1);
+						return $this->post_msg($content, $content_type, $debug, $max_redirect - 1);
 					}
 				}
 			}
@@ -372,12 +372,12 @@ 
 	 * @param boolean $fold=false true: return folded signature, false: return a single line
 	 * @return string DKIM-Signature: ...
 	 */
-	public function dkim_sign(array $headers, $body, $selector='calendar',$sign_headers=self::DKIM_HEADERS,$expires=300,$fold=false)
+	public function dkim_sign(array $headers, $body, $selector = 'calendar', $sign_headers = self::DKIM_HEADERS, $expires = 300, $fold = false)
 	{
 		$header_values = $header_names = array();
-		foreach(explode(':', $sign_headers) as $header)
+		foreach (explode(':', $sign_headers) as $header)
 		{
-			foreach((array)$headers[$header] as $value)
+			foreach ((array)$headers[$header] as $value)
 			{
 				$header_values[] = $header.': '.$value;
 				$header_names[] = $header;
@@ -388,19 +388,19 @@ 
 		// generate DKIM signature according to iSchedule spec
 		$dkim = $mds->getDKIM(implode(':', $header_names), $header_values, $body, 'ischedule-relaxed/simple', 'rsa-sha256',
 			"DKIM-Signature: ".
-	                "v=1; ".          // DKIM Version
-	                "a=\$a; ".        // The algorithm used to generate the signature "rsa-sha1"
-					"q=private-exchange:dns/txt:http/well-known; ".	// how to fetch public key: dns/txt, http/well-known or private-exchange
-					"x=".(time()+$expires)."; ".        // how long request will be valid as timestamp
+	                "v=1; ".// DKIM Version
+	                "a=\$a; ".// The algorithm used to generate the signature "rsa-sha1"
+					"q=private-exchange:dns/txt:http/well-known; ".// how to fetch public key: dns/txt, http/well-known or private-exchange
+					"x=".(time() + $expires)."; ".// how long request will be valid as timestamp
 					// end iSchedule specific
-	                "s=\$s; ".        // The selector subdividing the namespace for the "d=" (domain) tag
-	                "d=\$d; ".        // The domain of the signing entity
-	                "l=\$l; ".        // Canonicalizated Body length count
-	                "t=\$t; ".        // Signature Timestamp
-	                "c=\$c; ".        // Message (Headers/Body) Canonicalization "relaxed/relaxed"
-	                "h=\$h; ".        // Signed header fields
-	                "bh=\$bh;\r\n\t". // The hash of the canonicalized body part of the message
-	                "b=");             // The signature data (Empty because we will calculate it later));
+	                "s=\$s; ".// The selector subdividing the namespace for the "d=" (domain) tag
+	                "d=\$d; ".// The domain of the signing entity
+	                "l=\$l; ".// Canonicalizated Body length count
+	                "t=\$t; ".// Signature Timestamp
+	                "c=\$c; ".// Message (Headers/Body) Canonicalization "relaxed/relaxed"
+	                "h=\$h; ".// Signed header fields
+	                "bh=\$bh;\r\n\t".// The hash of the canonicalized body part of the message
+	                "b="); // The signature data (Empty because we will calculate it later));
 
 		// as we do http, no need to fold dkim, in fact recommendation is not to
 		if (!$fold) $dkim = str_replace(array(";\r\n\t", "\r\n\t"), array('; ', ''), $dkim);
@@ -422,7 +422,7 @@ 
 	 * @return mixed
 	 * @throws Exception in case of an error or discovery failure
 	 */
-	public function capabilities($name=null)
+	public function capabilities($name = null)
 	{
 		if (!isset($this->capabilities))
 		{
@@ -489,7 +489,7 @@ 
 					}
 					if ($xml->hasAttributes)
 					{
-						while($xml->moveToNextAttribute())
+						while ($xml->moveToNextAttribute())
 						{
 							if ($xml->name != 'name')
 					   	{

Braces +51 added lines, -14 removed lines

@@ -104,7 +104,10 @@ 
 		{
 			return false;
 		}
-		if (strpos($domain, '@') !== false) list(, $domain) = explode('@', $domain);
+		if (strpos($domain, '@') !== false)
+		{
+			list(, $domain) = explode('@', $domain);
+		}
 
 		try {
 			$url = self::discover($domain);
@@ -129,7 +132,10 @@ 
 	public static function freebusy_request($recipients, $start, $end, $uid=null, $originator=null)
 	{
 		$client = new ischedule_client($recipients);
-		if ($originator) $client->setOriginator($originator);
+		if ($originator)
+		{
+			$client->setOriginator($originator);
+		}
 
 		$vcal = new Horde_iCalendar;
 		$vcal->setAttribute('PRODID','-//EGroupware//NONSGML EGroupware Calendar '.$GLOBALS['egw_info']['apps']['calendar']['version'].'//'.
@@ -138,7 +144,10 @@ 
 		$vcal->setAttribute('METHOD',$method='REQUEST');
 
 		$vfreebusy = Horde_iCalendar::newComponent($component='VFREEBUSY', $vcal);
-		if ($uid) $vfreebusy->setAttribute('UID', $uid);
+		if ($uid)
+		{
+			$vfreebusy->setAttribute('UID', $uid);
+		}
 		$vfreebusy->setAttribute('DTSTAMP', time());
 		$vfreebusy->setAttribute('DTSTART', $start);
 		$vfreebusy->setAttribute('DTEND', $end);
@@ -221,7 +230,10 @@ 
 			'http' => 80,
 		);
 
-		if (isset(self::$domain2url[$domain])) return self::$domain2url[$domain];
+		if (isset(self::$domain2url[$domain]))
+		{
+			return self::$domain2url[$domain];
+		}
 
 		$d = $domain;
 		for($n = 0; $n < 3; ++$n)
@@ -231,12 +243,18 @@ 
 			{
 				// try without subdomain(s)
 				$parts = explode('.', $d);
-				if (count($parts) < 3) break;
+				if (count($parts) < 3)
+				{
+					break;
+				}
 				array_shift($parts);
 				$d = implode('.', $parts);
 			}
 		}
-		if (!$records) throw new Exception("Could not discover iSchedule service for domain '$domain'!");
+		if (!$records)
+		{
+			throw new Exception("Could not discover iSchedule service for domain '$domain'!");
+		}
 
 		$path = '/.well-known/ischedule';
 
@@ -254,11 +272,17 @@ 
 					break;
 
 				case 'TXT':
-					if (strpos($record['txt'], 'path=') === 0) $path = substr($record['txt'], 5);
+					if (strpos($record['txt'], 'path=') === 0)
+					{
+						$path = substr($record['txt'], 5);
+					}
 					break;
 			}
 		}
-		if (!isset($srv)) throw new Exception("Could not discover iSchedule service for domain '$domain'!");
+		if (!isset($srv))
+		{
+			throw new Exception("Could not discover iSchedule service for domain '$domain'!");
+		}
 
 		$url = strpos($host, '_ischedules') === 0 ? 'https' : 'http';
 		if ($scheme2port[$url] == $srv['port'])
@@ -327,7 +351,10 @@ 
 		    )
 		);
 
-		if ($debug) echo "POST $this->url HTTP/1.1\n$header_string\n$content\n";
+		if ($debug)
+		{
+			echo "POST $this->url HTTP/1.1\n$header_string\n$content\n";
+		}
 
 		// need to suppress warning, if http-status not 2xx
 		$response = @file_get_contents($this->url, false, stream_context_create($opts));
@@ -352,9 +379,15 @@ 
 					}
 				}
 			}
-			if ($debug && $http_response_header) echo implode("\r\n", $http_response_header)."\r\n\r\n".$response;
+			if ($debug && $http_response_header)
+			{
+				echo implode("\r\n", $http_response_header)."\r\n\r\n".$response;
+			}
 
-			if (preg_match('|<response-description>(.*)</response-description>|', $response, $matches)) $message .= ': '.$matches[1];
+			if (preg_match('|<response-description>(.*)</response-description>|', $response, $matches))
+			{
+				$message .= ': '.$matches[1];
+			}
 
 			throw new Exception($message, $code);
 		}
@@ -403,7 +436,10 @@ 
 	                "b=");             // The signature data (Empty because we will calculate it later));
 
 		// as we do http, no need to fold dkim, in fact recommendation is not to
-		if (!$fold) $dkim = str_replace(array(";\r\n\t", "\r\n\t"), array('; ', ''), $dkim);
+		if (!$fold)
+		{
+			$dkim = str_replace(array(";\r\n\t", "\r\n\t"), array('; ', ''), $dkim);
+		}
 
 		return $dkim;
 	}
@@ -456,7 +492,8 @@ 
 	{
 		while ($xml->read())
 		{
-			switch ($xml->nodeType) {
+			switch ($xml->nodeType)
+			{
 				case XMLReader::END_ELEMENT:
 					return $target;
 				case XMLReader::ELEMENT:
@@ -492,7 +529,7 @@ 
 						while($xml->moveToNextAttribute())
 						{
 							if ($xml->name != 'name')
-					   	{
+							{
 						   		$t['@'.$xml->name] = $xml->value;
 							}
 						}

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

@@ -327,7 +327,7 @@
 		    )
 		);
 
-		if ($debug) echo "POST $this->url HTTP/1.1\n$header_string\n$content\n";
+		if ($debug) echo "post $this->url HTTP/1.1\n$header_string\n$content\n";
 
 		// need to suppress warning, if http-status not 2xx
 		$response = @file_get_contents($this->url, false, stream_context_create($opts));

phpgwapi/inc/class.ischedule_server.inc.php

Doc Comments +3 added lines, -3 removed lines

@@ -320,7 +320,7 @@ 
 	 *
 	 * @param array $event
 	 * @param calendar_ical $handler
-	 * @param string $component
+	 * @param Horde_iCalendar_vevent $component
 	 * @param XMLWriter $xml
 	 */
 	function vevent(array $event, calendar_ical $handler, Horde_iCalendar_vevent $component, XMLWriter $xml)
@@ -636,7 +636,7 @@ 
 	 *
 	 * @param string $d domain
 	 * @param string $s selector
-	 * @return string|boolean string with (full) public key or false if not found or other error retrieving it
+	 * @return false|string string with (full) public key or false if not found or other error retrieving it
 	 */
 	public static function well_known_pubkey($d, $s)
 	{
@@ -653,7 +653,7 @@ 
 	 *
 	 * @param string $d domain
 	 * @param string $s selector
-	 * @return string|boolean string with (full) public key or false if not found or other error retrieving it
+	 * @return false|string string with (full) public key or false if not found or other error retrieving it
 	 */
 	public function dns_txt_pubkey($d, $s)
 	{

Spacing +53 added lines, -53 removed lines

@@ -71,7 +71,7 @@ 
 		// get raw request body
 		$this->request = file_get_contents('php://input');
 
-		switch($_SERVER['REQUEST_METHOD'])
+		switch ($_SERVER['REQUEST_METHOD'])
 		{
 			case 'GET':
 				$this->get();
@@ -154,11 +154,11 @@ 
 	{
 		// get and verify required headers
 		$headers = array();
-		foreach($_SERVER as $name => $value)
+		foreach ($_SERVER as $name => $value)
 		{
 			$name = strtolower(str_replace('_', '-', $name));
 			list($first, $rest) = explode('-', $name, 2);
-			switch($first)
+			switch ($first)
 			{
 				case 'content':
 					$headers[$name] = $value;
@@ -175,7 +175,7 @@ 
 			{
 				$error = 'originator-missing';
 			}
-			elseif(in_array('recipient', $missing))
+			elseif (in_array('recipient', $missing))
 			{
 				$error = 'recipient-missing';
 			}
@@ -183,7 +183,7 @@ 
 			{
 				$error = 'invalid-scheduling-message';
 			}
-			throw new Exception ("Bad Request: $error: missing required headers: ".implode(', ', $missing), 400);
+			throw new Exception("Bad Request: $error: missing required headers: ".implode(', ', $missing), 400);
 		}
 
 		// validate dkim signature
@@ -228,15 +228,15 @@ 
 		// ToDo: no component or method in Content-Type should give an "invalid-scheduling-message" error
 		// only unsupported (not in capablities) component should give "invalid-caledar-data-type"
 		if (!preg_match('/component=([^;]+)/i', $headers['content-type'], $matches) ||
-			(!in_array($component=strtoupper($matches[1]), self::$supported_components)))
+			(!in_array($component = strtoupper($matches[1]), self::$supported_components)))
 		{
-			throw new Exception ('Bad Request: invalid-calendar-data-type: missing or unsupported component in Content-Type header', 400);
+			throw new Exception('Bad Request: invalid-calendar-data-type: missing or unsupported component in Content-Type header', 400);
 		}
 		if (!preg_match('/method=([^;]+)/i', $headers['content-type'], $matches) ||
-			(!isset(self::$supported_method2origin_requirement[$method=strtoupper($matches[1])])) ||
+			(!isset(self::$supported_method2origin_requirement[$method = strtoupper($matches[1])])) ||
 			$component == 'VFREEBUSY' && $method != 'REQUEST')
 		{
-			throw new Exception ('Bad Request: missing or unsupported method in Content-Type header', 400);
+			throw new Exception('Bad Request: missing or unsupported method in Content-Type header', 400);
 		}
 		// parse iCal
 		// code copied from calendar_groupdav::outbox_freebusy_request for now
@@ -248,11 +248,11 @@ 
 		}
 		$version = $vcal->getAttribute('VERSION');
 		$handler = new calendar_ical();
-		$handler->setSupportedFields('GroupDAV',$this->agent);
-		$handler->calendarOwner = $handler->user = 0;	// to NOT default owner/organizer to something
+		$handler->setSupportedFields('GroupDAV', $this->agent);
+		$handler->calendarOwner = $handler->user = 0; // to NOT default owner/organizer to something
 		if (!($vcal_comp = $vcal->getComponent(0)) ||
 			!($event = $handler->vevent2egw($vcal_comp, $version, $handler->supportedFields,
-				$principalURL='', $check_component='Horde_iCalendar_'.strtolower($component))))
+				$principalURL = '', $check_component = 'Horde_iCalendar_'.strtolower($component))))
 		{
 			throw new Exception('Bad Request: invalid-calendar-data: Failed converting iCal', 400);
 		}
@@ -262,7 +262,7 @@ 
 		if (isset($originator_requirement))
 		{
 			$matches = false;
-			foreach($originator_requirement as $requirement)
+			foreach ($originator_requirement as $requirement)
 			{
 				$originator = $headers['originator'];
 				if (stripos($originator, 'mailto:') === 0) $originator = substr($originator, 7);
@@ -276,7 +276,7 @@ 
 					 	in_array($originator_account_id, $event['participants'])))
 			 	{
 			 		$matches = true;
-			 		break;	// no need to try further as we OR
+			 		break; // no need to try further as we OR
 			 	}
 			}
 			if (!$matches)
@@ -289,9 +289,9 @@ 
 		$xml->openMemory();
 		$xml->setIndent(true);
 		$xml->startDocument('1.0', 'UTF-8');
-		$xml->startElementNs(null, 'schedule-response', self::ISCHEDULE);	// null = no prefix
+		$xml->startElementNs(null, 'schedule-response', self::ISCHEDULE); // null = no prefix
 
-		switch($component)
+		switch ($component)
 		{
 			case 'VFREEBUSY':
 				$this->vfreebusy($event, $handler, $vcal_comp, $xml);
@@ -302,10 +302,10 @@ 
 				break;
 
 			default:
-				throw new Exception ('Bad Request: invalid-calendar-data-type: not implemented', 400);
+				throw new Exception('Bad Request: invalid-calendar-data-type: not implemented', 400);
 		}
 
-		$xml->endElement();	// schedule-response
+		$xml->endElement(); // schedule-response
 		$xml->endDocument();
 
 		header('Content-Type: text/xml; charset=UTF-8');
@@ -331,11 +331,11 @@ 
 		$handler->importVCal($vCalendar, $eventId,
 			self::etag2value($this->http_if_match), false, 0, $this->groupdav->current_user_principal, $user, $charset, $id);
 
-		foreach($event['participants'] as $uid => $status)
+		foreach ($event['participants'] as $uid => $status)
 		{
 			$xml->startElement('response');
 
-			$xml->writeElement('recipient', $attendee=array_shift($attendees));	// iSchedule has not DAV:href!
+			$xml->writeElement('recipient', $attendee = array_shift($attendees)); // iSchedule has not DAV:href!
 
 			if (is_numeric($uid))
 			{
@@ -347,7 +347,7 @@ 
 				$xml->writeElement('request-status', '3.7;Invalid Calendar User');
 				$xml->writeElement('responsedescription', 'Recipient not a local user');
 			}
-			$xml->endElement();	// response
+			$xml->endElement(); // response
 		}
 	}
 
@@ -364,11 +364,11 @@ 
 		$organizer = $component->getAttribute('ORGANIZER');
 		$attendees = (array)$component->getAttribute('ATTENDEE');
 
-		foreach($attendees as $attendee)
+		foreach ($attendees as $attendee)
 		{
 			$xml->startElement('response');
 
-			$xml->writeElement('recipient', $attendee);	// iSchedule has not DAV:href!
+			$xml->writeElement('recipient', $attendee); // iSchedule has not DAV:href!
 
 			if (stripos($attendee, 'mailto:') === 0 &&
 				($uid = $GLOBALS['egw']->accounts->name2id(substr($attendee, 7), 'account_email')))
@@ -385,7 +385,7 @@ 
 			{
 				$xml->writeElement('request-status', '3.7;Invalid Calendar User');
 			}
-			$xml->endElement();	// response
+			$xml->endElement(); // response
 		}
 	}
 	/**
@@ -408,7 +408,7 @@ 
 	 * @param string &$error=null error if false returned
 	 * @return boolean true if signature could be validated, false otherwise
 	 */
-	public static function dkim_validate(array $headers, $body, &$error=null)
+	public static function dkim_validate(array $headers, $body, &$error = null)
 	{
 		// parse dkim signature, after unfolding it
 		if (!isset($headers['dkim-signature']) ||
@@ -437,7 +437,7 @@ 
 		// create headers array, h tag can contain whitespace, which need to be removed
 		$dkim_headers = array();
 		$check = $headers;
-		foreach(explode(':', strtolower(preg_replace("|\s|", "", $dkim['h']))) as $header)
+		foreach (explode(':', strtolower(preg_replace("|\s|", "", $dkim['h']))) as $header)
 		{
 			// dkim oversigning: ommit not existing headers in signing
 			if (!isset($check[$header])) continue;
@@ -454,7 +454,7 @@ 
 		list($header_canon, $body_canon) = explode('/', isset($dkim['c']) ? $dkim['c'] : 'simple/simple');
 
 		// Canonicalization for Body
-		switch($body_canon)
+		switch ($body_canon)
 		{
 			case 'relaxed':
 				$_b = mailDomainSigner::bodyRelaxCanon($body);
@@ -489,18 +489,18 @@ 
 		}
 
 		// Canonicalization Header Data
-		switch($header_canon)
+		switch ($header_canon)
 		{
 			case 'relaxed':
-				$_unsigned  = mailDomainSigner::headRelaxCanon(implode("\r\n", $dkim_headers). "\r\n".$dkim_unsigned);
+				$_unsigned = mailDomainSigner::headRelaxCanon(implode("\r\n", $dkim_headers)."\r\n".$dkim_unsigned);
 				break;
 
 			case 'ischedule-relaxed':
-				$_unsigned  = mailDomainSigner::headIScheduleRelaxCanon(implode("\r\n", $dkim_headers). "\r\n".$dkim_unsigned);
+				$_unsigned = mailDomainSigner::headIScheduleRelaxCanon(implode("\r\n", $dkim_headers)."\r\n".$dkim_unsigned);
 				break;
 
 			case 'simple':
-				$_unsigned  = mailDomainSigner::headSimpleCanon(implode("\r\n", $dkim_headers). "\r\n".$dkim_unsigned);
+				$_unsigned = mailDomainSigner::headSimpleCanon(implode("\r\n", $dkim_headers)."\r\n".$dkim_unsigned);
 				break;
 
 			default:
@@ -509,9 +509,9 @@ 
 		}
 
 		// fetch public key using method in dkim q
-		foreach(explode(':', $dkim['q']) as $method)
+		foreach (explode(':', $dkim['q']) as $method)
 		{
-			switch($method)
+			switch ($method)
 			{
 				case 'dns/txt':
 					$public_key = self::dns_txt_pubkey($dkim['d'], $dkim['s']);
@@ -543,7 +543,7 @@ 
 		$ok = openssl_verify($_unsigned, base64_decode(preg_replace("|\s|", "", $dkim['b'])), $public_key, $hash_algo);
 		if ($ok != 1) error_log(__METHOD__."() openssl_verify('$_unsigned', ..., '$public_key', '$hash_algo') returned ".array2string($ok));
 
-		switch($ok)
+		switch ($ok)
 		{
 			case -1:
 				$error = 'Error while verifying DKIM';
@@ -671,9 +671,9 @@ 
 	 * @param string $selector
 	 * @return array with values for keys parsed from eg. "v=DKIM1\;k=rsa\;h=sha1\;s=calendar\;t=s\;p=..."
 	 */
-	public static function fetch_dns($domain, $selector='calendar')
+	public static function fetch_dns($domain, $selector = 'calendar')
 	{
-		if (!($records = dns_get_record($host=$selector.'._domainkey.'.$domain, DNS_TXT))) return false;
+		if (!($records = dns_get_record($host = $selector.'._domainkey.'.$domain, DNS_TXT))) return false;
 
 		if (!isset($records[0]['text']) &&
 			!preg_match_all('/[\t\s]*([a-z]+)=([^;]+);?/i', $records[0]['txt'], $matches))
@@ -753,57 +753,57 @@ 
 		$xml->writeElement('serial-number', self::SERIAL);
 
 		$xml->startElement('versions');
-		foreach(self::$supported_versions as $version)
+		foreach (self::$supported_versions as $version)
 		{
 			$xml->writeElement('version', $version);
 		}
-		$xml->endElement();	// versions
+		$xml->endElement(); // versions
 
 		$xml->startElement('scheduling-messages');
-		foreach(self::$supported_components as $component => $methods)
+		foreach (self::$supported_components as $component => $methods)
 		{
 			$xml->startElement('component');
 			$xml->writeAttribute('name', $component);
-			foreach($methods as $method)
+			foreach ($methods as $method)
 			{
 				$xml->startElement('method');
 				$xml->writeAttribute('name', $method);
-				$xml->endElement();	// method
+				$xml->endElement(); // method
 			}
-			$xml->endElement();	// component
+			$xml->endElement(); // component
 		}
-		$xml->endElement();	// scheduling-messages
+		$xml->endElement(); // scheduling-messages
 
 		$xml->startElement('calendar-data-types');
-		foreach(self::$supported_calendar_data_types as $data)
+		foreach (self::$supported_calendar_data_types as $data)
 		{
 			$xml->startElement('calendar-data-type');
-			foreach($data as $name => $value)
+			foreach ($data as $name => $value)
 			{
 				$xml->writeAttribute($name, $value);
 			}
-			$xml->endElement();	// calendar-data-type
+			$xml->endElement(); // calendar-data-type
 		}
-		$xml->endElement();	// calendar-data-types
+		$xml->endElement(); // calendar-data-types
 
 		$xml->startElement('attachments');
-		foreach(self::$supported_attachments as $type)
+		foreach (self::$supported_attachments as $type)
 		{
 			$xml->writeElement($type, '');
 		}
-		$xml->endElement();	// attachments
+		$xml->endElement(); // attachments
 
 		if (!empty($GLOBALS['egw_info']['server']['admin_mails']))
 		{
 			self::$capablities['administrator'] = 'mailto:'.$GLOBALS['egw_info']['server']['admin_mails'];
 		}
-		foreach(self::$capablities as $name => $value)
+		foreach (self::$capablities as $name => $value)
 		{
 			$xml->writeElement($name, $value);
 		}
 
-		$xml->endElement();	// capabilities
-		$xml->endElement();	// query-result
+		$xml->endElement(); // capabilities
+		$xml->endElement(); // query-result
 		$xml->endDocument();
 		$capabilities = $xml->outputMemory();
 
@@ -828,7 +828,7 @@ 
 	public static function exception_handler(Exception $e)
 	{
 		// logging exception as regular egw_execption_hander does
-		_egw_log_exception($e,$headline);
+		_egw_log_exception($e, $headline);
 
 		// exception handler sending message back to the client as http status
 		$code = $e->getCode();

Braces +33 added lines, -9 removed lines

@@ -86,7 +86,10 @@ 
 				header("HTTP/1.1 400 Bad Request");
 		}
 
-		if (self::$request_starttime) self::log_request();
+		if (self::$request_starttime)
+		{
+			self::log_request();
+		}
 	}
 
 	/**
@@ -265,7 +268,10 @@ 
 			foreach($originator_requirement as $requirement)
 			{
 				$originator = $headers['originator'];
-				if (stripos($originator, 'mailto:') === 0) $originator = substr($originator, 7);
+				if (stripos($originator, 'mailto:') === 0)
+				{
+					$originator = substr($originator, 7);
+				}
 
 				if ($requirement == 'ORGANIZER' &&
 					($event['organizer'] == $originator || strpos($event['organizer'], '<'.$originator.'>') !== false) ||
@@ -274,7 +280,7 @@ 
 					// ToDO: Participant could have CN, need to check that too
 					 $originator_account_id = $GLOBALS['egw']->accounts->name2id($originator, 'account_email') &&
 					 	in_array($originator_account_id, $event['participants'])))
-			 	{
+				{
 			 		$matches = true;
 			 		break;	// no need to try further as we OR
 			 	}
@@ -440,7 +446,10 @@ 
 		foreach(explode(':', strtolower(preg_replace("|\s|", "", $dkim['h']))) as $header)
 		{
 			// dkim oversigning: ommit not existing headers in signing
-			if (!isset($check[$header])) continue;
+			if (!isset($check[$header]))
+			{
+				continue;
+			}
 
 			$value = $check[$header];
 			unset($check[$header]);
@@ -529,10 +538,16 @@ 
 					$public_key = false;
 					break;
 			}
-			if ($public_key) break;
+			if ($public_key)
+			{
+				break;
+			}
 		}
 		// for testing purpose allways try private-exchange, if none other match
-		if (!$public_key) $public_key = self::private_exchange_pubkey($dkim['d'], $dkim['s']);
+		if (!$public_key)
+		{
+			$public_key = self::private_exchange_pubkey($dkim['d'], $dkim['s']);
+		}
 
 		if (!$public_key)
 		{
@@ -541,7 +556,10 @@ 
 		}
 		// value of b tag can contain whitespace, which need to be removed
 		$ok = openssl_verify($_unsigned, base64_decode(preg_replace("|\s|", "", $dkim['b'])), $public_key, $hash_algo);
-		if ($ok != 1) error_log(__METHOD__."() openssl_verify('$_unsigned', ..., '$public_key', '$hash_algo') returned ".array2string($ok));
+		if ($ok != 1)
+		{
+			error_log(__METHOD__."() openssl_verify('$_unsigned', ..., '$public_key', '$hash_algo') returned ".array2string($ok));
+		}
 
 		switch($ok)
 		{
@@ -673,7 +691,10 @@ 
 	 */
 	public static function fetch_dns($domain, $selector='calendar')
 	{
-		if (!($records = dns_get_record($host=$selector.'._domainkey.'.$domain, DNS_TXT))) return false;
+		if (!($records = dns_get_record($host=$selector.'._domainkey.'.$domain, DNS_TXT)))
+		{
+			return false;
+		}
 
 		if (!isset($records[0]['text']) &&
 			!preg_match_all('/[\t\s]*([a-z]+)=([^;]+);?/i', $records[0]['txt'], $matches))
@@ -840,7 +861,10 @@ 
 			$description = $error.($description ? ': '.$description : '');
 			$error = 'invalid-scheduling-message';
 		}
-		if (!in_array($code, array(400, 403, 407, 503))) $code = 500;
+		if (!in_array($code, array(400, 403, 407, 503)))
+		{
+			$code = 500;
+		}
 
 		header('HTTP/1.1 '.$code.' '.$http_status, true, $code);
 		header('Content-Type: text/xml; charset=UTF-8');

phpgwapi/inc/class.jscalendar.inc.php

Doc Comments +7 added lines, -14 removed lines

@@ -33,8 +33,7 @@ 
 	/**
 	 * Constructor
 	 *
-	 * @param boolean $do_header=true if true, necessary javascript and css gets loaded, only needed for input
-	 * @param string $path='jscalendar'
+	 * @param boolean $do_header if true, necessary javascript and css gets loaded, only needed for input
 	 * @return jscalendar
 	 */
 	function __construct($do_header=True,$path='jscalendar')
@@ -81,14 +80,14 @@ 
 	 * Creates an inputfield for the jscalendar (returns the necessary html and js)
 	 *
 	 * @param string $name name and id of the input-field (it also names the id of the img $name.'-toggle')
-	 * @param int/string $date date as string or unix timestamp (in server timezone)
-	 * @param int $year=0 if $date is not used
-	 * @param int $month=0 if $date is not used
-	 * @param int $day=0 if $date is not used
+	 * @param boolean $date date as string or unix timestamp (in server timezone)
+	 * @param int $year if $date is not used
+	 * @param int $month if $date is not used
+	 * @param int $day if $date is not used
 	 * @param string $helpmsg='' a helpmessage for the statusline of the browser
 	 * @param string $options='' any other options to the inputfield
-	 * @param boolean $jsreturn=false
-	 * @param boolean $useicon=true true: use icon to trigger popup, false: click into input triggers popup
+	 * @param boolean $jsreturn
+	 * @param boolean $useicon true: use icon to trigger popup, false: click into input triggers popup
 	 * 		the input is made readonly via javascript to NOT trigger mobile devices to display a keyboard!
 	 * @return string html
 	 */
@@ -150,12 +149,10 @@ 
 	 * Flat jscalendar with tooltips and url's for days, weeks and month
 	 *
 	 * @param string $url url to call if user clicks on a date (&date=YYYYmmdd is appended automatically)
-	 * @param string/int $date=null format YYYYmmdd or timestamp
 	 * @param string $weekUrl=''
 	 * @param string $weekTTip=''
 	 * @param string $monthUrl=''
 	 * @param string $monthTTip=''
-	 * @param string $id='calendar-container'
 	 * @return string html
 	 */
 	function flat($url,$date=null,$weekUrl='',$weekTTip='',$monthUrl='',$monthTTip='',$id='calendar-container')
@@ -212,10 +209,6 @@ 
 	 * Converts the date-string back to an array with year, month, day and a timestamp
 	 *
 	 * @param string $datestr content of the inputfield generated by jscalendar::input()
-	 * @param boolean/string $raw='raw' key of the timestamp-field in the returned array or False of no timestamp
-	 * @param string $day='day' keys for the array, eg. to set mday instead of day
-	 * @param string $month='month' keys for the array
-	 * @param string $year='year' keys for the array
 	 * @return array/boolean array with the specified keys and values or false if $datestr == ''
 	 */
 	function input2date($datestr,$raw='raw',$day='day',$month='month',$year='year')

Spacing +32 added lines, -34 removed lines

@@ -37,12 +37,12 @@ 
 	 * @param string $path='jscalendar'
 	 * @return jscalendar
 	 */
-	function __construct($do_header=True,$path='jscalendar')
+	function __construct($do_header = True, $path = 'jscalendar')
 	{
 		$this->jscalendar_url = $GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/js/'.$path;
 		$this->dateformat = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'];
 
-		$args = array_intersect_key($GLOBALS['egw_info']['user']['preferences']['common'],array('lang'=>1,'dateformat'=>1));
+		$args = array_intersect_key($GLOBALS['egw_info']['user']['preferences']['common'], array('lang'=>1, 'dateformat'=>1));
 		if (isset($GLOBALS['egw_info']['flags']['currentapp']))
 		{
 			$args['app'] = $GLOBALS['egw_info']['flags']['currentapp'];
@@ -54,9 +54,9 @@ 
 		if ($do_header)
 		{
 			egw_framework::includeCSS('/phpgwapi/js/jscalendar/calendar-blue.css');
-			egw_framework::validate_file('jscalendar','calendar');
-			$args = array_intersect_key($GLOBALS['egw_info']['user']['preferences']['common'],array('lang'=>1,'dateformat'=>1));
-			egw_framework::validate_file('/phpgwapi/inc/jscalendar-setup.php',$args);
+			egw_framework::validate_file('jscalendar', 'calendar');
+			$args = array_intersect_key($GLOBALS['egw_info']['user']['preferences']['common'], array('lang'=>1, 'dateformat'=>1));
+			egw_framework::validate_file('/phpgwapi/inc/jscalendar-setup.php', $args);
 		}
 	}
 
@@ -69,11 +69,11 @@ 
 	 */
 	function get_javascript()
 	{
-		$args = array_intersect_key($GLOBALS['egw_info']['user']['preferences']['common'],array('lang'=>1,'dateformat'=>1));
+		$args = array_intersect_key($GLOBALS['egw_info']['user']['preferences']['common'], array('lang'=>1, 'dateformat'=>1));
 		return
 '<link rel="stylesheet" type="text/css" media="all" href="'.$this->jscalendar_url.'/calendar-blue.css" title="blue" />
 <script type="text/javascript" src="'.$this->jscalendar_url.'/calendar.js"></script>
-<script type="text/javascript" src="'.egw::link('/phpgwapi/inc/jscalendar-setup.php',$args,false).'"></script>
+<script type="text/javascript" src="'.egw::link('/phpgwapi/inc/jscalendar-setup.php', $args, false).'"></script>
 ';
 	}
 
@@ -92,43 +92,42 @@ 
 	 * 		the input is made readonly via javascript to NOT trigger mobile devices to display a keyboard!
 	 * @return string html
 	 */
-	function input($name,$date,$year=0,$month=0,$day=0,$helpmsg='',$options='',$jsreturn=false,$useicon=true)
+	function input($name, $date, $year = 0, $month = 0, $day = 0, $helpmsg = '', $options = '', $jsreturn = false, $useicon = true)
 	{
 		//echo "<p>jscalendar::input(name='$name', date='$date'='".date('Y-m-d',$date)."', year='$year', month='$month', day='$day')</p>\n";
 
 		if ($date && (is_int($date) || is_numeric($date)))
 		{
-			$year  = (int)adodb_date('Y',$date);
-			$month = (int)adodb_date('n',$date);
-			$day   = (int)adodb_date('d',$date);
+			$year  = (int)adodb_date('Y', $date);
+			$month = (int)adodb_date('n', $date);
+			$day   = (int)adodb_date('d', $date);
 		}
 		if ($year && $month && $day)
 		{
-			$date = adodb_date($this->dateformat,$ts = adodb_mktime(12,0,0,$month,$day,$year));
-			if (strpos($this->dateformat,'M') !== false)
+			$date = adodb_date($this->dateformat, $ts = adodb_mktime(12, 0, 0, $month, $day, $year));
+			if (strpos($this->dateformat, 'M') !== false)
 			{
 				static $substr;
 				if (is_null($substr)) $substr = function_exists('mb_substr') ? 'mb_substr' : 'substr';
 				static $chars_shortcut;
-				if (is_null($chars_shortcut)) $chars_shortcut = (int)lang('3 number of chars for month-shortcut');	// < 0 to take the chars from the end
+				if (is_null($chars_shortcut)) $chars_shortcut = (int)lang('3 number of chars for month-shortcut'); // < 0 to take the chars from the end
 
-				$short = translation::translate($m = adodb_date('M',$ts), null, '*');	// check if we have a translation of the short-cut
-				if ($substr($short,-1) == '*')	// if not generate one by truncating the translation of the long name
+				$short = translation::translate($m = adodb_date('M', $ts), null, '*'); // check if we have a translation of the short-cut
+				if ($substr($short, -1) == '*')	// if not generate one by truncating the translation of the long name
 				{
-					$short = $chars_shortcut > 0 ? $substr(lang(adodb_date('F',$ts)),0,$chars_shortcut) :
-						$substr(lang(adodb_date('F',$ts)),$chars_shortcut);
+					$short = $chars_shortcut > 0 ? $substr(lang(adodb_date('F', $ts)), 0, $chars_shortcut) : $substr(lang(adodb_date('F', $ts)), $chars_shortcut);
 				}
-				$date = str_replace(adodb_date('M',$ts),$short,$date);
+				$date = str_replace(adodb_date('M', $ts), $short, $date);
 			}
 		}
 		if ($helpmsg !== '')
 		{
-			$options .= " onFocus=\"self.status='".addslashes($helpmsg)."'; return true;\"" .
+			$options .= " onFocus=\"self.status='".addslashes($helpmsg)."'; return true;\"".
 			" onBlur=\"self.status=''; return true;\"";
 		}
 
 		$html = '<input type="text" id="'.$name.'" name="'.$name.'" size="10" value="'.htmlspecialchars($date).'"'.$options.'/>
-'.($useicon ? '<img id="'.$name.'-trigger" src="'.common::find_image('phpgwapi','datepopup').'" title="'.lang('Select date').'" style="cursor:pointer; cursor:hand;">' : '');
+'.($useicon ? '<img id="'.$name.'-trigger" src="'.common::find_image('phpgwapi', 'datepopup').'" title="'.lang('Select date').'" style="cursor:pointer; cursor:hand;">' : '');
 
 		$js = '<script type="text/javascript">
 '.(!$useicon ? '	document.getElementById("'.$name.'").readOnly=true;' : '').
@@ -158,12 +157,11 @@ 
 	 * @param string $id='calendar-container'
 	 * @return string html
 	 */
-	function flat($url,$date=null,$weekUrl='',$weekTTip='',$monthUrl='',$monthTTip='',$id='calendar-container')
+	function flat($url, $date = null, $weekUrl = '', $weekTTip = '', $monthUrl = '', $monthTTip = '', $id = 'calendar-container')
 	{
 		if ($date)	// string if format YYYYmmdd or timestamp
 		{
-			$date = is_int($date) ? adodb_date('m/d/Y',$date) :
-				substr($date,4,2).'/'.substr($date,6,2).'/'.substr($date,0,4);
+			$date = is_int($date) ? adodb_date('m/d/Y', $date) : substr($date, 4, 2).'/'.substr($date, 6, 2).'/'.substr($date, 0, 4);
 		}
 		return '
 <div id="'.$id.'"></div>
@@ -218,28 +216,28 @@ 
 	 * @param string $year='year' keys for the array
 	 * @return array/boolean array with the specified keys and values or false if $datestr == ''
 	 */
-	function input2date($datestr,$raw='raw',$day='day',$month='month',$year='year')
+	function input2date($datestr, $raw = 'raw', $day = 'day', $month = 'month', $year = 'year')
 	{
 		//echo "<p>jscalendar::input2date('$datestr') ".print_r($fields,True)."</p>\n";
 		if ($datestr === '')
 		{
 			return False;
 		}
-		$fields = preg_split('/[.\\/-]/',$datestr);
-		foreach(preg_split('/[.\\/-]/',$this->dateformat) as $n => $field)
+		$fields = preg_split('/[.\\/-]/', $datestr);
+		foreach (preg_split('/[.\\/-]/', $this->dateformat) as $n => $field)
 		{
 			if ($field == 'M')
 			{
 				if (!is_numeric($fields[$n]))
 				{
 					$partcial_match = 0;
-					for($i = 1; $i <= 12; $i++)
+					for ($i = 1; $i <= 12; $i++)
 					{
-						$long_name  = lang(adodb_date('F',mktime(12,0,0,$i,1,2000)));
-						$short_name = translation::translate(adodb_date('M',mktime(12,0,0,$i,1,2000)), null, '*');	// do we have a translation of the short-cut
-						if (substr($short_name,-1) == '*')	// if not generate one by truncating the translation of the long name
+						$long_name  = lang(adodb_date('F', mktime(12, 0, 0, $i, 1, 2000)));
+						$short_name = translation::translate(adodb_date('M', mktime(12, 0, 0, $i, 1, 2000)), null, '*'); // do we have a translation of the short-cut
+						if (substr($short_name, -1) == '*')	// if not generate one by truncating the translation of the long name
 						{
-							$short_name = substr($long_name,0,(int) lang('3 number of chars for month-shortcut'));
+							$short_name = substr($long_name, 0, (int)lang('3 number of chars for month-shortcut'));
 						}
 						//echo "<br>checking '".$fields[$n]."' against '$long_name' or '$short_name'";
 						if ($fields[$n] == $long_name || $fields[$n] == $short_name)
@@ -248,7 +246,7 @@ 
 							$fields[$n] = $i;
 							break;
 						}
-						if (@strstr($long_name,$fields[$n]) == $long_name)	// partcial match => multibyte saver
+						if (@strstr($long_name, $fields[$n]) == $long_name)	// partcial match => multibyte saver
 						{
 							$partcial_match = $i;
 						}
@@ -270,7 +268,7 @@ 
 		);
 		if ($raw)
 		{
-			$ret[$raw] = adodb_mktime(12,0,0,$date['m'],$date['d'],$date['Y']);
+			$ret[$raw] = adodb_mktime(12, 0, 0, $date['m'], $date['d'], $date['Y']);
 		}
 		//echo "<p>jscalendar::input2date('$datestr','$raw',$day','$month','$year') = "; print_r($ret); echo "</p>\n";
 

Braces +33 added lines, -8 removed lines

@@ -108,16 +108,26 @@ 
 			if (strpos($this->dateformat,'M') !== false)
 			{
 				static $substr;
-				if (is_null($substr)) $substr = function_exists('mb_substr') ? 'mb_substr' : 'substr';
+				if (is_null($substr))
+				{
+					$substr = function_exists('mb_substr') ? 'mb_substr' : 'substr';
+				}
 				static $chars_shortcut;
-				if (is_null($chars_shortcut)) $chars_shortcut = (int)lang('3 number of chars for month-shortcut');	// < 0 to take the chars from the end
+				if (is_null($chars_shortcut))
+				{
+					$chars_shortcut = (int)lang('3 number of chars for month-shortcut');
+				}
+				// < 0 to take the chars from the end
 
 				$short = translation::translate($m = adodb_date('M',$ts), null, '*');	// check if we have a translation of the short-cut
-				if ($substr($short,-1) == '*')	// if not generate one by truncating the translation of the long name
+				if ($substr($short,-1) == '*')
+				{
+					// if not generate one by truncating the translation of the long name
 				{
 					$short = $chars_shortcut > 0 ? $substr(lang(adodb_date('F',$ts)),0,$chars_shortcut) :
 						$substr(lang(adodb_date('F',$ts)),$chars_shortcut);
 				}
+				}
 				$date = str_replace(adodb_date('M',$ts),$short,$date);
 			}
 		}
@@ -141,7 +151,10 @@ 
 	});
 </script>
 ';
-		if ($jsreturn) return array('html' => $html, 'js' => $js);
+		if ($jsreturn)
+		{
+			return array('html' => $html, 'js' => $js);
+		}
 
 		return $html."\n".$js;
 	}
@@ -160,11 +173,14 @@ 
 	 */
 	function flat($url,$date=null,$weekUrl='',$weekTTip='',$monthUrl='',$monthTTip='',$id='calendar-container')
 	{
-		if ($date)	// string if format YYYYmmdd or timestamp
+		if ($date)
+		{
+			// string if format YYYYmmdd or timestamp
 		{
 			$date = is_int($date) ? adodb_date('m/d/Y',$date) :
 				substr($date,4,2).'/'.substr($date,6,2).'/'.substr($date,0,4);
 		}
+		}
 		return '
 <div id="'.$id.'"></div>
 <script type="text/javascript">
@@ -237,10 +253,13 @@ 
 					{
 						$long_name  = lang(adodb_date('F',mktime(12,0,0,$i,1,2000)));
 						$short_name = translation::translate(adodb_date('M',mktime(12,0,0,$i,1,2000)), null, '*');	// do we have a translation of the short-cut
-						if (substr($short_name,-1) == '*')	// if not generate one by truncating the translation of the long name
+						if (substr($short_name,-1) == '*')
+						{
+							// if not generate one by truncating the translation of the long name
 						{
 							$short_name = substr($long_name,0,(int) lang('3 number of chars for month-shortcut'));
 						}
+						}
 						//echo "<br>checking '".$fields[$n]."' against '$long_name' or '$short_name'";
 						if ($fields[$n] == $long_name || $fields[$n] == $short_name)
 						{
@@ -248,15 +267,21 @@ 
 							$fields[$n] = $i;
 							break;
 						}
-						if (@strstr($long_name,$fields[$n]) == $long_name)	// partcial match => multibyte saver
+						if (@strstr($long_name,$fields[$n]) == $long_name)
+						{
+							// partcial match => multibyte saver
 						{
 							$partcial_match = $i;
 						}
+						}
 					}
-					if ($i > 12 && $partcial_match)	// nothing found, but a partcial match
+					if ($i > 12 && $partcial_match)
+					{
+						// nothing found, but a partcial match
 					{
 						$fields[$n] = $partcial_match;
 					}
+					}
 				}
 				$field = 'm';
 			}

phpgwapi/inc/class.ldap.inc.php

Doc Comments +3 added lines, -3 removed lines

@@ -50,7 +50,7 @@ 
 	/**
 	 * Constructor
 	 *
-	 * @param boolean $exception_on_error=false true: throw Exceptions in ldapConnect instead of echoing error and returning false
+	 * @param boolean $exception_on_error true: throw Exceptions in ldapConnect instead of echoing error and returning false
 	 */
 	function __construct($exception_on_error=false)
 	{
@@ -61,7 +61,7 @@ 
 	/**
 	 * Returns information about connected ldap server
 	 *
-	 * @return ldapserverinfo|null
+	 * @return ldapserverinfo
 	 */
 	function getLDAPServerInfo()
 	{
@@ -178,7 +178,7 @@ 
 	 * @param string $host ldap host
 	 * @param string $dn ldap dn
 	 * @param string $passwd ldap pw
-	 * @return resource|boolean resource from ldap_connect() or false on error
+	 * @return boolean resource from ldap_connect() or false on error
 	 */
 	private function _connect($host, $dn, $passwd)
 	{

Indentation +8 added lines, -8 removed lines

@@ -27,17 +27,17 @@
 class ldap
 {
 	/**
-	* Holds the LDAP link identifier
-	*
-	* @var resource $ds
-	*/
+	 * Holds the LDAP link identifier
+	 *
+	 * @var resource $ds
+	 */
 	var $ds;
 
 	/**
-	* Holds the detected information about the connected ldap server
-	*
-	* @var ldapserverinfo $ldapserverinfo
-	*/
+	 * Holds the detected information about the connected ldap server
+	 *
+	 * @var ldapserverinfo $ldapserverinfo
+	 */
 	var $ldapServerInfo;
 
 	/**

Spacing +19 added lines, -19 removed lines

@@ -45,14 +45,14 @@ 
 	 *
 	 * @var boolean $exception_on_error
 	 */
-	var $exception_on_error=false;
+	var $exception_on_error = false;
 
 	/**
 	 * Constructor
 	 *
 	 * @param boolean $exception_on_error=false true: throw Exceptions in ldapConnect instead of echoing error and returning false
 	 */
-	function __construct($exception_on_error=false)
+	function __construct($exception_on_error = false)
 	{
 		$this->exception_on_error = $exception_on_error;
 		$this->restoreSessionData();
@@ -80,7 +80,7 @@ 
 	 */
 	static function quote($string)
 	{
-		return str_replace(array('\\','*','(',')','\0',' '),array('\\\\','\*','\(','\)','\\0','\20'),$string);
+		return str_replace(array('\\', '*', '(', ')', '\0', ' '), array('\\\\', '\*', '\(', '\)', '\\0', '\20'), $string);
 	}
 
 	/**
@@ -94,7 +94,7 @@ 
 		if (!is_array($ldap)) return false;
 
 		$arr = array();
-		foreach($ldap as $var => $val)
+		foreach ($ldap as $var => $val)
 		{
 			if (is_int($var) || $var == 'count') continue;
 
@@ -125,13 +125,13 @@ 
 	 * @return resource|boolean resource from ldap_connect() or false on error
 	 * @throws egw_exception_assertion_failed 'LDAP support unavailable!' (no ldap extension)
 	 */
-	function ldapConnect($host='', $dn='', $passwd='')
+	function ldapConnect($host = '', $dn = '', $passwd = '')
 	{
-		if(!function_exists('ldap_connect'))
+		if (!function_exists('ldap_connect'))
 		{
 			if ($this->exception_on_error) throw new egw_exception_assertion_failed('LDAP support unavailable!');
 
-			printf('<b>Error: LDAP support unavailable</b><br>',$host);
+			printf('<b>Error: LDAP support unavailable</b><br>', $host);
 			return False;
 		}
 		if (empty($host))
@@ -149,7 +149,7 @@ 
 		{
 			$host = $_SESSION['ldapConnect'][$host];
 		}
-		foreach($hosts=preg_split('/[ ,;]+/', $host) as $h)
+		foreach ($hosts = preg_split('/[ ,;]+/', $host) as $h)
 		{
 			if ($this->_connect($h, $dn, $passwd))
 			{
@@ -157,7 +157,7 @@ 
 				{
 					if (isset($_SESSION))	// store working host as first choice in session
 					{
-						$_SESSION['ldapConnect'][$host] = implode(' ',array_unique(array_merge(array($h),$hosts)));
+						$_SESSION['ldapConnect'][$host] = implode(' ', array_unique(array_merge(array($h), $hosts)));
 					}
 				}
 				return $this->ds;
@@ -182,20 +182,20 @@ 
 	 */
 	private function _connect($host, $dn, $passwd)
 	{
-		if (($use_tls = substr($host,0,6) == 'tls://'))
+		if (($use_tls = substr($host, 0, 6) == 'tls://'))
 		{
-			$port = parse_url($host,PHP_URL_PORT);
-			$host = parse_url($host,PHP_URL_HOST);
+			$port = parse_url($host, PHP_URL_PORT);
+			$host = parse_url($host, PHP_URL_HOST);
 		}
 		// connect to ldap server (never fails, as connection happens in bind!)
-		if(!($this->ds = !empty($port) ? ldap_connect($host, $port) : ldap_connect($host)))
+		if (!($this->ds = !empty($port) ? ldap_connect($host, $port) : ldap_connect($host)))
 		{
 			return False;
 		}
 		// set network timeout to not block for minutes
 		ldap_set_option($this->ds, LDAP_OPT_NETWORK_TIMEOUT, 5);
 
-		if(ldap_set_option($this->ds, LDAP_OPT_PROTOCOL_VERSION, 3))
+		if (ldap_set_option($this->ds, LDAP_OPT_PROTOCOL_VERSION, 3))
 		{
 			$supportedLDAPVersion = 3;
 		}
@@ -206,7 +206,7 @@ 
 		if ($use_tls) ldap_start_tls($this->ds);
 
 		if (!isset($this->ldapServerInfo) ||
-			!is_a($this->ldapServerInfo,'ldapserverinfo') ||
+			!is_a($this->ldapServerInfo, 'ldapserverinfo') ||
 			$this->ldapServerInfo->host != $host)
 		{
 			//error_log("no ldap server info found");
@@ -216,7 +216,7 @@ 
 			$this->saveSessionData();
 		}
 
-		if(!@ldap_bind($this->ds, $dn, $passwd))
+		if (!@ldap_bind($this->ds, $dn, $passwd))
 		{
 			return False;
 		}
@@ -229,7 +229,7 @@ 
 	 */
 	function ldapDisconnect()
 	{
-		if(is_resource($this->ds))
+		if (is_resource($this->ds))
 		{
 			ldap_unbind($this->ds);
 			unset($this->ds);
@@ -244,7 +244,7 @@ 
 	{
 		if (isset($GLOBALS['egw']->session))	// no availible in setup
 		{
-			$this->ldapServerInfo = (array) unserialize($GLOBALS['egw']->session->appsession('ldapServerInfo'));
+			$this->ldapServerInfo = (array)unserialize($GLOBALS['egw']->session->appsession('ldapServerInfo'));
 		}
 	}
 
@@ -255,7 +255,7 @@ 
 	{
 		if (isset($GLOBALS['egw']->session))	// no availible in setup
 		{
-			$GLOBALS['egw']->session->appsession('ldapServerInfo','',serialize($this->ldapServerInfo));
+			$GLOBALS['egw']->session->appsession('ldapServerInfo', '', serialize($this->ldapServerInfo));
 		}
 	}
 }

Braces +36 added lines, -9 removed lines

@@ -91,12 +91,18 @@ 
 	 */
 	static function result2array($ldap)
 	{
-		if (!is_array($ldap)) return false;
+		if (!is_array($ldap))
+		{
+			return false;
+		}
 
 		$arr = array();
 		foreach($ldap as $var => $val)
 		{
-			if (is_int($var) || $var == 'count') continue;
+			if (is_int($var) || $var == 'count')
+			{
+				continue;
+			}
 
 			if (is_array($val) && $val['count'] == 1)
 			{
@@ -104,7 +110,10 @@ 
 			}
 			else
 			{
-				if (is_array($val)) unset($val['count']);
+				if (is_array($val))
+				{
+					unset($val['count']);
+				}
 
 				$arr[$var] = $val;
 			}
@@ -129,7 +138,10 @@ 
 	{
 		if(!function_exists('ldap_connect'))
 		{
-			if ($this->exception_on_error) throw new egw_exception_assertion_failed('LDAP support unavailable!');
+			if ($this->exception_on_error)
+			{
+				throw new egw_exception_assertion_failed('LDAP support unavailable!');
+			}
 
 			printf('<b>Error: LDAP support unavailable</b><br>',$host);
 			return False;
@@ -155,10 +167,13 @@ 
 			{
 				if ($h !== $host)
 				{
-					if (isset($_SESSION))	// store working host as first choice in session
+					if (isset($_SESSION))
+					{
+						// store working host as first choice in session
 					{
 						$_SESSION['ldapConnect'][$host] = implode(' ',array_unique(array_merge(array($h),$hosts)));
 					}
+					}
 				}
 				return $this->ds;
 			}
@@ -167,7 +182,10 @@ 
 				' '.function_backtrace());
 		}
 		// give visible error, only if we cant connect to any ldap server
-		if ($this->exception_on_error) throw new egw_exception_no_permission("Can't connect/bind to LDAP server '$host' and dn='$dn'!");
+		if ($this->exception_on_error)
+		{
+			throw new egw_exception_no_permission("Can't connect/bind to LDAP server '$host' and dn='$dn'!");
+		}
 
 		return false;
 	}
@@ -203,7 +221,10 @@ 
 		{
 			$supportedLDAPVersion = 2;
 		}
-		if ($use_tls) ldap_start_tls($this->ds);
+		if ($use_tls)
+		{
+			ldap_start_tls($this->ds);
+		}
 
 		if (!isset($this->ldapServerInfo) ||
 			!is_a($this->ldapServerInfo,'ldapserverinfo') ||
@@ -242,10 +263,13 @@ 
 	 */
 	function restoreSessionData()
 	{
-		if (isset($GLOBALS['egw']->session))	// no availible in setup
+		if (isset($GLOBALS['egw']->session))
+		{
+			// no availible in setup
 		{
 			$this->ldapServerInfo = (array) unserialize($GLOBALS['egw']->session->appsession('ldapServerInfo'));
 		}
+		}
 	}
 
 	/**
@@ -253,9 +277,12 @@ 
 	 */
 	function saveSessionData()
 	{
-		if (isset($GLOBALS['egw']->session))	// no availible in setup
+		if (isset($GLOBALS['egw']->session))
+		{
+			// no availible in setup
 		{
 			$GLOBALS['egw']->session->appsession('ldapServerInfo','',serialize($this->ldapServerInfo));
 		}
+		}
 	}
 }