EGroupware / egroupware

api/src/Json/Request.php

Braces +16 added lines, -4 removed lines

@@ -42,7 +42,10 @@ 
 	public static function isJSONRequest($set=null)
 	{
 		$ret = self::$_hadJSONRequest;
-		if (isset($set)) self::$_hadJSONRequest = $set;
+		if (isset($set))
+		{
+			self::$_hadJSONRequest = $set;
+		}
 		return $ret;
 	}
 
@@ -60,7 +63,10 @@ 
 		// Remember that we currently are in a JSON request - e.g. used in the redirect code
 		self::$_hadJSONRequest = true;
 
-		if (get_magic_quotes_gpc()) $input_data = stripslashes($input_data);
+		if (get_magic_quotes_gpc())
+		{
+			$input_data = stripslashes($input_data);
+		}
 
 		$json_data = json_decode($input_data,true);
 		if (is_array($json_data) && isset($json_data['request']) && isset($json_data['request']['parameters']) && is_array($json_data['request']['parameters']))
@@ -100,9 +106,12 @@ 
 	 */
 	public function handleRequest($menuaction, array $parameters)
 	{
-		if (strpos($menuaction,'::') !== false && strpos($menuaction,'.') === false)	// static method name app_something::method
+		if (strpos($menuaction,'::') !== false && strpos($menuaction,'.') === false)
+		{
+			// static method name app_something::method
 		{
 			@list($className,$functionName,$handler) = explode('::',$menuaction);
+		}
 			if (substr($className, 0, 11) == 'EGroupware\\')
 			{
 				list(,$appName) = explode('\\', strtolower($className));
@@ -179,6 +188,9 @@ 
 			Api\Translation::convert($parameters, 'utf-8'));
 
 		// check if we have push notifications, if notifications app available
-		if (class_exists('notifications_push')) notifications_push::get();
+		if (class_exists('notifications_push'))
+		{
+			notifications_push::get();
+		}
 	}
 }

api/src/Json/Response.php

Braces +4 added lines, -1 removed lines

@@ -268,7 +268,10 @@
 	 */
 	public static function fix_content($var, $prefix='')
 	{
-		if (json_encode($var) !== false) return $var;
+		if (json_encode($var) !== false)
+		{
+			return $var;
+		}
 
 		if (is_scalar($var))
 		{

api/src/Json/Tail.php

Braces +24 added lines, -6 removed lines

@@ -76,7 +76,10 @@ 
 		{
 			$this->filename = $filename;
 
-			if (!$this->filenames || !in_array($filename,$this->filenames)) $this->filenames[] = $filename;
+			if (!$this->filenames || !in_array($filename,$this->filenames))
+			{
+				$this->filenames[] = $filename;
+			}
 		}
 	}
 
@@ -93,7 +96,10 @@ 
 		{
 			throw new Api\Exception\WrongParameter("Not allowed to view '$filename'!");
 		}
-		if ($filename[0] != '/') $filename = $GLOBALS['egw_info']['server']['files_dir'].'/'.$filename;
+		if ($filename[0] != '/')
+		{
+			$filename = $GLOBALS['egw_info']['server']['files_dir'].'/'.$filename;
+		}
 
 		if (file_exists($filename))
 		{
@@ -101,7 +107,10 @@ 
 			if (!$start || $start < 0 || $start > $size || $size-$start > 4*self::MAX_CHUNK_SIZE)
 			{
 				$start = $size - 4*self::MAX_CHUNK_SIZE;
-				if ($start < 0) $start = 0;
+				if ($start < 0)
+				{
+					$start = 0;
+				}
 			}
 			$hsize = Api\Vfs::hsize($size);
 			$content = file_get_contents($filename, false, null, $start, self::MAX_CHUNK_SIZE);
@@ -137,7 +146,10 @@ 
 		{
 			throw new Api\Exception\WrongParameter("Not allowed to view '$filename'!");
 		}
-		if ($filename[0] != '/') $filename = $GLOBALS['egw_info']['server']['files_dir'].'/'.$filename;
+		if ($filename[0] != '/')
+		{
+			$filename = $GLOBALS['egw_info']['server']['files_dir'].'/'.$filename;
+		}
 		if ($truncate)
 		{
 			file_put_contents($filename, '');
@@ -161,7 +173,10 @@ 
 		{
 			throw new Api\Exception\WrongParameter("Must be instanciated with filename!");
 		}
-		if (is_null($header)) $header = $this->filename;
+		if (is_null($header))
+		{
+			$header = $this->filename;
+		}
 
 		return '
 <p style="float: left; margin: 5px"><b>'.htmlspecialchars($header).'</b></p>
@@ -192,7 +207,10 @@ 
 			throw new Api\Exception\WrongParameter("Not allowed to download '$filename'!");
 		}
 		Api\Header\Content::type(basename($filename), 'text/plain');
-		if ($filename[0] != '/') $filename = $GLOBALS['egw_info']['server']['files_dir'].'/'.$filename;
+		if ($filename[0] != '/')
+		{
+			$filename = $GLOBALS['egw_info']['server']['files_dir'].'/'.$filename;
+		}
 		for($n=ob_get_level(); $n > 0; --$n)
 		{
 			ob_end_clean();	// stop all output buffering, to NOT run into memory_limit

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/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/Mailer.php

Braces +50 added lines, -13 removed lines

@@ -117,10 +117,13 @@ 
 		}
 		else
 		{
-			if (!($this->account = Mail\Account::get_default(true)))	// true = need an SMTP (not just IMAP) account
+			if (!($this->account = Mail\Account::get_default(true)))
+			{
+				// true = need an SMTP (not just IMAP) account
 			{
 				throw new Exception\NotFound('SMTP: '.lang('Account not found!'));
 			}
+			}
 		}
 
 		try
@@ -167,7 +170,10 @@ 
 		{
 			throw new Exception\WrongParameter("Unknown type '$type'!");
 		}
-		if ($personal) $address = self::add_personal ($address, $personal);
+		if ($personal)
+		{
+			$address = self::add_personal ($address, $personal);
+		}
 
 		// add to our local list
 		$this->$type->add($address);
@@ -239,10 +245,13 @@ 
 		if (is_string($address) && !empty($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).'"';
 			}
+			}
 			$address = ($personal ? $personal.' <' : '').$address.($personal ? '>' : '');
 		}
 		return $address;
@@ -345,7 +354,10 @@ 
 			throw new Exception\NotFound("File '$data' not found!");
 		}
 
-		if (empty($type) && !is_resource($data)) $type = Vfs::mime_content_type($data);
+		if (empty($type) && !is_resource($data))
+		{
+			$type = Vfs::mime_content_type($data);
+		}
 
 		// set "text/calendar; method=*" as alternativ body
 		$matches = null;
@@ -368,11 +380,17 @@ 
 		$part->setContents($resource);
 
 		// setting name, also sets content-disposition attachment (!), therefore we have to do it after "text/calendar; method=" handling
-		if ($name || !is_resource($data)) $part->setName($name ? $name : Vfs::basename($data));
+		if ($name || !is_resource($data))
+		{
+			$part->setName($name ? $name : Vfs::basename($data));
+		}
 
 		// this should not be necessary, because binary data get detected by mime-type,
 		// but at least Cyrus complains about NUL characters
-		if (substr($type, 0, 5) != 'text/') $part->setTransferEncoding('base64', array('send' => true));
+		if (substr($type, 0, 5) != 'text/')
+		{
+			$part->setTransferEncoding('base64', array('send' => true));
+		}
 		$part->setDisposition('attachment');
 
 		return $this->addMimePart($part);
@@ -496,9 +514,12 @@ 
 		unset($resend);	// parameter is not used, but required by function signature
 
 		if (!($message_id = $this->getHeader('Message-ID')) &&
-			class_exists('Horde_Mime_Headers_MessageId'))	// since 2.5.0
+			class_exists('Horde_Mime_Headers_MessageId'))
+		{
+			// since 2.5.0
 		{
 			$message_id = Horde_Mime_Headers_MessageId::create('EGroupware');
+		}
 			$this->addHeader('Message-ID', $message_id);
 		}
 		$body_sha1 = null;	// skip sha1, it requires whole mail in memory, which we traing to avoid now
@@ -538,7 +559,10 @@ 
 
 		try {
 			// no flowed for encrypted messages
-			if (!isset($flowed)) $flowed = $this->_body && $this->_body->getType() != 'multipart/encrypted';
+			if (!isset($flowed))
+			{
+				$flowed = $this->_body && $this->_body->getType() != 'multipart/encrypted';
+			}
 
 			// check if flowed is disabled in mail site configuration
 			if (($config = Config::read('mail')) && $config['disable_rfc3676_flowed'])
@@ -612,13 +636,19 @@ 
 				$msg .= 'ERROR '.$e->getMessage();
 			}
 			$msg .= ' cc='.implode(', ', $cc).', bcc='.implode(', ', $bcc);
-			if ($GLOBALS['egw_info']['server']['log_mail'] !== true) $msg .= "\n\n";
+			if ($GLOBALS['egw_info']['server']['log_mail'] !== true)
+			{
+				$msg .= "\n\n";
+			}
 
 			error_log($msg,$GLOBALS['egw_info']['server']['log_mail'] === true ? 0 : 3,
 				$GLOBALS['egw_info']['server']['log_mail']);
 		}
 		// rethrow error
-		if (isset($e)) throw $e;
+		if (isset($e))
+		{
+			throw $e;
+		}
 	}
 
 
@@ -663,7 +693,8 @@ 
 		}
 		// code copied from Horde_Mime_Mail::getRaw(), as there is no way to inject charset in
 		// _headers->toString(), which is required to encode headers containing non-ascii chars correct
-        if ($stream) {
+        if ($stream)
+        {
             $hdr = new Horde_Stream();
             $hdr->add($this->_headers->toString(array('charset' => 'utf-8', 'canonical' => true)), true);
             return Horde_Stream_Wrapper_Combine::getStream(
@@ -740,7 +771,10 @@ 
 	{
 		try {
 			$base = $this->getBasePart();
-			if (!($part_id = $base->findBody($subtype))) return null;
+			if (!($part_id = $base->findBody($subtype)))
+			{
+				return null;
+			}
 			return $base->getPart($part_id);
 		}
 		catch (Exception $e) {
@@ -854,7 +888,10 @@ 
 	 */
 	public function addMimePart($part)
 	{
-		if ($this->_base) $this->parseBasePart();
+		if ($this->_base)
+		{
+			$this->parseBasePart();
+		}
 
 		return parent::addMimePart($part);
 	}