EGroupware / egroupware

api/src/Json/Exception/InvalidName.php

Braces +3 added lines, -1 removed lines

@@ -20,4 +20,6 @@
  *
  * As you get this only by an error in the code or during development, the message does not need to be translated
  */
-class InvalidName extends Exception\NoPermission { }
+class InvalidName extends Exception\NoPermission
+{
+}

api/src/Json/Exception.php

Braces +3 added lines, -1 removed lines

@@ -20,4 +20,6 @@
  *
  * As you get this only by an error in the code or during development, the message does not need to be translated
  */
-class Exception extends Api\Exception\WrongParameter { }
+class Exception extends Api\Exception\WrongParameter
+{
+}

api/src/CalDAV/Handler.php

Braces +60 added lines, -15 removed lines

@@ -123,7 +123,10 @@ 
 	function __construct($app, Api\CalDAV $caldav)
 	{
 		$this->app = $app;
-		if (!is_null($caldav->debug)) $this->debug = $caldav->debug;
+		if (!is_null($caldav->debug))
+		{
+			$this->debug = $caldav->debug;
+		}
 		$this->base_uri = $caldav->base_uri;
 		$this->caldav = $caldav;
 
@@ -282,11 +285,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];
@@ -295,12 +304,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';
 			}
 		}
@@ -313,11 +328,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';
@@ -327,17 +348,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';
@@ -376,7 +406,10 @@ 
 
 			if (($ret = $this->get($options, $id ? $id : $this->new_id, $user)) && !empty($options['data']))
 			{
-				if (!$this->caldav->use_compression()) header('Content-Length: '.$this->caldav->bytes($options['data']));
+				if (!$this->caldav->use_compression())
+				{
+					header('Content-Length: '.$this->caldav->bytes($options['data']));
+				}
 				header('Content-Type: '.$options['mimetype']);
 				echo $options['data'];
 			}
@@ -412,7 +445,10 @@ 
 		if (!array_key_exists($app,$handler_cache))
 		{
 			$class = $app.'_groupdav';
-			if (!class_exists($class) && !class_exists($class = __NAMESPACE__.'\\'.ucfirst($app))) return null;
+			if (!class_exists($class) && !class_exists($class = __NAMESPACE__.'\\'.ucfirst($app)))
+			{
+				return null;
+			}
 
 			$handler_cache[$app] = new $class($app, $groupdav);
 		}
@@ -474,7 +510,10 @@ 
 						$matches = null;
 						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':
@@ -575,7 +614,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.'"');
 		}
 
@@ -741,7 +783,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'])

Doc Comments +3 added lines, -4 removed lines

@@ -151,7 +151,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)
 	 * @return array with "files" array with values for keys path and props
 	 */
 	function &propfind_callback($path, array $filter, $start)
@@ -192,7 +192,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*/);
@@ -237,7 +236,7 @@ 
 	 * Get the etag for an entry, can be reimplemented for other algorithm or field names
 	 *
 	 * @param array|int $entry 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)
 	{
@@ -422,7 +421,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()
 	{

Spacing +60 added lines, -60 removed lines

@@ -144,7 +144,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
@@ -156,7 +156,7 @@ 
 	 */
 	function &propfind_callback($path, array $filter, $start)
 	{
-		unset($path, $filter, $start);	// not used, but required by function signature
+		unset($path, $filter, $start); // not used, but required by function signature
 	}
 
 	/**
@@ -167,7 +167,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
@@ -177,7 +177,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
@@ -187,7 +187,7 @@ 
 	 * @param int $user account_id of collection owner
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	abstract function delete(&$options,$id,$user);
+	abstract function delete(&$options, $id, $user);
 
 	/**
 	 * Read an entry
@@ -216,7 +216,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
@@ -227,9 +227,9 @@ 
 	 * @param int $user =null account_id of owner of collection
 	 * @return array
 	 */
-	public function extra_properties(array $props, $displayname, $base_uri=null, $user=null)
+	public function extra_properties(array $props, $displayname, $base_uri = null, $user = null)
 	{
-		unset($displayname, $base_uri, $user);	// not used, but required by function signature
+		unset($displayname, $base_uri, $user); // not used, but required by function signature
 
 		return $props;
 	}
@@ -262,7 +262,7 @@ 
 	 */
 	static function etag2value($etag)
 	{
-		list(,$val) = explode(':',$etag,2);
+		list(,$val) = explode(':', $etag, 2);
 
 		return $val;
 	}
@@ -280,18 +280,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 != Api\Acl::READ && $this->check_access($extra_acl,$entry) === false))
+			($extra_acl != Api\Acl::READ && $this->check_access($extra_acl, $entry) === false))
 		{
 			if ($return_no_access && !is_null($entry))
 			{
@@ -300,7 +300,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';
 			}
 		}
@@ -330,7 +330,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';
@@ -355,7 +355,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'])))
@@ -394,7 +394,7 @@ 
 	 */
 	public function update_tags($entry)
 	{
-		unset($entry);	// not used, but required by function signature
+		unset($entry); // not used, but required by function signature
 	}
 
 	/**
@@ -409,7 +409,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 = __NAMESPACE__.'\\'.ucfirst($app))) return null;
@@ -427,37 +427,37 @@ 
 	 */
 	static function get_agent()
 	{
-		static $agent=null;
+		static $agent = null;
 
 		if (is_null($agent))
 		{
 			$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
-				'caldavsynchronizer'=> 'caldavsynchronizer',	// Outlook CalDAV Synchroniser (https://caldavsynchronizer.org/)
+				'ical4ol'			=> 'ical4ol', // iCal4OL client
+				'evolution'         => 'evolution', // Evolution
+				'thunderbird'       => 'thunderbird', // SOGo connector for addressbook, no Lightning installed
+				'caldavsynchronizer'=> 'caldavsynchronizer', // Outlook CalDAV Synchroniser (https://caldavsynchronizer.org/)
 			) as $pattern => $name)
 			{
-				if (strpos($user_agent,$pattern) !== false)
+				if (strpos($user_agent, $pattern) !== false)
 				{
 					$agent = $name;
 					break;
@@ -513,35 +513,35 @@ 
 	 * @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)
 	{
-		unset($path);	// not used, but required by function signature
+		unset($path); // not used, but required by function signature
 
-		static $grants=null;
+		static $grants = null;
 		if (is_null($grants))
 		{
 			$grants = $this->get_grants();
 		}
 		$priviledes = array('read-current-user-privilege-set' => 'read-current-user-privilege-set');
 
-		if (is_null($user) || $grants[$user] & Api\Acl::READ)
+		if (is_null($user) || $grants[$user]&Api\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] & Api\Acl::ADD)
+		if (is_null($user) || $grants[$user]&Api\Acl::ADD)
 		{
-			$priviledes['bind'] = 'bind';	// PUT for new resources
+			$priviledes['bind'] = 'bind'; // PUT for new resources
 		}
-		if (is_null($user) || $grants[$user] & Api\Acl::EDIT)
+		if (is_null($user) || $grants[$user]&Api\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] & Api\Acl::DELETE)
+		if (is_null($user) || $grants[$user]&Api\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());
@@ -568,7 +568,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
@@ -611,7 +611,7 @@ 
 	 */
 	static function get_settings($hook_data)
 	{
-		unset($hook_data);	// not used, but required by function signature
+		unset($hook_data); // not used, but required by function signature
 
 		return array();
 	}
@@ -631,7 +631,7 @@ 
 		{
 			$props['getetag'] = $this->get_etag($entry);
 		}
-		foreach(array(
+		foreach (array(
 			'getcontenttype' => 'text/calendar',
 			'getlastmodified' => $entry['modified'],
 			'displayname' => $entry['title'],
@@ -669,17 +669,17 @@ 
 	 * @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=null;
-		static $path=null;
+		static $uri = null;
+		static $path = null;
 
 		if (!isset($uri))
 		{
 			$uri = $path = $this->caldav->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
 			{
@@ -703,7 +703,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)
@@ -717,7 +717,7 @@ 
 ';
 			if ($this->caldav->crrnd)
 			{
-				$error = str_replace(array('<D:', '</D:'),  array('<', '</'), $error);
+				$error = str_replace(array('<D:', '</D:'), array('<', '</'), $error);
 			}
 			echo $error;
 		}
@@ -740,7 +740,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);
 

api/src/loader/common.php

Braces +24 added lines, -6 removed lines

@@ -47,7 +47,10 @@ 
 {
 	static $func_overload = null;
 
-	if (is_null($func_overload)) $func_overload = extension_loaded('mbstring') ? ini_get('mbstring.func_overload') : 0;
+	if (is_null($func_overload))
+	{
+		$func_overload = extension_loaded('mbstring') ? ini_get('mbstring.func_overload') : 0;
+	}
 
 	return $func_overload & 2 ? mb_strlen($str,'ascii') : strlen($str);
 }
@@ -64,7 +67,10 @@ 
 {
 	static $func_overload = null;
 
-	if (is_null($func_overload)) $func_overload = extension_loaded('mbstring') ? ini_get('mbstring.func_overload') : 0;
+	if (is_null($func_overload))
+	{
+		$func_overload = extension_loaded('mbstring') ? ini_get('mbstring.func_overload') : 0;
+	}
 
 	if (is_null($len))
 	{
@@ -130,7 +136,10 @@ 
 			{
 				$personal = str_replace('\\', '', substr($personal, 1, -1));
 			}
-			if (empty($host)) $host = $default_host;
+			if (empty($host))
+			{
+				$host = $default_host;
+			}
 
 			$addresses[] = (object)array_diff(array(
 				'mailbox'  => $mailbox,
@@ -153,13 +162,19 @@ 
 	 */
 	function imap_rfc822_write_address($mailbox, $host, $personal)
 	{
-		if (is_array($personal))  $personal = implode(' ', $personal);
+		if (is_array($personal))
+		{
+			$personal = implode(' ', $personal);
+		}
 
 		//if (!preg_match('/^[!#$%&\'*+/0-9=?A-Z^_`a-z{|}~-]+$/u', $personal))	// that's how I read the rfc(2)822
-		if ($personal && !preg_match('/^[0-9A-Z -]*$/iu', $personal))	// but quoting is never wrong, so quote more then necessary
+		if ($personal && !preg_match('/^[0-9A-Z -]*$/iu', $personal))
+		{
+			// but quoting is never wrong, so quote more then necessary
 		{
 			$personal = '"'.str_replace(array('\\', '"'),array('\\\\', '\\"'), $personal).'"';
 		}
+		}
 		return ($personal ? $personal.' <' : '').$mailbox.($host ? '@'.$host : '').($personal ? '>' : '');
 	}
 }
@@ -366,7 +381,9 @@ 
 	return $_GET['menuaction'] ? $_GET['menuaction'] : str_replace(EGW_SERVER_ROOT,'',$_SERVER['SCRIPT_FILENAME']);
 }
 
-if (!function_exists('lang') || defined('NO_LANG'))	// setup declares an own version
+if (!function_exists('lang') || defined('NO_LANG'))
+{
+	// setup declares an own version
 {
 	/**
 	 * function to handle multilanguage support
@@ -380,6 +397,7 @@ 
 		if(!is_array($vars))
 		{
 			$vars = func_get_args();
+}
 			array_shift($vars);	// remove $key
 		}
 		return Api\Translation::translate($key,$vars);

Spacing +32 added lines, -32 removed lines

@@ -29,7 +29,7 @@ 
 	{
 		return stripslashes($var);
 	}
-	foreach($var as $key => $val)
+	foreach ($var as $key => $val)
 	{
 		$var[$key] = is_array($val) ? array_stripslashes($val) : stripslashes($val);
 	}
@@ -49,7 +49,7 @@ 
 
 	if (is_null($func_overload)) $func_overload = extension_loaded('mbstring') ? ini_get('mbstring.func_overload') : 0;
 
-	return $func_overload & 2 ? mb_strlen($str,'ascii') : strlen($str);
+	return $func_overload&2 ? mb_strlen($str, 'ascii') : strlen($str);
 }
 
 /**
@@ -60,7 +60,7 @@ 
  * @param int $len
  * @return string
  */
-function cut_bytes(&$data,$offset,$len=null)
+function cut_bytes(&$data, $offset, $len = null)
 {
 	static $func_overload = null;
 
@@ -68,9 +68,9 @@ 
 
 	if (is_null($len))
 	{
-		return $func_overload & 2 ? mb_substr($data,$offset,bytes($data),'ascii') : substr($data,$offset);
+		return $func_overload&2 ? mb_substr($data, $offset, bytes($data), 'ascii') : substr($data, $offset);
 	}
-	return $func_overload & 2 ? mb_substr($data,$offset,$len,'ascii') : substr($data,$offset,$len);
+	return $func_overload&2 ? mb_substr($data, $offset, $len, 'ascii') : substr($data, $offset, $len);
 }
 
 if (!function_exists('imap_rfc822_parse_adrlist'))
@@ -102,10 +102,10 @@ 
 	{
 		$addresses = array();
 		$pending = '';
-		foreach(explode(',', $address) as $part)
+		foreach (explode(',', $address) as $part)
 		{
 			$trimmed = trim(($pending ? $pending.',' : '').$part);
-			if (($trimmed[0] == '"' && substr($trimmed, -1) != '>')||strpos($part, '@')===false)
+			if (($trimmed[0] == '"' && substr($trimmed, -1) != '>') || strpos($part, '@') === false)
 			{
 				$pending .= ($pending ? $pending.',' : '').$part;
 				continue;
@@ -158,7 +158,7 @@ 
 		//if (!preg_match('/^[!#$%&\'*+/0-9=?A-Z^_`a-z{|}~-]+$/u', $personal))	// that's how I read the rfc(2)822
 		if ($personal && !preg_match('/^[0-9A-Z -]*$/iu', $personal))	// but quoting is never wrong, so quote more then necessary
 		{
-			$personal = '"'.str_replace(array('\\', '"'),array('\\\\', '\\"'), $personal).'"';
+			$personal = '"'.str_replace(array('\\', '"'), array('\\\\', '\\"'), $personal).'"';
 		}
 		return ($personal ? $personal.' <' : '').$mailbox.($host ? '@'.$host : '').($personal ? '>' : '');
 	}
@@ -179,7 +179,7 @@ 
 	{
 		return array((object)array(
 			'text' => Horde_Mime::decode($text),
-			'charset' => Api\Translation::charset(),	// is already in our internal encoding!
+			'charset' => Api\Translation::charset(), // is already in our internal encoding!
 		));
 	}
 }
@@ -208,7 +208,7 @@ 
 	 * @param int $len
 	 * @return string
 	 */
-	function mb_substr(&$data, $offset, $len=null)
+	function mb_substr(&$data, $offset, $len = null)
 	{
 		return is_null($len) ? substr($data, $offset) : substr($data, $offset, $len);
 	}
@@ -236,7 +236,7 @@ 
 			return 'NULL';
 		case 'object':
 		case 'array':
-			return str_replace(array("\n",'    '/*,'Array'*/),'',print_r($var,true));
+			return str_replace(array("\n", '    '/*,'Array'*/), '', print_r($var, true));
 	}
 	return 'UNKNOWN TYPE!';
 }
@@ -249,14 +249,14 @@ 
  * @return boolean true if loaded now, false otherwise
  * @throws Api\Exception\AssertionFailed
  */
-function check_load_extension($extension,$throw=false)
+function check_load_extension($extension, $throw = false)
 {
 	if (!defined('PHP_SHLIB_PREFIX'))
 	{
-		define('PHP_SHLIB_PREFIX',PHP_SHLIB_SUFFIX == 'dll' ? 'php_' : '');
+		define('PHP_SHLIB_PREFIX', PHP_SHLIB_SUFFIX == 'dll' ? 'php_' : '');
 	}
 	// we check for the existens of 'dl', as multithreaded webservers dont have it and some hosters disable it !!!
-	$loaded = extension_loaded($extension) || function_exists('dl') && @dl($dl=PHP_SHLIB_PREFIX.$extension.'.'.PHP_SHLIB_SUFFIX);
+	$loaded = extension_loaded($extension) || function_exists('dl') && @dl($dl = PHP_SHLIB_PREFIX.$extension.'.'.PHP_SHLIB_SUFFIX);
 
 	if (!$loaded && $throw)
 	{
@@ -284,7 +284,7 @@ 
  * @param int/string $default_id either a name or an id
  * @return int account_id
  */
-function get_account_id($account_id = '',$default_id = '')
+function get_account_id($account_id = '', $default_id = '')
 {
 	if (gettype($account_id) == 'integer')
 	{
@@ -294,7 +294,7 @@ 
 	{
 		if ($default_id == '')
 		{
-			return (isset($GLOBALS['egw_info']['user']['account_id'])?$GLOBALS['egw_info']['user']['account_id']:0);
+			return (isset($GLOBALS['egw_info']['user']['account_id']) ? $GLOBALS['egw_info']['user']['account_id'] : 0);
 		}
 		elseif (is_string($default_id))
 		{
@@ -304,7 +304,7 @@ 
 	}
 	elseif (is_string($account_id))
 	{
-		if((int)$account_id && $GLOBALS['egw']->accounts->exists((int)$account_id) == True)
+		if ((int)$account_id && $GLOBALS['egw']->accounts->exists((int)$account_id) == True)
 		{
 			return (int)$account_id;
 		}
@@ -322,9 +322,9 @@ 
  * @param boolean $print =true print or return the content
  * @return string if !$print
  */
-function _debug_array($array,$print=True)
+function _debug_array($array, $print = True)
 {
-	$output = '<pre>'.print_r($array,true)."</pre>\n";
+	$output = '<pre>'.print_r($array, true)."</pre>\n";
 
 	if ($print)
 	{
@@ -343,28 +343,28 @@ 
  * @param int $remove =0 number of levels to remove
  * @return string function-names separated by slashes (beginning with the calling function not this one)
  */
-function function_backtrace($remove=0)
+function function_backtrace($remove = 0)
 {
 	if (function_exists('debug_backtrace'))
 	{
 		$backtrace = debug_backtrace();
 		//echo "function_backtrace($remove)<pre>".print_r($backtrace,True)."</pre>\n";
-		foreach($backtrace as $n => $level)
+		foreach ($backtrace as $n => $level)
 		{
 			if ($remove-- < 0)
 			{
-				$ret[] = (isset($level['class'])?$level['class'].$level['type']:'').$level['function'].
-					($n > 0 && isset($backtrace[$n-1]['line']) ? ':'.$backtrace[$n-1]['line'] : '').	// add line number of call
+				$ret[] = (isset($level['class']) ? $level['class'].$level['type'] : '').$level['function'].
+					($n > 0 && isset($backtrace[$n - 1]['line']) ? ':'.$backtrace[$n - 1]['line'] : '').// add line number of call
 					(!$level['class'] && !is_object($level['args'][0]) && $level['function'] != 'unserialize' ?
-					'('.substr(str_replace(EGW_SERVER_ROOT,'',(string)$level['args'][0]),0,64).')' : '');
+					'('.substr(str_replace(EGW_SERVER_ROOT, '', (string)$level['args'][0]), 0, 64).')' : '');
 			}
 		}
 		if (is_array($ret))
 		{
-			return implode(' / ',$ret);
+			return implode(' / ', $ret);
 		}
 	}
-	return $_GET['menuaction'] ? $_GET['menuaction'] : str_replace(EGW_SERVER_ROOT,'',$_SERVER['SCRIPT_FILENAME']);
+	return $_GET['menuaction'] ? $_GET['menuaction'] : str_replace(EGW_SERVER_ROOT, '', $_SERVER['SCRIPT_FILENAME']);
 }
 
 if (!function_exists('lang') || defined('NO_LANG'))	// setup declares an own version
@@ -376,14 +376,14 @@ 
 	 * @param string $vars =null multiple values to replace the placeholders
 	 * @return string translated message with placeholders replaced
 	 */
-	function lang($key,$vars=null)
+	function lang($key, $vars = null)
 	{
-		if(!is_array($vars))
+		if (!is_array($vars))
 		{
 			$vars = func_get_args();
-			array_shift($vars);	// remove $key
+			array_shift($vars); // remove $key
 		}
-		return Api\Translation::translate($key,$vars);
+		return Api\Translation::translate($key, $vars);
 	}
 }
 
@@ -413,9 +413,9 @@ 
 	 *
 	 * @deprecated use $GLOBALS['egw']->framework->sidebox()
 	 */
-	function display_sidebox($appname,$menu_title,$_file)
+	function display_sidebox($appname, $menu_title, $_file)
 	{
 		$file = str_replace('preferences.uisettings.index', 'preferences.preferences_settings.index', $_file);
-		$GLOBALS['egw']->framework->sidebox($appname,$menu_title,$file);
+		$GLOBALS['egw']->framework->sidebox($appname, $menu_title, $file);
 	}
 }

api/src/loader/security.php

Braces +8 added lines, -2 removed lines

@@ -24,7 +24,9 @@ 
 {
 	static $preg=null;
 	//old: '/<\/?[^>]*\b(iframe|script|javascript|on(before)?(abort|blur|change|click|dblclick|error|focus|keydown|keypress|keyup|load|mousedown|mousemove|mouseout|mouseover|mouseup|reset|select|submit|unload))\b[^>]*>/i';
-	if (!isset($preg)) $preg =
+	if (!isset($preg))
+	{
+		$preg =
 		// forbidden tags like iframe or script
 		'/(<(\s*\/)?\s*(iframe|script|object|embed|math|meta)[^a-z0-9]|'.
 		// on* attributes
@@ -33,6 +35,7 @@ 
 		'<[^>]+(href|src|dynsrc|lowsrc|background|style|poster|action)\s*=\s*("|\')?[^"\']*javascript|'.
 		// benavior:url and expression in style attribute
 		'<[^>]+style\s*=\s*("|\')[^>]*(behavior\s*:\s*url|expression)\s*\()/i';
+	}
 	if (is_array($var))
 	{
 		foreach($var as $key => $val)
@@ -41,7 +44,9 @@ 
 			{
 				_check_script_tag($var[$key],$name.'['.$key.']');
 			}
-			elseif(strpos($val, '<') !== false)	// speedup: ignore everything without <
+			elseif(strpos($val, '<') !== false)
+			{
+				// speedup: ignore everything without <
 			{
 				if (preg_match($preg,$val))
 				{
@@ -49,6 +54,7 @@ 
 					if ($name == '_POST' && $key == 'json_data' && ($json_data = json_decode($val, true)))
 					{
 						_check_script_tag($json_data, $name.'[json_data]');
+			}
 						$_REQUEST[$key] = $var[$key] = json_encode($json_data);
 						continue;
 					}

Doc Comments +1 added lines

@@ -20,6 +20,7 @@
  * @param array &$var reference of array to check
  * @param string $name ='' name of the array
  * @param boolean $log = true Log the results of checking to the error log
+ * @param string[] $var
  */
 function _check_script_tag(&$var,$name='',$log=true)
 {

Spacing +19 added lines, -19 removed lines

@@ -21,9 +21,9 @@ 
  * @param string $name ='' name of the array
  * @param boolean $log = true Log the results of checking to the error log
  */
-function _check_script_tag(&$var,$name='',$log=true)
+function _check_script_tag(&$var, $name = '', $log = true)
 {
-	static $preg=null;
+	static $preg = null;
 	//old: '/<\/?[^>]*\b(iframe|script|javascript|on(before)?(abort|blur|change|click|dblclick|error|focus|keydown|keypress|keyup|load|mousedown|mousemove|mouseout|mouseover|mouseup|reset|select|submit|unload))\b[^>]*>/i';
 	if (!isset($preg)) $preg =
 		// forbidden tags like iframe or script
@@ -40,15 +40,15 @@ 
 		'<[^>]+style\s*=\s*("|\')[^>]*(behavior\s*:\s*url|expression)\s*\()/i';
 	if (is_array($var))
 	{
-		foreach($var as $key => $val)
+		foreach ($var as $key => $val)
 		{
 			if (is_array($val))
 			{
-				_check_script_tag($var[$key],$name.'['.$key.']');
+				_check_script_tag($var[$key], $name.'['.$key.']');
 			}
-			elseif(strpos($val, '<') !== false)	// speedup: ignore everything without <
+			elseif (strpos($val, '<') !== false)	// speedup: ignore everything without <
 			{
-				if (preg_match($preg,$val))
+				if (preg_match($preg, $val))
 				{
 					// special handling for $_POST[json_data], to decend into it's decoded content, fixing json direct might break json syntax
 					if ($name == '_POST' && $key == 'json_data' && ($json_data = json_decode($val, true)))
@@ -64,13 +64,13 @@ 
 					// check if we succeeded, if not drop the var anyway, keep the egw_unset_var in any case
 					if (preg_match($preg, $var[$key]))
 					{
-						if($log)
+						if ($log)
 						{
 							error_log("*** _check_script_tag($name): unset(${name}[$key]) with value '$val'");
 						}
 						unset($var[$key]);
 					}
-					elseif($log)
+					elseif ($log)
 					{
 						error_log("*** _check_script_tag($name): HtmlLawed::purify(${name}[$key]) succeeded '$val' --> '{$var[$key]}'");
 					}
@@ -82,15 +82,15 @@ 
 	}
 }
 
-foreach(array('_COOKIE','_GET','_POST','_REQUEST','HTTP_GET_VARS','HTTP_POST_VARS') as $n => $where)
+foreach (array('_COOKIE', '_GET', '_POST', '_REQUEST', 'HTTP_GET_VARS', 'HTTP_POST_VARS') as $n => $where)
 {
 	$pregs = array(
 		'order' => '/^[a-zA-Z0-9_,]*$/',
 		'sort'  => '/^(ASC|DESC|asc|desc|0|1|2|3|4|5|6|7){0,1}$/',
 	);
-	foreach(array('order','sort') as $name)
+	foreach (array('order', 'sort') as $name)
 	{
-		if (isset($GLOBALS[$where][$name]) && !is_array($GLOBALS[$where][$name]) && !preg_match($pregs[$name],$GLOBALS[$where][$name]))
+		if (isset($GLOBALS[$where][$name]) && !is_array($GLOBALS[$where][$name]) && !preg_match($pregs[$name], $GLOBALS[$where][$name]))
 		{
 			$GLOBALS[$where][$name] = '';
 		}
@@ -99,14 +99,14 @@ 
 	// speeds up the execusion a bit
 	if (isset($GLOBALS[$where]) && is_array($GLOBALS[$where]) && ($n < 3 || isset($GLOBALS['egw_unset_vars'])))
 	{
-		_check_script_tag($GLOBALS[$where],$where);
+		_check_script_tag($GLOBALS[$where], $where);
 	}
 }
 //if (is_array($GLOBALS['egw_unset_vars'])) { echo "egw_unset_vars=<pre>".htmlspecialchars(print_r($GLOBALS['egw_unset_vars'],true))."</pre>"; exit; }
 
 // $GLOBALS[egw_info][flags][currentapp] and die  if it contains something nasty or unexpected
 if (isset($GLOBALS['egw_info']) && isset($GLOBALS['egw_info']['flags']) &&
-	isset($GLOBALS['egw_info']['flags']['currentapp']) && !preg_match('/^[A-Za-z0-9_-]+$/',$GLOBALS['egw_info']['flags']['currentapp']))
+	isset($GLOBALS['egw_info']['flags']['currentapp']) && !preg_match('/^[A-Za-z0-9_-]+$/', $GLOBALS['egw_info']['flags']['currentapp']))
 {
 	error_log(__FILE__.': '.__LINE__.' Invalid $GLOBALS[egw_info][flags][currentapp]='.array2string($GLOBALS['egw_info']['flags']['currentapp']).', $_SERVER[REQUEST_URI]='.array2string($_SERVER['REQUEST_URI']));
 	die('Invalid $GLOBALS[egw_info][flags][currentapp]!');
@@ -124,12 +124,12 @@ 
 			die('GLOBALS overwrite detected!!!');
 		}
 		// unregister all globals
-		$noUnset = array('GLOBALS','_GET','_POST','_COOKIE','_SERVER','_ENV','_FILES','xajax');
-		foreach(array_unique(array_merge(
-			array_keys($_GET),array_keys($_POST),array_keys($_COOKIE),array_keys($_SERVER),array_keys($_ENV),array_keys($_FILES),
+		$noUnset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_SERVER', '_ENV', '_FILES', 'xajax');
+		foreach (array_unique(array_merge(
+			array_keys($_GET), array_keys($_POST), array_keys($_COOKIE), array_keys($_SERVER), array_keys($_ENV), array_keys($_FILES),
 			isset($_SESSION) && is_array($_SESSION) ? array_keys($_SESSION) : array())) as $k)
 		{
-			if (!in_array($k,$noUnset) && isset($GLOBALS[$k]))
+			if (!in_array($k, $noUnset) && isset($GLOBALS[$k]))
 			{
 				unset($GLOBALS[$k]);
 			}
@@ -159,7 +159,7 @@ 
 		preg_match('/(^|;|{)[OC]:\d+:"/', $str))
 	{
 		error_log(__METHOD__."('$str') contains objects --> return NULL");
-		return null;	// null, not false, to not trigger behavior of returning string itself to app code
+		return null; // null, not false, to not trigger behavior of returning string itself to app code
 	}
 	return unserialize($str);
 }
@@ -173,7 +173,7 @@ 
  * @param boolean $allow_not_serialized =false true: return $str as is, if it is no serialized array
  * @return array|str|false false if content can not be unserialized (not null like json_decode!)
  */
-function json_php_unserialize($str, $allow_not_serialized=false)
+function json_php_unserialize($str, $allow_not_serialized = false)
 {
 	if ((in_array($str[0], array('a', 'i', 's', 'b', 'O', 'C')) && $str[1] == ':' || $str === 'N;') &&
 		($arr = php_safe_unserialize($str)) !== false || $str === 'b:0;')

api/src/Exception/NoPermission/Record.php

Braces +3 added lines, -1 removed lines

@@ -19,4 +19,6 @@
  * User lacks a record level permission, eg. he's not the owner and has no grant from the owner
  *
  */
-class Record extends Exception\NoPermission { }
+class Record extends Exception\NoPermission
+{
+}

api/src/Exception/WrongUserinput.php

Braces +3 added lines, -1 removed lines

@@ -17,4 +17,6 @@
  * Wrong or missing required user input: message should be translated so it can be shown directly to the user
  *
  */
-class WrongUserinput extends AssertionFailed { }
+class WrongUserinput extends AssertionFailed
+{
+}

api/src/Exception/WrongParameter.php

Braces +3 added lines, -1 removed lines

@@ -18,4 +18,6 @@
  *
  * As you get this only by an error in the code or during development, the message does not need to be translated
  */
-class WrongParameter extends AssertionFailed { }
+class WrongParameter extends AssertionFailed
+{
+}

api/src/Exception/AssertionFailed.php

Braces +3 added lines, -1 removed lines

@@ -20,4 +20,6 @@
  *
  * As you get this only by an error in the code or during development, the message does not need to be translated
  */
-class AssertionFailed extends Api\Exception { }
+class AssertionFailed extends Api\Exception
+{
+}