EGroupware / egroupware

api/src/CalDAV/PropfindIterator.php

Braces +41 added lines, -10 removed lines

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

api/src/CalDAV/IcalIterator.php

Braces +29 added lines, -8 removed lines

@@ -116,7 +116,10 @@ 
 		if (is_callable($callback))
 		{
 			$this->callback = $callback;
-			if ($add_container) $callback_params[] = $this;
+			if ($add_container)
+			{
+				$callback_params[] = $this;
+			}
 			$this->callback_params = $callback_params;
 		}
 		if (is_string($ical_file))
@@ -197,8 +200,14 @@ 
 		{
 			$ret = is_a($this->component,'Horde_Icalendar');
 			do {
-				if ($ret === false) $this->next();
-				if (!is_a($this->component,'Horde_Icalendar')) return false;
+				if ($ret === false)
+				{
+					$this->next();
+				}
+				if (!is_a($this->component,'Horde_Icalendar'))
+				{
+					return false;
+				}
 				$params = $this->callback_params;
 				array_unshift($params,$this->component);
 			}
@@ -231,9 +240,12 @@ 
 		{
 			// ignore it
 		}
-		if ($line === false)	// end-of-file or end-of-container
+		if ($line === false)
+		{
+			// end-of-file or end-of-container
 		{
 			$this->component = false;
+		}
 			return;
 		}
 		$type = substr(trim($line),6);
@@ -309,7 +321,10 @@ 
 			//error_log(__METHOD__."() about to call this->parsevCalendar('$data','$this->base','$this->charset')");
 			$this->parsevCalendar($data,$this->base,$this->charset);
 		}
-		if ($line) $this->unread_line($line);
+		if ($line)
+		{
+			$this->unread_line($line);
+		}
 
 		// advance to first element
 		$this->next();
@@ -438,7 +453,10 @@ 
 ';
 	echo $GLOBALS['egw']->framework->header();
 	//$ical_file = fopen('/tmp/KalenderFelicitasKubala.ics');
-	if (!is_resource($ical_file)) echo "<pre>$ical_file</pre>\n";
+	if (!is_resource($ical_file))
+	{
+		echo "<pre>$ical_file</pre>\n";
+	}
 	//$calendar_ical = new calendar_ical();
 	//$calendar_ical->setSupportedFields('file');
 	$ical_it = new IcalIterator($ical_file);//,'VCALENDAR','iso-8859-1',array($calendar_ical,'_ical2egw_callback'),array('Europe/Berlin'));
@@ -446,5 +464,8 @@ 
 	{
 		echo "$uid<pre>".print_r($vevent->toHash(), true)."</pre>\n";
 	}
-	if (is_resource($ical_file)) fclose($ical_file);
-}
\ No newline at end of file
+	if (is_resource($ical_file))
+	{
+		fclose($ical_file);
+	}
+	}
\ No newline at end of file

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'])

api/src/CalDAV/Principals.php

Braces +116 added lines, -29 removed lines

@@ -49,7 +49,10 @@ 
 	{
 		parent::__construct($app, $caldav);
 
-		if (!isset(self::$resources)) self::$resources = new resources_bo();
+		if (!isset(self::$resources))
+		{
+			self::$resources = new resources_bo();
+		}
 	}
 
 	/**
@@ -93,7 +96,10 @@ 
 	{
 		unset($path);	// not used, but required by function signature
 
-		if (is_null($reports)) $reports = $this->supported_reports;
+		if (is_null($reports))
+		{
+			$reports = $this->supported_reports;
+		}
 
 		$supported = array();
 		foreach($reports as $name => $data)
@@ -264,7 +270,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'];
@@ -303,7 +312,10 @@ 
 			// find prop to expand
 			foreach($prop_files['files'][0]['props'] as $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')
@@ -319,10 +331,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'],
@@ -330,7 +345,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->caldav->options = $options2;	// also modify global variable
 
 			// run regular profind to get requested 2.-level properties for each href
@@ -526,9 +544,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
@@ -538,16 +559,26 @@ 
 				// search resource for $search_prop
 				foreach($resource['props'] as $prop)
 				{
-					if ($prop['name'] === $search_prop['name']) break;
+					if ($prop['name'] === $search_prop['name'])
+					{
+						break;
+					}
 				}
-				if ($prop['name'] === $search_prop['name'])	// search_prop NOT found
+				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;
 						}
@@ -749,7 +780,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
 		}
@@ -903,7 +937,11 @@ 
 	{
 		$addressbooks = array();
 		$ab_home_set = $GLOBALS['egw_info']['user']['preferences']['groupdav']['addressbook-home-set'];
-		if (empty($ab_home_set)) $ab_home_set = 'P';	// personal addressbook
+		if (empty($ab_home_set))
+		{
+			$ab_home_set = 'P';
+		}
+		// personal addressbook
 		$addressbook_home_set = explode(',', $ab_home_set);
 		// replace symbolic id's with real nummeric id's
 		foreach(array(
@@ -917,10 +955,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(array_keys($GLOBALS['egw']->contacts->get_addressbooks(Api\Acl::READ)) as $id)
 		{
 			if ((in_array('A',$addressbook_home_set) || in_array((string)$id,$addressbook_home_set)) &&
@@ -999,7 +1040,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] == '/')
 		{
@@ -1009,7 +1053,10 @@ 
 		{
 			list($schema, $rest) = explode(':', $url, 2);
 		}
-		if (empty($rest)) return false;
+		if (empty($rest))
+		{
+			return false;
+		}
 
 		switch(strtolower($schema))
 		{
@@ -1056,9 +1103,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, , $id_abs, $install_id) = explode('-', $uid);
+				}
 					$id = -$id_abs;
 				}
 				// own urn
@@ -1072,7 +1122,10 @@ 
 					else
 					{
 						static $calendar_bo=null;
-						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')
@@ -1179,7 +1232,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 = Api\Translation::convert($resource['name'],	Api\Translation::charset(), 'utf-8');
 
@@ -1225,7 +1281,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)))
 			{
@@ -1262,7 +1321,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(
@@ -1333,9 +1395,15 @@ 
 		// required props per WebDAV ACL
 		foreach(array('alternate-URI-set', 'group-membership') as $name)
 		{
-			if (!isset($props[$name])) $props[$name] = Api\CalDAV::mkprop($name,'');
+			if (!isset($props[$name]))
+			{
+				$props[$name] = Api\CalDAV::mkprop($name,'');
+			}
+		}
+		if (!$principal_url)
+		{
+			$principal_url = $principal;
 		}
-		if (!$principal_url) $principal_url = $principal;
 
 		$props['principal-URL'] = array(
 			Api\CalDAV::mkprop('href',$this->base_uri.'/principals/'.$principal.'/'));
@@ -1358,7 +1426,11 @@ 
 	{
 		list($app,,$what) = explode('-', $type);
 
-		if (true) $proxys = array();	// ignore parameter!
+		if (true)
+		{
+			$proxys = array();
+		}
+		// ignore parameter!
 		list($account_type,$account) = explode('/', $principal);
 
 		switch($account_type)
@@ -1440,16 +1512,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[] = Api\CalDAV::mkprop('href', $this->base_uri.'/principals/'.($account_id < 0 ? 'groups/' : 'users/').$account_lid.'/');
 			}
+			}
 		}
 		if ($app_proxys)
 		{
 			foreach((array)$app_proxys as $app)
 			{
-				if (!isset($GLOBALS['egw_info']['user']['apps'][$app])) continue;
+				if (!isset($GLOBALS['egw_info']['user']['apps'][$app]))
+				{
+					continue;
+				}
 
 				switch($app)
 				{
@@ -1490,7 +1568,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;
 					}
 				}
@@ -1524,12 +1605,15 @@ 
 		{
 			if ($account_id != $account && ($rights & Api\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[] = Api\CalDAV::mkprop('href', $this->base_uri.'/principals/'.
 					($account_id < 0 ? 'groups/' : 'users/').
 					$account_lid.'/'.$app.'-proxy-'.($rights & Api\Acl::EDIT ? 'write' : 'read').'/');
 			}
+			}
 		}
 		return $set;
 	}
@@ -1621,7 +1705,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),
 				$this->propfind_groups('','',$options));
 			if ($GLOBALS['egw_info']['user']['apps']['resources'])

api/src/Translation.php

Braces +121 added lines, -31 removed lines

@@ -126,17 +126,23 @@ 
 			}
 			return $charsets[$lang];
 		}
-		if (self::$system_charset)	// do we have a system-charset ==> return it
+		if (self::$system_charset)
+		{
+			// do we have a system-charset ==> return it
 		{
 			$charset = self::$system_charset;
 		}
+		}
 		else
 		{
 			// if no translations are loaded (system-startup) use a default, else lang('charset')
 			$charset = !self::$lang_arr ? 'utf-8' : strtolower(self::translate('charset'));
 		}
 		// in case no charset is set, default to utf-8
-		if (empty($charset) || $charset == 'charset') $charset = 'utf-8';
+		if (empty($charset) || $charset == 'charset')
+		{
+			$charset = 'utf-8';
+		}
 
 		// we need to set our charset as mbstring.internal_encoding if mbstring.func_overlaod > 0
 		// else we get problems for a charset is different from the default utf-8
@@ -195,8 +201,14 @@ 
 			}
 			$apps = array('common');
 			// for eTemplate apps, load etemplate before app itself (allowing app to overwrite etemplate translations)
-			if (class_exists('EGroupware\\Api\\Etemplate', false) || class_exists('etemplate', false)) $apps[] = 'etemplate';
-			if ($GLOBALS['egw_info']['flags']['currentapp']) $apps[] = $GLOBALS['egw_info']['flags']['currentapp'];
+			if (class_exists('EGroupware\\Api\\Etemplate', false) || class_exists('etemplate', false))
+			{
+				$apps[] = 'etemplate';
+			}
+			if ($GLOBALS['egw_info']['flags']['currentapp'])
+			{
+				$apps[] = $GLOBALS['egw_info']['flags']['currentapp'];
+			}
 			// load instance specific translations last, so they can overwrite everything
 			$apps[] = 'custom';
 			self::add_app($apps);
@@ -224,7 +236,10 @@ 
 			self::init();
 		}
 		$ret = $key;				// save key if we dont find a translation
-		if ($not_found) $ret .= $not_found;
+		if ($not_found)
+		{
+			$ret .= $not_found;
+		}
 
 		if (isset(self::$lang_arr[$key]))
 		{
@@ -271,9 +286,15 @@ 
 	{
 		//error_log(__METHOD__."(".array2string($apps).", $lang) count(self::\$lang_arr)=".count(self::$lang_arr));
 		//$start = microtime(true);
-		if (!$lang) $lang = self::$userlang;
+		if (!$lang)
+		{
+			$lang = self::$userlang;
+		}
 		$tree_level = $instance_level = array();
-		if (!is_array($apps)) $apps = (array)$apps;
+		if (!is_array($apps))
+		{
+			$apps = (array)$apps;
+		}
 		foreach($apps as $key => $app)
 		{
 			if (!isset(self::$loaded_apps[$app]) || self::$loaded_apps[$app] != $lang && $app != 'common')
@@ -293,8 +314,14 @@ 
 			}
 		}
 		// load all translations from cache at once
-		if ($tree_level) $tree_level = Cache::getTree(__CLASS__, $tree_level);
-		if ($instance_level) $instance_level = Cache::getInstance(__CLASS__, $instance_level);
+		if ($tree_level)
+		{
+			$tree_level = Cache::getTree(__CLASS__, $tree_level);
+		}
+		if ($instance_level)
+		{
+			$instance_level = Cache::getInstance(__CLASS__, $instance_level);
+		}
 
 		// merging loaded translations together
 		$updated_load_via = false;
@@ -361,7 +388,10 @@ 
 	static function &load_app($app,$lang)
 	{
 		//$start = microtime(true);
-		if (is_null(self::$db)) self::init(false);
+		if (is_null(self::$db))
+		{
+			self::init(false);
+		}
 		$loaded = array();
 		foreach(self::$db->select(self::LANG_TABLE,'message_id,content',array(
 			'lang'		=> $lang,
@@ -467,7 +497,10 @@ 
 				$cache['']['en'] = count($en_phrases);
 				foreach(array_keys(self::get_available_langs()) as $lang)
 				{
-					if ($lang == 'en') continue;
+					if ($lang == 'en')
+					{
+						continue;
+					}
 					$lang_phrases = array_keys(self::load_app_files(null, $lang, 'all-apps'));
 					$valid_phrases = array_intersect($lang_phrases, $en_phrases);
 					$cache[''][$lang] = count($valid_phrases);
@@ -484,7 +517,10 @@ 
 						continue;
 					}
 					$en_phrases = array_keys(self::load_app_files(null, 'en', $app));
-					if (count($en_phrases) <= 2) continue;
+					if (count($en_phrases) <= 2)
+					{
+						continue;
+					}
 					$cache['en'][$app] = count($en_phrases);
 					$lang_phrases = array_keys(self::load_app_files(null, $_lang, $app));
 					$valid_phrases = array_intersect($lang_phrases, $en_phrases);
@@ -516,7 +552,10 @@ 
 			// check if cache is NOT invalided by checking if we have a modification time for concerned lang-file
 			$time = Cache::getTree(__CLASS__, $file=self::get_lang_file($_app, $_lang));
 			// if we dont have one, cache has been invalidated and we need to load translations
-			if (!isset($time)) self::add_app($_app, $_lang);
+			if (!isset($time))
+			{
+				self::add_app($_app, $_lang);
+			}
 
 			$etag = self::max_lang_time();
 		}
@@ -568,7 +607,11 @@ 
 		$loaded = array();
 		foreach($load_app == 'all-apps' ? scandir(EGW_SERVER_ROOT) : (array)$load_app as $app_dir)
 		{
-			if ($load_app == 'all-apps' && $app_dir=='..') continue; // do not try to break out of egw server root
+			if ($load_app == 'all-apps' && $app_dir=='..')
+			{
+				continue;
+			}
+			// do not try to break out of egw server root
 			if ($app_dir[0] == '.' || !is_dir(EGW_SERVER_ROOT.'/'.$app_dir) ||
 				!@file_exists($file=self::get_lang_file($app_dir, $lang)) ||
 				!($f = fopen($file, 'r')))
@@ -587,9 +630,15 @@ 
 			{
 				$line = explode("\t", trim($read));
 				++$line_nr;
-				if (count($line) != 4) continue;
+				if (count($line) != 4)
+				{
+					continue;
+				}
 				list($l_id,$l_app,$l_lang,$l_translation) = $line;
-				if ($l_lang != $lang) continue;
+				if ($l_lang != $lang)
+				{
+					continue;
+				}
 				if (!isset($just_app_file) && $l_app != $app)
 				{
 					// check if $l_app contained in file in $app_dir is mentioned in $load_via
@@ -603,8 +652,14 @@ 
 						}
 						// if not update load_via accordingly and store it as config
 						//error_log(__METHOD__."() load_via does not contain $l_app => $app_dir");
-						if (!isset(self::$load_via[$l_app])) self::$load_via[$l_app] = array($l_app);
-						if (!is_array(self::$load_via[$l_app])) self::$load_via[$l_app] = array(self::$load_via[$l_app]);
+						if (!isset(self::$load_via[$l_app]))
+						{
+							self::$load_via[$l_app] = array($l_app);
+						}
+						if (!is_array(self::$load_via[$l_app]))
+						{
+							self::$load_via[$l_app] = array(self::$load_via[$l_app]);
+						}
 						self::$load_via[$l_app][] = $app_dir;
 						$updated_load_via = true;
 					}
@@ -671,7 +726,10 @@ 
 
 			if ($translate)
 			{
-				if (is_null(self::$db)) self::init(false);
+				if (is_null(self::$db))
+				{
+					self::init(false);
+				}
 
 				foreach(self::$langs as $lang => $name)
 				{
@@ -704,10 +762,13 @@ 
 	 */
 	static function lang2language($lang)
 	{
-		if (isset(self::$langs[$lang]))	// no need to query the DB
+		if (isset(self::$langs[$lang]))
+		{
+			// no need to query the DB
 		{
 			return self::$langs[$lang];
 		}
+		}
 		return self::$db->select(self::LANGUAGES_TABLE,'lang_name',array('lang_id' => $lang),__LINE__,__FILE__)->fetchColumn();
 	}
 
@@ -746,7 +807,10 @@ 
 	 */
 	static function get_lang_file($app,$lang)
 	{
-		if ($app == 'common') $app = 'phpgwapi';
+		if ($app == 'common')
+		{
+			$app = 'phpgwapi';
+		}
 		return EGW_SERVER_ROOT.'/'.$app.'/'.self::LANG_DIR.'/'.self::LANGFILE_PREFIX.$lang.self::LANGFILE_EXTENSION;
 	}
 
@@ -809,9 +873,15 @@ 
 	{
 		if ($check_to_from)
 		{
-			if ($from) $from = strtolower($from);
+			if ($from)
+			{
+				$from = strtolower($from);
+			}
 
-			if ($to) $to = strtolower($to);
+			if ($to)
+			{
+				$to = strtolower($to);
+			}
 
 			if (!$from)
 			{
@@ -936,7 +1006,10 @@ 
 	 */
 	static function convert_jsonsafe($_data,$from=False)
 	{
-		if ($from===false) $from = self::detect_encoding($_data);
+		if ($from===false)
+		{
+			$from = self::detect_encoding($_data);
+		}
 
 		$data = self::convert($_data, strtolower($from));
 
@@ -1035,15 +1108,22 @@ 
 	static function get_message_id($translation,$app=null,$lang=null)
 	{
 		$where = array('content '.self::$db->capabilities[Db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.self::$db->quote($translation));
-		if ($app) $where['app_name'] = $app;
-		if ($lang) $where['lang'] = $lang;
+		if ($app)
+		{
+			$where['app_name'] = $app;
+		}
+		if ($lang)
+		{
+			$where['lang'] = $lang;
+		}
 
 		$id = self::$db->select(self::LANG_TABLE,'message_id',$where,__LINE__,__FILE__)->fetchColumn();
 
 		// Check cache, since most things aren't in the DB anymore
 		if(!$id)
 		{
-			$ids = array_filter(array_keys(self::$lang_arr), function($haystack) use($translation) {
+			$ids = array_filter(array_keys(self::$lang_arr), function($haystack) use($translation)
+			{
 				return stripos(self::$lang_arr[$haystack],$translation) !== false;
 			});
 			$id = array_shift($ids);
@@ -1060,10 +1140,17 @@ 
 				}
 
 				// load all translations from cache at once
-				if ($tree_level) $lang_arr = Cache::getTree(__CLASS__, $tree_level);
-				if ($instance_level) $lang_arr = Cache::getInstance(__CLASS__, $instance_level);
+				if ($tree_level)
+				{
+					$lang_arr = Cache::getTree(__CLASS__, $tree_level);
+				}
+				if ($instance_level)
+				{
+					$lang_arr = Cache::getInstance(__CLASS__, $instance_level);
+				}
 				$lang_arr = $lang_arr[$app.':en'];
-				$ids = array_filter(array_keys($lang_arr), function($haystack) use($translation, $lang_arr) {
+				$ids = array_filter(array_keys($lang_arr), function($haystack) use($translation, $lang_arr)
+				{
 					return stripos($lang_arr[$haystack],$translation) !== false;
 				});
 				$id = array_shift($ids);
@@ -1087,7 +1174,10 @@ 
 		{
 			$list = array('utf-8', 'iso-8859-1', 'windows-1251'); // list may be extended
 
-			if ($verify) array_unshift($list, $verify);
+			if ($verify)
+			{
+				array_unshift($list, $verify);
+			}
 
 			foreach ($list as $item)
 			{

api/src/Acl.php

Braces +81 added lines, -20 removed lines

@@ -111,7 +111,10 @@ 
 		else
 		{
 			$acl_acc_list = (array)$GLOBALS['egw']->accounts->memberships($this->account_id, true);
-			if (is_array($no_groups)) $acl_acc_list = array_diff($acl_acc_list,$no_groups);
+			if (is_array($no_groups))
+			{
+				$acl_acc_list = array_diff($acl_acc_list,$no_groups);
+			}
 			array_unshift($acl_acc_list,$this->account_id);
 		}
 
@@ -149,7 +152,10 @@ 
 	 */
 	function add($appname,$location,$rights)
 	{
-		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		$row = array(
 			'appname'  => $appname,
@@ -171,7 +177,10 @@ 
 	 */
 	function delete($appname,$location)
 	{
-		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		foreach($this->data as $idx => $value)
 		{
@@ -209,10 +218,13 @@ 
 			}
 		}
 		if ($this->account_id == $GLOBALS['egw_info']['user']['account_id'] &&
-			method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+			method_exists($GLOBALS['egw'],'invalidate_session_cache'))
+		{
+			// egw object in setup is limited
 		{
 			$GLOBALS['egw']->invalidate_session_cache();
 		}
+		}
 		return $this->data;
 	}
 
@@ -240,7 +252,10 @@ 
 		{
 			$this->read_repository();
 		}
-		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		if (!count($this->data) && $GLOBALS['egw_info']['server']['acl_default'] != 'deny')
 		{
@@ -289,7 +304,10 @@ 
 	 */
 	function get_specific_rights($location, $appname = '', $memberships=array())
 	{
-		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		if (!count($this->data) && $GLOBALS['egw_info']['server']['acl_default'] != 'deny')
 		{
@@ -353,10 +371,13 @@ 
 		),__LINE__,__FILE__);
 
 		if ($account_id == $GLOBALS['egw_info']['user']['account_id'] &&
-			method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+			method_exists($GLOBALS['egw'],'invalidate_session_cache'))
+		{
+			// egw object in setup is limited
 		{
 			$GLOBALS['egw']->invalidate_session_cache();
 		}
+		}
 		return True;
 	}
 
@@ -387,11 +408,17 @@ 
 				$where['acl_account'] = $cache_accountid[$accountid] = get_account_id($accountid,$this->account_id);
 			}
 		}
-		if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+		if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))
+		{
+			// egw object in setup is limited
 		{
 			$GLOBALS['egw']->invalidate_session_cache();
 		}
-		if ($app == '%' || $app == '%%') unset($where['acl_appname']);
+		}
+		if ($app == '%' || $app == '%%')
+		{
+			unset($where['acl_appname']);
+		}
 
 		$this->db->delete(self::TABLE,$where,__LINE__,__FILE__);
 
@@ -408,7 +435,10 @@ 
 	 */
 	function get_specific_rights_for_account($account_id,$location,$appname='')
 	{
-		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		return $this->db->select(self::TABLE,'acl_rights',array(
 			'acl_location' => $location,
@@ -426,7 +456,10 @@ 
 	 */
 	function get_all_rights($location,$appname='')
 	{
-		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		$rights = array();
 		foreach($this->db->select(self::TABLE,'acl_account,acl_rights',array(
@@ -449,7 +482,10 @@ 
 	 */
 	function get_all_location_rights($account_id,$appname='',$use_memberships=true)
 	{
-		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		$accounts = array($account_id);
 		if ($use_memberships && (int)$account_id > 0)
@@ -553,7 +589,10 @@ 
 	 */
 	function get_ids_for_location($location, $required, $app = '')
 	{
-		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$app)
+		{
+			$app = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		$accounts = false;
 		foreach($this->db->select(self::TABLE,array('acl_account','acl_rights'),array(
@@ -577,7 +616,10 @@ 
 	 */
 	function get_locations_for_app($app='')
 	{
-		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$app)
+		{
+			$app = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		$locations = false;
 		foreach($this->db->select(self::TABLE,'DISTINCT '.'acl_location',array(
@@ -613,7 +655,10 @@ 
 			$account_id = get_account_id($accountid,$this->account_id);
 			$cache_accountid[$accountid] = $account_id;
 		}
-		if ($use_memberships && (int)$account_id > 0) $memberships = $GLOBALS['egw']->accounts->memberships($account_id, true);
+		if ($use_memberships && (int)$account_id > 0)
+		{
+			$memberships = $GLOBALS['egw']->accounts->memberships($account_id, true);
+		}
 		$memberships[] = (int)$account_id;
 
 		$apps = array();
@@ -647,15 +692,24 @@ 
 	 */
 	function get_grants($app='',$enum_group_acls=true,$user=null)
 	{
-		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
-		if (!$user) $user = $this->account_id;
+		if (!$app)
+		{
+			$app = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
+		if (!$user)
+		{
+			$user = $this->account_id;
+		}
 
 		static $cache = array();	// some caching withing the request
 
 		$grants =& $cache[$app][$user];
 		if (!isset($grants))
 		{
-			if ((int)$user > 0) $memberships = $GLOBALS['egw']->accounts->memberships($user, true);
+			if ((int)$user > 0)
+			{
+				$memberships = $GLOBALS['egw']->accounts->memberships($user, true);
+			}
 			$memberships[] = $user;
 
 			$grants = $accounts = Array();
@@ -680,7 +734,11 @@ 
 					// return the grant for each member of the group (false = also for no longer active users)
 					foreach((array)$GLOBALS['egw']->accounts->members($grantor, true, false) as $grantor)
 					{
-						if (!$grantor) continue;	// can happen if group has no members
+						if (!$grantor)
+						{
+							continue;
+						}
+						// can happen if group has no members
 
 						// Don't allow to override private with group ACL's!
 						$rights &= ~self::PRIVAT;
@@ -734,7 +792,10 @@ 
 	 */
 	function get_location_grants($location,$app='')
 	{
-		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$app)
+		{
+			$app = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		$locations = array();
 		foreach($this->db->select(self::TABLE,'acl_location,acl_account,acl_rights',array(

api/src/Config.php

Braces +28 added lines, -8 removed lines

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

api/src/DateTime.php

Braces +76 added lines, -18 removed lines

@@ -95,7 +95,11 @@ 
 	 */
 	public function __construct($time='now',DateTimeZone $tz=null,&$type=null)
 	{
-		if (is_null($tz)) $tz = self::$user_timezone;	// default user timezone
+		if (is_null($tz))
+		{
+			$tz = self::$user_timezone;
+		}
+		// default user timezone
 
 		switch(($type = gettype($time)))
 		{
@@ -108,7 +112,11 @@ 
 				if (!(is_numeric($time) && ($time > 21000000 || $time < 19000000)))
 				{
 					$t_str = $time;
-					if (is_numeric($time) && strlen($time) == 8) $t_str .= 'T000000';	// 'Ymd' string used in calendar to represent a date
+					if (is_numeric($time) && strlen($time) == 8)
+					{
+						$t_str .= 'T000000';
+					}
+					// 'Ymd' string used in calendar to represent a date
 					// $time ending in a Z (Zulu or UTC time), is unterstood by DateTime class itself
 					try {
 						parent::__construct($t_str,$tz);
@@ -116,7 +124,10 @@ 
 					}
 					catch(Exception $e) {
 						// if string is nummeric, ignore the exception and treat string as timestamp
-						if (!is_numeric($time)) throw $e;
+						if (!is_numeric($time))
+						{
+							throw $e;
+						}
 					}
 				}
 				$type = 'integer';
@@ -137,7 +148,9 @@ 
 
 			case 'array':
 				parent::__construct('now',$tz);
-				if (isset($time['Y']))	// array format used in eTemplate
+				if (isset($time['Y']))
+				{
+					// array format used in eTemplate
 				{
 					$time = array(
 						'year'   => $time['Y'],
@@ -148,13 +161,17 @@ 
 						'second' => $time['s'],
 					);
 				}
+				}
 				if (!empty($time['full']) && empty($time['year']))
 				{
 					$time['year']  = (int)substr($time['full'],0,4);
 					$time['month'] = (int)substr($time['full'],4,2);
 					$time['day']   = (int)substr($time['full'],6,2);
 				}
-				if (isset($time['year'])) $this->setDate((int)$time['year'],(int)$time['month'],isset($time['day']) ? (int)$time['day'] : (int)$time['mday']);
+				if (isset($time['year']))
+				{
+					$this->setDate((int)$time['year'],(int)$time['month'],isset($time['day']) ? (int)$time['day'] : (int)$time['mday']);
+				}
 				$this->setTime((int)$time['hour'],(int)$time['minute'],(int)$time['second']);
 				break;
 
@@ -178,7 +195,10 @@ 
 	 */
 	public function add($interval)
 	{
-		if (is_string($interval)) $interval = DateInterval::createFromDateString($interval);
+		if (is_string($interval))
+		{
+			$interval = DateInterval::createFromDateString($interval);
+		}
 
 		parent::add($interval);
 	}
@@ -202,7 +222,10 @@ 
 				$wstart = -($wday ? $wday-1 : 6);
 				break;
 		}
-		if ($wstart) $this->add($wstart.'days');
+		if ($wstart)
+		{
+			$this->add($wstart.'days');
+		}
 	}
 
 	/**
@@ -263,15 +286,27 @@ 
 			}
 			elseif ($sday || $eday)
 			{
-				if ($sday) $start->add($sday.'days');
-				if ($eday) $end->add($eday.'days');
+				if ($sday)
+				{
+					$start->add($sday.'days');
+				}
+				if ($eday)
+				{
+					$end->add($eday.'days');
+				}
 			}
 			elseif ($sweek || $eweek)
 			{
 				$start->setWeekstart();
-				if ($sweek) $start->add($sweek.'weeks');
+				if ($sweek)
+				{
+					$start->add($sweek.'weeks');
+				}
 				$end->setWeekstart();
-				if ($eweek) $end->add($eweek.'weeks');
+				if ($eweek)
+				{
+					$end->add($eweek.'weeks');
+				}
 			}
 		}
 		// convert start + end from user to servertime for the filter
@@ -416,7 +451,10 @@ 
 		}
 		$time->setUser();
 
-		if (is_null($type)) $type = $typeof;
+		if (is_null($type))
+		{
+			$type = $typeof;
+		}
 
 		//echo "<p>".__METHOD__."($time,$type) = ".print_r($format->format($type),true)."</p>\n";
 		return $time->format($type);
@@ -446,7 +484,10 @@ 
 		}
 		$time->setServer();
 
-		if (is_null($type)) $type = $typeof;
+		if (is_null($type))
+		{
+			$type = $typeof;
+		}
 
 		//echo "<p>".__METHOD__."($time,$type) = ".print_r($format->format($type),true)."</p>\n";
 		return $time->format($type);
@@ -489,7 +530,10 @@ 
 	public static function setUserPrefs($tz,$dateformat='',$timeformat='')
 	{
 		//echo "<p>".__METHOD__."('$tz','$dateformat','$timeformat') ".function_backtrace()."</p>\n";
-		if (!empty($dateformat)) self::$user_dateformat = $dateformat;
+		if (!empty($dateformat))
+		{
+			self::$user_dateformat = $dateformat;
+		}
 
 		switch($timeformat)
 		{
@@ -527,7 +571,10 @@ 
 	 */
 	public static function tz_offset_s($time='now')
 	{
-		if (!($time instanceof DateTime)) $time = new DateTime($time);
+		if (!($time instanceof DateTime))
+		{
+			$time = new DateTime($time);
+		}
 
 		return self::$user_timezone->getOffset($time) - self::$server_timezone->getOffset($time);
 	}
@@ -635,9 +682,17 @@ 
 		);
 		foreach(DateTimeZone::listIdentifiers() as $name)
 		{
-			if (in_array($name,$no_vtimezone)) continue;	// do NOT allow to set in EGroupware, as we have not VTIMEZONE component for it
+			if (in_array($name,$no_vtimezone))
+			{
+				continue;
+			}
+			// do NOT allow to set in EGroupware, as we have not VTIMEZONE component for it
 			list($continent) = explode('/',$name,2);
-			if (!isset($tzs[$continent])) continue;	// old depricated timezones
+			if (!isset($tzs[$continent]))
+			{
+				continue;
+			}
+			// old depricated timezones
 			$datetime = new DateTime('now',new DateTimeZone($name));
 			$tzs[$continent][$name] = str_replace(array('_','/'),array(' ',' / '),$name)."  ".$datetime->format();
 			unset($datetime);
@@ -676,10 +731,13 @@ 
 		{
 			$user_tzs = array_merge(array($tz),$user_tzs);
 		}
-		if (!$user_tzs)	// if we have no user timezones, eg. user set no pref --> use server default
+		if (!$user_tzs)
+		{
+			// if we have no user timezones, eg. user set no pref --> use server default
 		{
 			$user_tzs = array($GLOBALS['egw_info']['server']['server_timezone']);
 		}
+		}
 		if ($extra && !in_array($extra,$user_tzs))
 		{
 			$user_tzs = array_merge(array($extra),$user_tzs);

api/src/Categories.php

Braces +208 added lines, -52 removed lines

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