EGroupware / egroupware

api/src/Json/Push.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
 	{
 		if (!isset(self::$backend))
 		{
-			foreach(self::$backends as $class)
+			foreach (self::$backends as $class)
 			{
 				if (class_exists($class))
 				{

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

Braces +16 added lines, -4 removed lines

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

api/src/Json/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;

Braces +24 added lines, -6 removed lines

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

api/src/CalDAV/IcalIterator.php

Indentation +6 added lines, -6 removed lines

@@ -249,12 +249,12 @@
 
 		$this->component = Horde_Icalendar::newComponent($type, $this);
 		//error_log(__METHOD__."() this->component = Horde_Icalendar::newComponent('$type', \$this) = ".array2string($this->component));
-        if ($this->component === false)
-        {
-        	error_log(__METHOD__."() Horde_Icalendar::newComponent('$type', \$this) returned FALSE");
-        	return;
-            //return PEAR::raiseError("Unable to create object for type $type");
-        }
+		if ($this->component === false)
+		{
+			error_log(__METHOD__."() Horde_Icalendar::newComponent('$type', \$this) returned FALSE");
+			return;
+			//return PEAR::raiseError("Unable to create object for type $type");
+		}
 		if ($this->charset && $this->charset != 'utf-8')
 		{
 			$data = Api\Translation::convert($data, $this->charset, 'utf-8');

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";
 	}

Braces +29 added lines, -8 removed lines

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

api/src/CalDAV/Hooks.php

Spacing +15 added lines, -15 removed lines

@@ -37,15 +37,15 @@ 
 		if ($location == 'preferences')
 		{
 			$file = array(
-				'Preferences'     => Api\Framework::link('/index.php','menuaction=preferences.preference_settings.index&appname='.$appname),
+				'Preferences'     => Api\Framework::link('/index.php', 'menuaction=preferences.preference_settings.index&appname='.$appname),
 			);
 			if ($location == 'preferences')
 			{
-				display_section($appname,$file);
+				display_section($appname, $file);
 			}
 			else
 			{
-				display_sidebox($appname,lang('Preferences'),$file);
+				display_sidebox($appname, lang('Preferences'), $file);
 			}
 		}
 	}
@@ -62,13 +62,13 @@ 
 
 		if ($hook_data['setup'])
 		{
-			$apps = array('addressbook','calendar','infolog');
+			$apps = array('addressbook', 'calendar', 'infolog');
 		}
 		else
 		{
 			$apps = array_keys($GLOBALS['egw_info']['user']['apps']);
 		}
-		foreach($apps as $app)
+		foreach ($apps as $app)
 		{
 			$class_name = $app.'_groupdav';
 			if (class_exists($class_name, true))
@@ -77,7 +77,7 @@ 
 					'type'  => 'section',
 					'title' => $app,
 				);
-				$settings += call_user_func(array($class_name,'get_settings'), $hook_data);
+				$settings += call_user_func(array($class_name, 'get_settings'), $hook_data);
 			}
 		}
 
@@ -105,20 +105,20 @@ 
 			if ($GLOBALS['type'] === 'user')
 			{
 				$logs = array();
-				if (file_exists($log_dir=$GLOBALS['egw_info']['server']['files_dir'].'/groupdav') && ($files = scandir($log_dir)))
+				if (file_exists($log_dir = $GLOBALS['egw_info']['server']['files_dir'].'/groupdav') && ($files = scandir($log_dir)))
 				{
 					$account_lid_len = strlen($GLOBALS['egw_info']['user']['account_lid']);
-					foreach($files as $log)
+					foreach ($files as $log)
 					{
-						if (substr($log,0,$account_lid_len+1) == $GLOBALS['egw_info']['user']['account_lid'].'-' &&
-							substr($log,-4) == '.log')
+						if (substr($log, 0, $account_lid_len + 1) == $GLOBALS['egw_info']['user']['account_lid'].'-' &&
+							substr($log, -4) == '.log')
 						{
 							$logs['groupdav/'.$log] = Api\DateTime::to(filemtime($log_dir.'/'.$log)).': '.
-								str_replace('!','/',substr($log,$account_lid_len+1,-4));
+								str_replace('!', '/', substr($log, $account_lid_len + 1, -4));
 						}
 					}
 				}
-				$link = Api\Framework::link('/index.php',array(
+				$link = Api\Framework::link('/index.php', array(
 					'menuaction' => 'api.'.__CLASS__.'.log',
 					'filename' => '',
 				));
@@ -153,7 +153,7 @@ 
 	public static function log()
 	{
 		$filename = $_GET['filename'];
-		if (!preg_match('|^groupdav/'.preg_quote($GLOBALS['egw_info']['user']['account_lid'],'|').'-[^/]+\.log$|',$filename))
+		if (!preg_match('|^groupdav/'.preg_quote($GLOBALS['egw_info']['user']['account_lid'], '|').'-[^/]+\.log$|', $filename))
 		{
 			throw new Api\Exception\WrongParameter("Access denied to file '$filename'!");
 		}
@@ -161,8 +161,8 @@ 
 body { background-color: #e0e0e0; overflow: hidden; }
 pre.tail { background-color: white; padding-left: 5px; margin-left: 5px; }
 ';
-		$header = str_replace('!','/',substr($filename,10+strlen($GLOBALS['egw_info']['user']['account_lid']),-4));
+		$header = str_replace('!', '/', substr($filename, 10 + strlen($GLOBALS['egw_info']['user']['account_lid']), -4));
 		$tail = new Api\Json\Tail($filename);
-		$GLOBALS['egw']->framework->render($tail->show($header),false,false);
+		$GLOBALS['egw']->framework->render($tail->show($header), false, false);
 	}
 }
\ No newline at end of file

api/src/loader/common.php

Spacing +33 added lines, -33 removed lines

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

Braces +24 added lines, -6 removed lines

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

api/src/loader/deprecated_factory.php

Spacing +22 added lines, -22 removed lines

@@ -27,7 +27,7 @@ 
  */
 function CreateObject($class)
 {
-	list($appname,$classname) = explode('.',$class);
+	list($appname, $classname) = explode('.', $class);
 
 	if (!class_exists($classname))
 	{
@@ -53,7 +53,7 @@ 
 				$classname = $replace[$classname];
 			}
 		}
-		if (!file_exists($f=EGW_INCLUDE_ROOT.'/'.$appname.'/inc/class.'.$classname.'.inc.php'))
+		if (!file_exists($f = EGW_INCLUDE_ROOT.'/'.$appname.'/inc/class.'.$classname.'.inc.php'))
 		{
 			throw new Api\Exception\AssertionFailed(__FUNCTION__."($classname) file $f not found!");
 		}
@@ -61,7 +61,7 @@ 
 		require_once(EGW_INCLUDE_ROOT.'/'.$appname.'/inc/class.'.$classname.'.inc.php');
 	}
 	$args = func_get_args();
-	switch(count($args))
+	switch (count($args))
 	{
 		case 1:
 			$obj = new $classname;
@@ -70,18 +70,18 @@ 
 			$obj = new $classname($args[1]);
 			break;
 		case 3:
-			$obj = new $classname($args[1],$args[2]);
+			$obj = new $classname($args[1], $args[2]);
 			break;
 		case 4:
-			$obj = new $classname($args[1],$args[2],$args[3]);
+			$obj = new $classname($args[1], $args[2], $args[3]);
 			break;
 		default:
-			$code = '$obj = new ' . $classname . '(';
-			foreach(array_keys($args) as $n)
+			$code = '$obj = new '.$classname.'(';
+			foreach (array_keys($args) as $n)
 			{
 				if ($n)
 				{
-					$code .= ($n > 1 ? ',' : '') . '$args[' . $n . ']';
+					$code .= ($n > 1 ? ',' : '').'$args['.$n.']';
 				}
 			}
 			$code .= ');';
@@ -107,15 +107,15 @@ 
 function &ExecMethod2($acm)
 {
 	// class::method is php5.2.3+
-	if (strpos($acm,'::') !== false && version_compare(PHP_VERSION,'5.2.3','<'))
+	if (strpos($acm, '::') !== false && version_compare(PHP_VERSION, '5.2.3', '<'))
 	{
-		list($class,$method) = explode('::',$acm);
-		$acm = array($class,$method);
+		list($class, $method) = explode('::', $acm);
+		$acm = array($class, $method);
 	}
 	if (!is_callable($acm))
 	{
-		list(,$class,$method) = explode('.',$acm);
-		if (!is_object($obj =& $GLOBALS[$class]))
+		list(,$class, $method) = explode('.', $acm);
+		if (!is_object($obj = & $GLOBALS[$class]))
 		{
 			if (class_exists($class))
 			{
@@ -127,17 +127,17 @@ 
 			}
 		}
 
-		if (!method_exists($obj,$method))
+		if (!method_exists($obj, $method))
 		{
 			echo "<p><b>".function_backtrace()."</b>: no methode '$method' in class '$class'</p>\n";
 			return False;
 		}
-		$acm = array($obj,$method);
+		$acm = array($obj, $method);
 	}
 	$args = func_get_args();
 	unset($args[0]);
 
-	return call_user_func_array($acm,$args);
+	return call_user_func_array($acm, $args);
 }
 
 /**
@@ -155,13 +155,13 @@ 
  */
 function ExecMethod($method, $functionparam = '_UNDEF_', $loglevel = 3, $classparams = '_UNDEF_')
 {
-	unset($loglevel);	// not used
+	unset($loglevel); // not used
 	/* Need to make sure this is working against a single dimensional object */
-	$partscount = count(explode('.',$method)) - 1;
+	$partscount = count(explode('.', $method)) - 1;
 
 	if (!is_callable($method) && $partscount == 2)
 	{
-		list($appname,$classname,$functionname) = explode(".", $method);
+		list($appname, $classname, $functionname) = explode(".", $method);
 		if (!is_object($GLOBALS[$classname]))
 		{
 			// please note: no reference assignment (=&) here, as $GLOBALS is a reference itself!!!
@@ -179,16 +179,16 @@ 
 			}
 		}
 
-		if (!method_exists($GLOBALS[$classname],$functionname))
+		if (!method_exists($GLOBALS[$classname], $functionname))
 		{
 			error_log("ExecMethod('$method', ...) No methode '$functionname' in class '$classname'! ".function_backtrace());
 			return false;
 		}
-		$method = array($GLOBALS[$classname],$functionname);
+		$method = array($GLOBALS[$classname], $functionname);
 	}
 	if (is_callable($method))
 	{
-		return $functionparam != '_UNDEF_' ? call_user_func($method,$functionparam) : call_user_func($method);
+		return $functionparam != '_UNDEF_' ? call_user_func($method, $functionparam) : call_user_func($method);
 	}
 	error_log("ExecMethod('$method', ...) Error in parts! ".function_backtrace());
 	return false;

api/src/loader/exception.php

Spacing +18 added lines, -18 removed lines

@@ -23,16 +23,16 @@ 
  * @param string $vars =null multiple values to replace the placeholders
  * @return string translated message with placeholders replaced
  */
-function try_lang($key,$vars=null)
+function try_lang($key, $vars = null)
 {
-	static $varnames = array('%1','%2','%3','%4');
+	static $varnames = array('%1', '%2', '%3', '%4');
 
-	if(!is_array($vars))
+	if (!is_array($vars))
 	{
 		$vars = func_get_args();
-		array_shift($vars);	// remove $key
+		array_shift($vars); // remove $key
 	}
-	return class_exists('EGroupware\Api\Translations',false) ? Api\Translation::translate($key,$vars) : str_replace($varnames,$vars,$key);
+	return class_exists('EGroupware\Api\Translations', false) ? Api\Translation::translate($key, $vars) : str_replace($varnames, $vars, $key);
 }
 
 /**
@@ -41,7 +41,7 @@ 
  * @param Exception|Error $e
  * @param string &$headline
  */
-function _egw_log_exception($e,&$headline=null)
+function _egw_log_exception($e, &$headline = null)
 {
 	$trace = explode("\n", $e->getTraceAsString());
 	if ($e instanceof Api\Exception\NoPermission)
@@ -54,7 +54,7 @@ 
 	}
 	elseif ($e instanceof Api\Exception\WrongUserinput)
 	{
-		$headline = '';	// message contains the whole message, it's usually no real error but some input validation
+		$headline = ''; // message contains the whole message, it's usually no real error but some input validation
 	}
 	elseif ($e instanceof egw_exception_warning)
 	{
@@ -67,15 +67,15 @@ 
 	}
 	// log exception to error log, if not running as cli,
 	// which outputs the error_log to stderr and therefore output it twice to the user
-	if(isset($_SERVER['HTTP_HOST']) || $GLOBALS['egw_info']['flags']['no_exception_handler'] !== 'cli')
+	if (isset($_SERVER['HTTP_HOST']) || $GLOBALS['egw_info']['flags']['no_exception_handler'] !== 'cli')
 	{
 		error_log($headline.($e instanceof egw_exception_warning ? ': ' : ' ('.get_class($e).'): ').$e->getMessage());
-		foreach($trace as $line)
+		foreach ($trace as $line)
 		{
 			error_log($line);
 		}
 		error_log('# Instance='.$GLOBALS['egw_info']['user']['domain'].', User='.$GLOBALS['egw_info']['user']['account_lid'].
-			', Request='.$_SERVER['REQUEST_METHOD'].' '.($_SERVER['HTTPS']?'https://':'http://').$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'].
+			', Request='.$_SERVER['REQUEST_METHOD'].' '.($_SERVER['HTTPS'] ? 'https://' : 'http://').$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'].
 			', User-agent='.$_SERVER['HTTP_USER_AGENT']);
 	}
 }
@@ -96,17 +96,17 @@ 
 	}
 	// logging all exceptions to the error_log (if not cli) and get headline
 	$headline = null;
-	_egw_log_exception($e,$headline);
+	_egw_log_exception($e, $headline);
 
 	// exception handler for cli (command line interface) clients, no html, no logging
-	if(!isset($_SERVER['HTTP_HOST']) || $GLOBALS['egw_info']['flags']['no_exception_handler'] == 'cli')
+	if (!isset($_SERVER['HTTP_HOST']) || $GLOBALS['egw_info']['flags']['no_exception_handler'] == 'cli')
 	{
 		echo ($headline ? $headline.': ' : '').$e->getMessage()."\n";
 		if ($GLOBALS['egw_info']['server']['exception_show_trace'])
 		{
 			echo $e->getTraceAsString()."\n";
 		}
-		exit($e->getCode() ? $e->getCode() : 9999);		// allways give a non-zero exit code
+		exit($e->getCode() ? $e->getCode() : 9999); // allways give a non-zero exit code
 	}
 	// regular GUI exception
 	if (!isset($GLOBALS['egw_info']['flags']['no_exception_handler']))
@@ -123,16 +123,16 @@ 
 		$message .= "</pre>\n";
 		if (is_a($e, 'EGroupware\Api\Db\Exception\Setup'))
 		{
-			$setup_dir = str_replace(array('home/index.php','index.php'),'setup/',$_SERVER['PHP_SELF']);
+			$setup_dir = str_replace(array('home/index.php', 'index.php'), 'setup/', $_SERVER['PHP_SELF']);
 			$message .= '<a href="'.$setup_dir.'">Run setup to install or configure EGroupware.</a>';
 		}
-		elseif (is_object($GLOBALS['egw']) && isset($GLOBALS['egw']->session) && method_exists($GLOBALS['egw'],'link'))
+		elseif (is_object($GLOBALS['egw']) && isset($GLOBALS['egw']->session) && method_exists($GLOBALS['egw'], 'link'))
 		{
 			$message .= '<p><a href="'.$GLOBALS['egw']->link('/index.php').'">'.try_lang('Click here to resume your eGroupWare Session.').'</a></p>';
 		}
 		if (is_object($GLOBALS['egw']) && isset($GLOBALS['egw']->framework))
 		{
-			$GLOBALS['egw']->framework->render($message,$headline);
+			$GLOBALS['egw']->framework->render($message, $headline);
 		}
 		else
 		{
@@ -140,7 +140,7 @@ 
 		}
 	}
 	// exception handler sending message back to the client as basic auth message
-	elseif($GLOBALS['egw_info']['flags']['no_exception_handler'] == 'basic_auth')
+	elseif ($GLOBALS['egw_info']['flags']['no_exception_handler'] == 'basic_auth')
 	{
 		$error = str_replace(array("\r", "\n"), array('', ' | '), $e->getMessage());
 		header('WWW-Authenticate: Basic realm="'.$headline.' '.$error.'"');
@@ -165,7 +165,7 @@ 
  * @link http://www.php.net/manual/en/function.set-error-handler.php
  * @throws ErrorException
  */
-function egw_error_handler ($errno, $errstr, $errfile, $errline)
+function egw_error_handler($errno, $errstr, $errfile, $errline)
 {
 	switch ($errno)
 	{

Braces +3 added lines, -1 removed lines

@@ -188,7 +188,9 @@
 /**
  * Used internally to trace warnings
  */
-class egw_exception_warning extends Exception {}
+class egw_exception_warning extends Exception
+{
+}
 
 // install our error-handler only for catchable fatal errors and warnings
 // following error types cannot be handled with a user defined function: E_ERROR, E_PARSE, E_CORE_ERROR, E_CORE_WARNING, E_COMPILE_ERROR, E_COMPILE_WARNING

api/src/loader/security.php

Spacing +18 added lines, -18 removed lines

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

Braces +8 added lines, -2 removed lines

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