EGroupware / egroupware

api/src/Json/Request.php

Spacing +16 added lines, -16 removed lines

@@ -39,7 +39,7 @@ 
 	 * @param boolean $set =null
 	 * @return boolean
 	 */
-	public static function isJSONRequest($set=null)
+	public static function isJSONRequest($set = null)
 	{
 		$ret = self::$_hadJSONRequest;
 		if (isset($set)) self::$_hadJSONRequest = $set;
@@ -62,11 +62,11 @@ 
 
 		if (get_magic_quotes_gpc()) $input_data = stripslashes($input_data);
 
-		$json_data = json_decode($input_data,true);
+		$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']))
 		{
 			//error_log(__METHOD__.__LINE__.array2string($json_data['request']).function_backtrace());
-			$parameters =& $json_data['request']['parameters'];
+			$parameters = & $json_data['request']['parameters'];
 		}
 		else
 		{
@@ -77,14 +77,14 @@ 
 		{
 			$responses = array();
 			$response = Response::get();
-			foreach($parameters[0] as $uid => $data)
+			foreach ($parameters[0] as $uid => $data)
 			{
 				//error_log("$uid: menuaction=$data[menuaction], parameters=".array2string($data['parameters']));
 				$this->handleRequest($data['menuaction'], (array)$data['parameters']);
 				$responses[$uid] = $response->initResponseArray();
 				//error_log("responses[$uid]=".array2string($responses[$uid]));
 			}
-			$response->data($responses);	// send all responses as data
+			$response->data($responses); // send all responses as data
 		}
 		else
 		{
@@ -100,32 +100,32 @@ 
 	 */
 	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);
+			@list($className, $functionName, $handler) = explode('::', $menuaction);
 			if (substr($className, 0, 11) == 'EGroupware\\')
 			{
 				list(,$appName) = explode('\\', strtolower($className));
 			}
 			else
 			{
-				list($appName) = explode('_',$className);
+				list($appName) = explode('_', $className);
 			}
 
 			// Check for a real static method, avoid instanciation if it is
 			$m = new ReflectionMethod($menuaction);
-			if($m->isStatic())
+			if ($m->isStatic())
 			{
 				$ajaxClass = $className;
 			}
 		}
 		else
 		{
-			@list($appName, $className, $functionName, $handler) = explode('.',$menuaction);
+			@list($appName, $className, $functionName, $handler) = explode('.', $menuaction);
 		}
 		//error_log("json.php: appName=$appName, className=$className, functionName=$functionName, handler=$handler");
 
-		switch($handler)
+		switch ($handler)
 		{
 			case '/etemplate/process_exec':
 				$_GET['menuaction'] = $appName.'.'.$className.'.'.$functionName;
@@ -151,15 +151,15 @@ 
 				break;
 		}
 
-		if(substr($className,0,4) != 'ajax' && substr($className,-4) != 'ajax' &&
-			$menuaction != 'etemplate.etemplate.process_exec' && substr($functionName,0,4) != 'ajax' ||
-			!preg_match('/^[A-Za-z0-9_\\\\-]+(\.[A-Za-z0-9_\\\\]+\.|::)[A-Za-z0-9_]+$/',$menuaction))
+		if (substr($className, 0, 4) != 'ajax' && substr($className, -4) != 'ajax' &&
+			$menuaction != 'etemplate.etemplate.process_exec' && substr($functionName, 0, 4) != 'ajax' ||
+			!preg_match('/^[A-Za-z0-9_\\\\-]+(\.[A-Za-z0-9_\\\\]+\.|::)[A-Za-z0-9_]+$/', $menuaction))
 		{
 			// stopped for security reasons
 			error_log("className='$className', functionName='$functionName', menuaction='$menuaction'");
-			error_log($_SERVER['PHP_SELF']. ' stopped for security reason. '.$menuaction.' is not valid. class- or function-name must start with ajax!!!');
+			error_log($_SERVER['PHP_SELF'].' stopped for security reason. '.$menuaction.' is not valid. class- or function-name must start with ajax!!!');
 			// send message also to the user
-			throw new Exception\InvalidName($_SERVER['PHP_SELF']. ' stopped for security reason. '.$menuaction.' is not valid. class- or function-name must start with ajax!!!');
+			throw new Exception\InvalidName($_SERVER['PHP_SELF'].' stopped for security reason. '.$menuaction.' is not valid. class- or function-name must start with ajax!!!');
 		}
 
 		if (isset($template))

api/src/Json/Tail.php

Spacing +18 added lines, -18 removed lines

@@ -68,15 +68,15 @@ 
 	 *
 	 * @param string $filename =null if not starting with as slash relative to EGw files dir (this is strongly prefered for security reasons)
 	 */
-	public function __construct($filename=null)
+	public function __construct($filename = null)
 	{
-		$this->filenames =& Api\Cache::getSession('phpgwapi', __CLASS__);
+		$this->filenames = & Api\Cache::getSession('phpgwapi', __CLASS__);
 
 		if ($filename)
 		{
 			$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;
 		}
 	}
 
@@ -87,9 +87,9 @@ 
 	 * @param int $start =0 last position in log-file
 	 * @throws Api\Exception\WrongParameter
 	 */
-	public function ajax_chunk($filename,$start=0)
+	public function ajax_chunk($filename, $start = 0)
 	{
-		if (!in_array($filename,$this->filenames))
+		if (!in_array($filename, $this->filenames))
 		{
 			throw new Api\Exception\WrongParameter("Not allowed to view '$filename'!");
 		}
@@ -98,9 +98,9 @@ 
 		if (file_exists($filename))
 		{
 			$size = filesize($filename);
-			if (!$start || $start < 0 || $start > $size || $size-$start > 4*self::MAX_CHUNK_SIZE)
+			if (!$start || $start < 0 || $start > $size || $size - $start > 4 * self::MAX_CHUNK_SIZE)
 			{
-				$start = $size - 4*self::MAX_CHUNK_SIZE;
+				$start = $size - 4 * self::MAX_CHUNK_SIZE;
 				if ($start < 0) $start = 0;
 			}
 			$hsize = Api\Vfs::hsize($size);
@@ -131,9 +131,9 @@ 
 	 * @param boolean $truncate =false true: truncate file, false: delete file
 	 * @throws Api\Exception\WrongParameter
 	 */
-	public function ajax_delete($filename,$truncate=false)
+	public function ajax_delete($filename, $truncate = false)
 	{
-		if (!in_array($filename,$this->filenames))
+		if (!in_array($filename, $this->filenames))
 		{
 			throw new Api\Exception\WrongParameter("Not allowed to view '$filename'!");
 		}
@@ -155,7 +155,7 @@ 
 	 * @return string
 	 * @throws Api\Exception\WrongParameter
 	 */
-	public function show($header=null)
+	public function show($header = null)
 	{
 		if (!isset($this->filename))
 		{
@@ -167,11 +167,11 @@ 
 <p style="float: left; margin: 5px"><b>'.htmlspecialchars($header).'</b></p>
 <div style="float: right; margin: 2px; margin-right: 5px">
 	'.Api\Html::form(
-		Api\Html::input('clear_log',lang('Clear window'),'button','id="clear_log"')."\n".
-		Api\Html::input('delete_log',lang('Delete file'),'button','id="purge_log"')."\n".
-		Api\Html::input('empty_log',lang('Empty file'),'button','id="empty_log"')."\n".
-		Api\Html::input('download_log',lang('Download'),'submit','id="download_log"'),
-		'','/index.php',array(
+		Api\Html::input('clear_log', lang('Clear window'), 'button', 'id="clear_log"')."\n".
+		Api\Html::input('delete_log', lang('Delete file'), 'button', 'id="purge_log"')."\n".
+		Api\Html::input('empty_log', lang('Empty file'), 'button', 'id="empty_log"')."\n".
+		Api\Html::input('download_log', lang('Download'), 'submit', 'id="download_log"'),
+		'', '/index.php', array(
 		'menuaction' => 'api.'.__CLASS__.'.download',
 		'filename' => $this->filename,
 	)).'
@@ -187,15 +187,15 @@ 
 	public function download()
 	{
 		$filename = $_GET['filename'];
-		if (!in_array($filename,$this->filenames))
+		if (!in_array($filename, $this->filenames))
 		{
 			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;
-		for($n=ob_get_level(); $n > 0; --$n)
+		for ($n = ob_get_level(); $n > 0; --$n)
 		{
-			ob_end_clean();	// stop all output buffering, to NOT run into memory_limit
+			ob_end_clean(); // stop all output buffering, to NOT run into memory_limit
 		}
 		readfile($filename);
 		exit;

api/src/CalDAV/PropfindIterator.php

Spacing +7 added lines, -7 removed lines

@@ -71,7 +71,7 @@ 
 	 *
 	 * @var int
 	 */
-	protected $start=0;
+	protected $start = 0;
 
 	/**
 	 * Number of entries queried from callback in one call
@@ -95,7 +95,7 @@ 
 	 * @param array $filter filter for propfind call
 	 * @param array $files =array() extra files/responses to return too
 	 */
-	public function __construct(Handler $handler, $path, array $filter,array &$files=array())
+	public function __construct(Handler $handler, $path, array $filter, array &$files = array())
 	{
 		if ($this->debug) error_log(__METHOD__."('$path', ".array2string($filter).",)");
 		$this->path    = $path;
@@ -126,7 +126,7 @@ 
 		$current = current($this->files);
 
 		if ($this->debug) error_log(__METHOD__."() returning ".array2string($current['path']));
-		return $current['path'];	// we return path as key
+		return $current['path']; // we return path as key
 	}
 
 	/**
@@ -146,11 +146,11 @@ 
 			return false;
 		}
 		// try query further files via propfind callback of handler and store result in $this->files
-		$this->files = $this->handler->propfind_callback($this->path,$this->filter,array($this->start,self::CHUNK_SIZE));
+		$this->files = $this->handler->propfind_callback($this->path, $this->filter, array($this->start, self::CHUNK_SIZE));
 		if (!is_array($this->files) || !($entries = count($this->files)))
 		{
 			if ($this->debug) error_log(__METHOD__."() returning FALSE (no more entries)");
-			return false;	// no further entries
+			return false; // no further entries
 		}
 		$this->start += self::CHUNK_SIZE;
 		reset($this->files);
@@ -169,7 +169,7 @@ 
 
 		$this->start = 0;
 		$this->files = $this->common_files;
-		if (!$this->files) $this->next();	// otherwise valid will return false and nothing get returned
+		if (!$this->files) $this->next(); // otherwise valid will return false and nothing get returned
 		reset($this->files);
 	}
 
@@ -178,7 +178,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function valid ()
+	public function valid()
 	{
 		if ($this->debug) error_log(__METHOD__."() returning ".array2string(current($this->files) !== false));
 		return current($this->files) !== false;

api/src/CalDAV/IcalIterator.php

Spacing +22 added lines, -22 removed lines

@@ -106,7 +106,7 @@ 
 	 * @param array $callback_params =array() further parameters for the callback, 1. parameter is component
 	 * @param boolean $add_container =false true, add container / $this as last parameter to callback
 	 */
-	public function __construct($ical_file,$base='VCALENDAR',$charset=null,$callback=null,array $callback_params=array(), $add_container=false)
+	public function __construct($ical_file, $base = 'VCALENDAR', $charset = null, $callback = null, array $callback_params = array(), $add_container = false)
 	{
 		// call parent constructor
 		parent::__construct();
@@ -131,7 +131,7 @@ 
 		}
 		if (!is_resource($this->ical_file))
 		{
-			throw new Api\Exception\WrongParameter(__METHOD__.'($ical_file, ...) NO resource! $ical_file='.substr(array2string($ical_file),0,100));
+			throw new Api\Exception\WrongParameter(__METHOD__.'($ical_file, ...) NO resource! $ical_file='.substr(array2string($ical_file), 0, 100));
 		}
 	}
 
@@ -155,7 +155,7 @@ 
 		{
 			$line = array_shift($this->unread_lines);
 		}
-		elseif(feof($this->ical_file))
+		elseif (feof($this->ical_file))
 		{
 			$line = false;
 		}
@@ -164,9 +164,9 @@ 
 			$line = fgets($this->ical_file);
 		}
 		// check if end of container reached
-		if ($this->container && $line && substr($line,0,4+strlen($this->base)) === 'END:'.$this->base)
+		if ($this->container && $line && substr($line, 0, 4 + strlen($this->base)) === 'END:'.$this->base)
 		{
-			$this->unread_line($line);	// put back end-of-container, to continue to return false
+			$this->unread_line($line); // put back end-of-container, to continue to return false
 			$line = false;
 		}
 		//error_log(__METHOD__."() returning ".($line === false ? 'FALSE' : "'$line'"));
@@ -182,7 +182,7 @@ 
 	protected function unread_line($line)
 	{
 		//error_log(__METHOD__."('$line')");
-		array_unshift($this->unread_lines,$line);
+		array_unshift($this->unread_lines, $line);
 	}
 
 	/**
@@ -195,14 +195,14 @@ 
 		//error_log(__METHOD__."() returning a ".gettype($this->component));
 		if ($this->callback)
 		{
-			$ret = is_a($this->component,'Horde_Icalendar');
+			$ret = is_a($this->component, 'Horde_Icalendar');
 			do {
 				if ($ret === false) $this->next();
-				if (!is_a($this->component,'Horde_Icalendar')) return false;
+				if (!is_a($this->component, 'Horde_Icalendar')) return false;
 				$params = $this->callback_params;
-				array_unshift($params,$this->component);
+				array_unshift($params, $this->component);
 			}
-			while(($ret = call_user_func_array($this->callback,$params)) === false);
+			while (($ret = call_user_func_array($this->callback, $params)) === false);
 
 			return $ret;
 		}
@@ -227,7 +227,7 @@ 
 	{
 		unset($this->component);
 
-		while (($line = $this->read_line()) && substr($line,0,6) !== 'BEGIN:')
+		while (($line = $this->read_line()) && substr($line, 0, 6) !== 'BEGIN:')
 		{
 			// ignore it
 		}
@@ -236,12 +236,12 @@ 
 			$this->component = false;
 			return;
 		}
-		$type = substr(trim($line),6);
+		$type = substr(trim($line), 6);
 
 		//error_log(__METHOD__."() found $type component");
 
 		$data = $line;
-		while (($line = $this->read_line()) && substr($line,0,4+strlen($type)) !== 'END:'.$type)
+		while (($line = $this->read_line()) && substr($line, 0, 4 + strlen($type)) !== 'END:'.$type)
 		{
 			$data .= $line;
 		}
@@ -276,23 +276,23 @@ 
 	 */
 	public function rewind()
 	{
-		@fseek($this->ical_file,0,SEEK_SET);
+		@fseek($this->ical_file, 0, SEEK_SET);
 
 		// advance to begin of container
-		while(($line = $this->read_line()) && substr($line,0,6+strlen($this->base)) !== 'BEGIN:'.$this->base)
+		while (($line = $this->read_line()) && substr($line, 0, 6 + strlen($this->base)) !== 'BEGIN:'.$this->base)
 		{
 
 		}
 		// if no container start found --> use whole file (rewind) and set container marker
 		if (!($this->container = $line !== false))
 		{
-			fseek($this->ical_file,0,SEEK_SET);
+			fseek($this->ical_file, 0, SEEK_SET);
 		}
 		//error_log(__METHOD__."() $this->base container ".($this->container ? 'found' : 'NOT found'));
 
 		$data = $line;
 		// advance to first component
-		while (($line = $this->read_line()) && substr($line,0,6) !== 'BEGIN:')
+		while (($line = $this->read_line()) && substr($line, 0, 6) !== 'BEGIN:')
 		{
 			$matches = null;
 			if (preg_match('/^VERSION:(\d\.\d)\s*$/ism', $line, $matches))
@@ -307,7 +307,7 @@ 
 		{
 			$data .= "END:$this->base\n";
 			//error_log(__METHOD__."() about to call this->parsevCalendar('$data','$this->base','$this->charset')");
-			$this->parsevCalendar($data,$this->base,$this->charset);
+			$this->parsevCalendar($data, $this->base, $this->charset);
 		}
 		if ($line) $this->unread_line($line);
 
@@ -320,10 +320,10 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function valid ()
+	public function valid()
 	{
 		//error_log(__METHOD__."() returning ".(is_a($this->component,'Horde_Icalendar') ? 'TRUE' : 'FALSE').' get_class($this->component)='.get_class($this->component));
-		return is_a($this->component,'Horde_Icalendar');
+		return is_a($this->component, 'Horde_Icalendar');
 	}
 }
 
@@ -441,8 +441,8 @@ 
 	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'));
-	foreach($ical_it as $uid => $vevent)
+	$ical_it = new IcalIterator($ical_file); //,'VCALENDAR','iso-8859-1',array($calendar_ical,'_ical2egw_callback'),array('Europe/Berlin'));
+	foreach ($ical_it as $uid => $vevent)
 	{
 		echo "$uid<pre>".print_r($vevent->toHash(), true)."</pre>\n";
 	}

api/src/CalDAV/Principals.php

Spacing +186 added lines, -187 removed lines

@@ -89,19 +89,18 @@ 
 	 * @param array $reports =null
 	 * @return array Api\CalDAV::mkprop('supported-report-set', ...)
 	 */
-	protected function supported_report_set($path, array $reports=null)
+	protected function supported_report_set($path, array $reports = null)
 	{
-		unset($path);	// not used, but required by function signature
+		unset($path); // not used, but required by function signature
 
 		if (is_null($reports)) $reports = $this->supported_reports;
 
 		$supported = array();
-		foreach($reports as $name => $data)
+		foreach ($reports as $name => $data)
 		{
-			$supported[$name] = Api\CalDAV::mkprop('supported-report',array(
-				Api\CalDAV::mkprop('report',array(
-					!$data['ns'] ? Api\CalDAV::mkprop($name, '') :
-						Api\CalDAV::mkprop($data['ns'], $name, '')))));
+			$supported[$name] = Api\CalDAV::mkprop('supported-report', array(
+				Api\CalDAV::mkprop('report', array(
+					!$data['ns'] ? Api\CalDAV::mkprop($name, '') : Api\CalDAV::mkprop($data['ns'], $name, '')))));
 		}
 		return $supported;
 	}
@@ -115,7 +114,7 @@ 
 	 * @param int $user account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function propfind($path,&$options,&$files,$user)
+	function propfind($path, &$options, &$files, $user)
 	{
 		if (($report = isset($_GET['report']) ? $_GET['report'] : $options['root']['name']) && $report != 'propfind')
 		{
@@ -127,7 +126,7 @@ 
 			$this->caldav->log(__METHOD__."('$path', ".array2string($options).",, $user) not implemented report, returning 501 Not Implemented");
 			return '501 Not Implemented';
 		}
-		list(,,$type,$name,$rest) = explode('/',$path,5);
+		list(,, $type, $name, $rest) = explode('/', $path, 5);
 		// /principals/users/$name/
 		//            /users/$name/calendar-proxy-read/
 		//            /users/$name/calendar-proxy-write/
@@ -136,19 +135,19 @@ 
 		//            /locations/$resource/
 		//            /__uids__/$uid/.../
 
-		switch($type)
+		switch ($type)
 		{
 			case 'users':
-				$files['files'] = $this->propfind_users($name,$rest,$options);
+				$files['files'] = $this->propfind_users($name, $rest, $options);
 				break;
 			case 'groups':
-				$files['files'] = $this->propfind_groups($name,$rest,$options);
+				$files['files'] = $this->propfind_groups($name, $rest, $options);
 				break;
 			case 'resources':
-				$files['files'] = $this->propfind_resources($name,$rest,$options,false);
+				$files['files'] = $this->propfind_resources($name, $rest, $options, false);
 				break;
 			case 'locations':
-				$files['files'] = $this->propfind_resources($name,$rest,$options,true);
+				$files['files'] = $this->propfind_resources($name, $rest, $options, true);
 				break;
 			/*case '__uids__':
 				$files['files'] = $this->propfind_uids($name,$rest,$options);
@@ -258,11 +257,11 @@ 
 	 * @param int $user account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function expand_property_report($path,&$options,&$files,$user)
+	function expand_property_report($path, &$options, &$files, $user)
 	{
 		//error_log(__METHOD__."('$path', ".array2string($options).",, $user)");
 		$requested_props = $options['other'];
-		while(($requested_prop = array_shift($requested_props)))
+		while (($requested_prop = array_shift($requested_props)))
 		{
 			if ($requested_prop['name'] != 'property' || $requested_prop['depth'] != 1) continue;
 
@@ -270,11 +269,11 @@ 
 			$prop_name = $requested_prop['attrs']['name'];
 			$prop_path = $path;
 			// calendarserver has some special property-names for expansion
-			switch($prop_name)
+			switch ($prop_name)
 			{
 				case 'calendar-proxy-read-for':
 				case 'calendar-proxy-write-for':
-					$prop_path = $path . substr($prop_name, 0, -4).'/';
+					$prop_path = $path.substr($prop_name, 0, -4).'/';
 					$prop_name = 'group-member-set';
 					$prop_ns = Api\CalDAV::DAV;
 					break;
@@ -294,14 +293,14 @@ 
 				'xmlns' => $prop_ns,
 			));
 			$prop_files = array();
-			$this->caldav->options = $options;	// also modify global variable
+			$this->caldav->options = $options; // also modify global variable
 			if (empty($prop_name) || $this->propfind($prop_path, $options, $prop_files, $user) !== true)
 			{
 				$this->caldav->log('### NO expand-property report for '.$requested_prop['attrs']['name']);
 				continue;
 			}
 			// find prop to expand
-			foreach($prop_files['files'][0]['props'] as $expand_prop)
+			foreach ($prop_files['files'][0]['props'] as $expand_prop)
 			{
 				if ($expand_prop['name'] === $prop_name) break;
 			}
@@ -315,7 +314,7 @@ 
 			// requested properties of each href are in depth=2 properties
 			// set them as regular propfind properties to $options['props']
 			$options2 = array('props' => 'all');
-			while(($prop = array_shift($requested_props)) && $prop['depth'] >= 2)
+			while (($prop = array_shift($requested_props)) && $prop['depth'] >= 2)
 			{
 				if ($prop['name'] == 'property' && $prop['depth'] == 2)
 				{
@@ -331,10 +330,10 @@ 
 			}
 			// put back evtl. read top-level property
 			if ($prop && $prop['depth'] == 1) array_unshift($requested_props, $prop);
-			$this->caldav->options = $options2;	// also modify global variable
+			$this->caldav->options = $options2; // also modify global variable
 
 			// run regular profind to get requested 2.-level properties for each href
-			foreach($expand_prop['val'] as $key => &$prop_val)
+			foreach ($expand_prop['val'] as $key => &$prop_val)
 			{
 				list(,$expand_path) = explode($this->caldav->base_uri, $prop_val['val']);
 				//error_log(__METHOD__."('$path', ..., $user) calling propfind('$expand_path', ".array2string($options2).', '.array2string($prop_val).", $user)");
@@ -429,23 +428,23 @@ 
 	 * @param int $user account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function principal_property_search_report($path,&$options,&$files,$user)
+	function principal_property_search_report($path, &$options, &$files, $user)
 	{
 		//error_log(__METHOD__."('$path', ".array2string($options).",, $user)");
 
 		// cant find the test attribute to root principal-property-search element in WebDAV rfc, but iPhones use it ...
-		$anyof = !empty($options['root']['attrs']['test']) && $options['root']['attrs']['test'] == 'anyof';	// "allof" (default) or "anyof"
+		$anyof = !empty($options['root']['attrs']['test']) && $options['root']['attrs']['test'] == 'anyof'; // "allof" (default) or "anyof"
 
 		// parse property-search prop(s) contained in $options['other']
-		foreach($options['other'] as $n => $prop)
+		foreach ($options['other'] as $n => $prop)
 		{
-			switch($prop['name'])
+			switch ($prop['name'])
 			{
 				case 'apply-to-principal-collection-set':	// optinal prop to apply search on principal-collection-set == '/principals/'
 					$path = '/principals/';
 					break;
 				case 'property-search':
-					$property_search = $n;	// should be 1
+					$property_search = $n; // should be 1
 					break;
 				case 'prop':
 					if (isset($property_search))
@@ -475,7 +474,7 @@ 
 			return '400 Bad Request';
 		}
 		// make sure search property is included in toplevel props (can be missing and defaults to property-search/prop's)
-		foreach($search_props as $prop)
+		foreach ($search_props as $prop)
 		{
 			if (!$this->caldav->prop_requested($prop['name'], $prop['xmlns']))
 			{
@@ -488,7 +487,7 @@ 
 			// but interprets returning all principals (all have a matching calendar-home-set) as NOT supporting CalDAV scheduling
 			// --> search only current user's principal
 			if ($prop['name'] == 'calendar-home-set' && stripos($_SERVER['HTTP_USER_AGENT'], 'Lightning') !== false &&
-				substr($search_props[0]['match'],-13) == '/groupdav.php')
+				substr($search_props[0]['match'], -13) == '/groupdav.php')
 			{
 				$path = '/principals/users/'.$GLOBALS['egw_info']['user']['account_lid'].'/';
 				$this->caldav->log('Enabling hack for Lightning prior 1.1.1 for searching calendar-home-set matching "/groupdav.php": limiting search to '.$path);
@@ -497,7 +496,7 @@ 
 		// check type attribute to limit search on a certain tree
 		if (isset($options['root']['attrs']['type']))
 		{
-			switch($options['root']['attrs']['type'])
+			switch ($options['root']['attrs']['type'])
 			{
 				case 'INDIVIDUAL':
 					$path = '/principals/users/';
@@ -524,7 +523,7 @@ 
 			return $ret;
 		}
 		// now filter out not matching "files"
-		foreach($files['files'] as $n => $resource)
+		foreach ($files['files'] as $n => $resource)
 		{
 			if (count(explode('/', $resource['path'])) < 5)	// hack to only return principals, not the collections itself
 			{
@@ -533,18 +532,18 @@ 
 			}
 			// match with $search_props
 			$matches = 0;
-			foreach($search_props as $search_prop)
+			foreach ($search_props as $search_prop)
 			{
 				// search resource for $search_prop
-				foreach($resource['props'] as $prop)
+				foreach ($resource['props'] as $prop)
 				{
 					if ($prop['name'] === $search_prop['name']) break;
 				}
 				if ($prop['name'] === $search_prop['name'])	// search_prop NOT found
 				{
-					foreach((array)$prop['val'] as $value)
+					foreach ((array)$prop['val'] as $value)
 					{
-						if (is_array($value)) $value = $value['val'];	// eg. href prop
+						if (is_array($value)) $value = $value['val']; // eg. href prop
 						if (self::match($value, $search_prop['match'], $search_prop['match-type']) !== false)	// prop does match
 						{
 							++$matches;
@@ -556,7 +555,7 @@ 
 				if ($anyof && $matches || $matches == count($search_props))
 				{
 					//error_log("$resource[path]: anyof=$anyof, $matches matches --> keep");
-					continue 2;	// enough matches --> keep
+					continue 2; // enough matches --> keep
 				}
 			}
 			//error_log("$resource[path]: anyof=$anyof, $matches matches --> skip");
@@ -574,9 +573,9 @@ 
 	 * @param string $match criteria/sub-string
 	 * @param string $match_type ='contains' 'starts-with', 'ends-with' or 'equals'
 	 */
-	private static function match($value, $match, $match_type='contains')
+	private static function match($value, $match, $match_type = 'contains')
 	{
-		switch($match_type)
+		switch ($match_type)
 		{
 			case 'equals':
 				return $value === $match;
@@ -646,9 +645,9 @@ 
 	 * @param int $user account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function principal_search_property_set_report($path,&$options,&$files,$user)
+	function principal_search_property_set_report($path, &$options, &$files, $user)
 	{
-		unset($path, $options, $files, $user);	// not used, but required by function signature
+		unset($path, $options, $files, $user); // not used, but required by function signature
 
 		static $search_props = array(
 			// from iOS iCal
@@ -670,7 +669,7 @@ 
 		$xml->startDocument('1.0', 'UTF-8');
 		$xml->startElementNs(null, 'principal-search-property-set', 'DAV:');
 
-		foreach($search_props as $name => $data)
+		foreach ($search_props as $name => $data)
 		{
 			$xml->startElement('principal-search-property');
 			$xml->startElement('prop');
@@ -682,16 +681,16 @@ 
 			{
 				$xml->writeElement($name);
 			}
-			$xml->endElement();	// prop
+			$xml->endElement(); // prop
 
 			$xml->startElement('description');
 			$xml->writeAttribute('xml:lang', 'en');
 			$xml->text(is_array($data) ? $data['description'] : $data);
-			$xml->endElement();	// description
+			$xml->endElement(); // description
 
-			$xml->endElement();	// principal-search-property
+			$xml->endElement(); // principal-search-property
 		}
-		$xml->endElement();	// principal-search-property-set
+		$xml->endElement(); // principal-search-property-set
 		$xml->endDocument();
 		echo $xml->outputMemory();
 
@@ -726,7 +725,7 @@ 
 	 * @param int $user account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function acl_principal_prop_set_report($path,&$options,&$files,$user)
+	function acl_principal_prop_set_report($path, &$options, &$files, $user)
 	{
 		//error_log(__METHOD__."('$path', ".array2string($options).",, $user)");
 
@@ -745,13 +744,13 @@ 
 			return $ret;
 		}
 		// now filter out not matching "files"
-		foreach($files['files'] as $n => $resource)
+		foreach ($files['files'] as $n => $resource)
 		{
-			foreach($resource['props']['resourcetype']['val'] as $prop)
+			foreach ($resource['props']['resourcetype']['val'] as $prop)
 			{
 				if ($prop['name'] == 'principal') continue 2;
 			}
-			unset($files['files'][$n]);	// not a principal --> do not return
+			unset($files['files'][$n]); // not a principal --> do not return
 		}
 		// we should not return it
 		unset($options['props']['resourcetype']);
@@ -767,7 +766,7 @@ 
 	 * @param array $options
 	 * @return array|string array with files or HTTP error code
 	 */
-	protected function propfind_users($name,$rest,array $options)
+	protected function propfind_users($name, $rest, array $options)
 	{
 		//error_log(__METHOD__."($name,$rest,".array2string($options).')');
 		if (empty($name))
@@ -786,7 +785,7 @@ 
 				else
 				{
 					// add all users (account_selection == groupmembers is handled by accounts->search())
-					foreach($this->accounts->search(array('type' => 'accounts','order' => 'account_lid')) as $account)
+					foreach ($this->accounts->search(array('type' => 'accounts', 'order' => 'account_lid')) as $account)
 					{
 						$files[] = $this->add_account($account);
 					}
@@ -795,18 +794,18 @@ 
 		}
 		else
 		{
-			if (!($id = $this->accounts->name2id($name,'account_lid','u')) ||
+			if (!($id = $this->accounts->name2id($name, 'account_lid', 'u')) ||
 				!($account = $this->accounts->read($id)) ||
 				!$this->accounts->visible($name))
 			{
 				$this->caldav->log(__METHOD__."('$name', ...) account '$name' NOT found OR not visible to you (check account-selection preference)!");
 				return '404 Not Found';
 			}
-			while (substr($rest,-1) == '/')
+			while (substr($rest, -1) == '/')
 			{
-				$rest = substr($rest,0,-1);
+				$rest = substr($rest, 0, -1);
 			}
-			switch((string)$rest)
+			switch ((string)$rest)
 			{
 				case '':
 					$files[] = $this->add_account($account);
@@ -836,7 +835,7 @@ 
 	 * @param array $options
 	 * @return array|string array with files or HTTP error code
 	 */
-	protected function propfind_groups($name,$rest,array $options)
+	protected function propfind_groups($name, $rest, array $options)
 	{
 		//echo "<p>".__METHOD__."($name,$rest,".array2string($options).")</p>\n";
 		if (empty($name))
@@ -848,11 +847,11 @@ 
 			if ($options['depth'])
 			{
 				// only show own groups, if account-selection is groupmembers or none
-				$type = in_array($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'], array('groupmembers','none')) ?
+				$type = in_array($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'], array('groupmembers', 'none')) ?
 					'owngroups' : 'groups';
 
 				// add all groups or only membergroups
-				foreach($this->accounts->search(array('type' => $type,'order' => 'account_lid')) as $account)
+				foreach ($this->accounts->search(array('type' => $type, 'order' => 'account_lid')) as $account)
 				{
 					$files[] = $this->add_group($account);
 				}
@@ -860,19 +859,19 @@ 
 		}
 		else
 		{
-			if (!($id = $this->accounts->name2id($name,'account_lid','g')) ||
+			if (!($id = $this->accounts->name2id($name, 'account_lid', 'g')) ||
 				!($account = $this->accounts->read($id)) ||
 				// do NOT allow other groups, if account-selection is groupmembers or none
-				in_array($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'], array('groupmembers','none')) &&
-				!in_array($account['account_id'], $this->accounts->memberships($GLOBALS['egw_info']['user']['account_id'],true)))
+				in_array($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'], array('groupmembers', 'none')) &&
+				!in_array($account['account_id'], $this->accounts->memberships($GLOBALS['egw_info']['user']['account_id'], true)))
 			{
 				return '404 Not Found';
 			}
-			while (substr($rest,-1) == '/')
+			while (substr($rest, -1) == '/')
 			{
-				$rest = substr($rest,0,-1);
+				$rest = substr($rest, 0, -1);
 			}
-			switch((string)$rest)
+			switch ((string)$rest)
 			{
 				case '':
 					$files[] = $this->add_group($account);
@@ -903,10 +902,10 @@ 
 	{
 		$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(
+		foreach (array(
 			'P' => $GLOBALS['egw_info']['user']['account_id'],
 			'G' => $GLOBALS['egw_info']['user']['account_primary_group'],
 			'U' => '0',
@@ -917,13 +916,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)
+		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)) &&
+			if ((in_array('A', $addressbook_home_set) || in_array((string)$id, $addressbook_home_set)) &&
 				is_numeric($id) && ($owner = $this->accounts->id2name($id)))
 			{
 				$addressbooks[] = '/'.$owner.'/';
@@ -947,45 +946,45 @@ 
 		$calendars[] = Api\CalDAV::mkprop('href',
 			$this->base_uri.'/'.$account['account_lid'].'/');
 
-		$displayname = Api\Translation::convert($account['account_fullname'], Api\Translation::charset(),'utf-8');
+		$displayname = Api\Translation::convert($account['account_fullname'], Api\Translation::charset(), 'utf-8');
 
 		return $this->add_principal('users/'.$account['account_lid'], array(
 			'getetag' => $this->get_etag($account),
 			'displayname' => $displayname,
 			// CalDAV
-			'calendar-home-set' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-home-set',$calendars),
+			'calendar-home-set' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-home-set', $calendars),
 			// CalDAV scheduling
-			'schedule-outbox-URL' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'schedule-outbox-URL',array(
-				Api\CalDAV::mkprop('href',$this->base_uri.'/'.$account['account_lid'].'/outbox/'))),
-			'schedule-inbox-URL' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'schedule-inbox-URL',array(
-				Api\CalDAV::mkprop('href',$this->base_uri.'/'.$account['account_lid'].'/inbox/'))),
-			'calendar-user-address-set' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-user-address-set',array(
-				Api\CalDAV::mkprop('href','mailto:'.$account['account_email']),
-				Api\CalDAV::mkprop('href',$this->base_uri(true).'/principals/users/'.$account['account_lid'].'/'),
-				Api\CalDAV::mkprop('href',$this->base_uri(false).'/principals/users/'.$account['account_lid'].'/'),
-				Api\CalDAV::mkprop('href','urn:uuid:'.Api\CalDAV::generate_uid('accounts', $account['account_id'])),
+			'schedule-outbox-URL' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'schedule-outbox-URL', array(
+				Api\CalDAV::mkprop('href', $this->base_uri.'/'.$account['account_lid'].'/outbox/'))),
+			'schedule-inbox-URL' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'schedule-inbox-URL', array(
+				Api\CalDAV::mkprop('href', $this->base_uri.'/'.$account['account_lid'].'/inbox/'))),
+			'calendar-user-address-set' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-user-address-set', array(
+				Api\CalDAV::mkprop('href', 'mailto:'.$account['account_email']),
+				Api\CalDAV::mkprop('href', $this->base_uri(true).'/principals/users/'.$account['account_lid'].'/'),
+				Api\CalDAV::mkprop('href', $this->base_uri(false).'/principals/users/'.$account['account_lid'].'/'),
+				Api\CalDAV::mkprop('href', 'urn:uuid:'.Api\CalDAV::generate_uid('accounts', $account['account_id'])),
 			)),
-			'calendar-user-type' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-user-type','INDIVIDUAL'),
+			'calendar-user-type' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-user-type', 'INDIVIDUAL'),
 			// Calendarserver
-			'email-address-set' => Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER,'email-address-set',array(
-				Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER,'email-address',$account['account_email']))),
-			'last-name' => Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER,'last-name',$account['account_lastname']),
-			'first-name' => Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER,'first-name',$account['account_firstname']),
-			'record-type' => Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER,'record-type','users'),
+			'email-address-set' => Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER, 'email-address-set', array(
+				Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER, 'email-address', $account['account_email']))),
+			'last-name' => Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER, 'last-name', $account['account_lastname']),
+			'first-name' => Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER, 'first-name', $account['account_firstname']),
+			'record-type' => Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER, 'record-type', 'users'),
 			// WebDAV ACL and CalDAV proxy
 			'group-membership' => $this->principal_set('group-membership', $this->accounts->memberships($account['account_id']),
-				array('calendar', 'resources'), $account['account_id']),	// add proxy-rights
+				array('calendar', 'resources'), $account['account_id']), // add proxy-rights
 			'alternate-URI-set' => array(
-				Api\CalDAV::mkprop('href','mailto:'.$account['account_email'])),
+				Api\CalDAV::mkprop('href', 'mailto:'.$account['account_email'])),
 			// CardDAV
-			'addressbook-home-set' => Api\CalDAV::mkprop(Api\CalDAV::CARDDAV,'addressbook-home-set',$addressbooks),
-			'principal-address' => Api\CalDAV::mkprop(Api\CalDAV::CARDDAV,'principal-address',
+			'addressbook-home-set' => Api\CalDAV::mkprop(Api\CalDAV::CARDDAV, 'addressbook-home-set', $addressbooks),
+			'principal-address' => Api\CalDAV::mkprop(Api\CalDAV::CARDDAV, 'principal-address',
 				$GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'] ? '' : array(
-				Api\CalDAV::mkprop('href',$this->base_uri.'/addressbook-accounts/'.$account['person_id'].'.vcf'))),
+				Api\CalDAV::mkprop('href', $this->base_uri.'/addressbook-accounts/'.$account['person_id'].'.vcf'))),
 			// CardDAV directory
-			'directory-gateway' => Api\CalDAV::mkprop(Api\CalDAV::CARDDAV, 'directory-gateway',array(
+			'directory-gateway' => Api\CalDAV::mkprop(Api\CalDAV::CARDDAV, 'directory-gateway', array(
 				Api\CalDAV::mkprop('href', $this->base_uri.'/addressbook/'))),
-			'resource-id' => array(Api\CalDAV::mkprop('href','urn:uuid:'.Api\CalDAV::generate_uid('accounts', $account['account_id']))),
+			'resource-id' => array(Api\CalDAV::mkprop('href', 'urn:uuid:'.Api\CalDAV::generate_uid('accounts', $account['account_id']))),
 		));
 	}
 
@@ -997,7 +996,7 @@ 
 	 * @param string $cn =null common name to be stored in case of an "e" uid
 	 * @return int|string|boolean integer account_id, string calendar uid or false if not a supported uid
 	 */
-	static public function url2uid($url, $only_type=null, $cn=null)
+	static public function url2uid($url, $only_type = null, $cn = null)
 	{
 		if (!$only_type) $only_type = array('users', 'groups', 'resources', 'locations', 'mailto');
 
@@ -1011,17 +1010,17 @@ 
 		}
 		if (empty($rest)) return false;
 
-		switch(strtolower($schema))
+		switch (strtolower($schema))
 		{
 			case 'http':
 			case 'https':
 				list(,$rest) = explode('/groupdav.php/principals/', $url);
 				list($type, $name) = explode('/', $rest);
-				switch($type)
+				switch ($type)
 				{
 					case 'users':
 					case 'groups':
-						$uid = $GLOBALS['egw']->accounts->name2id($name, 'account_lid', $type[0]);	// u=users, g=groups
+						$uid = $GLOBALS['egw']->accounts->name2id($name, 'account_lid', $type[0]); // u=users, g=groups
 						break;
 					case 'resources':
 					case 'locations':
@@ -1038,9 +1037,9 @@ 
 				}
 				// search contacts for email
 				if ((list($data) = $GLOBALS['egw']->contacts->search(array('email' => $rest, 'email_home' => $rest),
-					array('id','egw_addressbook.account_id as account_id','n_fn'),
+					array('id', 'egw_addressbook.account_id as account_id', 'n_fn'),
 					'egw_addressbook.account_id IS NOT NULL DESC, n_fn IS NOT NULL DESC',
-					'','',false,'OR')))
+					'', '', false, 'OR')))
 				{
 					// found an addressbook entry
 					$uid = $data['account_id'] ? (int)$data['account_id'] : 'c'.$data['id'];
@@ -1058,7 +1057,7 @@ 
 				list($type, $id, $install_id) = explode('-', $uid);
 				if ($type == 'accounts' && empty($id))	// groups have a negative id, eg. "urn:uuid:accounts--1-..."
 				{
-					list($type, , $id_abs, $install_id) = explode('-', $uid);
+					list($type,, $id_abs, $install_id) = explode('-', $uid);
 					$id = -$id_abs;
 				}
 				// own urn
@@ -1071,9 +1070,9 @@ 
 					}
 					else
 					{
-						static $calendar_bo=null;
+						static $calendar_bo = null;
 						if (is_null($calendar_bo)) $calendar_bo = new calendar_bo();
-						foreach($calendar_bo->resources as $letter => $info)
+						foreach ($calendar_bo->resources as $letter => $info)
 						{
 							if ($info['app'] == $type || $info['app'] == 'resources' && $type == 'location')
 							{
@@ -1086,7 +1085,7 @@ 
 				break;
 
 			default:
-				if (isset($GLOBALS['groupdav']) && is_a($GLOBALS['groupdav'],'groupdav'))
+				if (isset($GLOBALS['groupdav']) && is_a($GLOBALS['groupdav'], 'groupdav'))
 				{
 					$GLOBALS['groupdav']->log(__METHOD__."('$url') unsupported principal URL '$url'!");
 				}
@@ -1104,7 +1103,7 @@ 
 	 */
 	protected function add_group(array $account)
 	{
-		$displayname = Api\Translation::convert(lang('Group').' '.$account['account_lid'],	Api\Translation::charset(), 'utf-8');
+		$displayname = Api\Translation::convert(lang('Group').' '.$account['account_lid'], Api\Translation::charset(), 'utf-8');
 
 		// only return current user, if account-selection == 'none'
 		if ($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] == 'none')
@@ -1119,19 +1118,19 @@ 
 		return $this->add_principal('groups/'.$account['account_lid'], array(
 			'getetag' => $this->get_etag($account),
 			'displayname' => $displayname,
-			'calendar-home-set' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-home-set',array(
-				Api\CalDAV::mkprop('href',$this->base_uri.'/'.$account['account_lid'].'/'))),
-			'addressbook-home-set' => Api\CalDAV::mkprop(Api\CalDAV::CARDDAV,'addressbook-home-set',array(
-				Api\CalDAV::mkprop('href',$this->base_uri.'/'.$account['account_lid'].'/'))),
-			'calendar-user-address-set' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-user-address-set',array(
-				Api\CalDAV::mkprop('href',$this->base_uri(true).'/principals/groups/'.$account['account_lid'].'/'),
-				Api\CalDAV::mkprop('href',$this->base_uri(false).'/principals/groups/'.$account['account_lid'].'/'),
-				Api\CalDAV::mkprop('href','urn:uuid:'.Api\CalDAV::generate_uid('accounts', $account['account_id'])),
+			'calendar-home-set' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-home-set', array(
+				Api\CalDAV::mkprop('href', $this->base_uri.'/'.$account['account_lid'].'/'))),
+			'addressbook-home-set' => Api\CalDAV::mkprop(Api\CalDAV::CARDDAV, 'addressbook-home-set', array(
+				Api\CalDAV::mkprop('href', $this->base_uri.'/'.$account['account_lid'].'/'))),
+			'calendar-user-address-set' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-user-address-set', array(
+				Api\CalDAV::mkprop('href', $this->base_uri(true).'/principals/groups/'.$account['account_lid'].'/'),
+				Api\CalDAV::mkprop('href', $this->base_uri(false).'/principals/groups/'.$account['account_lid'].'/'),
+				Api\CalDAV::mkprop('href', 'urn:uuid:'.Api\CalDAV::generate_uid('accounts', $account['account_id'])),
 			)),
-			'record-type' => Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER,'record-type','groups'),
-			'calendar-user-type' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-user-type','GROUP'),
+			'record-type' => Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER, 'record-type', 'groups'),
+			'calendar-user-type' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-user-type', 'GROUP'),
 			'group-member-set' => $this->principal_set('group-member-set', $groupmembers),
-			'resource-id' => array(Api\CalDAV::mkprop('href','urn:uuid:'.Api\CalDAV::generate_uid('accounts', $account['account_id']))),
+			'resource-id' => array(Api\CalDAV::mkprop('href', 'urn:uuid:'.Api\CalDAV::generate_uid('accounts', $account['account_id']))),
 		));
 	}
 
@@ -1142,7 +1141,7 @@ 
 	 * @param boolean $is_location =null
 	 * @return array with values for keys 'path' and 'props'
 	 */
-	protected function add_principal_resource(array $resource, $is_location=null)
+	protected function add_principal_resource(array $resource, $is_location = null)
 	{
 		$displayname = null;
 		$name = $this->resource2name($resource, $is_location, $displayname);
@@ -1150,18 +1149,18 @@ 
 		return $this->add_principal($name, array(
 			'getetag' => $this->get_resource_etag($resource),
 			'displayname' => $displayname,
-			'calendar-user-address-set' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-user-address-set',array(
-				Api\CalDAV::mkprop('href',$this->base_uri(true).'/principals/'.$name.'/'),
-				Api\CalDAV::mkprop('href',$this->base_uri(false).'/principals/'.$name.'/'),
-				Api\CalDAV::mkprop('href','urn:uuid:'.Api\CalDAV::generate_uid('resources', $resource['res_id'])),
+			'calendar-user-address-set' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-user-address-set', array(
+				Api\CalDAV::mkprop('href', $this->base_uri(true).'/principals/'.$name.'/'),
+				Api\CalDAV::mkprop('href', $this->base_uri(false).'/principals/'.$name.'/'),
+				Api\CalDAV::mkprop('href', 'urn:uuid:'.Api\CalDAV::generate_uid('resources', $resource['res_id'])),
 			)),
-			'record-type' => Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER,'record-type',$is_location ? 'locations' : 'resources'),
-			'calendar-user-type' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-user-type',$is_location ? 'ROOM' : 'RESOURCE'),
-			'resource-id' => array(Api\CalDAV::mkprop('href','urn:uuid:'.Api\CalDAV::generate_uid('resources', $resource['res_id']))),
+			'record-type' => Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER, 'record-type', $is_location ? 'locations' : 'resources'),
+			'calendar-user-type' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-user-type', $is_location ? 'ROOM' : 'RESOURCE'),
+			'resource-id' => array(Api\CalDAV::mkprop('href', 'urn:uuid:'.Api\CalDAV::generate_uid('resources', $resource['res_id']))),
 			// Calendarserver also reports empty email-address-set, thought iCal still does not show resources (only locations)
-			'email-address-set' => Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER,'email-address-set',''),
-			'calendar-home-set' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-home-set',array(
-				Api\CalDAV::mkprop('href',$this->base_uri.'/'.$name.'/'))),
+			'email-address-set' => Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER, 'email-address-set', ''),
+			'calendar-home-set' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-home-set', array(
+				Api\CalDAV::mkprop('href', $this->base_uri.'/'.$name.'/'))),
 		));
 	}
 
@@ -1173,7 +1172,7 @@ 
 	 * @param string &$displayname=null on return displayname of resource
 	 * @return string eg. "locations/123-some-room" or "resouces/345-some-device"
 	 */
-	public static function resource2name($resource, &$is_location=null, &$displayname=null)
+	public static function resource2name($resource, &$is_location = null, &$displayname = null)
 	{
 		if (!is_array($resource) && !($resource = self::read_resource($resource)))
 		{
@@ -1181,10 +1180,10 @@ 
 		}
 		if (is_null($is_location)) $is_location = self::resource_is_location($resource);
 
-		$displayname = Api\Translation::convert($resource['name'],	Api\Translation::charset(), 'utf-8');
+		$displayname = Api\Translation::convert($resource['name'], Api\Translation::charset(), 'utf-8');
 
 		return ($is_location ? 'locations/' : 'resources/').$resource['res_id'].'-'.
-			preg_replace('/[^a-z0-9]+/i','-', Api\Translation::to_ascii($resource['name']));
+			preg_replace('/[^a-z0-9]+/i', '-', Api\Translation::to_ascii($resource['name']));
 	}
 
 	/**
@@ -1195,7 +1194,7 @@ 
 	 */
 	public static function resource_is_location($resource)
 	{
-		static $location_cats=null;
+		static $location_cats = null;
 		if (is_null($location_cats))
 		{
 			$config = Api\Config::read('resources');
@@ -1216,7 +1215,7 @@ 
 	 */
 	public static function read_resource($res_id)
 	{
-		static $cache=null;	// some per-request caching
+		static $cache = null; // some per-request caching
 
 		if (isset(self::$all_resources) && isset(self::$all_resources[$res_id]))
 		{
@@ -1258,7 +1257,7 @@ 
 	 * @param int $user =null account_if of user, or null for current user
 	 * @return array of array with values for res_id, cat_id and name (no other values1)
 	 */
-	public static function get_resources($user=null)
+	public static function get_resources($user = null)
 	{
 		if (!isset(self::$all_resources))
 		{
@@ -1266,18 +1265,18 @@ 
 
 			self::$all_resources = array();
 			$query = array(
-				'show_bookable' => true,	// ignore non-bookable resources
+				'show_bookable' => true, // ignore non-bookable resources
 				'filter2' => -3,
 				'start' => 0,
-				'num_rows' => 10000,	// return all aka first 10000 entries
+				'num_rows' => 10000, // return all aka first 10000 entries
 			);
 			$rows = $readonlys = null;
 			if (self::$resources->get_rows($query, $rows, $readonlys))
 			{
 				//_debug_array($rows);
-				foreach($rows as $resource)
+				foreach ($rows as $resource)
 				{
-					self::$all_resources[$resource['res_id']] = array_intersect_key($resource, array('res_id'=>true,'cat_id'=>true,'name'=>true));
+					self::$all_resources[$resource['res_id']] = array_intersect_key($resource, array('res_id'=>true, 'cat_id'=>true, 'name'=>true));
 				}
 			}
 		}
@@ -1293,7 +1292,7 @@ 
 	 */
 	protected function get_resource_rights()
 	{
-		static $grants=null;
+		static $grants = null;
 
 		if (is_null($grants))
 		{
@@ -1326,19 +1325,19 @@ 
 	 * @param string $principal_url =null include given principal url, relative to principal-collection-set, default $principal
 	 * @return array with values for keys 'path' and 'props'
 	 */
-	protected function add_principal($principal, array $props = array(), $principal_url=null)
+	protected function add_principal($principal, array $props = array(), $principal_url = null)
 	{
 		$props['resourcetype'][] = Api\CalDAV::mkprop('principal', '');
 
 		// required props per WebDAV ACL
-		foreach(array('alternate-URI-set', 'group-membership') as $name)
+		foreach (array('alternate-URI-set', 'group-membership') as $name)
 		{
-			if (!isset($props[$name])) $props[$name] = Api\CalDAV::mkprop($name,'');
+			if (!isset($props[$name])) $props[$name] = Api\CalDAV::mkprop($name, '');
 		}
 		if (!$principal_url) $principal_url = $principal;
 
 		$props['principal-URL'] = array(
-			Api\CalDAV::mkprop('href',$this->base_uri.'/principals/'.$principal.'/'));
+			Api\CalDAV::mkprop('href', $this->base_uri.'/principals/'.$principal.'/'));
 
 		return $this->add_collection('/principals/'.$principal.'/', $props);
 	}
@@ -1354,20 +1353,20 @@ 
 	 * @param array $resource =null resource to use (to not query it multiple times from the database)
 	 * @return array with values for 'path' and 'props'
 	 */
-	protected function add_proxys($principal, $type, array $proxys=array(), array $resource=null)
+	protected function add_proxys($principal, $type, array $proxys = array(), array $resource = null)
 	{
 		list($app,,$what) = explode('-', $type);
 
-		if (true) $proxys = array();	// ignore parameter!
-		list($account_type,$account) = explode('/', $principal);
+		if (true) $proxys = array(); // ignore parameter!
+		list($account_type, $account) = explode('/', $principal);
 
-		switch($account_type)
+		switch ($account_type)
 		{
 			case 'users':
 			case 'groups':
 				$account = $location = $this->accounts->name2id($account, 'account_lid', $account_type[0]);
 				$right = $what == 'write' ? Api\Acl::EDIT : Api\Acl::READ;
-				$mask = $what == 'write' ? Api\Acl::EDIT : Api\Acl::EDIT|Api\Acl::READ;	// do NOT report write+read in read
+				$mask = $what == 'write' ? Api\Acl::EDIT : Api\Acl::EDIT|Api\Acl::READ; // do NOT report write+read in read
 				break;
 
 			case 'locations':
@@ -1379,18 +1378,18 @@ 
 				}
 				$location = 'L'.$resource['cat_id'];
 				$right = $what == 'write' ? EGW_ACL_DIRECT_BOOKING : EGW_ACL_CALREAD;
-				$mask = $what == 'write' ? EGW_ACL_DIRECT_BOOKING : EGW_ACL_DIRECT_BOOKING|EGW_ACL_CALREAD;	// do NOT report write+read in read
+				$mask = $what == 'write' ? EGW_ACL_DIRECT_BOOKING : EGW_ACL_DIRECT_BOOKING|EGW_ACL_CALREAD; // do NOT report write+read in read
 				break;
 		}
 		static $principal2grants = array();
-		$grants =& $principal2grants[$principal];
+		$grants = & $principal2grants[$principal];
 		if (!isset($grants))
 		{
-			switch($app)
+			switch ($app)
 			{
 				case 'resources':
 					$res_grants = $this->get_resource_rights();
-					$grants = (array)$res_grants[$location];	// returns array($location => $grants)
+					$grants = (array)$res_grants[$location]; // returns array($location => $grants)
 					break;
 
 				case 'calendar':
@@ -1400,9 +1399,9 @@ 
 			}
 			//echo "<p>type=$type --> app=$app, what=$what --> right=$right, mask=$mask, account=$account, location=$location --> grants=".array2string($grants)."</p>\n";
 		}
-		foreach($grants as $account_id => $rights)
+		foreach ($grants as $account_id => $rights)
 		{
-			if ($account_id !== 'run' && $account_id != $account && ($rights & $mask) == $right &&
+			if ($account_id !== 'run' && $account_id != $account && ($rights&$mask) == $right &&
 				($account_lid = $this->accounts->id2name($account_id)))
 			{
 				// ignore "broken" grants (eg. negative account_id for a user), as they lead to further errors (no members)
@@ -1433,12 +1432,12 @@ 
 	 * @param int $account who is the proxy
 	 * @return array with href props
 	 */
-	protected function principal_set($prop, array $accounts=array(), $app_proxys=null, $account=null)
+	protected function principal_set($prop, array $accounts = array(), $app_proxys = null, $account = null)
 	{
-		unset($prop);	// not used, but required by function signature
+		unset($prop); // not used, but required by function signature
 
 		$set = array();
-		foreach($accounts as $account_id => $account_lid)
+		foreach ($accounts as $account_id => $account_lid)
 		{
 			if ($this->accounts->visible($account_lid))	// only add visible accounts, gives error in iCal otherwise
 			{
@@ -1447,11 +1446,11 @@ 
 		}
 		if ($app_proxys)
 		{
-			foreach((array)$app_proxys as $app)
+			foreach ((array)$app_proxys as $app)
 			{
 				if (!isset($GLOBALS['egw_info']['user']['apps'][$app])) continue;
 
-				switch($app)
+				switch ($app)
 				{
 					case 'resources':
 						$proxy_groups = $this->get_resource_proxy_groups($account);
@@ -1483,11 +1482,11 @@ 
 			// get location grants for $account (incl. his memberships)
 			$memberships = $GLOBALS['egw']->accounts->memberships($account, true);
 			$location_grants = array();
-			foreach($all_location_grants as $location => $grants)
+			foreach ($all_location_grants as $location => $grants)
 			{
-				foreach($grants as $account_id => $rights)
+				foreach ($grants as $account_id => $rights)
 				{
-					if (($rights & (EGW_ACL_CALREAD|EGW_ACL_DIRECT_BOOKING)) &&	// we only care for these rights
+					if (($rights&(EGW_ACL_CALREAD|EGW_ACL_DIRECT_BOOKING)) && // we only care for these rights
 						($account_id == $account || in_array($account_id, $memberships)))
 					{
 						if (!isset($location_grants[$location])) $location_grants[$location] = 0;
@@ -1496,13 +1495,13 @@ 
 				}
 			}
 			// now add proxy-groups for all resources user has rights to
-			foreach($resources as $resource)
+			foreach ($resources as $resource)
 			{
 				$rights = $location_grants['L'.$resource['cat_id']];
 				if (isset($rights))
 				{
 					$set[] = Api\CalDAV::mkprop('href', $this->base_uri.'/principals/'.$this->resource2name($resource).
-						'/calendar-proxy-'.($rights & EGW_ACL_DIRECT_BOOKING ? 'write' : 'read').'/');
+						'/calendar-proxy-'.($rights&EGW_ACL_DIRECT_BOOKING ? 'write' : 'read').'/');
 				}
 			}
 		}
@@ -1517,18 +1516,18 @@ 
 	 * @param string|array $app ='calendar' applications for which proxys should be added
 	 * @return array with href props
 	 */
-	protected function get_calendar_proxy_groups($account, $app='calendar')
+	protected function get_calendar_proxy_groups($account, $app = 'calendar')
 	{
 		$set = array();
-		foreach($this->acl->get_grants($app, $app != 'addressbook', $account) as $account_id => $rights)
+		foreach ($this->acl->get_grants($app, $app != 'addressbook', $account) as $account_id => $rights)
 		{
-			if ($account_id != $account && ($rights & Api\Acl::READ) &&
+			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
 			{
 				$set[] = Api\CalDAV::mkprop('href', $this->base_uri.'/principals/'.
 					($account_id < 0 ? 'groups/' : 'users/').
-					$account_lid.'/'.$app.'-proxy-'.($rights & Api\Acl::EDIT ? 'write' : 'read').'/');
+					$account_lid.'/'.$app.'-proxy-'.($rights&Api\Acl::EDIT ? 'write' : 'read').'/');
 			}
 		}
 		return $set;
@@ -1543,7 +1542,7 @@ 
 	 * @param boolean $do_locations =false false: /principal/resources, true: /principals/locations
 	 * @return array|string array with files or HTTP error code
 	 */
-	protected function propfind_resources($name,$rest,array $options,$do_locations=false)
+	protected function propfind_resources($name, $rest, array $options, $do_locations = false)
 	{
 		if (!isset($GLOBALS['egw_info']['user']['apps']['resources']))
 		{
@@ -1562,7 +1561,7 @@ 
 				if (($resources = $this->get_resources()))
 				{
 					//_debug_array($resources);
-					foreach($resources as $resource)
+					foreach ($resources as $resource)
 					{
 						if (($is_location = self::resource_is_location($resource)) == $do_locations)
 						{
@@ -1579,11 +1578,11 @@ 
 				return '404 Not Found';
 			}
 			$path = ($is_location ? 'locations/' : 'resources/').$name;
-			while (substr($rest,-1) == '/')
+			while (substr($rest, -1) == '/')
 			{
-				$rest = substr($rest,0,-1);
+				$rest = substr($rest, 0, -1);
 			}
-			switch((string)$rest)
+			switch ((string)$rest)
 			{
 				case '':
 					$files[] = $this->add_principal_resource($resource);
@@ -1622,12 +1621,12 @@ 
 		if ($options['depth'])
 		{
 			if (is_numeric($options['depth'])) --$options['depth'];
-			$files = array_merge($files, $this->propfind_users('','',$options),
-				$this->propfind_groups('','',$options));
+			$files = array_merge($files, $this->propfind_users('', '', $options),
+				$this->propfind_groups('', '', $options));
 			if ($GLOBALS['egw_info']['user']['apps']['resources'])
 			{
-				$files = array_merge($files, $this->propfind_resources('','',$options,false),	// resources
-					$this->propfind_resources('','',$options,true));	// locations
+				$files = array_merge($files, $this->propfind_resources('', '', $options, false), // resources
+					$this->propfind_resources('', '', $options, true)); // locations
 			}
 			//$files = array_merge($files,$this->propfind_uids('','',$options));
 		}
@@ -1642,9 +1641,9 @@ 
 	 * @param int $user =null account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function get(&$options,$id,$user=null)
+	function get(&$options, $id, $user = null)
 	{
-		unset($options, $id, $user);	// not used, but required by function signature
+		unset($options, $id, $user); // not used, but required by function signature
 
 		return false;
 	}
@@ -1657,9 +1656,9 @@ 
 	 * @param int $user =null account_id of owner, default null
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function put(&$options,$id,$user=null)
+	function put(&$options, $id, $user = null)
 	{
-		unset($options, $id, $user);	// not used, but required by function signature
+		unset($options, $id, $user); // not used, but required by function signature
 
 		return false;
 	}
@@ -1671,9 +1670,9 @@ 
 	 * @param int $id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function delete(&$options,$id)
+	function delete(&$options, $id)
 	{
-		unset($options, $id);	// not used, but required by function signature
+		unset($options, $id); // not used, but required by function signature
 
 		return false;
 	}
@@ -1686,7 +1685,7 @@ 
 	 */
 	function read($id)
 	{
-		unset($id);	// not used, but required by function signature
+		unset($id); // not used, but required by function signature
 
 		return false;
 	}
@@ -1698,13 +1697,13 @@ 
 	 * @param array|int $entry entry-array or id
 	 * @return boolean null if entry does not exist, false if no access, true if access permitted
 	 */
-	function check_access($acl,$entry)
+	function check_access($acl, $entry)
 	{
 		if ($acl != Api\Acl::READ)
 		{
 			return false;
 		}
-		if (!is_array($entry) && !$this->accounts->name2id($entry,'account_lid','u'))
+		if (!is_array($entry) && !$this->accounts->name2id($entry, 'account_lid', 'u'))
 		{
 			return null;
 		}
@@ -1741,9 +1740,9 @@ 
 	 * @param int $user =null owner of the collection, default current user
 	 * @return array with privileges
 	 */
-	public function current_user_privileges($path, $user=null)
+	public function current_user_privileges($path, $user = null)
 	{
-		unset($path, $user);	// not used, but required by function signature
+		unset($path, $user); // not used, but required by function signature
 
 		return array('read', 'read-current-user-privilege-set');
 	}

api/src/Translation.php

Spacing +100 added lines, -100 removed lines

@@ -99,7 +99,7 @@ 
 	 *
 	 * @var array
 	 */
-	static $instance_specific_translations = array('loginscreen','mainscreen','custom');
+	static $instance_specific_translations = array('loginscreen', 'mainscreen', 'custom');
 
 	/**
 	 * returns the charset to use (!$lang) or the charset of the lang-files or $lang
@@ -107,7 +107,7 @@ 
 	 * @param string|boolean $lang =False return charset of the active user-lang, or $lang if specified
 	 * @return string charset
 	 */
-	static function charset($lang=False)
+	static function charset($lang = False)
 	{
 		static $charsets = array();
 
@@ -115,11 +115,11 @@ 
 		{
 			if (!isset($charsets[$lang]))
 			{
-				if (!($charsets[$lang] = self::$db->select(self::LANG_TABLE,'content',array(
+				if (!($charsets[$lang] = self::$db->select(self::LANG_TABLE, 'content', array(
 					'lang'		=> $lang,
 					'message_id'=> 'charset',
 					'app_name'	=> 'common',
-				),__LINE__,__FILE__)->fetchColumn()))
+				), __LINE__, __FILE__)->fetchColumn()))
 				{
 					$charsets[$lang] = 'utf-8';
 				}
@@ -153,7 +153,7 @@ 
 	 *
 	 * @param boolean $load_translations =true should we also load translations for common and currentapp
 	 */
-	static function init($load_translations=true)
+	static function init($load_translations = true)
 	{
 		if (!isset(self::$db))
 		{
@@ -165,11 +165,11 @@ 
 		}
 		else
 		{
-			self::$system_charset =& $GLOBALS['egw_setup']->system_charset;
+			self::$system_charset = & $GLOBALS['egw_setup']->system_charset;
 		}
 		if ((self::$mbstring = check_load_extension('mbstring')))
 		{
-			if(!empty(self::$system_charset))
+			if (!empty(self::$system_charset))
 			{
 				$ini_default_charset = version_compare(PHP_VERSION, '5.6', '<') ? 'mbstring.internal_encoding' : 'default_charset';
 				ini_set($ini_default_charset, self::$system_charset);
@@ -178,7 +178,7 @@ 
 
 		// try loading load_via from tree-wide cache and check if it contains more rules
 		if (($load_via = Cache::getTree(__CLASS__, 'load_via')) &&
-			$load_via >= self::$load_via && 	// > for array --> contains more elements
+			$load_via >= self::$load_via && // > for array --> contains more elements
 			// little sanity check: cached array contains all stock keys, otherwise ignore it
 			!array_diff_key(self::$load_via, $load_via))
 		{
@@ -217,13 +217,13 @@ 
 	 * @param string $not_found ='*' what to add to not found phrases, default '*'
 	 * @return string with translation
 	 */
-	static function translate($key, $vars=null, $not_found='' )
+	static function translate($key, $vars = null, $not_found = '')
 	{
 		if (!self::$lang_arr)
 		{
 			self::init();
 		}
-		$ret = $key;				// save key if we dont find a translation
+		$ret = $key; // save key if we dont find a translation
 		if ($not_found) $ret .= $not_found;
 
 		if (isset(self::$lang_arr[$key]))
@@ -243,16 +243,16 @@ 
 		{
 			if (count($vars) > 1)
 			{
-				static $placeholders = array('%3','%2','%1','|%2|','|%3|','%4','%5','%6','%7','%8','%9','%10');
+				static $placeholders = array('%3', '%2', '%1', '|%2|', '|%3|', '%4', '%5', '%6', '%7', '%8', '%9', '%10');
 				// to cope with $vars[0] containing '%2' (eg. an urlencoded path like a referer),
 				// we first replace '%2' in $ret with '|%2|' and then use that as 2. placeholder
 				// we do that for %3 as well, ...
-				$vars = array_merge(array('|%3|','|%2|'),$vars);	// push '|%2|' (and such) as first replacement on $vars
-				$ret = str_replace($placeholders,$vars,$ret);
+				$vars = array_merge(array('|%3|', '|%2|'), $vars); // push '|%2|' (and such) as first replacement on $vars
+				$ret = str_replace($placeholders, $vars, $ret);
 			}
 			else
 			{
-				$ret = str_replace('%1',$vars[0],$ret);
+				$ret = str_replace('%1', $vars[0], $ret);
 			}
 		}
 		return $ret;
@@ -267,14 +267,14 @@ 
 	 * 	if multiple names given, they are requested in one request from cache and loaded in given order
 	 * @param string $lang =false 2 or 5 char lang-code or false for the users language
 	 */
-	static function add_app($apps, $lang=null)
+	static function add_app($apps, $lang = null)
 	{
 		//error_log(__METHOD__."(".array2string($apps).", $lang) count(self::\$lang_arr)=".count(self::$lang_arr));
 		//$start = microtime(true);
 		if (!$lang) $lang = self::$userlang;
 		$tree_level = $instance_level = array();
 		if (!is_array($apps)) $apps = (array)$apps;
-		foreach($apps as $key => $app)
+		foreach ($apps as $key => $app)
 		{
 			if (!isset(self::$loaded_apps[$app]) || self::$loaded_apps[$app] != $lang && $app != 'common')
 			{
@@ -298,26 +298,26 @@ 
 
 		// merging loaded translations together
 		$updated_load_via = false;
-		foreach((array)$apps as $app)
+		foreach ((array)$apps as $app)
 		{
 			$l = $app == 'custom' ? 'en' : $lang;
 			if (isset($tree_level[$app.':'.$l]))
 			{
-				$loaded =& $tree_level[$app.':'.$l];
+				$loaded = & $tree_level[$app.':'.$l];
 			}
 			elseif (isset($instance_level[$app.':'.$l]))
 			{
-				$loaded =& $instance_level[$app.':'.$l];
+				$loaded = & $instance_level[$app.':'.$l];
 			}
 			else
 			{
 				if (($instance_specific = in_array($app, self::$instance_specific_translations)))
 				{
-					$loaded =& self::load_app($app, $l);
+					$loaded = & self::load_app($app, $l);
 				}
 				else
 				{
-					$loaded =& self::load_app_files($app, $l, null, $updated_load_via);
+					$loaded = & self::load_app_files($app, $l, null, $updated_load_via);
 				}
 				//error_log(__METHOD__."('$app', '$lang') instance_specific=$instance_specific, load_app(_files)() returned ".(is_array($loaded)?'Array('.count($loaded).')':array2string($loaded)));
 				if ($loaded || $instance_specific)
@@ -330,14 +330,14 @@ 
 			if ($loaded)
 			{
 				self::$lang_arr = array_merge(self::$lang_arr, $loaded);
-				self::$loaded_apps[$app] = $l;	// dont set something not existing to $loaded_apps, no need to load client-side
+				self::$loaded_apps[$app] = $l; // dont set something not existing to $loaded_apps, no need to load client-side
 			}
 		}
 		// Re-merge custom over instance level, they have higher precidence
-		if($tree_level && !$instance_level && self::$instance_specific_translations)
+		if ($tree_level && !$instance_level && self::$instance_specific_translations)
 		{
 			$custom = Cache::getInstance(__CLASS__, 'custom:en');
-			if($custom)
+			if ($custom)
 			{
 				self::$lang_arr = array_merge(self::$lang_arr, $custom);
 			}
@@ -358,15 +358,15 @@ 
 	 * @param string $lang =false 2 or 5 char lang-code or false for the users language
 	 * @return array the loaded strings
 	 */
-	static function &load_app($app,$lang)
+	static function &load_app($app, $lang)
 	{
 		//$start = microtime(true);
 		if (is_null(self::$db)) self::init(false);
 		$loaded = array();
-		foreach(self::$db->select(self::LANG_TABLE,'message_id,content',array(
+		foreach (self::$db->select(self::LANG_TABLE, 'message_id,content', array(
 			'lang'		=> $lang,
 			'app_name'	=> $app,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
 			$loaded[strtolower($row['message_id'])] = $row['content'];
 		}
@@ -390,7 +390,7 @@ 
 		'sitemgr-link' => array('sitemgr'),
 		'groupdav' => array('api'),
 		'developer_tools' => array('etemplate'),
-		'login' => array('api','registration'),
+		'login' => array('api', 'registration'),
 	);
 
 	/**
@@ -402,7 +402,7 @@ 
 	{
 		$lang = $GLOBALS['egw_info']['user']['preferences']['common']['lang'];
 		$apps = array_keys($GLOBALS['egw_info']['apps']);
-		foreach($apps as $app)
+		foreach ($apps as $app)
 		{
 			$file = self::get_lang_file($app, $lang);
 			// check if file has changed compared to what's cached
@@ -432,7 +432,7 @@ 
 		Cache::unsetTree(__CLASS__, $app.':'.$lang);
 		Cache::unsetTree(__CLASS__, self::get_lang_file($app, $lang));
 
-		foreach(self::$load_via as $load => $via)
+		foreach (self::$load_via as $load => $via)
 		{
 			//error_log("load_via[load='$load'] = via = ".array2string($via));
 			if ($via === 'all-apps' || in_array($app, (array)$via))
@@ -454,7 +454,7 @@ 
 	 * @param string $_lang =null
 	 * @return array $lang or $app => number pairs
 	 */
-	static function statistics($_lang=null)
+	static function statistics($_lang = null)
 	{
 		$cache = Cache::getTree(__CLASS__, 'statistics');
 
@@ -465,7 +465,7 @@ 
 			{
 				$en_phrases = array_keys(self::load_app_files(null, 'en', 'all-apps'));
 				$cache['']['en'] = count($en_phrases);
-				foreach(array_keys(self::get_available_langs()) as $lang)
+				foreach (array_keys(self::get_available_langs()) as $lang)
 				{
 					if ($lang == 'en') continue;
 					$lang_phrases = array_keys(self::load_app_files(null, $lang, 'all-apps'));
@@ -476,7 +476,7 @@ 
 			else
 			{
 				$cache['en'] = array();
-				foreach(scandir(EGW_SERVER_ROOT) as $app)
+				foreach (scandir(EGW_SERVER_ROOT) as $app)
 				{
 					if ($app[0] == '.' || !is_dir(EGW_SERVER_ROOT.'/'.$app) ||
 						!file_exists(self::get_lang_file($app, 'en')))
@@ -514,7 +514,7 @@ 
 		if (!in_array($_app, self::$instance_specific_translations))
 		{
 			// 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));
+			$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);
 
@@ -534,7 +534,7 @@ 
 	 * @param type $time
 	 * @return type
 	 */
-	static function max_lang_time($time=null)
+	static function max_lang_time($time = null)
 	{
 		static $max_lang_time = null;
 
@@ -545,7 +545,7 @@ 
 		if (isset($time) && $time > $max_lang_time)
 		{
 			//error_log(__METHOD__."($time) updating previous max_lang_time=$max_lang_time to $time");
-			Cache::setTree(__CLASS__, 'max_lang_time', $max_lang_time=$time);
+			Cache::setTree(__CLASS__, 'max_lang_time', $max_lang_time = $time);
 		}
 		return $max_lang_time;
 	}
@@ -561,34 +561,34 @@ 
 	 * @param boolean $updated_load_via =false on return true if self::$load_via was updated
 	 * @return array the loaded strings
 	 */
-	static function &load_app_files($app, $lang, $just_app_file=null, &$updated_load_via=false)
+	static function &load_app_files($app, $lang, $just_app_file = null, &$updated_load_via = false)
 	{
 		//$start = microtime(true);
 		$load_app = isset($just_app_file) ? $just_app_file : (isset(self::$load_via[$app]) ? self::$load_via[$app] : $app);
 		$loaded = array();
-		foreach($load_app == 'all-apps' ? scandir(EGW_SERVER_ROOT) : (array)$load_app as $app_dir)
+		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)) ||
+				!@file_exists($file = self::get_lang_file($app_dir, $lang)) ||
 				!($f = fopen($file, 'r')))
 			{
 				continue;
 			}
 			// store ctime of file we parse
-			Cache::setTree(__CLASS__, $file, $time=filemtime($file));
+			Cache::setTree(__CLASS__, $file, $time = filemtime($file));
 			self::max_lang_time($time);
 
 			$line_nr = 0;
 			//use fgets and split the line, as php5.3.3 with squeeze does not support splitting lines with fgetcsv while reading properly
 			//if the first letter after the delimiter is a german umlaut (UTF8 representation thereoff)
 			//while(($line = fgetcsv($f, 1024, "\t")))
-			while(($read = fgets($f)))
+			while (($read = fgets($f)))
 			{
 				$line = explode("\t", trim($read));
 				++$line_nr;
 				if (count($line) != 4) continue;
-				list($l_id,$l_app,$l_lang,$l_translation) = $line;
+				list($l_id, $l_app, $l_lang, $l_translation) = $line;
 				if ($l_lang != $lang) continue;
 				if (!isset($just_app_file) && $l_app != $app)
 				{
@@ -629,7 +629,7 @@ 
 			// little sanity check: cached array contains all stock keys, otherwise ignore it
 			!array_diff_key(self::$load_via, $load_via))
 		{
-			foreach($load_via as $app => $via)
+			foreach ($load_via as $app => $via)
 			{
 				if (self::$load_via[$app] != $via)
 				{
@@ -655,15 +655,15 @@ 
 	 * @param boolean $force_read =false force a re-read of the languages
 	 * @return array with lang-code => descriptiv lang-name pairs
 	 */
-	static function get_available_langs($translate=true, $force_read=false)
+	static function get_available_langs($translate = true, $force_read = false)
 	{
 		if (!is_array(self::$langs) || $force_read)
 		{
-			if (!($f = fopen($file=EGW_SERVER_ROOT.'/setup/lang/languages','rb')))
+			if (!($f = fopen($file = EGW_SERVER_ROOT.'/setup/lang/languages', 'rb')))
 			{
 				throw new Exception("List of available languages (%1) missing!", $file);
 			}
-			while(($line = fgetcsv($f, null, "\t")))
+			while (($line = fgetcsv($f, null, "\t")))
 			{
 				self::$langs[$line[0]] = $line[1];
 			}
@@ -673,12 +673,12 @@ 
 			{
 				if (is_null(self::$db)) self::init(false);
 
-				foreach(self::$langs as $lang => $name)
+				foreach (self::$langs as $lang => $name)
 				{
-					self::$langs[$lang] = self::translate($name,False,'');
+					self::$langs[$lang] = self::translate($name, False, '');
 				}
 			}
-			uasort(self::$langs,'strcasecmp');
+			uasort(self::$langs, 'strcasecmp');
 		}
 		return self::$langs;
 	}
@@ -691,7 +691,7 @@ 
 	 * @param boolean $force_read =false force a re-read of the languages
 	 * @return array with lang-code => descriptiv lang-name pairs
 	 */
-	static function get_installed_langs($force_read=false)
+	static function get_installed_langs($force_read = false)
 	{
 		return self::get_available_langs($force_read);
 	}
@@ -708,7 +708,7 @@ 
 		{
 			return self::$langs[$lang];
 		}
-		return self::$db->select(self::LANGUAGES_TABLE,'lang_name',array('lang_id' => $lang),__LINE__,__FILE__)->fetchColumn();
+		return self::$db->select(self::LANGUAGES_TABLE, 'lang_name', array('lang_id' => $lang), __LINE__, __FILE__)->fetchColumn();
 	}
 
 	/**
@@ -717,20 +717,20 @@ 
 	 * @param boolean $force_read =false
 	 * @return array with lang_id => lang_name pairs
 	 */
-	static function list_langs($force_read=false)
+	static function list_langs($force_read = false)
 	{
 		if (!$force_read)
 		{
-			return Cache::getInstance(__CLASS__,'list_langs',array(__CLASS__,'list_langs'),array(true));
+			return Cache::getInstance(__CLASS__, 'list_langs', array(__CLASS__, 'list_langs'), array(true));
 		}
-		$languages = self::get_installed_langs();	// available languages
-		$availible = "('".implode("','",array_keys($languages))."')";
+		$languages = self::get_installed_langs(); // available languages
+		$availible = "('".implode("','", array_keys($languages))."')";
 
 		// this shows first the installed, then the available and then the rest
-		foreach(self::$db->select(self::LANGUAGES_TABLE,array(
-			'lang_id','lang_name',
+		foreach (self::$db->select(self::LANGUAGES_TABLE, array(
+			'lang_id', 'lang_name',
 			"CASE WHEN lang_id IN $availible THEN 1 ELSE 0 END AS availible",
-		),"lang_id NOT IN ('".implode("','",array_keys($languages))."')",__LINE__,__FILE__,false,' ORDER BY availible DESC,lang_name') as $row)
+		), "lang_id NOT IN ('".implode("','", array_keys($languages))."')", __LINE__, __FILE__, false, ' ORDER BY availible DESC,lang_name') as $row)
 		{
 			$languages[$row['lang_id']] = $row['lang_name'];
 		}
@@ -744,7 +744,7 @@ 
 	 * @param string $lang language code
 	 * @return the full path of the filename for the requested app and language
 	 */
-	static function get_lang_file($app,$lang)
+	static function get_lang_file($app, $lang)
 	{
 		if ($app == 'common') $app = 'phpgwapi';
 		return EGW_SERVER_ROOT.'/'.$app.'/'.self::LANG_DIR.'/'.self::LANGFILE_PREFIX.$lang.self::LANGFILE_EXTENSION;
@@ -757,7 +757,7 @@ 
 	 */
 	static function get_installed_charsets()
 	{
-		static $charsets=null;
+		static $charsets = null;
 
 		if (!isset($charsets))
 		{
@@ -787,13 +787,13 @@ 
 		static $extra = array(
 			'&szlig;' => 'ss',
 		);
-		$entities = htmlentities($_str,ENT_QUOTES,self::charset());
+		$entities = htmlentities($_str, ENT_QUOTES, self::charset());
 
-		$estr = str_replace(array_keys($extra),array_values($extra), $entities);
-		$ustr = preg_replace('/&([aAuUoO])uml;/','\\1e', $estr);	// replace german umlauts with the letter plus one 'e'
-		$astr = preg_replace('/&([a-zA-Z])(grave|acute|circ|ring|cedil|tilde|slash|uml);/','\\1', $ustr);	// remove all types of accents
+		$estr = str_replace(array_keys($extra), array_values($extra), $entities);
+		$ustr = preg_replace('/&([aAuUoO])uml;/', '\\1e', $estr); // replace german umlauts with the letter plus one 'e'
+		$astr = preg_replace('/&([a-zA-Z])(grave|acute|circ|ring|cedil|tilde|slash|uml);/', '\\1', $ustr); // remove all types of accents
 
-		return preg_replace('/&([a-zA-Z]+|#[0-9]+|);/','', $astr);	// remove all other entities
+		return preg_replace('/&([a-zA-Z]+|#[0-9]+|);/', '', $astr); // remove all other entities
 	}
 
 	/**
@@ -805,7 +805,7 @@ 
 	 * @param boolean $check_to_from =true internal to bypass all charset replacements
 	 * @return string|array converted string(s) from $data
 	 */
-	static function convert($data,$from=False,$to=False,$check_to_from=true)
+	static function convert($data, $from = False, $to = False, $check_to_from = true)
 	{
 		if ($check_to_from)
 		{
@@ -816,7 +816,7 @@ 
 			if (!$from)
 			{
 				$from = self::$mbstring ? strtolower(mb_detect_encoding($data)) : 'iso-8859-1';
-				if($from == 'ascii')
+				if ($from == 'ascii')
 				{
 					$from = 'iso-8859-1';
 				}
@@ -826,7 +826,7 @@ 
 				 php does not seem to support gb2312
 				 but seems to be able to decode it as EUC-CN
 			*/
-			switch($from)
+			switch ($from)
 			{
 				case 'ks_c_5601-1987':
 					$from = 'CP949';
@@ -872,9 +872,9 @@ 
 		}
 		if (is_array($data))
 		{
-			foreach($data as $key => $str)
+			foreach ($data as $key => $str)
 			{
-				$ret[$key] = self::convert($str,$from,$to,false);	// false = bypass the above checks, as they are already done
+				$ret[$key] = self::convert($str, $from, $to, false); // false = bypass the above checks, as they are already done
 			}
 			return $ret;
 		}
@@ -886,7 +886,7 @@ 
 		{
 			return utf8_decode($data);
 		}
-		if (self::$mbstring && !$prefer_iconv && ($data = @mb_convert_encoding($data,$to,$from)) != '')
+		if (self::$mbstring && !$prefer_iconv && ($data = @mb_convert_encoding($data, $to, $from)) != '')
 		{
 			return $data;
 		}
@@ -914,12 +914,12 @@ 
 			// in an email on the first Traditional/Japanese/Korean character,
 			// but in reality when people send mails in GB2312, UMA mostly use
 			// extended GB13000/GB18030 which allow T/Jap/Korean characters.
-			if($from == 'euc-cn')
+			if ($from == 'euc-cn')
 			{
 				$from = 'gb18030';
 			}
 
-			if (($convertedData = iconv($from,$to,$data)))
+			if (($convertedData = iconv($from, $to, $data)))
 			{
 				return $convertedData;
 			}
@@ -934,9 +934,9 @@ 
 	 * @param string|boolean $from charset $data is in or False if it should be detected
 	 * @return string|array converted string(s) from $data
 	 */
-	static function convert_jsonsafe($_data,$from=False)
+	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));
 
@@ -945,12 +945,12 @@ 
 		{
 			$test = @json_encode($data);
 			//error_log(__METHOD__.__LINE__.' ->'.strlen($data).' Error:'.json_last_error().'<- data:#'.$test.'#');
-			if (($test=="null" || $test === false || is_null($test)) && strlen($data)>0)
+			if (($test == "null" || $test === false || is_null($test)) && strlen($data) > 0)
 			{
 				// try to fix broken utf8
-				$x = (function_exists('mb_convert_encoding')?mb_convert_encoding($data,'UTF-8','UTF-8'):(function_exists('iconv')?@iconv("UTF-8","UTF-8//IGNORE",$data):$data));
+				$x = (function_exists('mb_convert_encoding') ? mb_convert_encoding($data, 'UTF-8', 'UTF-8') : (function_exists('iconv') ? @iconv("UTF-8", "UTF-8//IGNORE", $data) : $data));
 				$test = @json_encode($x);
-				if (($test=="null" || $test === false || is_null($test)) && strlen($data)>0)
+				if (($test == "null" || $test === false || is_null($test)) && strlen($data) > 0)
 				{
 					// this should not be needed, unless something fails with charset detection/ wrong charset passed
 					error_log(__METHOD__.__LINE__.' Charset Reported:'.$from.' Charset Detected:'.self::detect_encoding($data));
@@ -973,36 +973,36 @@ 
 	 * @param string $message_id
 	 * @param string $content translation or null to delete translation
 	 */
-	static function write($lang,$app,$message_id,$content)
+	static function write($lang, $app, $message_id, $content)
 	{
 		if ($content)
 		{
-			self::$db->insert(self::LANG_TABLE,array(
+			self::$db->insert(self::LANG_TABLE, array(
 				'content' => $content,
-			),array(
+			), array(
 				'lang' => $lang,
 				'app_name' => $app,
 				'message_id' => $message_id,
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 		}
 		else
 		{
-			self::$db->delete(self::LANG_TABLE,array(
+			self::$db->delete(self::LANG_TABLE, array(
 				'lang' => $lang,
 				'app_name' => $app,
 				'message_id' => $message_id,
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 		}
 		// invalidate the cache
-		if(!in_array($app,self::$instance_specific_translations))
+		if (!in_array($app, self::$instance_specific_translations))
 		{
-			Cache::unsetCache(Cache::TREE,__CLASS__,$app.':'.$lang);
+			Cache::unsetCache(Cache::TREE, __CLASS__, $app.':'.$lang);
 		}
 		else
 		{
-			foreach(array_keys((array)self::get_installed_langs()) as $key)
+			foreach (array_keys((array)self::get_installed_langs()) as $key)
 			{
-				Cache::unsetCache(Cache::INSTANCE,__CLASS__,$app.':'.$key);
+				Cache::unsetCache(Cache::INSTANCE, __CLASS__, $app.':'.$key);
 			}
 		}
  	}
@@ -1015,13 +1015,13 @@ 
 	 * @param string $message_id
 	 * @return string|boolean content or false if not found
 	 */
-	static function read($lang,$app_name,$message_id)
+	static function read($lang, $app_name, $message_id)
 	{
-		return self::$db->select(self::LANG_TABLE,'content',array(
+		return self::$db->select(self::LANG_TABLE, 'content', array(
 			'lang' => $lang,
 			'app_name' => $app_name,
 			'message_id' => $message_id,
-		),__LINE__,__FILE__)->fetchColumn();
+		), __LINE__, __FILE__)->fetchColumn();
 	}
 
 	/**
@@ -1032,22 +1032,22 @@ 
 	 * @param string $lang ='' default check all langs
 	 * @return string
 	 */
-	static function get_message_id($translation,$app=null,$lang=null)
+	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;
 
-		$id = self::$db->select(self::LANG_TABLE,'message_id',$where,__LINE__,__FILE__)->fetchColumn();
+		$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)
+		if (!$id)
 		{
 			$ids = array_filter(array_keys(self::$lang_arr), function($haystack) use($translation) {
-				return stripos(self::$lang_arr[$haystack],$translation) !== false;
+				return stripos(self::$lang_arr[$haystack], $translation) !== false;
 			});
 			$id = array_shift($ids);
-			if(!$id && ($lang && $lang !== 'en' || self::$userlang != 'en'))
+			if (!$id && ($lang && $lang !== 'en' || self::$userlang != 'en'))
 			{
 				// Try english
 				if (in_array($app, self::$instance_specific_translations))
@@ -1064,7 +1064,7 @@ 
 				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) {
-					return stripos($lang_arr[$haystack],$translation) !== false;
+					return stripos($lang_arr[$haystack], $translation) !== false;
 				});
 				$id = array_shift($ids);
 			}
@@ -1081,7 +1081,7 @@ 
 	 * @param string $verify =null encoding to verify, get checked first and have a match for only ascii or no detection available
 	 * @return string - encoding
 	 */
-	static function detect_encoding($string, $verify=null)
+	static function detect_encoding($string, $verify = null)
 	{
 		if (function_exists('iconv'))
 		{
@@ -1104,7 +1104,7 @@ 
 		}
 		if ($verify && (!isset($detected) || $detected === 'ascii'))
 		{
-			return $verify;	// ascii matches all charsets
+			return $verify; // ascii matches all charsets
 		}
 		return isset($detected) ? $detected : 'iso-8859-1'; // we choose to return iso-8859-1 as default
 	}

api/src/Config.php

Spacing +27 added lines, -27 removed lines

@@ -86,11 +86,11 @@ 
 	{
 		if (is_array($this->config_data))
 		{
-			foreach($this->config_data as $name => $value)
+			foreach ($this->config_data as $name => $value)
 			{
 				self::save_value($name, $value, $this->appname, false);
 			}
-			foreach(self::$configs[$this->appname] as $name => $value)
+			foreach (self::$configs[$this->appname] as $name => $value)
 			{
 				if (!isset($this->config_data[$name]))	// has been deleted
 				{
@@ -99,9 +99,9 @@ 
 				}
 			}
 
-			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;
 
@@ -122,13 +122,13 @@ 
 	 * @throws Exception\WrongParameter if no $app parameter given for static call
 	 * @return boolean|int true if no change, else number of affected rows
 	 */
-	static function save_value($name, $value, $app, $update_cache=true)
+	static function save_value($name, $value, $app, $update_cache = true)
 	{
-		if (!$app && (!isset($this) || !is_a($this,__CLASS__)))
+		if (!$app && (!isset($this) || !is_a($this, __CLASS__)))
 		{
 			throw new Exception\WrongParameter('$app parameter required for static call of Config::save_value($name,$value,$app)!');
 		}
-		if (!$app || isset($this) && is_a($this,__CLASS__) && $app == $this->appname)
+		if (!$app || isset($this) && is_a($this, __CLASS__) && $app == $this->appname)
 		{
 			$app = $this->appname;
 			$this->config_data[$name] = $value;
@@ -140,25 +140,25 @@ 
 
 		if (isset(self::$configs[$app][$name]) && self::$configs[$app][$name] === $value)
 		{
-			return True;	// no change ==> exit
+			return True; // no change ==> exit
 		}
 
 		if (!isset($value) || $value === '')
 		{
 			if (isset(self::$configs[$app])) unset(self::$configs[$app][$name]);
-			self::$db->delete(self::TABLE,array('config_app'=>$app,'config_name'=>$name),__LINE__,__FILE__);
+			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);
-			self::$db->insert(self::TABLE,array('config_value'=>$value),array('config_app'=>$app,'config_name'=>$name),__LINE__,__FILE__);
+			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);
 		}
@@ -175,7 +175,7 @@ 
 		{
 			self::init_static();
 		}
-		self::$db->delete(self::TABLE,array('config_app' => $this->appname),__LINE__,__FILE__);
+		self::$db->delete(self::TABLE, array('config_app' => $this->appname), __LINE__, __FILE__);
 
 		unset(self::$configs[$this->appname]);
 		Cache::setInstance(__CLASS__, 'configs', self::$configs);
@@ -197,7 +197,7 @@ 
 	 * @param $variable_name string name of the config
 	 * @param $variable_data mixed the content
 	 */
-	function value($variable_name,$variable_data)
+	function value($variable_name, $variable_data)
 	{
 		$this->config_data[$variable_name] = $variable_data;
 	}
@@ -228,7 +228,7 @@ 
 	 * @deprecated use Api\Storage\Customfields::get()
 	 * @return array with customfields
 	 */
-	static function get_customfields($app, $all_private_too=false, $only_type2=null)
+	static function get_customfields($app, $all_private_too = false, $only_type2 = null)
 	{
 		//error_log(__METHOD__."('$app', $all_private_too, $only_type2) deprecated, use Storage\Customfields::get() in ".  function_backtrace());
 		return Storage\Customfields::get($app, $all_private_too, $only_type2);
@@ -258,12 +258,12 @@ 
 	{
 		static $white_list = array(
 			'all' => array('customfields', 'types'),
-			'phpgwapi' => array('webserver_url','server_timezone','enforce_ssl','system_charset',
-				'checkfornewversion','checkappversions','email_address_format',	// admin >> site config
-				'site_title','login_logo_file','login_logo_url','login_logo_title','favicon_file',
-				'markuntranslated','link_list_thumbnail','enabled_spellcheck','debug_minify',
-				'call_link','call_popup','geolocation_url',	// addressbook
-				'hide_birthdays','calview_no_consolidate', 'egw_tutorial_disable','fw_mobile_app_list'),	// calendar
+			'phpgwapi' => array('webserver_url', 'server_timezone', 'enforce_ssl', 'system_charset',
+				'checkfornewversion', 'checkappversions', 'email_address_format', // admin >> site config
+				'site_title', 'login_logo_file', 'login_logo_url', 'login_logo_title', 'favicon_file',
+				'markuntranslated', 'link_list_thumbnail', 'enabled_spellcheck', 'debug_minify',
+				'call_link', 'call_popup', 'geolocation_url', // addressbook
+				'hide_birthdays', 'calview_no_consolidate', 'egw_tutorial_disable', 'fw_mobile_app_list'), // calendar
 			'projectmanager' => array('hours_per_workday', 'duration_units'),
 			'manual' => array('manual_remote_egw_url'),
 			'infolog' => array('status'),
@@ -274,9 +274,9 @@ 
 			self::init_static();
 		}
 		$client_config = array();
-		foreach(self::$configs as $app => $config)
+		foreach (self::$configs as $app => $config)
 		{
-			foreach($config as $name => $value)
+			foreach ($config as $name => $value)
 			{
 				if (strpos($name, 'pass') !== false) continue;
 
@@ -314,12 +314,12 @@ 
 		}
 		// handling of old PHP serialized config values
 		$data = php_safe_unserialize($str);
-		if($data === false)
+		if ($data === false)
 		{
 			// manually retrieve the string lengths of the serialized array if unserialize failed (iso / utf-8 conversation)
 			$data = php_safe_unserialize(preg_replace_callback('!s:(\d+):"(.*?)";!s', function($matches)
 			{
-				return 's:'.mb_strlen($matches[2],'8bit').':"'.$matches[2].'";';
+				return 's:'.mb_strlen($matches[2], '8bit').':"'.$matches[2].'";';
 			}, $str));
 		}
 		// returning original string, if unserialize failed, eg. for "a:hello"
@@ -344,7 +344,7 @@ 
 		if (!(self::$configs = Cache::getInstance(__CLASS__, 'configs')) || !is_array(self::$configs['phpgwapi']))
 		{
 			self::$configs = array();
-			foreach(self::$db->select(self::TABLE,'*',false,__LINE__,__FILE__) as $row)
+			foreach (self::$db->select(self::TABLE, '*', false, __LINE__, __FILE__) as $row)
 			{
 				self::$configs[$row['config_app']][$row['config_name']] = self::unserialize($row['config_value']);
 				//error_log(__METHOD__."() configs[$row[config_app]][$row[config_name]]=".array2string(self::$configs[$row['config_app']][$row['config_name']]));

api/src/Asyncservice.php

Spacing +74 added lines, -76 removed lines

@@ -49,9 +49,9 @@ 
 		{
 			$this->db = $GLOBALS['egw_setup']->db;
 		}
-		$this->cronline = EGW_SERVER_ROOT . '/api/asyncservices.php '.$GLOBALS['egw_info']['user']['domain'];
+		$this->cronline = EGW_SERVER_ROOT.'/api/asyncservices.php '.$GLOBALS['egw_info']['user']['domain'];
 
-		$this->only_fallback = substr(php_uname(), 0, 7) == "Windows";	// atm cron-jobs dont work on win
+		$this->only_fallback = substr(php_uname(), 0, 7) == "Windows"; // atm cron-jobs dont work on win
 	}
 
 	/**
@@ -71,10 +71,10 @@ 
 	 * @param boolean $debug =false
 	 * @return boolean False if $id already exists, else True
 	 */
-	function set_timer($times,$id,$method,$data=null,$account_id=False,$debug=false)
+	function set_timer($times, $id, $method, $data = null, $account_id = False, $debug = false)
 	{
 		if (empty($id) || empty($method) || $this->read($id) ||
-				!($next = $this->next_run($times,$debug)))
+				!($next = $this->next_run($times, $debug)))
 		{
 			return False;
 		}
@@ -107,14 +107,14 @@ 
 	 * @param int $now Use this time to calculate then next run from.  Defaults to time().
 	 * @return int a unix timestamp of the next execution time or False if no more executions
 	 */
-	function next_run($times,$debug=False, $now = null)
+	function next_run($times, $debug = False, $now = null)
 	{
 		if ($this->debug)
 		{
-			echo "<p>next_run("; print_r($times); echo ",'$debug', " . date('Y-m-d H:i', $now) . ")</p>\n";
-			$debug = True;	// enable syntax-error messages too
+			echo "<p>next_run("; print_r($times); echo ",'$debug', ".date('Y-m-d H:i', $now).")</p>\n";
+			$debug = True; // enable syntax-error messages too
 		}
-		if(is_null($now)) {
+		if (is_null($now)) {
 			$now = time();
 		}
 
@@ -142,7 +142,7 @@ 
 			'dow'   => 6,
 			'day'   => 31,
 			'month' => 12,
-			'year'  => date('Y')+10	// else */[0-9] would never stop returning numbers
+			'year'  => date('Y') + 10	// else */[0-9] would never stop returning numbers
 		);
 		$min_unit = array(
 			'min'   => 0,
@@ -158,7 +158,7 @@ 
 		// get set to the minimum after
 		//
 		$i = $first_set = $last_set = 0;
-		foreach($units as $u => $date_pattern)
+		foreach ($units as $u => $date_pattern)
 		{
 			++$i;
 			if (isset($times[$u]))
@@ -176,24 +176,24 @@ 
 		// (as descript above), enumerations are arrays with unit-values as keys
 		//
 		$n = 0;
-		foreach($units as $u => $date_pattern)
+		foreach ($units as $u => $date_pattern)
 		{
 			++$n;
-			if ($this->debug) { echo "<p>n=$n, $u: isset(times[$u]="; print_r($times[$u]); echo ")=".(isset($times[$u])?'True':'False')."</p>\n"; }
+			if ($this->debug) { echo "<p>n=$n, $u: isset(times[$u]="; print_r($times[$u]); echo ")=".(isset($times[$u]) ? 'True' : 'False')."</p>\n"; }
 			if (isset($times[$u]))
 			{
-				if(is_array($times[$u])) {
+				if (is_array($times[$u])) {
 					$time = array_keys($times[$u]);
 				} else {
-					$time = explode(',',$times[$u]);
+					$time = explode(',', $times[$u]);
 				}
 				$times[$u] = array();
 
-				foreach($time as $t)
+				foreach ($time as $t)
 				{
-					if (strpos($t,'-') !== False && strpos($t,'/') === False)
+					if (strpos($t, '-') !== False && strpos($t, '/') === False)
 					{
-						list($min,$max) = $arr = explode('-',$t);
+						list($min, $max) = $arr = explode('-', $t);
 
 						if (count($arr) != 2 || !is_numeric($min) || !is_numeric($max) || $min > $max)
 						{
@@ -210,7 +210,7 @@ 
 					{
 						if ((string)$t == '*') 	$t = '*/1';
 
-						list($one,$inc) = $arr = explode('/',$t);
+						list($one, $inc) = $arr = explode('/', $t);
 
 						if (!(is_numeric($one) && count($arr) == 1 ||
 									count($arr) == 2 && is_numeric($inc)))
@@ -225,7 +225,7 @@ 
 						}
 						else
 						{
-							list($min,$max) = $arr = explode('-',$one);
+							list($min, $max) = $arr = explode('-', $one);
 							if (empty($one) || $one == '*')
 							{
 								$min = $min_unit[$u];
@@ -266,20 +266,19 @@ 
 		{
 			$future = False;
 
-			foreach($units as $u => $date_pattern)
+			foreach ($units as $u => $date_pattern)
 			{
-				$unit_now = $u != 'dow' ? (int)date($date_pattern, $now) :
-					(int)date($date_pattern,mktime(12,0,0,$found['month'],$found['day'],$found['year']));
+				$unit_now = $u != 'dow' ? (int)date($date_pattern, $now) : (int)date($date_pattern, mktime(12, 0, 0, $found['month'], $found['day'], $found['year']));
 
 				if (isset($found[$u]))
 				{
 					$future = $future || $found[$u] > $unit_now;
 					if ($this->debug) echo "--> already have a $u = ".$found[$u].", future='$future'<br>\n";
-					continue;	// already set
+					continue; // already set
 				}
-				foreach(array_keys($times[$u]) as $unit_value)
+				foreach (array_keys($times[$u]) as $unit_value)
 				{
-					switch($u)
+					switch ($u)
 					{
 						case 'dow':
 							$valid = $unit_value == $unit_now;
@@ -302,12 +301,12 @@ 
 				if (!isset($found[$u]))		// we have to try the next one, if it exists
 				{
 					$nexts = array_keys($units);
-					if (!isset($nexts[count($found)-1]))
+					if (!isset($nexts[count($found) - 1]))
 					{
 						if ($this->debug) echo "<p>Nothing found, exiting !!!</p>\n";
 						return False;
 					}
-					$next = $nexts[count($found)-1];
+					$next = $nexts[count($found) - 1];
 					$over = $found[$next];
 					unset($found[$next]);
 					if ($this->debug) echo "<p>Have to try the next $next, $u's are over for $next=$over !!!</p>\n";
@@ -317,7 +316,7 @@ 
 		}
 		if ($this->debug) { echo "<p>next="; print_r($found); echo "</p>\n"; }
 
-		return mktime($found['hour'],$found['min'],0,$found['month'],$found['day'],$found['year']);
+		return mktime($found['hour'], $found['min'], 0, $found['month'], $found['day'], $found['year']);
 	}
 
 	/**
@@ -339,7 +338,7 @@ 
 	 * @return mixed if !$set array('start' => $start,'end' => $end) with timestamps of last check_run start and end,  \
 	 * 	!$end means check_run is just running. If $set returns True if it was able to get the semaphore, else False
 	 */
-	function last_check_run($semaphore=False,$release=False,$run_by='')
+	function last_check_run($semaphore = False, $release = False, $run_by = '')
 	{
 		//echo "<p>last_check_run(semaphore=".($semaphore?'True':'False').",release=".($release?'True':'False').")</p>\n";
 		if (($exists = $this->read('##last-check-run##')))
@@ -361,7 +360,7 @@ 
 		}
 		else
 		{
-			@set_time_limit(0);		// dont stop for an execution-time-limit
+			@set_time_limit(0); // dont stop for an execution-time-limit
 			ignore_user_abort(True);
 
 			$last_run = array(
@@ -377,7 +376,7 @@ 
 			);
 			// as the async_next column is used as a semaphore we only update it,
 			// if it is 0 (semaphore released) or older then 10min to recover from failed or crashed attempts
-			if ($exists) $where = array('async_next=0 OR async_next<'.(time()-600));
+			if ($exists) $where = array('async_next=0 OR async_next<'.(time() - 600));
 		}
 		//echo "last_run=<pre>"; print_r($last_run); echo "</pre>\n";
 		return $this->write($last_run, !!$exists, $where) > 0;
@@ -386,20 +385,20 @@ 
 	/**
 	 * checks if there are any jobs ready to run (timer expired) and executes them
 	 */
-	function check_run($run_by='')
+	function check_run($run_by = '')
 	{
 		if ($run_by === 'fallback') flush();
 
-		if (!$this->last_check_run(True,False,$run_by))
+		if (!$this->last_check_run(True, False, $run_by))
 		{
-			return False;	// cant obtain semaphore
+			return False; // cant obtain semaphore
 		}
 		// mark enviroment as async-service, check with isset()!
 		$GLOBALS['egw_info']['flags']['async-service'] = $run_by;
 
 		if (($jobs = $this->read()))
 		{
-			foreach($jobs as $job)
+			foreach ($jobs as $job)
 			{
 				// checking / setting up egw_info/user
 				//
@@ -408,7 +407,7 @@ 
 					// run notifications, before changing account_id of enviroment
 					Link::run_notifies();
 					// unset all objects in $GLOBALS, which are created and used by ExecMethod, as they can contain user-data
-					foreach($GLOBALS as $name => $value)
+					foreach ($GLOBALS as $name => $value)
 					{
 						if ($name !== 'egw' && is_object($value)) unset($GLOBALS[$name]);
 					}
@@ -420,7 +419,7 @@ 
 					{
 						$GLOBALS['egw']->session->account_lid = $GLOBALS['egw']->accounts->id2name($job['account_id']);
 						$GLOBALS['egw']->session->account_domain = $domain;
-						$GLOBALS['egw_info']['user']  = $GLOBALS['egw']->session->read_repositories();
+						$GLOBALS['egw_info']['user'] = $GLOBALS['egw']->session->read_repositories();
 
 						if ($lang != $GLOBALS['egw_info']['user']['preferences']['common']['lang'])
 						{
@@ -435,12 +434,11 @@ 
 						$GLOBALS['egw_info']['user']['domain'] = $domain;
 					}
 				}
-				list($app) = strpos($job['method'],'::') !== false ? explode('_',$job['method']) :
-					explode('.',$job['method']);
+				list($app) = strpos($job['method'], '::') !== false ? explode('_', $job['method']) : explode('.', $job['method']);
 				Translation::add_app($app);
 				if (is_array($job['data']))
 				{
-					$job['data'] += array_diff_key($job,array('data' => false));
+					$job['data'] += array_diff_key($job, array('data' => false));
 				}
 				// update job before running it, to cope with jobs taking longer then async-frequency
 				if (($job['next'] = $this->next_run($job['times'])))
@@ -453,16 +451,16 @@ 
 				}
 				try
 				{
-					ExecMethod($job['method'],$job['data']);
+					ExecMethod($job['method'], $job['data']);
 				}
-				catch(Exception $e)
+				catch (Exception $e)
 				{
 					// log the exception to error_log, but continue running other async jobs
 					_egw_log_exception($e);
 				}
 			}
 		}
-		$this->last_check_run(True,True,$run_by);	// release semaphore
+		$this->last_check_run(True, True, $run_by); // release semaphore
 
 		return $jobs ? count($jobs) : 0;
 	}
@@ -478,7 +476,7 @@ 
 	 * @param int $num_rows =0 number of rows to return if offset set, default 0 = use default in user prefs
 	 * @return array/boolean db-rows / jobs as array or False if no matches
 	 */
-	function read($id=0,$cols='*',$offset=False,$append='ORDER BY async_next',$num_rows=0)
+	function read($id = 0, $cols = '*', $offset = False, $append = 'ORDER BY async_next', $num_rows = 0)
 	{
 		if (!is_a($this->db, 'EGroupware\\Api\\Db')) return false;
 
@@ -486,7 +484,7 @@ 
 		{
 			$where = "async_id != '##last-check-run##'";
 		}
-		elseif (!is_array($id) && (strpos($id,'%') !== False || strpos($id,'_') !== False))
+		elseif (!is_array($id) && (strpos($id, '%') !== False || strpos($id, '_') !== False))
 		{
 			$id = $this->db->quote($id);
 			$where = "async_id LIKE $id AND async_id != '##last-check-run##'";
@@ -500,21 +498,21 @@ 
 			$where = array('async_id' => $id);
 		}
 		$jobs = array();
-		foreach($this->db->select($this->db_table,$cols,$where,__LINE__,__FILE__,$offset,$append,False,$num_rows) as $row)
+		foreach ($this->db->select($this->db_table, $cols, $where, __LINE__, __FILE__, $offset, $append, False, $num_rows) as $row)
 		{
 			$row['async_times'] = json_php_unserialize($row['async_times']);
 			// check for broken value during migration
 			if ($row['async_data'][0] == '"' && substr($row['async_data'], 0, 7) == '"\\"\\\\\\"')
 			{
 				$row['async_data'] = null;
-				$this->write(Db::strip_array_keys($row,'async_'), true);
+				$this->write(Db::strip_array_keys($row, 'async_'), true);
 			}
 			else
 			{
 				$row['async_data'] = !empty($row['async_data']) ?
-					json_php_unserialize($row['async_data'], true) : null;	// allow non-serialized data
+					json_php_unserialize($row['async_data'], true) : null; // allow non-serialized data
 			}
-			$jobs[$row['async_id']] = Db::strip_array_keys($row,'async_');
+			$jobs[$row['async_id']] = Db::strip_array_keys($row, 'async_');
 		}
 		if (!count($jobs))
 		{
@@ -531,7 +529,7 @@ 
 	 * @param array $where additional where statemetn to update only if a certain condition is met, used for the semaphore
 	 * @return int affected rows, can be 0 if an additional where statement is given
 	 */
-	function write($job, $exists = False, $where=array())
+	function write($job, $exists = False, $where = array())
 	{
 		if (!is_a($this->db, 'EGroupware\\Api\\Db')) return 0;
 
@@ -562,7 +560,7 @@ 
 	 */
 	function delete($id)
 	{
-		$this->db->delete($this->db_table,array('async_id' => $id),__LINE__,__FILE__);
+		$this->db->delete($this->db_table, array('async_id' => $id), __LINE__, __FILE__);
 
 		return $this->db->affected_rows();
 	}
@@ -587,38 +585,38 @@ 
 		{
 			$binarys = array(
 				'php'  => '/usr/bin/php',
-				'php5' => '/usr/bin/php5',		// SuSE 9.3 with php5
+				'php5' => '/usr/bin/php5', // SuSE 9.3 with php5
 				'crontab' => '/usr/bin/crontab'
 			);
 			foreach ($binarys as $name => $path)
 			{
-				$this->$name = $path;	// a reasonable default for *nix
+				$this->$name = $path; // a reasonable default for *nix
 
 				if (!($Ok = @is_executable($this->$name)))
 				{
 					if (file_exists($this->$name))
 					{
-						echo '<p>'.lang('%1 is not executable by the webserver !!!',$this->$name)."</p>\n";
+						echo '<p>'.lang('%1 is not executable by the webserver !!!', $this->$name)."</p>\n";
 						$perms = fileperms($this->$name);
-						if (!($perms & 0x0001) && ($perms & 0x0008) && function_exists('posix_getuid'))	// only executable by group
+						if (!($perms&0x0001) && ($perms&0x0008) && function_exists('posix_getuid'))	// only executable by group
 						{
 							$group = posix_getgrgid(filegroup($this->$name));
-							$webserver = posix_getpwuid(posix_getuid ());
-							echo '<p>'.lang("You need to add the webserver user '%1' to the group '%2'.",$webserver['name'],$group['name'])."</p>\n";							}
+							$webserver = posix_getpwuid(posix_getuid());
+							echo '<p>'.lang("You need to add the webserver user '%1' to the group '%2'.", $webserver['name'], $group['name'])."</p>\n"; }
 					}
-					if (($fd = popen('/bin/sh -c "type -p '.$name.'"','r')))
+					if (($fd = popen('/bin/sh -c "type -p '.$name.'"', 'r')))
 					{
-						$this->$name = fgets($fd,256);
+						$this->$name = fgets($fd, 256);
 						@pclose($fd);
 					}
-					if (($pos = strpos($this->$name,"\n")))
+					if (($pos = strpos($this->$name, "\n")))
 					{
-						$this->$name = substr($this->$name,0,$pos);
+						$this->$name = substr($this->$name, 0, $pos);
 					}
 				}
 				if (!$Ok && !@is_executable($this->$name))
 				{
-					$this->$name = $name;	// hopefully its in the path
+					$this->$name = $name; // hopefully its in the path
 				}
 				//echo "<p>$name = '".$this->$name."'</p>\n";
 			}
@@ -649,15 +647,15 @@ 
 		}
 		$times = False;
 		$this->other_cronlines = array();
-		if (($crontab = popen('/bin/sh -c "'.$this->crontab.' -l" 2>&1','r')) !== False)
+		if (($crontab = popen('/bin/sh -c "'.$this->crontab.' -l" 2>&1', 'r')) !== False)
 		{
 			$n = 0;
-			while ($line = fgets($crontab,256))
+			while ($line = fgets($crontab, 256))
 			{
 				if ($this->debug) echo 'line '.++$n.": $line<br>\n";
-				$parts = explode(' ',$line,6);
+				$parts = explode(' ', $line, 6);
 
-				if ($line{0} == '#' || count($parts) < 6 || ($parts[5]{0} != '/' && substr($parts[5],0,3) != 'php'))
+				if ($line{0} == '#' || count($parts) < 6 || ($parts[5]{0} != '/' && substr($parts[5], 0, 3) != 'php'))
 				{
 					// ignore comments
 					if ($line{0} != '#')
@@ -665,12 +663,12 @@ 
 						$times['error'] .= $line;
 					}
 				}
-				elseif (strpos($line,$this->cronline) !== False ||
+				elseif (strpos($line, $this->cronline) !== False ||
 					// also check of old phpgwapi/cron path
 					strpos($line, str_replace('/api/', '/phpgwapi/cron/', $this->cronline)) !== False)
 				{
-					$cron_units = array('min','hour','day','month','dow');
-					foreach($cron_units as $n => $u)
+					$cron_units = array('min', 'hour', 'day', 'month', 'dow');
+					foreach ($cron_units as $n => $u)
 					{
 						$times[$u] = $parts[$n];
 					}
@@ -701,29 +699,29 @@ 
 		if ($this->only_fallback && $times !== False) {
 			return 0;
 		}
-		$this->installed();	// find other installed cronlines
+		$this->installed(); // find other installed cronlines
 
-		if (($crontab = popen('/bin/sh -c "'.$this->crontab.' -" 2>&1','w')) !== False)
+		if (($crontab = popen('/bin/sh -c "'.$this->crontab.' -" 2>&1', 'w')) !== False)
 		{
 			if (is_array($this->other_cronlines))
 			{
 				foreach ($this->other_cronlines as $cronline)
 				{
-					fwrite($crontab,$cronline);		// preserv the other lines on install
+					fwrite($crontab, $cronline); // preserv the other lines on install
 				}
 			}
 			if ($times !== False)
 			{
-				$cron_units = array('min','hour','day','month','dow');
+				$cron_units = array('min', 'hour', 'day', 'month', 'dow');
 				$cronline = '';
-				foreach($cron_units as $cu)
+				foreach ($cron_units as $cu)
 				{
-					$cronline .= (isset($times[$cu]) ? $times[$cu] : '*') . ' ';
+					$cronline .= (isset($times[$cu]) ? $times[$cu] : '*').' ';
 				}
 				// -d memory_limit=-1 --> no memory limit
 				$cronline .= $this->php.' -q -d memory_limit=-1 '.$this->cronline."\n";
 				//echo "<p>Installing: '$cronline'</p>\n";
-				fwrite($crontab,$cronline);
+				fwrite($crontab, $cronline);
 			}
 			@pclose($crontab);
 		}

api/src/Link/Storage.php

Spacing +58 added lines, -58 removed lines

@@ -59,7 +59,7 @@ 
 	 * @param int $lastmod =0 timestamp of last modification (defaults to now=time())
 	 * @return int/boolean False (for db or param-error) or on success link_id (Please not the return-value of $id1)
 	 */
-	static function link( $app1,&$id1,$app2,$id2='',$remark='',$owner=0,$lastmod=0 )
+	static function link($app1, &$id1, $app2, $id2 = '', $remark = '', $owner = 0, $lastmod = 0)
 	{
 		if (self::DEBUG)
 		{
@@ -68,21 +68,21 @@ 
 		if ($app1 == $app2 && $id1 == $id2 ||
 		    $id1 == '' || $id2 == '' || $app1 == '' || $app2 == '')
 		{
-			return False;	// dont link to self or other nosense
+			return False; // dont link to self or other nosense
 		}
-		if (($link = self::get_link($app1,$id1,$app2,$id2)))
+		if (($link = self::get_link($app1, $id1, $app2, $id2)))
 		{
 			if ($link['link_remark'] != $remark)
 			{
-				self::update_remark($link['link_id'],$remark);
+				self::update_remark($link['link_id'], $remark);
 			}
-			return $link['link_id'];	// link alread exist
+			return $link['link_id']; // link alread exist
 		}
 		if (!$owner)
 		{
 			$owner = $GLOBALS['egw_info']['user']['account_id'];
 		}
-		return self::$db->insert(self::TABLE,array(
+		return self::$db->insert(self::TABLE, array(
 				'link_app1'		=> $app1,
 				'link_id1'		=> $id1,
 				'link_app2'		=> $app2,
@@ -90,7 +90,7 @@ 
 				'link_remark'	=> $remark,
 				'link_lastmod'	=> $lastmod ? $lastmod : time(),
 				'link_owner'	=> $owner,
-			),False,__LINE__,__FILE__) ? self::$db->get_last_insert_id(self::TABLE,'link_id') : false;
+			), False, __LINE__, __FILE__) ? self::$db->get_last_insert_id(self::TABLE, 'link_id') : false;
 	}
 
 	/**
@@ -100,14 +100,14 @@ 
 	 * @param string $remark new text for the remark
 	 * @return boolean true on success, else false
 	 */
-	static function update_remark($link_id,$remark)
+	static function update_remark($link_id, $remark)
 	{
-		return self::$db->update(self::TABLE,array(
+		return self::$db->update(self::TABLE, array(
 				'link_remark'	=> $remark,
 				'link_lastmod'	=> time(),
-			),array(
+			), array(
 				'link_id'	=> $link_id,
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 	}
 
 	/**
@@ -121,15 +121,15 @@ 
 	 * @param int|array $limit =null number of entries to return, default null = all or array(offset, num_rows) to return num_rows starting from offset
 	 * @return array id => links pairs if $id is an array or just the links (only_app: ids) or empty array if no matching links found
 	 */
-	static function get_links($app, $id, $only_app='', $order='link_lastmod DESC', $deleted=false, $limit=null)
+	static function get_links($app, $id, $only_app = '', $order = 'link_lastmod DESC', $deleted = false, $limit = null)
 	{
 		if (self::DEBUG)
 		{
-			echo "<p>solink.get_links($app,".print_r($id,true).",$only_app,$order,$deleted)</p>\n";
+			echo "<p>solink.get_links($app,".print_r($id, true).",$only_app,$order,$deleted)</p>\n";
 		}
 		if (($not_only = $only_app[0] == '!'))
 		{
-			$only_app = substr($only_app,1);
+			$only_app = substr($only_app, 1);
 		}
 
 		$offset = false;
@@ -137,32 +137,32 @@ 
 		{
 			list($offset, $limit) = $limit;
 		}
-		elseif($limit)
+		elseif ($limit)
 		{
 			$offset = 0;
 		}
 
 		$links = array();
 		try {
-			foreach(self::$db->select(self::TABLE, '*', self::$db->expression(self::TABLE, '((', array(
+			foreach (self::$db->select(self::TABLE, '*', self::$db->expression(self::TABLE, '((', array(
 						'link_app1'	=> $app,
 						'link_id1'	=> $id,
-					),') OR (',array(
+					), ') OR (', array(
 						'link_app2'	=> $app,
 						'link_id2'	=> $id,
-					),'))',
+					), '))',
 					$deleted ? '' : ' AND deleted IS NULL'
 				), __LINE__, __FILE__, $offset, $order ? " ORDER BY $order" : '', 'phpgwapi', $limit) as $row)
 			{
 				// check if left side (1) is one of our targets --> add it
-				if ($row['link_app1'] == $app && in_array($row['link_id1'],(array)$id))
+				if ($row['link_app1'] == $app && in_array($row['link_id1'], (array)$id))
 				{
-					self::_add2links($row,true,$only_app,$not_only,$links);
+					self::_add2links($row, true, $only_app, $not_only, $links);
 				}
 				// check if right side (2) is one of our targets --> add it (both can be true for multiple targets!)
-				if ($row['link_app2'] == $app && in_array($row['link_id2'],(array)$id))
+				if ($row['link_app2'] == $app && in_array($row['link_id2'], (array)$id))
 				{
-					self::_add2links($row,false,$only_app,$not_only,$links);
+					self::_add2links($row, false, $only_app, $not_only, $links);
 				}
 			}
 			// if query returns exactly limit rows, we assume there are more and therefore set self::$limit_exceeded
@@ -170,18 +170,18 @@ 
 		}
 		// catch Illegal mix of collations (ascii_general_ci,IMPLICIT) and (utf8_general_ci,COERCIBLE) for operation '=' (1267)
 		// caused by non-ascii chars compared with ascii field uid
-		catch(Api\Db\Exception $e) {
+		catch (Api\Db\Exception $e) {
 			_egw_log_exception($e);
 		}
 		return is_array($id) ? $links : ($links[$id] ? $links[$id] : array());
 	}
 
-	private static function _add2links($row,$left,$only_app,$not_only,array &$links)
+	private static function _add2links($row, $left, $only_app, $not_only, array &$links)
 	{
 		$linked_app = $left ? $row['link_app2'] : $row['link_app1'];
 		$linked_id  = $left ? $row['link_id2'] : $row['link_id1'];
 		$app_id = $left ? $row['link_id1'] : $row['link_id2'];
-		list($app) = explode('-',$linked_app);
+		list($app) = explode('-', $linked_app);
 		if ($only_app && $not_only == ($linked_app == $only_app) || !$GLOBALS['egw_info']['user']['apps'][$app])
 		{
 			#echo "$linked_app == $only_app, ";var_dump($linked_app == $only_app);echo "	->dont return a link<br>";
@@ -208,13 +208,13 @@ 
 	 * @param string $id2 ='' id in $app2, if no integer link_id given in $app_link_id
 	 * @return array with link-data or False
 	 */
-	static function get_link($app_link_id,$id='',$app2='',$id2='')
+	static function get_link($app_link_id, $id = '', $app2 = '', $id2 = '')
 	{
 		if (self::DEBUG)
 		{
 			echo "<p>solink.get_link('$app_link_id',$id,'$app2','$id2')</p>\n";
 		}
-		if ((int) $app_link_id > 0)
+		if ((int)$app_link_id > 0)
 		{
 			$where = array('link_id' => $app_link_id);
 		}
@@ -224,24 +224,24 @@ 
 			{
 				return False;
 			}
-			$where = self::$db->expression(self::TABLE,'(',array(
+			$where = self::$db->expression(self::TABLE, '(', array(
 					'link_app1'	=> $app_link_id,
 					'link_id1'	=> $id,
 					'link_app2'	=> $app2,
 					'link_id2'	=> $id2,
-				),') OR (',array(
+				), ') OR (', array(
 					'link_app2'	=> $app_link_id,
 					'link_id2'	=> $id,
 					'link_app1'	=> $app2,
 					'link_id1'	=> $id2,
-				),')');
+				), ')');
 		}
 		try {
-			return self::$db->select(self::TABLE,'*',$where,__LINE__,__FILE__)->fetch(ADODB_FETCH_ASSOC);
+			return self::$db->select(self::TABLE, '*', $where, __LINE__, __FILE__)->fetch(ADODB_FETCH_ASSOC);
 		}
 		// catch Illegal mix of collations (ascii_general_ci,IMPLICIT) and (utf8_general_ci,COERCIBLE) for operation '=' (1267)
 		// caused by non-ascii chars compared with ascii field uid
-		catch(Api\Db\Exception $e) {
+		catch (Api\Db\Exception $e) {
 			_egw_log_exception($e);
 		}
 		return false;
@@ -259,7 +259,7 @@ 
 	 * @param boolean $hold_for_purge Don't really delete the link, just mark it as deleted and wait for final delete of linked entry
 	 * @return array with deleted links
 	 */
-	static function unlink($link_id,$app='',$id='',$owner=0,$app2='',$id2='',$hold_for_purge=false)
+	static function unlink($link_id, $app = '', $id = '', $owner = 0, $app2 = '', $id2 = '', $hold_for_purge = false)
 	{
 		if (self::DEBUG)
 		{
@@ -284,21 +284,21 @@ 
 					$check1['link_id1'] = $id;
 					$check2['link_id2'] = $id;
 				}
-				$where = self::$db->expression(self::TABLE,'((',$check1,') OR (',$check2,'))');
+				$where = self::$db->expression(self::TABLE, '((', $check1, ') OR (', $check2, '))');
 			}
 			elseif ($app != '' && $app2 != '')
 			{
-				$where = self::$db->expression(self::TABLE,'(',array(
+				$where = self::$db->expression(self::TABLE, '(', array(
 						'link_app1'	=> $app,
 						'link_id1'	=> $id,
 						'link_app2'	=> $app2,
 						'link_id2'	=> $id2,
-					),') OR (',array(
+					), ') OR (', array(
 						'link_app1'	=> $app2,
 						'link_id1'	=> $id2,
 						'link_app2'	=> $app,
 						'link_id2'	=> $id,
-					),')');
+					), ')');
 			}
 			if ($owner)
 			{
@@ -308,25 +308,25 @@ 
 		}
 		$deleted = array();
 		try {
-			foreach(self::$db->select(self::TABLE,'*',$where,__LINE__,__FILE__) as $row)
+			foreach (self::$db->select(self::TABLE, '*', $where, __LINE__, __FILE__) as $row)
 			{
 				$deleted[] = $row;
 			}
-			if($hold_for_purge)
+			if ($hold_for_purge)
 			{
-				self::$db->update(self::TABLE,array(
+				self::$db->update(self::TABLE, array(
 					'deleted' => time(),
 					'link_lastmod' => time(),
-				), $where, __LINE__,__FILE__);
+				), $where, __LINE__, __FILE__);
 			}
 			else
 			{
-				self::$db->delete(self::TABLE,$where,__LINE__,__FILE__);
+				self::$db->delete(self::TABLE, $where, __LINE__, __FILE__);
 			}
 		}
 		// catch Illegal mix of collations (ascii_general_ci,IMPLICIT) and (utf8_general_ci,COERCIBLE) for operation '=' (1267)
 		// caused by non-ascii chars compared with ascii field uid
-		catch(Api\Db\Exception $e) {
+		catch (Api\Db\Exception $e) {
 			_egw_log_exception($e);
 		}
 
@@ -357,8 +357,8 @@ 
 			$check1['link_id1'] = $id;
 			$check2['link_id2'] = $id;
 		}
-		$where = self::$db->expression(self::TABLE,'((',$check1,') OR (',$check2,'))');
-		self::$db->update(self::TABLE,array('deleted'=> null), $where, __LINE__,__FILE__);
+		$where = self::$db->expression(self::TABLE, '((', $check1, ') OR (', $check2, '))');
+		self::$db->update(self::TABLE, array('deleted'=> null), $where, __LINE__, __FILE__);
 	}
 
 	/**
@@ -371,13 +371,13 @@ 
 	 * @param int $new_owner account_id of new owner
 	 * @return int number of links changed
 	 */
-	static function chown($owner,$new_owner)
+	static function chown($owner, $new_owner)
 	{
-		if ((int)$owner <= 0 || (int) $new_owner <= 0)
+		if ((int)$owner <= 0 || (int)$new_owner <= 0)
 		{
 			return 0;
 		}
-		self::$db->update(self::TABLE,array('owner'=>$new_owner),array('owner'=>$owner),__LINE__,__FILE__);
+		self::$db->update(self::TABLE, array('owner'=>$new_owner), array('owner'=>$owner), __LINE__, __FILE__);
 
 		return self::$db->affected_rows();
 	}
@@ -404,15 +404,15 @@ 
 	 * @param int|array $limit =null number of entries to return, default null = all or array(offset, num_rows) to return num_rows starting from offset
 	 * @return array with links from entries from $app to $target_app/$target_id plus the other (b) link_id/app/id in the keys 'link3'/'app3'/'id3'
 	 */
-	static function get_3links($app, $target_app, $target_id=null, $just_app_ids=false, $order='link_lastmod DESC', $limit=null)
+	static function get_3links($app, $target_app, $target_id = null, $just_app_ids = false, $order = 'link_lastmod DESC', $limit = null)
 	{
 		$table = self::TABLE;
-		$arrayofselects=array(
+		$arrayofselects = array(
 			// retrieve the type of links, where the relation is realized as timesheet->infolog/tracker via infolog->projectmanager to timesheet->projectmanager
 			array('table'=>self::TABLE,
 				'cols'=>'c.*,b.link_app1 AS app3,b.link_id1 AS id3,b.link_id AS link3',
 				'where'=>'a.link_app1='.self::$db->quote($app).' AND c.link_app2='.self::$db->quote($target_app).
-                        		(!$target_id ? '' : self::$db->expression(self::TABLE,' AND c.',array('link_id2' => $target_id))),
+                        		(!$target_id ? '' : self::$db->expression(self::TABLE, ' AND c.', array('link_id2' => $target_id))),
                         	'join'=>" a
                         		JOIN $table b ON a.link_id2=b.link_id1 AND a.link_app2=b.link_app1
                        			JOIN $table c ON a.link_id1=c.link_id1 AND a.link_app1=c.link_app1 AND a.link_id!=c.link_id AND c.link_app2=b.link_app2 AND c.link_id2=b.link_id2",
@@ -421,7 +421,7 @@ 
 			array('table'=>self::TABLE,
 				'cols'=>'b.link_id, b.link_app2 as app1, b.link_id2 as id1, b.link_app1 as app2, b.link_id1 as id2, b.link_remark,b.link_lastmod,b.link_owner,b.deleted,c.link_app1 AS app3,c.link_id1 AS id3,c.link_id AS link3',
                        		'where'=>'a.link_app1='.self::$db->quote($app).' AND b.link_app1='.self::$db->quote($target_app).
-                        		(!$target_id ? '' : self::$db->expression(self::TABLE,' AND b.',array('link_id1' => $target_id))),
+                        		(!$target_id ? '' : self::$db->expression(self::TABLE, ' AND b.', array('link_id1' => $target_id))),
                         	'join'=>" a
                         		JOIN $table b ON a.link_id1=b.link_id2 AND a.link_app1=b.link_app2
                         		JOIN $table c ON a.link_id2=c.link_id1 AND a.link_app2=c.link_app1 AND a.link_id!=c.link_id AND c.link_app2=b.link_app1 AND c.link_id2=b.link_id1",
@@ -430,7 +430,7 @@ 
 			array('table'=>self::TABLE,
 				'cols'=>'a.*,c.link_app1 AS app3,c.link_id1 AS id3,c.link_id AS link3',
                      		'where'=>'a.link_app1='.self::$db->quote($app).' AND a.link_app2='.self::$db->quote($target_app).
-                        		(!$target_id ? '' : self::$db->expression(self::TABLE,' AND a.',array('link_id2' => $target_id))),
+                        		(!$target_id ? '' : self::$db->expression(self::TABLE, ' AND a.', array('link_id2' => $target_id))),
                        		'join'=>" a
                        			JOIN $table b ON a.link_id1=b.link_id2 AND a.link_app1=b.link_app2
                         		JOIN $table c ON a.link_id2=c.link_id2 AND a.link_app2=c.link_app2 AND a.link_id!=c.link_id AND c.link_app1=b.link_app1 AND c.link_id1=b.link_id1",
@@ -442,17 +442,17 @@ 
 		{
 			list($offset, $limit) = $limit;
 		}
-		elseif($limit)
+		elseif ($limit)
 		{
 			$offset = 0;
 		}
 
 		$links = array();
-		foreach(self::$db->union($arrayofselects, __LINE__, __FILE__, $order, $offset, $limit) as $row)
+		foreach (self::$db->union($arrayofselects, __LINE__, __FILE__, $order, $offset, $limit) as $row)
 		{
 			if ($just_app_ids)
 			{
-				if ($row['link_app1'] == $target_app && (is_null($target_id) || in_array($row['link_id1'],(array)$target_id)))
+				if ($row['link_app1'] == $target_app && (is_null($target_id) || in_array($row['link_id1'], (array)$target_id)))
 				{
 					$links[$row['link_id']] = $row['link_id2'];
 				}
@@ -463,7 +463,7 @@ 
 			}
 			else
 			{
-				$links[] = Api\Db::strip_array_keys($row,'link_');
+				$links[] = Api\Db::strip_array_keys($row, 'link_');
 			}
 		}
 		// if query returns exactly limit rows, we assume there are more and therefore set self::$limit_exceeded
@@ -477,7 +477,7 @@ 
 	 */
 	static function init_static( )
 	{
-		self::$db     = $GLOBALS['egw']->db;
+		self::$db = $GLOBALS['egw']->db;
 	}
 }
 Storage::init_static();