EGroupware / egroupware

phpgwapi/inc/class.egw_json.inc.php

Doc Comments +6 added lines, -5 removed lines

@@ -235,8 +235,7 @@ 
 	/**
 	 * Allows to call a global javascript function with given parameters: window[$func].call(window[, $param1[, ...]])
 	 *
-	 * @param string $func name of the global (window) javascript function to call
-	 * @param mixed $parameters variable number of parameters
+	 * @param string $function
 	 */
 	public function call($function)
 	{
@@ -261,7 +260,7 @@ 
 	 *
 	 * @param string $selector jquery selector
 	 * @param string $method name of the jquery to call
-	 * @param array $parameters =array()
+	 * @param string[] $parameters =array()
 	 */
 	public function jquery($selector,$method,array $parameters=array())
 	{
@@ -279,6 +278,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $type
+	 */
 	public function generic($type, array $parameters = array())
 	{
 		if (is_string($type))
@@ -544,7 +546,6 @@ 
 	/**
 	 * Init responseArray
 	 *
-	 * @param array $arr
 	 * @return array previous content
 	 */
 	public function initResponseArray()
@@ -628,7 +629,7 @@ 
 	 *
 	 * @param midex $var
 	 * @param string $prefix =''
-	 * @return mixed
+	 * @return midex|null
 	 */
 	public static function fix_content($var, $prefix='')
 	{

Indentation +7 added lines, -7 removed lines

@@ -242,13 +242,13 @@
 		if ($ret === false && ($err = json_last_error()))
 		{
 			static $json_err2str = array(
-	        	JSON_ERROR_NONE => 'No errors',
-	        	JSON_ERROR_DEPTH => 'Maximum stack depth exceeded',
-	        	JSON_ERROR_STATE_MISMATCH => 'Underflow or the modes mismatch',
-	        	JSON_ERROR_CTRL_CHAR => 'Unexpected control character found',
-	        	JSON_ERROR_SYNTAX => 'Syntax error, malformed JSON',
-	        	JSON_ERROR_UTF8 => 'Malformed UTF-8 characters, possibly incorrectly encoded',
-	        );
+				JSON_ERROR_NONE => 'No errors',
+				JSON_ERROR_DEPTH => 'Maximum stack depth exceeded',
+				JSON_ERROR_STATE_MISMATCH => 'Underflow or the modes mismatch',
+				JSON_ERROR_CTRL_CHAR => 'Unexpected control character found',
+				JSON_ERROR_SYNTAX => 'Syntax error, malformed JSON',
+				JSON_ERROR_UTF8 => 'Malformed UTF-8 characters, possibly incorrectly encoded',
+			);
 			error_log(__METHOD__.'('.array2string($var).') json_last_error()='.$err.'='.$json_err2str[$err]);
 
 			if (($var = self::fix_content($var)))

Spacing +23 added lines, -23 removed lines

@@ -30,7 +30,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;
@@ -53,11 +53,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
 		{
@@ -68,14 +68,14 @@ 
 		{
 			$responses = array();
 			$response = egw_json_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
 		{
@@ -91,25 +91,25 @@ 
 	 */
 	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($appName) = explode('_',$className);
+			@list($className, $functionName, $handler) = explode('::', $menuaction);
+			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;
@@ -135,14 +135,14 @@ 
 				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($_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($_SERVER['PHP_SELF']. ' stopped for security reason. '.$menuaction.' is not valid. class- or function-name must start with ajax!!!');
+			throw new Exception($_SERVER['PHP_SELF'].' stopped for security reason. '.$menuaction.' is not valid. class- or function-name must start with ajax!!!');
 		}
 
 		if (isset($template))
@@ -217,7 +217,7 @@ 
 	 * @param string $function name of the global (window) javascript function to call
 	 * @param array $parameters =array()
 	 */
-	public function apply($function,array $parameters=array())
+	public function apply($function, array $parameters = array())
 	{
 		if (is_string($function))
 		{
@@ -241,7 +241,7 @@ 
 	public function call($function)
 	{
 		$parameters = func_get_args();
-		array_shift($parameters);	// shift off $function
+		array_shift($parameters); // shift off $function
 
 		if (is_string($function))
 		{
@@ -263,7 +263,7 @@ 
 	 * @param string $method name of the jquery to call
 	 * @param array $parameters =array()
 	 */
-	public function jquery($selector,$method,array $parameters=array())
+	public function jquery($selector, $method, array $parameters = array())
 	{
 		if (is_string($selector) && is_string($method))
 		{
@@ -322,7 +322,7 @@ 
 	 * @param string $app =null default current app from flags
 	 * or only the current application
 	 */
-	public function redirect($url, $global = false, $app=null)
+	public function redirect($url, $global = false, $app = null)
 	{
 		if (is_string($url) && is_bool($global))
 		{
@@ -590,7 +590,7 @@ 
 		/* Wrap the result array into a parent "response" Object */
 		$res = array('response' => $inst->responseArray);
 
-		return self::json_encode($res);	//PHP5.3+, JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_AMP);
+		return self::json_encode($res); //PHP5.3+, JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_AMP);
 	}
 
 	/**
@@ -630,7 +630,7 @@ 
 	 * @param string $prefix =''
 	 * @return mixed
 	 */
-	public static function fix_content($var, $prefix='')
+	public static function fix_content($var, $prefix = '')
 	{
 		if (json_encode($var) !== false) return $var;
 
@@ -641,7 +641,7 @@ 
 		}
 		else
 		{
-			foreach($var as $name => &$value)
+			foreach ($var as $name => &$value)
 			{
 				$value = self::fix_content($value, $prefix ? $prefix.'['.$name.']' : $name);
 			}

Braces +20 added lines, -5 removed lines

@@ -33,7 +33,10 @@ 
 	public static function isJSONRequest($set=null)
 	{
 		$ret = self::$_hadJSONRequest;
-		if (isset($set)) self::$_hadJSONRequest = $set;
+		if (isset($set))
+		{
+			self::$_hadJSONRequest = $set;
+		}
 		return $ret;
 	}
 
@@ -51,7 +54,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']))
@@ -91,9 +97,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);
+		}
 			list($appName) = explode('_',$className);
 
 			// Check for a real static method, avoid instanciation if it is
@@ -162,7 +171,10 @@ 
 			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();
+		}
 	}
 }
 
@@ -632,7 +644,10 @@ 
 	 */
 	public static function fix_content($var, $prefix='')
 	{
-		if (json_encode($var) !== false) return $var;
+		if (json_encode($var) !== false)
+		{
+			return $var;
+		}
 
 		if (is_scalar($var))
 		{

phpgwapi/inc/class.egw_link.inc.php

Doc Comments +3 added lines, -5 removed lines

@@ -433,7 +433,7 @@ 
 	 * generate temporary link_id used as array-key
 	 *
 	 * @param string $app app-name
-	 * @param mixed $id
+	 * @param string $id
 	 * @return string
 	 */
 	static function temp_link_id($app,$id)
@@ -579,7 +579,7 @@ 
 	 * @param string|array $id ='' id if $app_link_id is an appname or array with links, if 1. entry not yet created
 	 * @param string $app2 ='' second app
 	 * @param string $id2 ='' id in $app2
-	 * @return array with link-data or False
+	 * @return string with link-data or False
 	 */
 	static function get_link($app_link_id,$id='',$app2='',$id2='')
 	{
@@ -734,7 +734,6 @@ 
 	 *
 	 * @param string $app app to search
 	 * @param string $pattern pattern to search
-	 * @param string $type Search only a certain sub-type of records (optional)
 	 * @return array with $id => $title pairs of matching entries of app
 	 */
 	static function query($app,$pattern, &$options = array())
@@ -1232,7 +1231,6 @@ 
 	 * @param string $app appname to link the file to
 	 * @param string $id id in $app
 	 * @param string $file VFS path to link to
-	 * @param string $comment ='' comment to add to the link
 	 */
 	static function link_file($app,$id,$file)//,$comment='')
 	{
@@ -1259,7 +1257,7 @@ 
 	 * @param int|string $app > 0: file_id of an attchemnt or $app/$id entry which linked to
 	 * @param string $id ='' id in app
 	 * @param string $fname ='' filename
-	 * @return boolean|array false on error ($app or $id not found), array with path as key and boolean result of delete
+	 * @return boolean false on error ($app or $id not found), array with path as key and boolean result of delete
 	 */
 	static function delete_attached($app,$id='',$fname='')
 	{

Indentation +3 added lines, -3 removed lines

@@ -480,7 +480,7 @@ 
 		}
 		$ids = Link\Storage::get_links($app, $id, $only_app, $order, $deleted, $limit);
 		if (empty($only_app) || $only_app == self::VFS_APPNAME ||
-		    ($only_app[0] == '!' && $only_app != '!'.self::VFS_APPNAME))
+			($only_app[0] == '!' && $only_app != '!'.self::VFS_APPNAME))
 		{
 			if (($vfs_ids = self::list_attached($app,$id)))
 			{
@@ -536,7 +536,7 @@ 
 		$links = Link\Storage::get_links($app,$ids,$only_app,$order,$deleted);
 
 		if (empty($only_app) || $only_app == self::VFS_APPNAME ||
-		    ($only_app[0] == '!' && $only_app != '!'.self::VFS_APPNAME))
+			($only_app[0] == '!' && $only_app != '!'.self::VFS_APPNAME))
 		{
 			// todo do that in a single query, eg. directory listing, too
 			foreach($ids as $id)
@@ -793,7 +793,7 @@ 
 
 		if (!isset($options['total']))
 		{
-		       $options['total'] = count($result);
+			   $options['total'] = count($result);
 		}
 		if (is_array($result) && (isset($options['start']) || (isset($options['num_rows']) && count($result) > $options['num_rows'])))
 		{

Spacing +179 added lines, -179 removed lines

@@ -110,7 +110,7 @@ 
 	/**
 	 * appname used for returned attached files (!= 'filemanager'!)
 	 */
-	const VFS_APPNAME = 'file';		// pseudo-appname for own file-attachments in vfs, this is NOT the vfs-app
+	const VFS_APPNAME = 'file'; // pseudo-appname for own file-attachments in vfs, this is NOT the vfs-app
 
 	/**
 	 * Appname used of files stored via egw_link::set_data()
@@ -143,7 +143,7 @@ 
 			'icon' => 'addressbook/accounts',
 			'query' => 'accounts::link_query',
 			'title' => 'common::grab_owner_name',
-			'view' => array('menuaction'=>'addressbook.addressbook_ui.view','ajax'=>'true'),
+			'view' => array('menuaction'=>'addressbook.addressbook_ui.view', 'ajax'=>'true'),
 			'view_id' => 'account_id'
 		),
 		'home' => array(
@@ -201,21 +201,21 @@ 
 		// other apps can participate in the linking by implementing a search_link hook, which
 		// has to return an array in the format of an app_register entry
 		// for performance reasons, we do it only once / cache it in the session
-		if (!($search_link_hooks = $GLOBALS['egw']->session->appsession('search_link_hooks','phpgwapi')))
+		if (!($search_link_hooks = $GLOBALS['egw']->session->appsession('search_link_hooks', 'phpgwapi')))
 		{
-			$search_link_hooks = $GLOBALS['egw']->hooks->process('search_link',array(), (bool)$GLOBALS['egw_info']['flags']['async-service']);
-			$GLOBALS['egw']->session->appsession('search_link_hooks','phpgwapi',$search_link_hooks);
+			$search_link_hooks = $GLOBALS['egw']->hooks->process('search_link', array(), (bool)$GLOBALS['egw_info']['flags']['async-service']);
+			$GLOBALS['egw']->session->appsession('search_link_hooks', 'phpgwapi', $search_link_hooks);
 		}
 		if (is_array($search_link_hooks))
 		{
-			foreach($search_link_hooks as $app => $data)
+			foreach ($search_link_hooks as $app => $data)
 			{
 				// allow apps to register additional types
 				if (isset($data['additional']))
 				{
-					foreach($data['additional'] as $name => $values)
+					foreach ($data['additional'] as $name => $values)
 					{
-						$values['app'] = $app;	// store name of registring app, to be able to check access
+						$values['app'] = $app; // store name of registring app, to be able to check access
 						self::$app_register[$name] = $values;
 					}
 					unset($data['additional']);
@@ -225,7 +225,7 @@ 
 				{
 					$data['list'] = array('menuaction' => $data['view_list']);
 				}
-				elseif(isset($data['list']) && !isset($data['view_list']))
+				elseif (isset($data['list']) && !isset($data['view_list']))
 				{
 					$data['view_list'] = $data['list']['menuaction'];
 				}
@@ -241,11 +241,11 @@ 
 		{
 			unset(self::$app_register['home-accounts']);
 		}
-		if (!(self::$title_cache = $GLOBALS['egw']->session->appsession('link_title_cache','phpgwapi')))
+		if (!(self::$title_cache = $GLOBALS['egw']->session->appsession('link_title_cache', 'phpgwapi')))
 		{
 			self::$title_cache = array();
 		}
-		if (!(self::$file_access_cache = $GLOBALS['egw']->session->appsession('link_file_access_cache','phpgwapi')))
+		if (!(self::$file_access_cache = $GLOBALS['egw']->session->appsession('link_file_access_cache', 'phpgwapi')))
 		{
 			self::$file_access_cache = array();
 		}
@@ -269,18 +269,18 @@ 
 	public static function json_registry()
 	{
 		$to_json = array();
-		foreach(self::$app_register as $app => $data)
+		foreach (self::$app_register as $app => $data)
 		{
 			if (isset($GLOBALS['egw_info']['user']['apps'][$app]) ||
 				isset($data['app']) && isset($GLOBALS['egw_info']['user']['apps'][$data['app']]))
 			{
 				$to_json[$app] = array_intersect_key($data, array_flip(array(
-					'view','view_id','view_popup',
-					'add','add_app','add_id','add_popup',
-					'edit','edit_id','edit_popup',
-					'list','list_popup',
-					'name','icon','query',
-					'mime','entry','entries',
+					'view', 'view_id', 'view_popup',
+					'add', 'add_app', 'add_id', 'add_popup',
+					'edit', 'edit_id', 'edit_popup',
+					'list', 'list_popup',
+					'name', 'icon', 'query',
+					'mime', 'entry', 'entries',
 				)));
 			}
 		}
@@ -297,8 +297,8 @@ 
 		if (isset($GLOBALS['egw']->session))	// eg. cron-jobs use it too, without any session
 		{
 			//error_log(__METHOD__.'() items in title-cache: '.count(self::$title_cache).' file-access-cache: '.count(self::$file_access_cache));
-			$GLOBALS['egw']->session->appsession('link_title_cache','phpgwapi',self::$title_cache);
-			$GLOBALS['egw']->session->appsession('link_file_access_cache','phpgwapi',self::$file_access_cache);
+			$GLOBALS['egw']->session->appsession('link_title_cache', 'phpgwapi', self::$title_cache);
+			$GLOBALS['egw']->session->appsession('link_file_access_cache', 'phpgwapi', self::$file_access_cache);
 		}
 	}
 
@@ -325,11 +325,11 @@ 
 	 * @param int $no_notify =0 &1 dont notify $app1, &2 dont notify $app2
 	 * @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,$no_notify=0 )
+	static function link($app1, &$id1, $app2, $id2 = '', $remark = '', $owner = 0, $lastmod = 0, $no_notify = 0)
 	{
 		if (self::DEBUG)
 		{
-			echo "<p>egw_link::link('$app1',$id1,'".print_r($app2,true)."',".print_r($id2,true).",'$remark',$owner,$lastmod)</p>\n";
+			echo "<p>egw_link::link('$app1',$id1,'".print_r($app2, true)."',".print_r($id2, true).",'$remark',$owner,$lastmod)</p>\n";
 		}
 		if (!$app1 || !$app2 || $app1 == $app2 && $id1 == $id2)
 		{
@@ -348,7 +348,7 @@ 
 				}
 				if (is_array($id1) || !$id1)		// create link only in $id1 array
 				{
-					self::link($app1, $id1, $link['app'], $link['id'], $link['remark'],$link['owner'],$link['lastmod']);
+					self::link($app1, $id1, $link['app'], $link['id'], $link['remark'], $link['owner'], $link['lastmod']);
 					continue;
 				}
 				switch ($link['app'])
@@ -361,19 +361,19 @@ 
 						}
 						// fall through
 					case self::VFS_APPNAME:
-						$link_id = self::attach_file($app1,$id1,$link['id'],$link['remark']);
+						$link_id = self::attach_file($app1, $id1, $link['id'], $link['remark']);
 						break;
 
 					case self::VFS_LINK:
-						$link_id = self::link_file($app1,$id1, $link['id'],$link['remark']);
+						$link_id = self::link_file($app1, $id1, $link['id'], $link['remark']);
 						break;
 
 					default:
-						$link_id = solink::link($app1,$id1,$link['app'],$link['id'],
-							$link['remark'],$link['owner'],$link['lastmod']);
+						$link_id = solink::link($app1, $id1, $link['app'], $link['id'],
+							$link['remark'], $link['owner'], $link['lastmod']);
 						// notify both sides
-						if (!($no_notify&2)) self::notify('link',$link['app'],$link['id'],$app1,$id1,$link_id);
-						if (!($no_notify&1)) self::notify('link',$app1,$id1,$link['app'],$link['id'],$link_id);
+						if (!($no_notify&2)) self::notify('link', $link['app'], $link['id'], $app1, $id1, $link_id);
+						if (!($no_notify&1)) self::notify('link', $app1, $id1, $link['app'], $link['id'], $link_id);
 						break;
 				}
 			}
@@ -385,7 +385,7 @@ 
 			{
 				$id1 = array( );
 			}
-			$link_id = self::temp_link_id($app2,$id2);
+			$link_id = self::temp_link_id($app2, $id2);
 
 			$id1[$link_id] = array(
 				'app' => $app2,
@@ -403,24 +403,24 @@ 
 		}
 		if ($app1 == self::VFS_LINK)
 		{
-			return self::link_file($app2,$id2,$id1,$remark);
+			return self::link_file($app2, $id2, $id1, $remark);
 		}
 		elseif ($app2 == self::VFS_LINK)
 		{
-			return self::link_file($app1,$id1,$id2,$remark);
+			return self::link_file($app1, $id1, $id2, $remark);
 		}
 		if ($app1 == self::VFS_APPNAME)
 		{
-			return self::attach_file($app2,$id2,$id1,$remark);
+			return self::attach_file($app2, $id2, $id1, $remark);
 		}
 		elseif ($app2 == self::VFS_APPNAME)
 		{
-			return self::attach_file($app1,$id1,$id2,$remark);
+			return self::attach_file($app1, $id1, $id2, $remark);
 		}
-		$link_id = solink::link($app1,$id1,$app2,$id2,$remark,$owner);
+		$link_id = solink::link($app1, $id1, $app2, $id2, $remark, $owner);
 
-		if (!($no_notify&2)) self::notify('link',$app2,$id2,$app1,$id1,$link_id);
-		if (!($no_notify&1)) self::notify('link',$app1,$id1,$app2,$id2,$link_id);
+		if (!($no_notify&2)) self::notify('link', $app2, $id2, $app1, $id1, $link_id);
+		if (!($no_notify&1)) self::notify('link', $app1, $id1, $app2, $id2, $link_id);
 
 		return $link_id;
 	}
@@ -432,9 +432,9 @@ 
 	 * @param mixed $id
 	 * @return string
 	 */
-	static function temp_link_id($app,$id)
+	static function temp_link_id($app, $id)
 	{
-		return $app.':'.(!in_array($app, array(self::VFS_APPNAME,self::VFS_LINK, self::DATA_APPNAME)) ? $id : $id['name']);
+		return $app.':'.(!in_array($app, array(self::VFS_APPNAME, self::VFS_LINK, self::DATA_APPNAME)) ? $id : $id['name']);
 	}
 
 	/**
@@ -450,7 +450,7 @@ 
 	 * @param int $limit =null number of entries to return, only affects links, attachments are allways reported!
 	 * @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',$cache_titles=false, $deleted=false, $limit=null)
+	static function get_links($app, $id, $only_app = '', $order = 'link_lastmod DESC', $cache_titles = false, $deleted = false, $limit = null)
 	{
 		if (self::DEBUG) echo "<p>egw_link::get_links(app='$app',id='$id',only_app='$only_app',order='$order',deleted='$deleted')</p>\n";
 
@@ -461,7 +461,7 @@ 
 			{
 				if (($not_only = $only_app[0] == '!'))
 				{
-					$only_app = substr(1,$only_app);
+					$only_app = substr(1, $only_app);
 				}
 				foreach (array_reverse($id) as $link)
 				{
@@ -478,7 +478,7 @@ 
 		if (empty($only_app) || $only_app == self::VFS_APPNAME ||
 		    ($only_app[0] == '!' && $only_app != '!'.self::VFS_APPNAME))
 		{
-			if (($vfs_ids = self::list_attached($app,$id)))
+			if (($vfs_ids = self::list_attached($app, $id)))
 			{
 				$ids += $vfs_ids;
 			}
@@ -488,18 +488,18 @@ 
 		{
 			// agregate links by app
 			$app_ids = array();
-			foreach($ids as $link)
+			foreach ($ids as $link)
 			{
 				$app_ids[$link['app']][] = $link['id'];
 			}
-			foreach($app_ids as $appname => $a_ids)
+			foreach ($app_ids as $appname => $a_ids)
 			{
-				self::titles($appname,array_unique($a_ids));
+				self::titles($appname, array_unique($a_ids));
 			}
 			// remove links, current user has no access, from result
-			foreach($ids as $key => $link)
+			foreach ($ids as $key => $link)
 			{
-				if (!self::title($link['app'],$link['id']))
+				if (!self::title($link['app'], $link['id']))
 				{
 					unset($ids[$key]);
 				}
@@ -521,27 +521,27 @@ 
 	 * @param boolean $deleted =false Include links that have been flagged as deleted, waiting for purge of linked record.
 	 * @return array of $id => array($links) pairs
 	 */
-	static function get_links_multiple($app,array $ids,$cache_titles=true,$only_app='',$order='link_lastmod DESC', $deleted=false )
+	static function get_links_multiple($app, array $ids, $cache_titles = true, $only_app = '', $order = 'link_lastmod DESC', $deleted = false)
 	{
-		if (self::DEBUG) echo "<p>".__METHOD__."('$app',".print_r($ids,true).",$cache_titles,'$only_app','$order')</p>\n";
+		if (self::DEBUG) echo "<p>".__METHOD__."('$app',".print_r($ids, true).",$cache_titles,'$only_app','$order')</p>\n";
 
 		if (!$ids)
 		{
-			return array();		// no ids are linked to nothing
+			return array(); // no ids are linked to nothing
 		}
-		$links = solink::get_links($app,$ids,$only_app,$order,$deleted);
+		$links = solink::get_links($app, $ids, $only_app, $order, $deleted);
 
 		if (empty($only_app) || $only_app == self::VFS_APPNAME ||
 		    ($only_app[0] == '!' && $only_app != '!'.self::VFS_APPNAME))
 		{
 			// todo do that in a single query, eg. directory listing, too
-			foreach($ids as $id)
+			foreach ($ids as $id)
 			{
 				if (!isset($links[$id]))
 				{
 					$links[$id] = array();
 				}
-				if (($vfs_ids = self::list_attached($app,$id)))
+				if (($vfs_ids = self::list_attached($app, $id)))
 				{
 					$links[$id] += $vfs_ids;
 				}
@@ -551,16 +551,16 @@ 
 		{
 			// agregate links by app
 			$app_ids = array();
-			foreach($links as &$targets)
+			foreach ($links as &$targets)
 			{
-				foreach($targets as $link)
+				foreach ($targets as $link)
 				{
 					if (is_array($link)) $app_ids[$link['app']][] = $link['id'];
 				}
 			}
-			foreach($app_ids as $app => $a_ids)
+			foreach ($app_ids as $app => $a_ids)
 			{
-				self::titles($app,array_unique($a_ids));
+				self::titles($app, array_unique($a_ids));
 			}
 		}
 		return $links;
@@ -577,7 +577,7 @@ 
 	 * @param string $id2 ='' id in $app2
 	 * @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)
 		{
@@ -585,7 +585,7 @@ 
 		}
 		if (is_array($id))
 		{
-			if (strpos($app_link_id,':') === false) $app_link_id = self::temp_link_id($app2,$id2);	// create link_id of temporary link, if not given
+			if (strpos($app_link_id, ':') === false) $app_link_id = self::temp_link_id($app2, $id2); // create link_id of temporary link, if not given
 
 			if (isset($id[$app_link_id]) && is_array($id[$app_link_id]))	// check for unlinked-marker
 			{
@@ -601,11 +601,11 @@ 
 			}
 			if ($app_link_id == self::VFS_APPNAME)
 			{
-				return self::info_attached($app2,$id2,$id);
+				return self::info_attached($app2, $id2, $id);
 			}
-			return self::info_attached($app_link_id,$id,$id2);
+			return self::info_attached($app_link_id, $id, $id2);
 		}
-		return solink::get_link($app_link_id,$id,$app2,$id2);
+		return solink::get_link($app_link_id, $id, $app2, $id2);
 	}
 
 	/**
@@ -623,9 +623,9 @@ 
 	 * @param boolean $hold_for_purge Don't really delete the link, just mark it as deleted and wait for final delete
 	 * @return the number of links deleted
 	 */
-	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)
 	{
-		return self::unlink2($link_id,$app,$id,$owner,$app2,$id2,$hold_for_purge);
+		return self::unlink2($link_id, $app, $id, $owner, $app2, $id2, $hold_for_purge);
 	}
 
 	/**
@@ -640,7 +640,7 @@ 
 	 * @param boolean $hold_for_purge Don't really delete the link, just mark it as deleted and wait for final delete
 	 * @return the number of links deleted
 	 */
-	static function unlink2($link_id,$app,&$id,$owner=0,$app2='',$id2='',$hold_for_purge=false)
+	static function unlink2($link_id, $app, &$id, $owner = 0, $app2 = '', $id2 = '', $hold_for_purge = false)
 	{
 		if (self::DEBUG)
 		{
@@ -652,22 +652,22 @@ 
 		}
 		elseif ($app == self::VFS_APPNAME)
 		{
-			return self::delete_attached($app2,$id2,$id);
+			return self::delete_attached($app2, $id2, $id);
 		}
 		elseif ($app2 == self::VFS_APPNAME)
 		{
-			return self::delete_attached($app,$id,$id2);
+			return self::delete_attached($app, $id, $id2);
 		}
 		if (!is_array($id))
 		{
 			if (!$link_id && !$app2 && !$id2 && $app2 != '!'.self::VFS_APPNAME)
 			{
-				self::delete_attached($app,$id);	// deleting all attachments
-				self::delete_cache($app,$id);
+				self::delete_attached($app, $id); // deleting all attachments
+				self::delete_cache($app, $id);
 			}
 
 			// Log in history
-			if($link_id && (!$app || !$app2))
+			if ($link_id && (!$app || !$app2))
 			{
 				// Need to load it first
 				$link = self::get_link($link_id);
@@ -678,21 +678,21 @@ 
 			}
 			if ($app && $app2)
 			{
-				historylog::static_add($app,$id,$GLOBALS['egw_info']['user']['account_id'],'~link~','',$app2.':'.$id2);
-				historylog::static_add($app2,$id2,$GLOBALS['egw_info']['user']['account_id'],'~link~','',$app.':'.$id);
+				historylog::static_add($app, $id, $GLOBALS['egw_info']['user']['account_id'], '~link~', '', $app2.':'.$id2);
+				historylog::static_add($app2, $id2, $GLOBALS['egw_info']['user']['account_id'], '~link~', '', $app.':'.$id);
 			}
-			$deleted =& solink::unlink($link_id,$app,$id,$owner,$app2 != '!'.self::VFS_APPNAME ? $app2 : '',$id2,$hold_for_purge);
+			$deleted = & solink::unlink($link_id, $app, $id, $owner, $app2 != '!'.self::VFS_APPNAME ? $app2 : '', $id2, $hold_for_purge);
 
 			// only notify on real links, not the one cached for writing or fileattachments
 			self::notify_unlink($deleted);
 
 			return count($deleted);
 		}
-		if (!$link_id) $link_id = self::temp_link_id($app2,$id2);	// create link_id of temporary link, if not given
+		if (!$link_id) $link_id = self::temp_link_id($app2, $id2); // create link_id of temporary link, if not given
 
 		if (isset($id[$link_id]))
 		{
-			$id[$link_id] = False;	// set the unlink marker
+			$id[$link_id] = False; // set the unlink marker
 
 			if (self::DEBUG)
 			{
@@ -709,10 +709,10 @@ 
 	 * @param string $must_support capability the apps need to support, eg. 'add', default ''=list all apps
 	 * @return array with app => title pairs
 	 */
-	static function app_list($must_support='')
+	static function app_list($must_support = '')
 	{
 		$apps = array();
-		foreach(self::$app_register as $type => $reg)
+		foreach (self::$app_register as $type => $reg)
 		{
 			if ($must_support && !isset($reg[$must_support])) continue;
 
@@ -733,7 +733,7 @@ 
 	 * @param string $type Search only a certain sub-type of records (optional)
 	 * @return array with $id => $title pairs of matching entries of app
 	 */
-	static function query($app,$pattern, &$options = array())
+	static function query($app, $pattern, &$options = array())
 	{
 		if ($app == '' || !is_array($reg = self::$app_register[$app]) || !isset($reg['query']))
 		{
@@ -749,14 +749,14 @@ 
 
 		// See etemplate's nextmatch widget, following was copied from there
 		// allow static callbacks
-		if(strpos($method,'::') !== false)
+		if (strpos($method, '::') !== false)
 		{
 			//  workaround for php < 5.3: do NOT call it static, but allow application code to specify static callbacks
-			if (version_compare(PHP_VERSION,'5.3','<')) list($class,$method) = explode('::',$method);
+			if (version_compare(PHP_VERSION, '5.3', '<')) list($class, $method) = explode('::', $method);
 		}
 		else
 		{
-			list($app,$class,$method) = explode('.',$method);
+			list($app, $class, $method) = explode('.', $method);
 		}
 		if ($class)
 		{
@@ -773,13 +773,13 @@ 
 				$obj = CreateObject($app.'.'.$class);
 			}
 		}
-		if(is_callable($method))        // php5.3+ call
+		if (is_callable($method))        // php5.3+ call
 		{
-			$result = call_user_func($method,$pattern,$options);
+			$result = call_user_func($method, $pattern, $options);
 		}
-		elseif(is_object($obj) && method_exists($obj,$method))
+		elseif (is_object($obj) && method_exists($obj, $method))
 		{
-			$result = $obj->$method($pattern,$options);
+			$result = $obj->$method($pattern, $options);
 		}
 		else
 		{
@@ -807,11 +807,11 @@ 
 	 * @param array $link =null link-data for file-attachments
 	 * @return string/boolean string with title, null if $id does not exist in $app or false if no perms to view it
 	 */
-	static function title($app,$id,$link=null)
+	static function title($app, $id, $link = null)
 	{
 		if (!$id) return '';
 
-		$title =& self::get_cache($app,$id);
+		$title = & self::get_cache($app, $id);
 		if (isset($title) && !empty($title) && !is_array($id))
 		{
 			if (self::DEBUG) echo '<p>'.__METHOD__."('$app','$id')='$title' (from cache)</p>\n";
@@ -844,7 +844,7 @@ 
 		}
 		$method = $reg['title'];
 
-		if (true) $title = ExecMethod($method,$id);
+		if (true) $title = ExecMethod($method, $id);
 
 		if ($id && is_null($title))	// $app,$id has been deleted ==> unlink all links to it
 		{
@@ -853,7 +853,7 @@ 
 			if (!isset($unlinking[$app]) || !isset($unlinking[$app][$id]))
 			{
 				$unlinking[$app][$id] = true;
-				self::unlink(0,$app,$id);
+				self::unlink(0, $app, $id);
 				unset($unlinking[$app][$id]);
 			}
 			if (self::DEBUG) echo '<p>'.__METHOD__."('$app','$id') unlinked, as $method returned null</p>\n";
@@ -878,36 +878,36 @@ 
 	 * @param string $app
 	 * @param array $ids
 	 */
-	static function titles($app,array $ids)
+	static function titles($app, array $ids)
 	{
 		if (self::DEBUG)
 		{
-			echo "<p>".__METHOD__."($app,".implode(',',$ids).")</p>\n";
+			echo "<p>".__METHOD__."($app,".implode(',', $ids).")</p>\n";
 		}
 		$titles = $ids_to_query = array();
-		foreach($ids as $id)
+		foreach ($ids as $id)
 		{
-			$title =& self::get_cache($app,$id);
+			$title = & self::get_cache($app, $id);
 			if (!isset($title))
 			{
 				if (isset(self::$app_register[$app]['titles']))
 				{
-					$ids_to_query[] = $id;	// titles method --> collect links to query at once
+					$ids_to_query[] = $id; // titles method --> collect links to query at once
 				}
 				else
 				{
-					$title = self::title($app,$id);	// no titles method --> fallback to query each link separate
+					$title = self::title($app, $id); // no titles method --> fallback to query each link separate
 				}
 			}
 			$titles[$id] = $title;
 		}
 		if ($ids_to_query)
 		{
-			for ($n = 0; ($ids = array_slice($ids_to_query,$n*self::MAX_TITLES_QUERY,self::MAX_TITLES_QUERY)); ++$n)
+			for ($n = 0; ($ids = array_slice($ids_to_query, $n * self::MAX_TITLES_QUERY, self::MAX_TITLES_QUERY)); ++$n)
 			{
-				foreach(ExecMethod(self::$app_register[$app]['titles'],$ids) as $id => $t)
+				foreach (ExecMethod(self::$app_register[$app]['titles'], $ids) as $id => $t)
 				{
-					$title =& self::get_cache($app,$id);
+					$title = & self::get_cache($app, $id);
 					$titles[$id] = $title = $t;
 				}
 			}
@@ -923,7 +923,7 @@ 
 	 * @param string $to_id =''id in $to_app
 	 * @return array/boolean with name-value pairs for link to add-methode of $app or false if add not supported
 	 */
-	static function add($app,$to_app='',$to_id='')
+	static function add($app, $to_app = '', $to_id = '')
 	{
 		//echo "<p>egw_link::add('$app','$to_app','$to_id') app_register[$app] ="; _debug_array($app_register[$app]);
 		if ($app == '' || !is_array($reg = self::$app_register[$app]) || !isset($reg['add']))
@@ -948,7 +948,7 @@ 
 	 * @param string &$popup=null on return popup size eg. '600x400' or null
 	 * @return array|boolean with name-value pairs for link to edit-methode of $app or false if edit not supported
 	 */
-	static function edit($app,$id,&$popup=null)
+	static function edit($app, $id, &$popup = null)
 	{
 		//echo "<p>egw_link::add('$app','$to_app','$to_id') app_register[$app] ="; _debug_array($app_register[$app]);
 		if (empty($app) || empty($id) || !is_array($reg = self::$app_register[$app]) || !isset($reg['edit']))
@@ -956,7 +956,7 @@ 
 			if ($reg && isset($reg['view']))
 			{
 				$popup = $reg['view_popup'];
-				return self::view($app,$id);	// fallback to view
+				return self::view($app, $id); // fallback to view
 			}
 			return false;
 		}
@@ -976,12 +976,12 @@ 
 	 * @param array $link =null link-data for file-attachments
 	 * @return array with name-value pairs for link to view-methode of $app to view $id
 	 */
-	static function view($app,$id,$link=null)
+	static function view($app, $id, $link = null)
 	{
 		if ($app == self::VFS_APPNAME && !empty($id) && is_array($link))
 		{
 			//return egw_vfs::download_url(self::vfs_path($link['app2'],$link['id2'],$link['id'],true));
-			return self::mime_open(self::vfs_path($link['app2'],$link['id2'],$link['id'],true), $link['type']);
+			return self::mime_open(self::vfs_path($link['app2'], $link['id2'], $link['id'], true), $link['type']);
 		}
 		if ($app == '' || !is_array($reg = self::$app_register[$app]) || !isset($reg['view']) || !isset($reg['view_id']))
 		{
@@ -989,11 +989,11 @@ 
 		}
 		$view = $reg['view'];
 
-		$names = explode(':',$reg['view_id']);
+		$names = explode(':', $reg['view_id']);
 		if (count($names) > 1)
 		{
-			$id = explode(':',$id);
-			while (list($n,$name) = each($names))
+			$id = explode(':', $id);
+			while (list($n, $name) = each($names))
 			{
 				$view[$name] = $id[$n];
 			}
@@ -1017,13 +1017,13 @@ 
 	 */
 	static function get_mime_info($type)
 	{
-		foreach(self::$app_register as $app => $registry)
+		foreach (self::$app_register as $app => $registry)
 		{
 			if (isset($registry['mime']) &&
 				(isset($GLOBALS['egw_info']['user']['apps'][$app]) ||
 				isset($registry['app']) && isset($GLOBALS['egw_info']['user']['apps'][$registry['app']])))
 			{
-				foreach($registry['mime'] as $mime => $data)
+				foreach ($registry['mime'] as $mime => $data)
 				{
 					if ($mime == $type) return $data;
 					if ($mime[0] == '/' && preg_match($mime.'i', $type))
@@ -1044,7 +1044,7 @@ 
 	 * @param string &$popup=null on return popup size or null
 	 * @return string|array string with EGw relative link, array with get-parameters for '/index.php' or null (directory and not filemanager access)
 	 */
-	static function mime_open($path, $type=null, &$popup=null)
+	static function mime_open($path, $type = null, &$popup = null)
 	{
 		if (is_null($type)) $type = egw_vfs::mime_content_type($path);
 
@@ -1060,7 +1060,7 @@ 
 				$data[$data['mime_id']] = $path;
 				unset($data['mime_id']);
 			}
-			elseif(isset($data['mime_popup']))
+			elseif (isset($data['mime_popup']))
 			{
 				$popup = $data['mime_popup'];
 			}
@@ -1085,9 +1085,9 @@ 
 	 * @param array $link =null link-data for file-attachments
 	 * @return boolean|string false if no popup is used or $app is not registered, otherwise string with the prefered popup size (eg. '640x400)
 	 */
-	static function is_popup($app, $action='view', $link=null)
+	static function is_popup($app, $action = 'view', $link = null)
 	{
-		$popup = self::get_registry($app,$action.'_popup');
+		$popup = self::get_registry($app, $action.'_popup');
 
 		// for files/attachments check mime-registry
 		if ($app == self::VFS_APPNAME && is_array($link) && !empty($link['type']))
@@ -1110,7 +1110,7 @@ 
 	 * @param string $name name / key in the registry, eg. 'view'
 	 * @return boolean|string false if $app is not registered, otherwise string with the value for $name
 	 */
-	static function get_registry($app,$name)
+	static function get_registry($app, $name)
 	{
 		$reg = self::$app_register[$app];
 
@@ -1118,7 +1118,7 @@ 
 
 		if (!isset($reg[$name]))	// some defaults
 		{
-			switch($name)
+			switch ($name)
 			{
 				case 'name':
 					$reg[$name] = $app;
@@ -1151,7 +1151,7 @@ 
 	 * @param boolean $just_the_path =false return url or just the vfs path
 	 * @return string/array path or array with path and relatives, depending on $relatives
 	 */
-	static function vfs_path($app,$id='',$file='',$just_the_path=false)
+	static function vfs_path($app, $id = '', $file = '', $just_the_path = false)
 	{
 		$path = self::VFS_BASEURL;
 
@@ -1171,7 +1171,7 @@ 
 		}
 		if ($just_the_path)
 		{
-			$path = parse_url($path,PHP_URL_PATH);
+			$path = parse_url($path, PHP_URL_PATH);
 		}
 		else
 		{
@@ -1195,16 +1195,16 @@ 
 	 * @param string $comment ='' comment to add to the link
 	 * @return int negative id of egw_sqlfs table as negative link-id's are for vfs attachments
 	 */
-	static function attach_file($app,$id,$file,$comment='')
+	static function attach_file($app, $id, $file, $comment = '')
 	{
-		$entry_dir = self::vfs_path($app,$id);
+		$entry_dir = self::vfs_path($app, $id);
 		if (self::DEBUG)
 		{
 			echo "<p>attach_file: app='$app', id='$id', tmp_name='$file[tmp_name]', name='$file[name]', size='$file[size]', type='$file[type]', path='$file[path]', ip='$file[ip]', comment='$comment', entry_dir='$entry_dir'</p>\n";
 		}
-		if (file_exists($entry_dir) || ($Ok = mkdir($entry_dir,0,true)))
+		if (file_exists($entry_dir) || ($Ok = mkdir($entry_dir, 0, true)))
 		{
-			$Ok = egw_vfs::copy_uploaded($file, $p=self::vfs_path($app,$id,'',true), $comment, false);	// no is_uploaded_file() check!
+			$Ok = egw_vfs::copy_uploaded($file, $p = self::vfs_path($app, $id, '', true), $comment, false); // no is_uploaded_file() check!
 			if (!$Ok) error_log(__METHOD__."('$app', '$id', ".array2string($file).", '$comment') called egw_vfs::copy_uploaded('$file[tmp_name]', '$p', '$comment', false)=".array2string($Ok));
 		}
 		else
@@ -1222,24 +1222,24 @@ 
 	 * @param string $file VFS path to link to
 	 * @param string $comment ='' comment to add to the link
 	 */
-	static function link_file($app,$id,$file)//,$comment='')
+	static function link_file($app, $id, $file)//,$comment='')
 	{
 		// Don't try to link into app dir if there is no id
-		if(!$id) return;
+		if (!$id) return;
 
-		$app_path = self::vfs_path($app,$id);
+		$app_path = self::vfs_path($app, $id);
 		$ok = true;
-		if (egw_vfs::file_exists($app_path) || ($ok = egw_vfs::mkdir($app_path,0,true)))
+		if (egw_vfs::file_exists($app_path) || ($ok = egw_vfs::mkdir($app_path, 0, true)))
 		{
 			if (!egw_vfs::stat($file))
 			{
-				error_log(__METHOD__. ' (Link target ' . egw_vfs::decodePath($file) . ' not found!');
+				error_log(__METHOD__.' (Link target '.egw_vfs::decodePath($file).' not found!');
 				return false;
 			}
 		}
 
-		$link = egw_vfs::concat($app_path,egw_vfs::basename($file));
-		return egw_vfs::symlink($file,$link);
+		$link = egw_vfs::concat($app_path, egw_vfs::basename($file));
+		return egw_vfs::symlink($file, $link);
 	}
 	/**
 	 * deletes a single or all attached files of an entry (for all there's no acl check, as the entry probably not exists any more!)
@@ -1249,7 +1249,7 @@ 
 	 * @param string $fname ='' filename
 	 * @return boolean|array false on error ($app or $id not found), array with path as key and boolean result of delete
 	 */
-	static function delete_attached($app,$id='',$fname='')
+	static function delete_attached($app, $id = '', $fname = '')
 	{
 		if ((int)$app > 0)	// is file_id
 		{
@@ -1259,9 +1259,9 @@ 
 		{
 			if (empty($app) || empty($id))
 			{
-				return False;	// dont delete more than all attachments of an entry
+				return False; // dont delete more than all attachments of an entry
 			}
-			$url = self::vfs_path($app,$id,$fname);
+			$url = self::vfs_path($app, $id, $fname);
 
 			if (!$fname || !$id)	// we delete the whole entry (or all entries), which probably not exist anymore
 			{
@@ -1274,15 +1274,15 @@ 
 			echo '<p>'.__METHOD__."('$app','$id','$fname') url=$url</p>\n";
 		}
 		// Log in history - Need to load it first
-		if((int)$app > 0)
+		if ((int)$app > 0)
 		{
 			$link = self::get_link(-$app);
-			if($link['app2'] && $link['id2'])
+			if ($link['app2'] && $link['id2'])
 			{
-				historylog::static_add($link['app2'],$link['id2'],$GLOBALS['egw_info']['user']['account_id'],'~file~','', basename($url));
+				historylog::static_add($link['app2'], $link['id2'], $GLOBALS['egw_info']['user']['account_id'], '~file~', '', basename($url));
 			}
 		}
-		if (($Ok = !file_exists($url) || egw_vfs::remove($url,true)) && ((int)$app > 0 || $fname))
+		if (($Ok = !file_exists($url) || egw_vfs::remove($url, true)) && ((int)$app > 0 || $fname))
 		{
 			// try removing the dir, in case it's empty
 			@egw_vfs::rmdir(egw_vfs::dirname($url));
@@ -1302,14 +1302,14 @@ 
 	 * @param string $filename filename
 	 * @return array 'kind' of link-array
 	 */
-	static function info_attached($app,$id,$filename)
+	static function info_attached($app, $id, $filename)
 	{
-		$path = self::vfs_path($app,$id,$filename,true);
-		if (!($stat = egw_vfs::stat($path,STREAM_URL_STAT_QUIET)))
+		$path = self::vfs_path($app, $id, $filename, true);
+		if (!($stat = egw_vfs::stat($path, STREAM_URL_STAT_QUIET)))
 		{
 			return false;
 		}
-		return self::fileinfo2link($stat,$path);
+		return self::fileinfo2link($stat, $path);
 	}
 
 	/**
@@ -1318,24 +1318,24 @@ 
 	 * @param array|int $fileinfo a row from the vfs-db-table (eg. returned by the vfs ls static function) or a file_id of that table
 	 * @return array a 'kind' of link-array
 	 */
-	static function fileinfo2link($fileinfo,$url=null)
+	static function fileinfo2link($fileinfo, $url = null)
 	{
 		if (!is_array($fileinfo))
 		{
 			$url = sqlfs_stream_wrapper::id2path($fileinfo);
-			if (!($fileinfo = egw_vfs::url_stat($url,STREAM_URL_STAT_QUIET)))
+			if (!($fileinfo = egw_vfs::url_stat($url, STREAM_URL_STAT_QUIET)))
 			{
 				return false;
 			}
 		}
-		list(,,$app,$id) = explode('/',$url[0] == '/' ? $url : parse_url($url,PHP_URL_PATH));	// /apps/$app/$id
+		list(,, $app, $id) = explode('/', $url[0] == '/' ? $url : parse_url($url, PHP_URL_PATH)); // /apps/$app/$id
 
 		return array(
 			'app'       => self::VFS_APPNAME,
 			'id'        => $fileinfo['name'],
 			'app2'      => $app,
 			'id2'       => $id,
-			'remark'    => '',					// only list_attached currently sets the remark
+			'remark'    => '', // only list_attached currently sets the remark
 			'owner'     => $fileinfo['uid'],
 			'link_id'   => -$fileinfo['ino'],
 			'lastmod'   => $fileinfo['mtime'],
@@ -1351,26 +1351,26 @@ 
 	 * @param string $id id in app
 	 * @return array with link_id => 'kind' of link-array pairs
 	 */
-	static function list_attached($app,$id)
+	static function list_attached($app, $id)
 	{
-		$path = self::vfs_path($app,$id);
+		$path = self::vfs_path($app, $id);
 		//error_log(__METHOD__."($app,$id) url=$url");
 
-		if (!($extra = self::get_registry($app,'find_extra'))) $extra = array();
+		if (!($extra = self::get_registry($app, 'find_extra'))) $extra = array();
 
 		// always use regular links stream wrapper here: extended one is unnecessary (slow) for just listing attachments
-		if (substr($path,0,13) == 'stylite.links') $path = substr($path,8);
+		if (substr($path, 0, 13) == 'stylite.links') $path = substr($path, 8);
 
 		$attached = array();
-		if (($url2stats = egw_vfs::find($path,array('need_mime'=>true,'type'=>'F','url'=>true)+$extra,true)))
+		if (($url2stats = egw_vfs::find($path, array('need_mime'=>true, 'type'=>'F', 'url'=>true) + $extra, true)))
 		{
-			$props = egw_vfs::propfind(array_keys($url2stats));	// get the comments
-			foreach($url2stats as $url => &$fileinfo)
+			$props = egw_vfs::propfind(array_keys($url2stats)); // get the comments
+			foreach ($url2stats as $url => &$fileinfo)
 			{
-				$link = self::fileinfo2link($fileinfo,$url);
+				$link = self::fileinfo2link($fileinfo, $url);
 				if ($props && isset($props[$url]))
 				{
-					foreach($props[$url] as $prop)
+					foreach ($props[$url] as $prop)
 					{
 						if ($prop['ns'] == egw_vfs::DEFAULT_PROP_NAMESPACE && $prop['name'] == 'comment')
 						{
@@ -1392,7 +1392,7 @@ 
 	 */
 	static private function decode_htmlspecialchars($str)
 	{
-		return str_replace(array('&amp;','&quot;','&lt;','&gt;'),array('&','"','<','>'),$str);
+		return str_replace(array('&amp;', '&quot;', '&lt;', '&gt;'), array('&', '"', '<', '>'), $str);
 	}
 
 	/**
@@ -1410,18 +1410,18 @@ 
 	 * @param string $id id in $app of the updated entry
 	 * @param array $data =null updated data of changed entry, as the read-method of the BO-layer would supply it
 	 */
-	static function notify_update($app,$id,$data=null)
+	static function notify_update($app, $id, $data = null)
 	{
-		self::delete_cache($app,$id);
+		self::delete_cache($app, $id);
 		//error_log(__METHOD__."('$app', $id, $data)");
-		foreach(self::get_links($app,$id,'!'.self::VFS_APPNAME) as $link_id => $link)
+		foreach (self::get_links($app, $id, '!'.self::VFS_APPNAME) as $link_id => $link)
 		{
-			self::notify('update',$link['app'],$link['id'],$app,$id,$link_id,$data);
+			self::notify('update', $link['app'], $link['id'], $app, $id, $link_id, $data);
 		}
-		if($data[egw_link::OLD_LINK_TITLE] && egw_json_response::isJSONResponse())
+		if ($data[egw_link::OLD_LINK_TITLE] && egw_json_response::isJSONResponse())
 		{
 			// Update client side with new title
-			egw_json_response::get()->apply('egw.link_title_callback',array(array($app => array($id => self::title($app, $id)))));
+			egw_json_response::get()->apply('egw.link_title_callback', array(array($app => array($id => self::title($app, $id)))));
 		}
 	}
 
@@ -1445,7 +1445,7 @@ 
 	 * @param string $target_id id in $target_app
 	 * @param array $data =null data of entry in app2 (optional)
 	 */
-	static private function notify($type,$notify_app,$notify_id,$target_app,$target_id,$link_id,$data=null)
+	static private function notify($type, $notify_app, $notify_id, $target_app, $target_id, $link_id, $data = null)
 	{
 		//error_log(__METHOD__."('$type', '$notify_app', $notify_id, '$target_app', $target_id, $link_id, $data)");
 		if ($link_id && isset(self::$app_register[$notify_app]) && isset(self::$app_register[$notify_app]['notify']))
@@ -1472,7 +1472,7 @@ 
 	static public function run_notifies()
 	{
 		//error_log(__METHOD__."() count(self::\$notifies)=".count(self::$notifies));
-		while(self::$notifies)
+		while (self::$notifies)
 		{
 			$args = array_shift(self::$notifies);
 			$method = $args['method'];
@@ -1490,11 +1490,11 @@ 
 	 */
 	static private function notify_unlink(&$links)
 	{
-		foreach($links as $link)
+		foreach ($links as $link)
 		{
 			// we notify both sides of the link, as the unlink command NOT clearly knows which side initiated the unlink
-			self::notify('unlink',$link['link_app1'],$link['link_id1'],$link['link_app2'],$link['link_id2'],$link['link_id']);
-			self::notify('unlink',$link['link_app2'],$link['link_id2'],$link['link_app1'],$link['link_id1'],$link['link_id']);
+			self::notify('unlink', $link['link_app1'], $link['link_id1'], $link['link_app2'], $link['link_id2'], $link['link_id']);
+			self::notify('unlink', $link['link_app2'], $link['link_id2'], $link['link_app1'], $link['link_id1'], $link['link_id']);
 		}
 	}
 
@@ -1506,9 +1506,9 @@ 
 	 * @param string $type ='title' 'title' or 'file_access'
 	 * @return int|string can be null, if cache not yet set
 	 */
-	private static function &get_cache($app,$id,$type = 'title')
+	private static function &get_cache($app, $id, $type = 'title')
 	{
-		switch($type)
+		switch ($type)
 		{
 			case 'title':
 				return self::$title_cache[$app.':'.$id];
@@ -1531,7 +1531,7 @@ 
 	 * @param string $title title string or null
 	 * @param int $file_access =null EGW_ACL_READ, EGW_ACL_EDIT or both or'ed together
 	 */
-	public static function set_cache($app,$id,$title,$file_access=null)
+	public static function set_cache($app, $id, $title, $file_access = null)
 	{
 		//error_log(__METHOD__."($app,$id,$title,$file_access)");
 		if (!is_null($title))
@@ -1550,7 +1550,7 @@ 
 	 * @param string $app app-name or null to delete the whole cache
 	 * @param int|string $id id or null to delete only file_access cache of given app (keeps title cache, if app implements file_access!)
 	 */
-	private static function delete_cache($app,$id)
+	private static function delete_cache($app, $id)
 	{
 		unset(self::$title_cache[$app.':'.$id]);
 		unset(self::$file_access_cache[$app.':'.$id]);
@@ -1565,7 +1565,7 @@ 
 	 * @param boolean $ignore_mime =false true: return id, even if nothing registered for given mime-type
 	 * @return string|null md5 hash of stored data of server-side supported mime-type or null otherwise
 	 */
-	public static function set_data($mime_type, $method, array $params, $ignore_mime=false)
+	public static function set_data($mime_type, $method, array $params, $ignore_mime = false)
 	{
 		if (!$ignore_mime && (!($info = self::get_mime_info($mime_type)) || empty($info['mime_data'])))
 		{
@@ -1586,7 +1586,7 @@ 
 	 * @return mixed null if id is not found or invalid
 	 * @throws egw_exception_wrong_parameter
 	 */
-	public static function get_data($id, $return_resource=false)
+	public static function get_data($id, $return_resource = false)
 	{
 		$data = egw_cache::getSession(__CLASS__, $id);
 
@@ -1610,7 +1610,7 @@ 
 			{
 				$fp = $ret;
 				$ret = '';
-				while(!feof($fp))
+				while (!feof($fp))
 				{
 					$ret .= fread($fp, 8192);
 				}
@@ -1635,42 +1635,42 @@ 
 	 * @param int $user =null default null = current user
 	 * @return boolean true if access granted, false otherwise
 	 */
-	static function file_access($app,$id,$required=EGW_ACL_READ,$rel_path=null,$user=null)
+	static function file_access($app, $id, $required = EGW_ACL_READ, $rel_path = null, $user = null)
 	{
 		// are we called for an other user
 		if ($user && $user != $GLOBALS['egw_info']['user']['account_id'])
 		{
 			// check if app supports file_access WITH 4th $user parameter --> return false if not
-			if (!self::get_registry($app,'file_access_user') || !($method = self::get_registry($app,'file_access')))
+			if (!self::get_registry($app, 'file_access_user') || !($method = self::get_registry($app, 'file_access')))
 			{
 				$ret = false;
 				$err = "(no file_access_user)";
 			}
 			else
 			{
-				$ret = ExecMethod2($method,$id,$required,$rel_path,$user);
+				$ret = ExecMethod2($method, $id, $required, $rel_path, $user);
 				$err = "(from $method)";
 			}
 			//error_log(__METHOD__."('$app',$id,$required,'$rel_path',$user) returning $err ".array2string($ret));
 			return $ret;
 		}
 
-		$cache =& self::get_cache($app,$id,'file_access');
+		$cache = & self::get_cache($app, $id, 'file_access');
 
-		if (!isset($cache) || $required == EGW_ACL_EDIT && !($cache & $required))
+		if (!isset($cache) || $required == EGW_ACL_EDIT && !($cache&$required))
 		{
-			if(($method = self::get_registry($app,'file_access')))
+			if (($method = self::get_registry($app, 'file_access')))
 			{
-				$cache |= ExecMethod2($method,$id,$required,$rel_path) ? $required|EGW_ACL_READ : 0;
+				$cache |= ExecMethod2($method, $id, $required, $rel_path) ? $required|EGW_ACL_READ : 0;
 			}
 			else
 			{
-				$cache |= self::title($app,$id) ? EGW_ACL_READ|EGW_ACL_EDIT : 0;
+				$cache |= self::title($app, $id) ? EGW_ACL_READ|EGW_ACL_EDIT : 0;
 			}
 			//error_log(__METHOD__."($app,$id,$required,$rel_path) got $cache --> ".($cache & $required ? 'true' : 'false'));
 		}
 		//else error_log(__METHOD__."($app,$id,$required,$rel_path) using cached value $cache --> ".($cache & $required ? 'true' : 'false'));
-		return !!($cache & $required);
+		return !!($cache&$required);
 	}
 }
 egw_link::init_static();

Braces +158 added lines, -39 removed lines

@@ -294,10 +294,13 @@ 
 	 */
 	static function save_session_cache()
 	{
-		if (isset($GLOBALS['egw']->session))	// eg. cron-jobs use it too, without any session
+		if (isset($GLOBALS['egw']->session))
+		{
+			// eg. cron-jobs use it too, without any session
 		{
 			//error_log(__METHOD__.'() items in title-cache: '.count(self::$title_cache).' file-access-cache: '.count(self::$file_access_cache));
 			$GLOBALS['egw']->session->appsession('link_title_cache','phpgwapi',self::$title_cache);
+		}
 			$GLOBALS['egw']->session->appsession('link_file_access_cache','phpgwapi',self::$file_access_cache);
 		}
 	}
@@ -341,14 +344,20 @@ 
 			$link_id = True;
 			while ($link_id && list(,$link) = each($app2))
 			{
-				if (!is_array($link))	// check for unlink-marker
+				if (!is_array($link))
+				{
+					// check for unlink-marker
 				{
 					//echo "<b>link='$link' is no array</b><br>\n";
 					continue;
 				}
-				if (is_array($id1) || !$id1)		// create link only in $id1 array
+				}
+				if (is_array($id1) || !$id1)
+				{
+					// create link only in $id1 array
 				{
 					self::link($app1, $id1, $link['app'], $link['id'], $link['remark'],$link['owner'],$link['lastmod']);
+				}
 					continue;
 				}
 				switch ($link['app'])
@@ -372,18 +381,27 @@ 
 						$link_id = solink::link($app1,$id1,$link['app'],$link['id'],
 							$link['remark'],$link['owner'],$link['lastmod']);
 						// notify both sides
-						if (!($no_notify&2)) self::notify('link',$link['app'],$link['id'],$app1,$id1,$link_id);
-						if (!($no_notify&1)) self::notify('link',$app1,$id1,$link['app'],$link['id'],$link_id);
+						if (!($no_notify&2))
+						{
+							self::notify('link',$link['app'],$link['id'],$app1,$id1,$link_id);
+						}
+						if (!($no_notify&1))
+						{
+							self::notify('link',$app1,$id1,$link['app'],$link['id'],$link_id);
+						}
 						break;
 				}
 			}
 			return $link_id;
 		}
-		if (is_array($id1) || !$id1)		// create link only in $id1 array
+		if (is_array($id1) || !$id1)
+		{
+			// create link only in $id1 array
 		{
 			if (!is_array($id1))
 			{
 				$id1 = array( );
+		}
 			}
 			$link_id = self::temp_link_id($app2,$id2);
 
@@ -419,8 +437,14 @@ 
 		}
 		$link_id = solink::link($app1,$id1,$app2,$id2,$remark,$owner);
 
-		if (!($no_notify&2)) self::notify('link',$app2,$id2,$app1,$id1,$link_id);
-		if (!($no_notify&1)) self::notify('link',$app1,$id1,$app2,$id2,$link_id);
+		if (!($no_notify&2))
+		{
+			self::notify('link',$app2,$id2,$app1,$id1,$link_id);
+		}
+		if (!($no_notify&1))
+		{
+			self::notify('link',$app1,$id1,$app2,$id2,$link_id);
+		}
 
 		return $link_id;
 	}
@@ -452,7 +476,10 @@ 
 	 */
 	static function get_links($app, $id, $only_app='', $order='link_lastmod DESC',$cache_titles=false, $deleted=false, $limit=null)
 	{
-		if (self::DEBUG) echo "<p>egw_link::get_links(app='$app',id='$id',only_app='$only_app',order='$order',deleted='$deleted')</p>\n";
+		if (self::DEBUG)
+		{
+			echo "<p>egw_link::get_links(app='$app',id='$id',only_app='$only_app',order='$order',deleted='$deleted')</p>\n";
+		}
 
 		if (is_array($id) || !$id)
 		{
@@ -523,7 +550,10 @@ 
 	 */
 	static function get_links_multiple($app,array $ids,$cache_titles=true,$only_app='',$order='link_lastmod DESC', $deleted=false )
 	{
-		if (self::DEBUG) echo "<p>".__METHOD__."('$app',".print_r($ids,true).",$cache_titles,'$only_app','$order')</p>\n";
+		if (self::DEBUG)
+		{
+			echo "<p>".__METHOD__."('$app',".print_r($ids,true).",$cache_titles,'$only_app','$order')</p>\n";
+		}
 
 		if (!$ids)
 		{
@@ -555,7 +585,10 @@ 
 			{
 				foreach($targets as $link)
 				{
-					if (is_array($link)) $app_ids[$link['app']][] = $link['id'];
+					if (is_array($link))
+					{
+						$app_ids[$link['app']][] = $link['id'];
+					}
 				}
 			}
 			foreach($app_ids as $app => $a_ids)
@@ -585,20 +618,30 @@ 
 		}
 		if (is_array($id))
 		{
-			if (strpos($app_link_id,':') === false) $app_link_id = self::temp_link_id($app2,$id2);	// create link_id of temporary link, if not given
+			if (strpos($app_link_id,':') === false)
+			{
+				$app_link_id = self::temp_link_id($app2,$id2);
+			}
+			// create link_id of temporary link, if not given
 
-			if (isset($id[$app_link_id]) && is_array($id[$app_link_id]))	// check for unlinked-marker
+			if (isset($id[$app_link_id]) && is_array($id[$app_link_id]))
+			{
+				// check for unlinked-marker
 			{
 				return $id[$app_link_id];
 			}
+			}
 			return False;
 		}
 		if ((int)$app_link_id < 0 || $app_link_id == self::VFS_APPNAME || $app2 == self::VFS_APPNAME)
 		{
-			if ((int)$app_link_id < 0)	// vfs link_id ?
+			if ((int)$app_link_id < 0)
+			{
+				// vfs link_id ?
 			{
 				return self::fileinfo2link(-$app_link_id);
 			}
+			}
 			if ($app_link_id == self::VFS_APPNAME)
 			{
 				return self::info_attached($app2,$id2,$id);
@@ -646,10 +689,13 @@ 
 		{
 			echo "<p>egw_link::unlink('$link_id','$app',".array2string($id).",'$owner','$app2','$id2', $hold_for_purge)</p>\n";
 		}
-		if ($link_id < 0)	// vfs-link?
+		if ($link_id < 0)
+		{
+			// vfs-link?
 		{
 			return self::delete_attached(-$link_id);
 		}
+		}
 		elseif ($app == self::VFS_APPNAME)
 		{
 			return self::delete_attached($app2,$id2,$id);
@@ -688,7 +734,11 @@ 
 
 			return count($deleted);
 		}
-		if (!$link_id) $link_id = self::temp_link_id($app2,$id2);	// create link_id of temporary link, if not given
+		if (!$link_id)
+		{
+			$link_id = self::temp_link_id($app2,$id2);
+		}
+		// create link_id of temporary link, if not given
 
 		if (isset($id[$link_id]))
 		{
@@ -714,7 +764,10 @@ 
 		$apps = array();
 		foreach(self::$app_register as $type => $reg)
 		{
-			if ($must_support && !isset($reg[$must_support])) continue;
+			if ($must_support && !isset($reg[$must_support]))
+			{
+				continue;
+			}
 
 			list($app) = explode('-', $type);
 			if ($GLOBALS['egw_info']['user']['apps'][$app])
@@ -752,7 +805,10 @@ 
 		if(strpos($method,'::') !== false)
 		{
 			//  workaround for php < 5.3: do NOT call it static, but allow application code to specify static callbacks
-			if (version_compare(PHP_VERSION,'5.3','<')) list($class,$method) = explode('::',$method);
+			if (version_compare(PHP_VERSION,'5.3','<'))
+			{
+				list($class,$method) = explode('::',$method);
+			}
 		}
 		else
 		{
@@ -764,19 +820,25 @@ 
 			{
 				$GLOBALS[$class] = new $class();
 			}
-			if (is_object($GLOBALS[$class]))        // use existing instance (put there by a previous CreateObject)
+			if (is_object($GLOBALS[$class]))
+			{
+				// use existing instance (put there by a previous CreateObject)
 			{
 				$obj = $GLOBALS[$class];
 			}
+			}
 			else
 			{
 				$obj = CreateObject($app.'.'.$class);
 			}
 		}
-		if(is_callable($method))        // php5.3+ call
+		if(is_callable($method))
+		{
+			// php5.3+ call
 		{
 			$result = call_user_func($method,$pattern,$options);
 		}
+		}
 		elseif(is_object($obj) && method_exists($obj,$method))
 		{
 			$result = $obj->$method($pattern,$options);
@@ -809,12 +871,18 @@ 
 	 */
 	static function title($app,$id,$link=null)
 	{
-		if (!$id) return '';
+		if (!$id)
+		{
+			return '';
+		}
 
 		$title =& self::get_cache($app,$id);
 		if (isset($title) && !empty($title) && !is_array($id))
 		{
-			if (self::DEBUG) echo '<p>'.__METHOD__."('$app','$id')='$title' (from cache)</p>\n";
+			if (self::DEBUG)
+			{
+				echo '<p>'.__METHOD__."('$app','$id')='$title' (from cache)</p>\n";
+			}
 			return $title;
 		}
 		if ($app == self::VFS_APPNAME)
@@ -834,21 +902,33 @@ 
 			{
 				$title .= ': '.$link['type'] . ' '.egw_vfs::hsize($link['size']);
 			}*/
-			if (self::DEBUG) echo '<p>'.__METHOD__."('$app','$id')='$title' (file)</p>\n";
+			if (self::DEBUG)
+			{
+				echo '<p>'.__METHOD__."('$app','$id')='$title' (file)</p>\n";
+			}
 			return $title;
 		}
 		if ($app == '' || !is_array($reg = self::$app_register[$app]) || !isset($reg['title']))
 		{
-			if (self::DEBUG) echo "<p>".__METHOD__."('$app','$id') something is wrong!!!</p>\n";
+			if (self::DEBUG)
+			{
+				echo "<p>".__METHOD__."('$app','$id') something is wrong!!!</p>\n";
+			}
 			return false; //array(); // not sure why it should return an array on failure, as the description states boolean/string
 		}
 		$method = $reg['title'];
 
-		if (true) $title = ExecMethod($method,$id);
+		if (true)
+		{
+			$title = ExecMethod($method,$id);
+		}
 
-		if ($id && is_null($title))	// $app,$id has been deleted ==> unlink all links to it
+		if ($id && is_null($title))
+		{
+			// $app,$id has been deleted ==> unlink all links to it
 		{
 			static $unlinking = array();
+		}
 			// check if we are already trying to unlink the entry, to avoid an infinit recursion
 			if (!isset($unlinking[$app]) || !isset($unlinking[$app][$id]))
 			{
@@ -856,10 +936,16 @@ 
 				self::unlink(0,$app,$id);
 				unset($unlinking[$app][$id]);
 			}
-			if (self::DEBUG) echo '<p>'.__METHOD__."('$app','$id') unlinked, as $method returned null</p>\n";
+			if (self::DEBUG)
+			{
+				echo '<p>'.__METHOD__."('$app','$id') unlinked, as $method returned null</p>\n";
+			}
 			return False;
 		}
-		if (self::DEBUG) echo '<p>'.__METHOD__."('$app','$id')='$title' (from $method)</p>\n";
+		if (self::DEBUG)
+		{
+			echo '<p>'.__METHOD__."('$app','$id')='$title' (from $method)</p>\n";
+		}
 
 		return $title;
 	}
@@ -1025,7 +1111,10 @@ 
 			{
 				foreach($registry['mime'] as $mime => $data)
 				{
-					if ($mime == $type) return $data;
+					if ($mime == $type)
+					{
+						return $data;
+					}
 					if ($mime[0] == '/' && preg_match($mime.'i', $type))
 					{
 						$wildcard_mime = $data;
@@ -1046,7 +1135,10 @@ 
 	 */
 	static function mime_open($path, $type=null, &$popup=null)
 	{
-		if (is_null($type)) $type = egw_vfs::mime_content_type($path);
+		if (is_null($type))
+		{
+			$type = egw_vfs::mime_content_type($path);
+		}
 
 		if (($data = self::get_mime_info($type)))
 		{
@@ -1114,14 +1206,20 @@ 
 	{
 		$reg = self::$app_register[$app];
 
-		if (!isset($reg)) return false;
+		if (!isset($reg))
+		{
+			return false;
+		}
 
-		if (!isset($reg[$name]))	// some defaults
+		if (!isset($reg[$name]))
+		{
+			// some defaults
 		{
 			switch($name)
 			{
 				case 'name':
 					$reg[$name] = $app;
+		}
 					break;
 				case 'icon':
 					if (isset($GLOBALS['egw_info']['apps'][$app]['icon']))
@@ -1205,7 +1303,10 @@ 
 		if (file_exists($entry_dir) || ($Ok = mkdir($entry_dir,0,true)))
 		{
 			$Ok = egw_vfs::copy_uploaded($file, $p=self::vfs_path($app,$id,'',true), $comment, false);	// no is_uploaded_file() check!
-			if (!$Ok) error_log(__METHOD__."('$app', '$id', ".array2string($file).", '$comment') called egw_vfs::copy_uploaded('$file[tmp_name]', '$p', '$comment', false)=".array2string($Ok));
+			if (!$Ok)
+			{
+				error_log(__METHOD__."('$app', '$id', ".array2string($file).", '$comment') called egw_vfs::copy_uploaded('$file[tmp_name]', '$p', '$comment', false)=".array2string($Ok));
+			}
 		}
 		else
 		{
@@ -1225,7 +1326,10 @@ 
 	static function link_file($app,$id,$file)//,$comment='')
 	{
 		// Don't try to link into app dir if there is no id
-		if(!$id) return;
+		if(!$id)
+		{
+			return;
+		}
 
 		$app_path = self::vfs_path($app,$id);
 		$ok = true;
@@ -1251,10 +1355,13 @@ 
 	 */
 	static function delete_attached($app,$id='',$fname='')
 	{
-		if ((int)$app > 0)	// is file_id
+		if ((int)$app > 0)
+		{
+			// is file_id
 		{
 			$url = egw_vfs::resolve_url(sqlfs_stream_wrapper::id2path($app));
 		}
+		}
 		else
 		{
 			if (empty($app) || empty($id))
@@ -1263,9 +1370,12 @@ 
 			}
 			$url = self::vfs_path($app,$id,$fname);
 
-			if (!$fname || !$id)	// we delete the whole entry (or all entries), which probably not exist anymore
+			if (!$fname || !$id)
+			{
+				// we delete the whole entry (or all entries), which probably not exist anymore
 			{
 				$current_is_root = egw_vfs::$is_root;
+			}
 				egw_vfs::$is_root = true;
 			}
 		}
@@ -1356,10 +1466,16 @@ 
 		$path = self::vfs_path($app,$id);
 		//error_log(__METHOD__."($app,$id) url=$url");
 
-		if (!($extra = self::get_registry($app,'find_extra'))) $extra = array();
+		if (!($extra = self::get_registry($app,'find_extra')))
+		{
+			$extra = array();
+		}
 
 		// always use regular links stream wrapper here: extended one is unnecessary (slow) for just listing attachments
-		if (substr($path,0,13) == 'stylite.links') $path = substr($path,8);
+		if (substr($path,0,13) == 'stylite.links')
+		{
+			$path = substr($path,8);
+		}
 
 		$attached = array();
 		if (($url2stats = egw_vfs::find($path,array('need_mime'=>true,'type'=>'F','url'=>true)+$extra,true)))
@@ -1596,7 +1712,10 @@ 
 		}
 		$ret = call_user_func_array('ExecMethod2', $data);
 
-		if (is_resource($ret)) fseek($ret, 0);
+		if (is_resource($ret))
+		{
+			fseek($ret, 0);
+		}
 
 		if ($return_resource != is_resource($ret))
 		{

phpgwapi/inc/class.egw_mailer.inc.php

Doc Comments +6 added lines, -4 removed lines

@@ -235,7 +235,7 @@ 
 	/**
 	 * Add one or multiple addresses to Cc
 	 *
-	 * @param string|array|Horde_Mail_Rfc822_List $address
+	 * @param string $address
 	 * @param string $personal ='' only used if $address is a string
 	 */
 	function addCc($address, $personal=null)
@@ -254,7 +254,7 @@ 
 	/**
 	 * Add one or multiple addresses to Bcc
 	 *
-	 * @param string|array|Horde_Mail_Rfc822_List $address
+	 * @param string $address
 	 * @param string $personal ='' only used if $address is a string
 	 */
 	function addBcc($address, $personal=null)
@@ -273,7 +273,7 @@ 
 	/**
 	 * Add one or multiple addresses to Reply-To
 	 *
-	 * @param string|array|Horde_Mail_Rfc822_List $address
+	 * @param false|string $address
 	 * @param string $personal ='' only used if $address is a string
 	 */
 	function addReplyTo($address, $personal=null)
@@ -365,7 +365,7 @@ 
 	/**
 	 * Adds an embedded image or other inline attachment
 	 *
-	 * @param string|resource $data Path to the attachment or open file-descriptor
+	 * @param string $data Path to the attachment or open file-descriptor
 	 * @param string $cid Content ID of the attachment.  Use this to identify
 	 *        the Id for accessing the image in an HTML form.
 	 * @param string $name Overrides the attachment name.
@@ -833,6 +833,7 @@ 
 
 	/**
 	 * @deprecated use AddHeader($header, $value)
+	 * @param string $str
 	 */
 	function AddCustomHeader($str)
 	{
@@ -851,6 +852,7 @@ 
 	}
 	/**
 	 * @deprecated done by Horde automatic
+	 * @return string
 	 */
 	function EncodeHeader($str/*, $position = 'text'*/)
 	{

Indentation +18 added lines, -18 removed lines

@@ -615,15 +615,15 @@ 
 	}
 
 	/**
-     * Get the raw email data sent by this object.
-     *
+	 * Get the raw email data sent by this object.
+	 *
 	 * Reimplement to be able to call it for saveAsDraft by calling
 	 * $this->send(new Horde_Mail_Transport_Null()),
 	 * if no base-part is set, because send is not called before.
 	 *
-     * @param  boolean $stream  If true, return a stream resource, otherwise
-     * @return stream|string  The raw email data.
-     */
+	 * @param  boolean $stream  If true, return a stream resource, otherwise
+	 * @return stream|string  The raw email data.
+	 */
 	function getRaw($stream=true)
 	{
 		try {
@@ -636,20 +636,20 @@ 
 		}
 		// code copied from Horde_Mime_Mail::getRaw(), as there is no way to inject charset in
 		// _headers->toString(), which is required to encode headers containing non-ascii chars correct
-        if ($stream) {
-            $hdr = new Horde_Stream();
-            $hdr->add($this->_headers->toString(array('charset' => 'utf-8', 'canonical' => true)), true);
-            return Horde_Stream_Wrapper_Combine::getStream(
-                array($hdr->stream,
-                      $this->getBasePart()->toString(
-                        array('stream' => true, 'canonical' => true, 'encode' => Horde_Mime_Part::ENCODE_7BIT | Horde_Mime_Part::ENCODE_8BIT | Horde_Mime_Part::ENCODE_BINARY))
-                )
-            );
-        }
-
-        return $this->_headers->toString(array('charset' => 'utf-8', 'canonical' => true)) .
+		if ($stream) {
+			$hdr = new Horde_Stream();
+			$hdr->add($this->_headers->toString(array('charset' => 'utf-8', 'canonical' => true)), true);
+			return Horde_Stream_Wrapper_Combine::getStream(
+				array($hdr->stream,
+					  $this->getBasePart()->toString(
+						array('stream' => true, 'canonical' => true, 'encode' => Horde_Mime_Part::ENCODE_7BIT | Horde_Mime_Part::ENCODE_8BIT | Horde_Mime_Part::ENCODE_BINARY))
+				)
+			);
+		}
+
+		return $this->_headers->toString(array('charset' => 'utf-8', 'canonical' => true)) .
 			$this->getBasePart()->toString(array('canonical' => true));
-    }
+	}
 
 	/**
 	 * Find body: 1. part with mimetype "text/$subtype"

Spacing +46 added lines, -46 removed lines

@@ -54,7 +54,7 @@ 
 	 *
 	 * @param int|emailadmin_account $account =null mail account to use, default use emailadmin_account::get_default($smtp=true)
 	 */
-	function __construct($account=null)
+	function __construct($account = null)
 	{
 		// Horde use locale for translation of error messages
 		common::setlocale(LC_MESSAGES);
@@ -89,7 +89,7 @@ 
 	 * @param int|emailadmin_account $account =null mail account to use, default use emailadmin_account::get_default($smtp=true)
 	 * @throws egw_exception_not_found if account was not found (or not valid for current user)
 	 */
-	function  setAccount($account=null)
+	function  setAccount($account = null)
 	{
 		if (is_a($account, 'emailadmin_account'))
 		{
@@ -111,7 +111,7 @@ 
 		{
 			$identity = emailadmin_account::read_identity($this->account->ident_id, true, null, $this->account);
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			unset($e);
 			error_log(__METHOD__.__LINE__.' Could not read_identity for account:'.$account['acc_id'].' with IdentID:'.$account['ident_id']);
@@ -133,7 +133,7 @@ 
 	 * @param string $address
 	 * @param string $personal =''
 	 */
-	public function setFrom($address, $personal='')
+	public function setFrom($address, $personal = '')
 	{
 		$this->addHeader('From', self::add_personal($address, $personal));
 	}
@@ -145,13 +145,13 @@ 
 	 * @param string $personal ='' only used if $address is a string
 	 * @param string $type ='to' type of address to add "to", "cc", "bcc" or "replyto"
 	 */
-	function addAddress($address, $personal='', $type='to')
+	function addAddress($address, $personal = '', $type = 'to')
 	{
 		if (!isset(self::$type2header[$type]))
 		{
 			throw new egw_exception_wrong_parameter("Unknown type '$type'!");
 		}
-		if ($personal) $address = self::add_personal ($address, $personal);
+		if ($personal) $address = self::add_personal($address, $personal);
 
 		// add to our local list
 		$this->$type->add($address);
@@ -165,7 +165,7 @@ 
 	 *
 	 * @param string $type ='to' type of address to add "to", "cc", "bcc" or "replyto"
 	 */
-	function clearAddresses($type='to')
+	function clearAddresses($type = 'to')
 	{
 		$this->$type = new Horde_Mail_Rfc822_List();
 
@@ -179,12 +179,12 @@ 
 	 * @param boolean $return_array =false true: return array of string, false: Horde_Mail_Rfc822_List
 	 * @return array|Horde_Mail_Rfc822_List supporting arrayAccess and Iterable
 	 */
-	function getAddresses($type='to', $return_array=false)
+	function getAddresses($type = 'to', $return_array = false)
 	{
 		if ($return_array)
 		{
 			$addresses = array();
-			foreach($this->$type as $addr)
+			foreach ($this->$type as $addr)
 			{
 				$addresses[] = (string)$addr;
 			}
@@ -225,7 +225,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).'"';
 			}
 			$address = ($personal ? $personal.' <' : '').$address.($personal ? '>' : '');
 		}
@@ -238,7 +238,7 @@ 
 	 * @param string|array|Horde_Mail_Rfc822_List $address
 	 * @param string $personal ='' only used if $address is a string
 	 */
-	function addCc($address, $personal=null)
+	function addCc($address, $personal = null)
 	{
 		$this->addAddress($address, $personal, 'cc');
 	}
@@ -257,7 +257,7 @@ 
 	 * @param string|array|Horde_Mail_Rfc822_List $address
 	 * @param string $personal ='' only used if $address is a string
 	 */
-	function addBcc($address, $personal=null)
+	function addBcc($address, $personal = null)
 	{
 		$this->addAddress($address, $personal, 'bcc');
 	}
@@ -276,7 +276,7 @@ 
 	 * @param string|array|Horde_Mail_Rfc822_List $address
 	 * @param string $personal ='' only used if $address is a string
 	 */
-	function addReplyTo($address, $personal=null)
+	function addReplyTo($address, $personal = null)
 	{
 		$this->addAddress($address, $personal, 'replyto');
 	}
@@ -311,7 +311,7 @@ 
 	 * @return integer part-number
 	 * @throws egw_exception_not_found if $file could not be opened for reading
 	 */
-	public function addAttachment($data, $name = null, $type = null, $old_type=null)
+	public function addAttachment($data, $name = null, $type = null, $old_type = null)
 	{
 		// deprecated PHPMailer::AddAttachment($path, $name = '', $encoding = 'base64', $type = 'application/octet-stream') call
 		if ($type === 'base64')
@@ -344,7 +344,7 @@ 
 		// set content-type parameters, which get ignored by setType
 		if (preg_match_all('/;\s*([^=]+)=([^;]*)/', $type, $matches))
 		{
-			foreach($matches[1] as $n => $label)
+			foreach ($matches[1] as $n => $label)
 			{
 				$part->setContentTypeParameter($label, $matches[2][$n]);
 			}
@@ -446,11 +446,11 @@ 
 	 * @param array $parameters =array() eg. array('method' => 'REQUEST')
 	 * @param string $charset =null default to $this->_charset="utf-8"
 	 */
-	function setAlternativBody($content, $type, $parameters=array(), $charset=null)
+	function setAlternativBody($content, $type, $parameters = array(), $charset = null)
 	{
 		$this->_alternativBody = new Horde_Mime_Part();
 		$this->_alternativBody->setType($type);
-		foreach($parameters as $label => $data)
+		foreach ($parameters as $label => $data)
 		{
 			$this->_alternativBody->setContentTypeParameter($label, $data);
 		}
@@ -476,24 +476,24 @@ 
 			$message_id = Horde_Mime_Headers_MessageId::create('EGroupware');
 			$this->addHeader('Message-ID', $message_id);
 		}
-		$body_sha1 = null;	// skip sha1, it requires whole mail in memory, which we traing to avoid now
+		$body_sha1 = null; // skip sha1, it requires whole mail in memory, which we traing to avoid now
 
 		$mail_id = $GLOBALS['egw']->hooks->process(array(
 			'location' => 'send_mail',
-			'subject' => $subject=$this->getHeader('Subject'),
+			'subject' => $subject = $this->getHeader('Subject'),
 			'from' => $this->getHeader('Return-Path') ? $this->getHeader('Return-Path') : $this->getHeader('From'),
-			'to' => $to=$this->getAddresses('to', true),
-			'cc' => $cc=$this->getAddresses('cc', true),
-			'bcc' => $bcc=$this->getAddresses('bcc', true),
+			'to' => $to = $this->getAddresses('to', true),
+			'cc' => $cc = $this->getAddresses('cc', true),
+			'bcc' => $bcc = $this->getAddresses('bcc', true),
 			'body_sha1' => $body_sha1,
 			'message_id' => (string)$message_id,
-		), array(), true);	// true = call all apps
+		), array(), true); // true = call all apps
 
 		// check if we are sending an html mail with inline images
 		if (!empty($this->_htmlBody) && count($this->_parts))
 		{
 			$related = null;
-			foreach($this->_parts as $n => $part)
+			foreach ($this->_parts as $n => $part)
 			{
 				if ($part->getDisposition() == 'inline' && $part->getContentId())
 				{
@@ -547,7 +547,7 @@ 
 				$this->_body = $body;
 				$flowed = false;
 			}
-			parent::send($this->account->smtpTransport(), true,	$flowed);	// true: keep Message-ID
+			parent::send($this->account->smtpTransport(), true, $flowed); // true: keep Message-ID
 		}
 		catch (Exception $e) {
 			// in case of errors/exceptions call hook again with previous returned mail_id and error-message to log
@@ -562,7 +562,7 @@ 
 				'message_id' => (string)$message_id,
 				'mail_id' => $mail_id,
 				'error' => $e->getMessage(),
-			), array(), true);	// true = call all apps
+			), array(), true); // true = call all apps
 		}
 
 		// log mails to file specified in $GLOBALS['egw_info']['server']['log_mail'] or error_log for true
@@ -575,7 +575,7 @@ 
 			$msg .= ' from instance '.$GLOBALS['egw_info']['user']['domain'].' and IP '.egw_session::getuser_ip();
 			$msg .= ' from user #'.$GLOBALS['egw_info']['user']['account_id'];
 
-			if ($GLOBALS['egw_info']['user']['account_id'] && class_exists('common',false))
+			if ($GLOBALS['egw_info']['user']['account_id'] && class_exists('common', false))
 			{
 				$msg .= ' ('.common::grab_owner_name($GLOBALS['egw_info']['user']['account_id']).')';
 			}
@@ -587,7 +587,7 @@ 
 			$msg .= ' cc='.implode(', ', $cc).', bcc='.implode(', ', $bcc);
 			if ($GLOBALS['egw_info']['server']['log_mail'] !== true) $msg .= "\n\n";
 
-			error_log($msg,$GLOBALS['egw_info']['server']['log_mail'] === true ? 0 : 3,
+			error_log($msg, $GLOBALS['egw_info']['server']['log_mail'] === true ? 0 : 3,
 				$GLOBALS['egw_info']['server']['log_mail']);
 		}
 		// rethrow error
@@ -624,15 +624,15 @@ 
      * @param  boolean $stream  If true, return a stream resource, otherwise
      * @return stream|string  The raw email data.
      */
-	function getRaw($stream=true)
+	function getRaw($stream = true)
 	{
 		try {
 			$this->getBasePart();
 		}
-		catch(Horde_Mail_Exception $e)
+		catch (Horde_Mail_Exception $e)
 		{
 			unset($e);
-			parent::send(new Horde_Mail_Transport_Null(), true);	// true: keep Message-ID
+			parent::send(new Horde_Mail_Transport_Null(), true); // true: keep Message-ID
 		}
 		// code copied from Horde_Mime_Mail::getRaw(), as there is no way to inject charset in
 		// _headers->toString(), which is required to encode headers containing non-ascii chars correct
@@ -642,12 +642,12 @@ 
             return Horde_Stream_Wrapper_Combine::getStream(
                 array($hdr->stream,
                       $this->getBasePart()->toString(
-                        array('stream' => true, 'canonical' => true, 'encode' => Horde_Mime_Part::ENCODE_7BIT | Horde_Mime_Part::ENCODE_8BIT | Horde_Mime_Part::ENCODE_BINARY))
+                        array('stream' => true, 'canonical' => true, 'encode' => Horde_Mime_Part::ENCODE_7BIT|Horde_Mime_Part::ENCODE_8BIT|Horde_Mime_Part::ENCODE_BINARY))
                 )
             );
         }
 
-        return $this->_headers->toString(array('charset' => 'utf-8', 'canonical' => true)) .
+        return $this->_headers->toString(array('charset' => 'utf-8', 'canonical' => true)).
 			$this->getBasePart()->toString(array('canonical' => true));
     }
 
@@ -659,7 +659,7 @@ 
 	 * @param string $subtype =null
 	 * @return Horde_Mime_Part part with body or null
 	 */
-	function findBody($subtype=null)
+	function findBody($subtype = null)
 	{
 		try {
 			$base = $this->getBasePart();
@@ -691,11 +691,11 @@ 
 			$this->_body = $this->_htmlBody = $this->_alternativBody = null;
 			$this->clearParts();
 
-			foreach($base->partIterator() as $part)
+			foreach ($base->partIterator() as $part)
 			{
 				$id = $part->getMimeId();
 				//error_log(__METHOD__."() plain=$plain_id, html=$html_id: $id: ".$part->getType());
-				switch($id)
+				switch ($id)
 				{
 					case '0':	// base-part itself
 						continue 2;
@@ -768,7 +768,7 @@ 
 	 */
 	function clearCustomHeaders()
 	{
-		foreach($this->_headers->toArray() as $header => $value)
+		foreach ($this->_headers->toArray() as $header => $value)
 		{
 			if (stripos($header, 'x-') === 0 || $header == 'Received')
 			{
@@ -793,10 +793,10 @@ 
 		try {
 			$this->getBasePart();
 		}
-		catch(Horde_Mail_Exception $e)
+		catch (Horde_Mail_Exception $e)
 		{
 			unset($e);
-			parent::send(new Horde_Mail_Transport_Null(), true);	// true: keep Message-ID
+			parent::send(new Horde_Mail_Transport_Null(), true); // true: keep Message-ID
 		}
 		return $this->_headers->toString();
 	}
@@ -812,13 +812,13 @@ 
 		try {
 			$this->getBasePart();
 		}
-		catch(Horde_Mail_Exception $e)
+		catch (Horde_Mail_Exception $e)
 		{
 			unset($e);
-			parent::send(new Horde_Mail_Transport_Null(), true);	// true: keep Message-ID
+			parent::send(new Horde_Mail_Transport_Null(), true); // true: keep Message-ID
 		}
 		return $this->getBasePart()->toString(
-			array('stream' => false, 'encode' => Horde_Mime_Part::ENCODE_7BIT | Horde_Mime_Part::ENCODE_8BIT | Horde_Mime_Part::ENCODE_BINARY));
+			array('stream' => false, 'encode' => Horde_Mime_Part::ENCODE_7BIT|Horde_Mime_Part::ENCODE_8BIT|Horde_Mime_Part::ENCODE_BINARY));
 	}
 
 	/**
@@ -910,10 +910,10 @@ 
 	 */
 	function __set($name, $value)
 	{
-		switch($name)
+		switch ($name)
 		{
 			case '_bcc':
-				$this->_bcc = $value;	// this is NOT PHPMailer compatibility, but need for working BCC, if $this->_bcc is NOT set
+				$this->_bcc = $value; // this is NOT PHPMailer compatibility, but need for working BCC, if $this->_bcc is NOT set
 				break;
 			case 'Sender':
 				$this->addHeader('Return-Path', '<'.$value.'>', true);
@@ -970,10 +970,10 @@ 
 	 */
 	function __get($name)
 	{
-		switch($name)
+		switch ($name)
 		{
 			case '_bcc':
-				return $this->_bcc;	// this is NOT PHPMailer compatibility, but quietening below log, if $this->_bcc is NOT set
+				return $this->_bcc; // this is NOT PHPMailer compatibility, but quietening below log, if $this->_bcc is NOT set
 			case 'Sender':
 				return $this->getHeader('Return-Path');
 			case 'From':

Braces +50 added lines, -13 removed lines

@@ -101,10 +101,13 @@ 
 		}
 		else
 		{
-			if (!($this->account = emailadmin_account::get_default(true)))	// true = need an SMTP (not just IMAP) account
+			if (!($this->account = emailadmin_account::get_default(true)))
+			{
+				// true = need an SMTP (not just IMAP) account
 			{
 				throw new egw_exception_not_found('SMTP: '.lang('Account not found!'));
 			}
+			}
 		}
 
 		try
@@ -151,7 +154,10 @@ 
 		{
 			throw new egw_exception_wrong_parameter("Unknown type '$type'!");
 		}
-		if ($personal) $address = self::add_personal ($address, $personal);
+		if ($personal)
+		{
+			$address = self::add_personal ($address, $personal);
+		}
 
 		// add to our local list
 		$this->$type->add($address);
@@ -223,10 +229,13 @@ 
 		if (is_string($address) && !empty($personal))
 		{
 			//if (!preg_match('/^[!#$%&\'*+/0-9=?A-Z^_`a-z{|}~-]+$/u', $personal))	// that's how I read the rfc(2)822
-			if ($personal && !preg_match('/^[0-9A-Z -]*$/iu', $personal))	// but quoting is never wrong, so quote more then necessary
+			if ($personal && !preg_match('/^[0-9A-Z -]*$/iu', $personal))
+			{
+				// but quoting is never wrong, so quote more then necessary
 			{
 				$personal = '"'.str_replace(array('\\', '"'),array('\\\\', '\\"'), $personal).'"';
 			}
+			}
 			$address = ($personal ? $personal.' <' : '').$address.($personal ? '>' : '');
 		}
 		return $address;
@@ -329,7 +338,10 @@ 
 			throw new egw_exception_not_found("File '$data' not found!");
 		}
 
-		if (empty($type) && !is_resource($data)) $type = egw_vfs::mime_content_type($data);
+		if (empty($type) && !is_resource($data))
+		{
+			$type = egw_vfs::mime_content_type($data);
+		}
 
 		// set "text/calendar; method=*" as alternativ body
 		$matches = null;
@@ -352,11 +364,17 @@ 
 		$part->setContents($resource);
 
 		// setting name, also sets content-disposition attachment (!), therefore we have to do it after "text/calendar; method=" handling
-		if ($name || !is_resource($data)) $part->setName($name ? $name : egw_vfs::basename($data));
+		if ($name || !is_resource($data))
+		{
+			$part->setName($name ? $name : egw_vfs::basename($data));
+		}
 
 		// this should not be necessary, because binary data get detected by mime-type,
 		// but at least Cyrus complains about NUL characters
-		if (substr($type, 0, 5) != 'text/') $part->setTransferEncoding('base64', array('send' => true));
+		if (substr($type, 0, 5) != 'text/')
+		{
+			$part->setTransferEncoding('base64', array('send' => true));
+		}
 		$part->setDisposition('attachment');
 
 		return $this->addMimePart($part);
@@ -471,9 +489,12 @@ 
 	function send()
 	{
 		if (!($message_id = $this->getHeader('Message-ID')) &&
-			class_exists('Horde_Mime_Headers_MessageId'))	// since 2.5.0
+			class_exists('Horde_Mime_Headers_MessageId'))
+		{
+			// since 2.5.0
 		{
 			$message_id = Horde_Mime_Headers_MessageId::create('EGroupware');
+		}
 			$this->addHeader('Message-ID', $message_id);
 		}
 		$body_sha1 = null;	// skip sha1, it requires whole mail in memory, which we traing to avoid now
@@ -585,13 +606,19 @@ 
 				$msg .= 'ERROR '.$e->getMessage();
 			}
 			$msg .= ' cc='.implode(', ', $cc).', bcc='.implode(', ', $bcc);
-			if ($GLOBALS['egw_info']['server']['log_mail'] !== true) $msg .= "\n\n";
+			if ($GLOBALS['egw_info']['server']['log_mail'] !== true)
+			{
+				$msg .= "\n\n";
+			}
 
 			error_log($msg,$GLOBALS['egw_info']['server']['log_mail'] === true ? 0 : 3,
 				$GLOBALS['egw_info']['server']['log_mail']);
 		}
 		// rethrow error
-		if (isset($e)) throw $e;
+		if (isset($e))
+		{
+			throw $e;
+		}
 	}
 
 
@@ -636,7 +663,8 @@ 
 		}
 		// code copied from Horde_Mime_Mail::getRaw(), as there is no way to inject charset in
 		// _headers->toString(), which is required to encode headers containing non-ascii chars correct
-        if ($stream) {
+        if ($stream)
+        {
             $hdr = new Horde_Stream();
             $hdr->add($this->_headers->toString(array('charset' => 'utf-8', 'canonical' => true)), true);
             return Horde_Stream_Wrapper_Combine::getStream(
@@ -663,7 +691,10 @@ 
 	{
 		try {
 			$base = $this->getBasePart();
-			if (!($part_id = $base->findBody($subtype))) return null;
+			if (!($part_id = $base->findBody($subtype)))
+			{
+				return null;
+			}
 			return $base->getPart($part_id);
 		}
 		catch (Exception $e) {
@@ -730,7 +761,10 @@ 
 	 */
 	public function addMimePart($part)
 	{
-		if ($this->_base) $this->parseBasePart();
+		if ($this->_base)
+		{
+			$this->parseBasePart();
+		}
 
 		return parent::addMimePart($part);
 	}
@@ -945,7 +979,10 @@ 
 				break;
 			case 'Date':
 			case 'RFCDateToSet':
-				if ($value) $this->addHeader('Date', $value, true);
+				if ($value)
+				{
+					$this->addHeader('Date', $value, true);
+				}
 				break;
 			case 'AltExtended':
 			case 'AltExtendedContentType':

phpgwapi/inc/class.egw_session.inc.php

Doc Comments +3 added lines, -2 removed lines

@@ -311,6 +311,7 @@ 
 	 * Encrypt the variables in the session
 	 *
 	 * Is called by self::__destruct().
+	 * @param string $kp3
 	 */
 	static function encrypt($kp3)
 	{
@@ -439,7 +440,7 @@ 
 	 * @param boolean $no_session =false dont create a real session, eg. for GroupDAV clients using only basic auth, no cookie support
 	 * @param boolean $auth_check =true if false, the user is loged in without checking his password (eg. for single sign on), default = true
 	 * @param boolean $fail_on_forced_password_change =false true: do NOT create session, if password change requested
-	 * @return string|boolean session id or false if session was not created, $this->(cd_)reason contains cause
+	 * @return false|string session id or false if session was not created, $this->(cd_)reason contains cause
 	 */
 	function create($login,$passwd = '',$passwd_type = '',$no_session=false,$auth_check=true,$fail_on_forced_password_change=false)
 	{
@@ -1021,7 +1022,7 @@ 
 	/**
 	 * Terminate a session
 	 *
-	 * @param int|string $sessionid nummeric or php session id of session to be terminated
+	 * @param string $sessionid nummeric or php session id of session to be terminated
 	 * @param string $kp3
 	 * @return boolean true on success, false on error
 	 */

Indentation +53 added lines, -53 removed lines

@@ -80,60 +80,60 @@ 
 	const MCRYPT_MODE = MCRYPT_MODE_ECB;
 
 	/**
-	* current user login (account_lid@domain)
-	*
-	* @var string
-	*/
+	 * current user login (account_lid@domain)
+	 *
+	 * @var string
+	 */
 	var $login;
 
 	/**
-	* current user password
-	*
-	* @var string
-	*/
+	 * current user password
+	 *
+	 * @var string
+	 */
 	var $passwd;
 
 	/**
-	* current user db/ldap account id
-	*
-	* @var int
-	*/
+	 * current user db/ldap account id
+	 *
+	 * @var int
+	 */
 	var $account_id;
 
 	/**
-	* current user account login id (without the eGW-domain/-instance part
-	*
-	* @var string
-	*/
+	 * current user account login id (without the eGW-domain/-instance part
+	 *
+	 * @var string
+	 */
 	var $account_lid;
 
 	/**
-	* domain for current user
-	*
-	* @var string
-	*/
+	 * domain for current user
+	 *
+	 * @var string
+	 */
 	var $account_domain;
 
 	/**
-	* type flag, A - anonymous session, N - None, normal session
-	*
-	* @var string
-	*/
+	 * type flag, A - anonymous session, N - None, normal session
+	 *
+	 * @var string
+	 */
 	var $session_flags;
 
 	/**
-	* current user session id
-	*
-	* @var string
-	*/
+	 * current user session id
+	 *
+	 * @var string
+	 */
 	var $sessionid;
 
 	/**
-	* an other session specific id (md5 from a random string),
-	* used together with the sessionid for xmlrpc basic auth and the encryption of session-data (if that's enabled)
-	*
-	* @var string
-	*/
+	 * an other session specific id (md5 from a random string),
+	 * used together with the sessionid for xmlrpc basic auth and the encryption of session-data (if that's enabled)
+	 *
+	 * @var string
+	 */
 	var $kp3;
 
 	/**
@@ -144,17 +144,17 @@ 
 	var $sessionid_access_log;
 
 	/**
-	* name of XML-RPC/SOAP method called
-	*
-	* @var string
-	*/
+	 * name of XML-RPC/SOAP method called
+	 *
+	 * @var string
+	 */
 	var $xmlrpc_method_called;
 
 	/**
-	* Array with the name of the system domains
-	*
-	* @var array
-	*/
+	 * Array with the name of the system domains
+	 *
+	 * @var array
+	 */
 	private $egw_domains;
 
 	/**
@@ -248,9 +248,9 @@ 
 
 		// set session_timeout from global php.ini and default to 14400=4h, if not set
 		if (!($GLOBALS['egw_info']['server']['sessions_timeout'] = ini_get('session.gc_maxlifetime')))
-      	{
-      		ini_set('session.gc_maxlifetime', $GLOBALS['egw_info']['server']['sessions_timeout']=14400);
-      	}
+	  	{
+	  		ini_set('session.gc_maxlifetime', $GLOBALS['egw_info']['server']['sessions_timeout']=14400);
+	  	}
 	}
 
 	/**
@@ -661,14 +661,14 @@ 
 	const ACCESS_LOG_TABLE = 'egw_access_log';
 
 	/**
-    * Write or update (for logout) the access_log
-	*
-	* @param string|int $sessionid nummeric or PHP session id or 0 for unsuccessful logins
-	* @param string $login ='' account_lid (evtl. with domain) or '' for setting the logout-time
-	* @param string $user_ip ='' ip to log
-	* @param int $account_id =0 numerical account_id
-	* @return int $sessionid primary key of egw_access_log for login, null otherwise
-	*/
+	 * Write or update (for logout) the access_log
+	 *
+	 * @param string|int $sessionid nummeric or PHP session id or 0 for unsuccessful logins
+	 * @param string $login ='' account_lid (evtl. with domain) or '' for setting the logout-time
+	 * @param string $user_ip ='' ip to log
+	 * @param int $account_id =0 numerical account_id
+	 * @return int $sessionid primary key of egw_access_log for login, null otherwise
+	 */
 	private function log_access($sessionid,$login='',$user_ip='',$account_id=0)
 	{
 		$now = time();
@@ -716,7 +716,7 @@ 
 
 	/**
 	 * Protect against brute force attacks, block login if too many unsuccessful login attmepts
-     *
+	 *
 	 * @param string $login account_lid (evtl. with domain)
 	 * @param string $ip ip of the user
 	 * @returns bool login blocked?

Spacing +175 added lines, -179 removed lines

@@ -177,7 +177,7 @@ 
 	const CD_BAD_LOGIN_OR_PASSWORD = 5;
 	const CD_FORCE_PASSWORD_CHANGE = 97;
 	const CD_ACCOUNT_EXPIRED = 98;
-	const CD_BLOCKED = 99;	// to many failed attempts to loing
+	const CD_BLOCKED = 99; // to many failed attempts to loing
 
 	/**
 	 * Verbose reason why session creation failed
@@ -191,7 +191,7 @@ 
 	 *
 	 * @param array $domain_names =null domain-names used in this install
 	 */
-	function __construct(array $domain_names=null)
+	function __construct(array $domain_names = null)
 	{
 		$this->required_files = $_SESSION[self::EGW_REQUIRED_FILES];
 
@@ -207,27 +207,27 @@ 
 			$save_rep = false;
 			if (!isset($GLOBALS['egw_info']['server']['max_access_log_age']))
 			{
-				$GLOBALS['egw_info']['server']['max_access_log_age'] = 90;	// default 90 days
+				$GLOBALS['egw_info']['server']['max_access_log_age'] = 90; // default 90 days
 				$save_rep = true;
 			}
 			if (!isset($GLOBALS['egw_info']['server']['block_time']))
 			{
-				$GLOBALS['egw_info']['server']['block_time'] = 1;	// default 1min, its enough to slow down brute force attacks
+				$GLOBALS['egw_info']['server']['block_time'] = 1; // default 1min, its enough to slow down brute force attacks
 				$save_rep = true;
 			}
 			if (!isset($GLOBALS['egw_info']['server']['num_unsuccessful_id']))
 			{
-				$GLOBALS['egw_info']['server']['num_unsuccessful_id']  = 3;	// default 3 trys per id
+				$GLOBALS['egw_info']['server']['num_unsuccessful_id'] = 3; // default 3 trys per id
 				$save_rep = true;
 			}
 			if (!isset($GLOBALS['egw_info']['server']['num_unsuccessful_ip']))
 			{
-				$GLOBALS['egw_info']['server']['num_unsuccessful_ip']  = $GLOBALS['egw_info']['server']['num_unsuccessful_id'] * 5;	// default is 5 times as high as the id default; since accessing via proxy is quite common
+				$GLOBALS['egw_info']['server']['num_unsuccessful_ip'] = $GLOBALS['egw_info']['server']['num_unsuccessful_id'] * 5; // default is 5 times as high as the id default; since accessing via proxy is quite common
 				$save_rep = true;
 			}
 			if (!isset($GLOBALS['egw_info']['server']['install_id']))
 			{
-				$GLOBALS['egw_info']['server']['install_id']  = md5(common::randomstring(15));
+				$GLOBALS['egw_info']['server']['install_id'] = md5(common::randomstring(15));
 			}
 			if (!isset($GLOBALS['egw_info']['server']['max_history']))
 			{
@@ -239,12 +239,12 @@ 
 			{
 				$config = new config('phpgwapi');
 				$config->read_repository();
-				$config->value('max_access_log_age',$GLOBALS['egw_info']['server']['max_access_log_age']);
-				$config->value('block_time',$GLOBALS['egw_info']['server']['block_time']);
-				$config->value('num_unsuccessful_id',$GLOBALS['egw_info']['server']['num_unsuccessful_id']);
-				$config->value('num_unsuccessful_ip',$GLOBALS['egw_info']['server']['num_unsuccessful_ip']);
-				$config->value('install_id',$GLOBALS['egw_info']['server']['install_id']);
-				$config->value('max_history',$GLOBALS['egw_info']['server']['max_history']);
+				$config->value('max_access_log_age', $GLOBALS['egw_info']['server']['max_access_log_age']);
+				$config->value('block_time', $GLOBALS['egw_info']['server']['block_time']);
+				$config->value('num_unsuccessful_id', $GLOBALS['egw_info']['server']['num_unsuccessful_id']);
+				$config->value('num_unsuccessful_ip', $GLOBALS['egw_info']['server']['num_unsuccessful_ip']);
+				$config->value('install_id', $GLOBALS['egw_info']['server']['install_id']);
+				$config->value('max_history', $GLOBALS['egw_info']['server']['max_history']);
 				$config->save_repository();
 			}
 		}
@@ -253,7 +253,7 @@ 
 		// set session_timeout from global php.ini and default to 14400=4h, if not set
 		if (!($GLOBALS['egw_info']['server']['sessions_timeout'] = ini_get('session.gc_maxlifetime')))
       	{
-      		ini_set('session.gc_maxlifetime', $GLOBALS['egw_info']['server']['sessions_timeout']=14400);
+      		ini_set('session.gc_maxlifetime', $GLOBALS['egw_info']['server']['sessions_timeout'] = 14400);
       	}
 	}
 
@@ -323,15 +323,15 @@ 
 
 		if (!isset($_SESSION[self::EGW_SESSION_ENCRYPTED]) && self::init_crypt($kp3))
 		{
-			foreach(self::$egw_session_vars as $name)
+			foreach (self::$egw_session_vars as $name)
 			{
 				if (isset($_SESSION[$name]))
 				{
-					$_SESSION[$name] = mcrypt_generic(self::$mcrypt,serialize($_SESSION[$name]));
+					$_SESSION[$name] = mcrypt_generic(self::$mcrypt, serialize($_SESSION[$name]));
 					//error_log(__METHOD__."() 'encrypting' session var: $name, len=".strlen($_SESSION[$name]));
 				}
 			}
-			$_SESSION[self::EGW_SESSION_ENCRYPTED] = true;	// flag session as encrypted
+			$_SESSION[self::EGW_SESSION_ENCRYPTED] = true; // flag session as encrypted
 
 			mcrypt_generic_deinit(self::$mcrypt);
 			self::$mcrypt = null;
@@ -346,24 +346,24 @@ 
 	 * @param boolean $recursion =true if true call itself for every item > $limit
 	 * @param int $limit =1000 log only differences > $limit
 	 */
-	static function log_session_usage(&$arr,$label,$recursion=true,$limit=1000)
+	static function log_session_usage(&$arr, $label, $recursion = true, $limit = 1000)
 	{
 		if (!is_array($arr)) return;
 
 		$sizes = array();
-		foreach($arr as $key => &$data)
+		foreach ($arr as $key => &$data)
 		{
 			$sizes[$key] = strlen(serialize($data));
 		}
-		arsort($sizes,SORT_NUMERIC);
-		foreach($sizes as $key => $size)
+		arsort($sizes, SORT_NUMERIC);
+		foreach ($sizes as $key => $size)
 		{
 			$diff = $size - (int)$_SESSION[$label.'-sizes'][$key];
 			$_SESSION[$label.'-sizes'][$key] = $size;
 			if ($diff > $limit)
 			{
 				error_log("strlen({$label}[$key])=".egw_vfs::hsize($size).", diff=".egw_vfs::hsize($diff));
-				if ($recursion) self::log_session_usage($arr[$key],$label.'['.$key.']',$recursion,$limit);
+				if ($recursion) self::log_session_usage($arr[$key], $label.'['.$key.']', $recursion, $limit);
 			}
 		}
 	}
@@ -378,15 +378,15 @@ 
 	{
 		if ($_SESSION[self::EGW_SESSION_ENCRYPTED] && self::init_crypt(self::get_request('kp3')))
 		{
-			foreach(self::$egw_session_vars as $name)
+			foreach (self::$egw_session_vars as $name)
 			{
 				if (isset($_SESSION[$name]))
 				{
-					$_SESSION[$name] = unserialize(trim(mdecrypt_generic(self::$mcrypt,$_SESSION[$name])));
+					$_SESSION[$name] = unserialize(trim(mdecrypt_generic(self::$mcrypt, $_SESSION[$name])));
 					//error_log(__METHOD__."() 'decrypting' session var $name: gettype($name) = ".gettype($_SESSION[$name]));
 				}
 			}
-			unset($_SESSION[self::EGW_SESSION_ENCRYPTED]);	// delete encryption flag
+			unset($_SESSION[self::EGW_SESSION_ENCRYPTED]); // delete encryption flag
 		}
 	}
 
@@ -399,15 +399,15 @@ 
 	 * @param string $mode =self::MCRYPT_MODE
 	 * @return boolean true if encryption is used, false otherwise
 	 */
-	static private function init_crypt($kp3,$algo=self::MCRYPT_ALGO,$mode=self::MCRYPT_MODE)
+	static private function init_crypt($kp3, $algo = self::MCRYPT_ALGO, $mode = self::MCRYPT_MODE)
 	{
-		if(!$GLOBALS['egw_info']['server']['mcrypt_enabled'])
+		if (!$GLOBALS['egw_info']['server']['mcrypt_enabled'])
 		{
-			return false;	// session encryption is switched off
+			return false; // session encryption is switched off
 		}
 		if ($GLOBALS['egw_info']['currentapp'] == 'syncml' || !$kp3)
 		{
-			$kp3 = 'staticsyncmlkp3';	// syncml has no kp3!
+			$kp3 = 'staticsyncmlkp3'; // syncml has no kp3!
 		}
 		if (is_null(self::$mcrypt))
 		{
@@ -423,9 +423,9 @@ 
 			}
 			$iv_size = mcrypt_enc_get_iv_size(self::$mcrypt);
 			$iv = !isset($GLOBALS['egw_info']['server']['mcrypt_iv']) || strlen($GLOBALS['egw_info']['server']['mcrypt_iv']) < $iv_size ?
-				mcrypt_create_iv ($iv_size, MCRYPT_RAND) : substr($GLOBALS['egw_info']['server']['mcrypt_iv'],0,$iv_size);
+				mcrypt_create_iv($iv_size, MCRYPT_RAND) : substr($GLOBALS['egw_info']['server']['mcrypt_iv'], 0, $iv_size);
 
-			if (mcrypt_generic_init(self::$mcrypt,$kp3, $iv) < 0)
+			if (mcrypt_generic_init(self::$mcrypt, $kp3, $iv) < 0)
 			{
 				error_log(__METHOD__."() could not initialise mcrypt, sessions get NOT encrypted!");
 				return self::$mcrypt = false;
@@ -445,7 +445,7 @@ 
 	 * @param boolean $fail_on_forced_password_change =false true: do NOT create session, if password change requested
 	 * @return string|boolean session id or false if session was not created, $this->(cd_)reason contains cause
 	 */
-	function create($login,$passwd = '',$passwd_type = '',$no_session=false,$auth_check=true,$fail_on_forced_password_change=false)
+	function create($login, $passwd = '', $passwd_type = '', $no_session = false, $auth_check = true, $fail_on_forced_password_change = false)
 	{
 		try {
 			if (is_array($login))
@@ -463,9 +463,9 @@ 
 			}
 			if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check) starting ...");
 
-			self::split_login_domain($login,$this->account_lid,$this->account_domain);
+			self::split_login_domain($login, $this->account_lid, $this->account_domain);
 			// add domain to the login, if not already there
-			if (substr($this->login,-strlen($this->account_domain)-1) != '@'.$this->account_domain)
+			if (substr($this->login, -strlen($this->account_domain) - 1) != '@'.$this->account_domain)
 			{
 				$this->login .= '@'.$this->account_domain;
 			}
@@ -482,7 +482,7 @@ 
 			{
 				$this->account_domain = $GLOBALS['egw_info']['user']['domain'];
 			}
-			elseif($this->account_domain != $GLOBALS['egw_info']['user']['domain'])
+			elseif ($this->account_domain != $GLOBALS['egw_info']['user']['domain'])
 			{
 				throw new Exception("Wrong domain! '$this->account_domain' != '{$GLOBALS['egw_info']['user']['domain']}'");
 			}
@@ -491,9 +491,9 @@ 
 			//echo "<p>session::create(login='$login'): lid='$this->account_lid', domain='$this->account_domain'</p>\n";
 			$user_ip = self::getuser_ip();
 
-			$this->account_id = $GLOBALS['egw']->accounts->name2id($this->account_lid,'account_lid','u');
+			$this->account_id = $GLOBALS['egw']->accounts->name2id($this->account_lid, 'account_lid', 'u');
 
-			if (($blocked = $this->login_blocked($login,$user_ip)) ||	// too many unsuccessful attempts
+			if (($blocked = $this->login_blocked($login, $user_ip)) || // too many unsuccessful attempts
 				$GLOBALS['egw_info']['server']['global_denied_users'][$this->account_lid] ||
 				$auth_check && !$GLOBALS['egw']->auth->authenticate($this->account_lid, $this->passwd, $this->passwd_type) ||
 				$this->account_id && $GLOBALS['egw']->accounts->get_type($this->account_id) == 'g')
@@ -502,9 +502,9 @@ 
 				$this->cd_reason = $blocked ? self::CD_BLOCKED : self::CD_BAD_LOGIN_OR_PASSWORD;
 
 				// we dont log anon users as it would block the website
-				if (!$GLOBALS['egw']->acl->get_specific_rights_for_account($this->account_id,'anonymous','phpgwapi'))
+				if (!$GLOBALS['egw']->acl->get_specific_rights_for_account($this->account_id, 'anonymous', 'phpgwapi'))
 				{
-					$this->log_access($this->reason,$login,$user_ip,0);	// log unsuccessfull login
+					$this->log_access($this->reason, $login, $user_ip, 0); // log unsuccessfull login
 				}
 				if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check) UNSUCCESSFULL ($this->reason)");
 				return false;
@@ -526,7 +526,7 @@ 
 			if ($this->account_lid != ($lid = $GLOBALS['egw']->accounts->id2name($this->account_id)))
 			{
 				$this->account_lid = $lid;
-				$this->login = $lid.substr($this->login,strlen($lid));
+				$this->login = $lid.substr($this->login, strlen($lid));
 			}
 
 			$GLOBALS['egw_info']['user']['account_id'] = $this->account_id;
@@ -549,7 +549,7 @@ 
 				}
 				$this->sessionid = session_id();
 			}
-			$this->kp3       = common::randomstring(24);
+			$this->kp3 = common::randomstring(24);
 
 			$GLOBALS['egw_info']['user'] = $this->read_repositories();
 			if ($GLOBALS['egw']->accounts->is_expired($GLOBALS['egw_info']['user']))
@@ -563,7 +563,7 @@ 
 
 			egw_cache::setSession('phpgwapi', 'password', base64_encode($this->passwd));
 
-			if ($GLOBALS['egw']->acl->check('anonymous',1,'phpgwapi'))
+			if ($GLOBALS['egw']->acl->check('anonymous', 1, 'phpgwapi'))
 			{
 				$this->session_flags = 'A';
 			}
@@ -581,39 +581,39 @@ 
 				'passwd'         => $this->passwd,
 				'account_domain' => $this->account_domain,
 				'user_ip'        => $user_ip,
-			),'',true)))	// true = run hooks from all apps, not just the ones the current user has perms to run
+			), '', true)))	// true = run hooks from all apps, not just the ones the current user has perms to run
 			{
-				foreach($hook_result as $reason)
+				foreach ($hook_result as $reason)
 				{
 					if ($reason)	// called hook requests to deny the session
 					{
 						$this->reason = $this->cd_reason = $reason;
-						$this->log_access($this->reason,$login,$user_ip,0);		// log unsuccessfull login
+						$this->log_access($this->reason, $login, $user_ip, 0); // log unsuccessfull login
 						if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check) UNSUCCESSFULL ($this->reason)");
 						return false;
 					}
 				}
 			}
 			$GLOBALS['egw']->db->transaction_begin();
-			$this->register_session($this->login,$user_ip,$now,$this->session_flags);
+			$this->register_session($this->login, $user_ip, $now, $this->session_flags);
 			if ($this->session_flags != 'A')		// dont log anonymous sessions
 			{
-				$this->sessionid_access_log = $this->log_access($this->sessionid,$login,$user_ip,$this->account_id);
+				$this->sessionid_access_log = $this->log_access($this->sessionid, $login, $user_ip, $this->account_id);
 			}
-			self::appsession('account_previous_login','phpgwapi',$GLOBALS['egw']->auth->previous_login);
-			$GLOBALS['egw']->accounts->update_lastlogin($this->account_id,$user_ip);
+			self::appsession('account_previous_login', 'phpgwapi', $GLOBALS['egw']->auth->previous_login);
+			$GLOBALS['egw']->accounts->update_lastlogin($this->account_id, $user_ip);
 			$GLOBALS['egw']->db->transaction_commit();
 
 			if ($GLOBALS['egw_info']['server']['usecookies'] && !$no_session)
 			{
-				self::egw_setcookie(self::EGW_SESSION_NAME,$this->sessionid);
-				self::egw_setcookie('kp3',$this->kp3);
-				self::egw_setcookie('domain',$this->account_domain);
+				self::egw_setcookie(self::EGW_SESSION_NAME, $this->sessionid);
+				self::egw_setcookie('kp3', $this->kp3);
+				self::egw_setcookie('domain', $this->account_domain);
 			}
 			if ($GLOBALS['egw_info']['server']['usecookies'] && !$no_session || isset($_COOKIE['last_loginid']))
 			{
-				self::egw_setcookie('last_loginid', $this->account_lid ,$now+1209600); /* For 2 weeks */
-				self::egw_setcookie('last_domain',$this->account_domain,$now+1209600);
+				self::egw_setcookie('last_loginid', $this->account_lid, $now + 1209600); /* For 2 weeks */
+				self::egw_setcookie('last_domain', $this->account_domain, $now + 1209600);
 			}
 			//if (!$this->sessionid) echo "<p>session::create(login='$login') = '$this->sessionid': lid='$this->account_lid', domain='$this->account_domain'</p>\n";
 			if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check) successfull sessionid=$this->sessionid");
@@ -621,7 +621,7 @@ 
 			return $this->sessionid;
 		}
 		// catch all exceptions, as their (allways logged) trace (eg. on a database error) would contain the user password
-		catch(Exception $e) {
+		catch (Exception $e) {
 			$this->reason = $this->cd_reason = $e->getMessage();
 			error_log(__METHOD__."('$login', ".array2string(str_repeat('*', strlen($passwd))).
 				", '$passwd_type', no_session=".array2string($no_session).
@@ -640,13 +640,12 @@ 
 	 * @param int $now
 	 * @param string $session_flags
 	 */
-	private function register_session($login,$user_ip,$now,$session_flags)
+	private function register_session($login, $user_ip, $now, $session_flags)
 	{
 		// restore session vars set before session was started
 		if (is_array($this->required_files))
 		{
-			$_SESSION[self::EGW_REQUIRED_FILES] = !is_array($_SESSION[self::EGW_REQUIRED_FILES]) ? $this->required_files :
-				array_unique(array_merge($_SESSION[self::EGW_REQUIRED_FILES],$this->required_files));
+			$_SESSION[self::EGW_REQUIRED_FILES] = !is_array($_SESSION[self::EGW_REQUIRED_FILES]) ? $this->required_files : array_unique(array_merge($_SESSION[self::EGW_REQUIRED_FILES], $this->required_files));
 			unset($this->required_files);
 		}
 		$_SESSION[self::EGW_SESSION_VAR] = array(
@@ -676,13 +675,13 @@ 
 	* @param int $account_id =0 numerical account_id
 	* @return int $sessionid primary key of egw_access_log for login, null otherwise
 	*/
-	private function log_access($sessionid,$login='',$user_ip='',$account_id=0)
+	private function log_access($sessionid, $login = '', $user_ip = '', $account_id = 0)
 	{
 		$now = time();
 
 		if ($login)
 		{
-			$GLOBALS['egw']->db->insert(self::ACCESS_LOG_TABLE,array(
+			$GLOBALS['egw']->db->insert(self::ACCESS_LOG_TABLE, array(
 				'session_php' => $sessionid,
 				'loginid'   => $login,
 				'ip'        => $user_ip,
@@ -690,10 +689,10 @@ 
 				'account_id'=> $account_id,
 				'user_agent'=> $_SERVER['HTTP_USER_AGENT'],
 				'session_dla'    => $now,
-				'session_action' => $this->update_dla(false),	// dont update egw_access_log
-			),false,__LINE__,__FILE__);
+				'session_action' => $this->update_dla(false), // dont update egw_access_log
+			), false, __LINE__, __FILE__);
 
-			$ret = $GLOBALS['egw']->db->get_last_insert_id(self::ACCESS_LOG_TABLE,'sessionid');
+			$ret = $GLOBALS['egw']->db->get_last_insert_id(self::ACCESS_LOG_TABLE, 'sessionid');
 		}
 		else
 		{
@@ -701,20 +700,20 @@ 
 			{
 				$sessionid = $this->sessionid_access_log;
 			}
-			$GLOBALS['egw']->db->update(self::ACCESS_LOG_TABLE,array(
+			$GLOBALS['egw']->db->update(self::ACCESS_LOG_TABLE, array(
 				'lo' => $now
-			),is_numeric($sessionid) ? array(
+			), is_numeric($sessionid) ? array(
 				'sessionid' => $sessionid,
 			) : array(
 				'session_php' => $sessionid,
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 
 			// run maintenance only on logout, to not delay login
 			if ($GLOBALS['egw_info']['server']['max_access_log_age'])
 			{
 				$max_age = $now - $GLOBALS['egw_info']['server']['max_access_log_age'] * 24 * 60 * 60;
 
-				$GLOBALS['egw']->db->delete(self::ACCESS_LOG_TABLE,"li < $max_age",__LINE__,__FILE__);
+				$GLOBALS['egw']->db->delete(self::ACCESS_LOG_TABLE, "li < $max_age", __LINE__, __FILE__);
 			}
 		}
 		//error_log(__METHOD__."('$sessionid', '$login', '$user_ip', $account_id) returning ".array2string($ret));
@@ -728,12 +727,12 @@ 
 	 * @param string $ip ip of the user
 	 * @returns bool login blocked?
 	 */
-	private function login_blocked($login,$ip)
+	private function login_blocked($login, $ip)
 	{
 		$block_time = time() - $GLOBALS['egw_info']['server']['block_time'] * 60;
 
 		$false_id = $false_ip = 0;
-		foreach($GLOBALS['egw']->db->union(array(
+		foreach ($GLOBALS['egw']->db->union(array(
 			array(
 				'table' => self::ACCESS_LOG_TABLE,
 				'cols'  => "'false_ip' AS name,COUNT(*) AS num",
@@ -770,28 +769,28 @@ 
 		//error_log(__METHOD__."('$login', '$ip') false_ip=$false_ip, false_id=$false_id --> blocked=".array2string($blocked));
 
 		if ($blocked && $GLOBALS['egw_info']['server']['admin_mails'] &&
-			$GLOBALS['egw_info']['server']['login_blocked_mail_time'] < time()-5*60)	// max. one mail every 5mins
+			$GLOBALS['egw_info']['server']['login_blocked_mail_time'] < time() - 5 * 60)	// max. one mail every 5mins
 		{
 			try {
 				$mailer = new egw_mailer();
 				// notify admin(s) via email
 				$mailer->setFrom('eGroupWare@'.$GLOBALS['egw_info']['server']['mail_suffix']);
-				$mailer->addHeader('Subject', lang("eGroupWare: login blocked for user '%1', IP %2",$login,$ip));
-				$mailer->setBody(lang("Too many unsucessful attempts to login: %1 for the user '%2', %3 for the IP %4",$false_id,$login,$false_ip,$ip));
-				foreach(preg_split('/,\s*/',$GLOBALS['egw_info']['server']['admin_mails']) as $mail)
+				$mailer->addHeader('Subject', lang("eGroupWare: login blocked for user '%1', IP %2", $login, $ip));
+				$mailer->setBody(lang("Too many unsucessful attempts to login: %1 for the user '%2', %3 for the IP %4", $false_id, $login, $false_ip, $ip));
+				foreach (preg_split('/,\s*/', $GLOBALS['egw_info']['server']['admin_mails']) as $mail)
 				{
 					$mailer->addAddress($mail);
 				}
 				$mailer->send();
 			}
-			catch(Exception $e) {
+			catch (Exception $e) {
 				// ignore exception, but log it, to block the account and give a correct error-message to user
 				error_log(__METHOD__."('$login', '$ip') ".$e->getMessage());
 			}
 			// save time of mail, to not send to many mails
 			$config = new config('phpgwapi');
 			$config->read_repository();
-			$config->value('login_blocked_mail_time',time());
+			$config->value('login_blocked_mail_time', time());
 			$config->save_repository();
 		}
 		return $blocked;
@@ -812,7 +811,7 @@ 
 	 * @param boolean $only_basic_auth =false return only a basic auth pseudo sessionid, default no
 	 * @return string
 	 */
-	static function get_sessionid($only_basic_auth=false)
+	static function get_sessionid($only_basic_auth = false)
 	{
 		// for WebDAV and GroupDAV we use a pseudo sessionid created from md5(user:passwd)
 		// --> allows this stateless protocolls which use basic auth to use sessions!
@@ -839,11 +838,11 @@ 
 				EGW_SERVER_ROOT.':'.self::getuser_ip().':'.filemtime(EGW_SERVER_ROOT.'/phpgwapi/setup/setup.inc.php').
 				':'.$_SERVER['HTTP_USER_AGENT']);
 		}
-		elseif(!$only_basic_auth && isset($_REQUEST[self::EGW_SESSION_NAME]))
+		elseif (!$only_basic_auth && isset($_REQUEST[self::EGW_SESSION_NAME]))
 		{
 			$sessionid = $_REQUEST[self::EGW_SESSION_NAME];
 		}
-		elseif(!$only_basic_auth && isset($_COOKIE[self::EGW_SESSION_NAME]))
+		elseif (!$only_basic_auth && isset($_COOKIE[self::EGW_SESSION_NAME]))
 		{
 			$sessionid = $_COOKIE[self::EGW_SESSION_NAME];
 		}
@@ -851,7 +850,7 @@ 
 		{
 			$sessionid = false;
 		}
-		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."() _SERVER[REQUEST_URI]='$_SERVER[REQUEST_URI]' returning ".print_r($sessionid,true));
+		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."() _SERVER[REQUEST_URI]='$_SERVER[REQUEST_URI]' returning ".print_r($sessionid, true));
 		return $sessionid;
 	}
 
@@ -867,9 +866,7 @@ 
 	 */
 	static function get_request($name)
 	{
-		return isset($_REQUEST[$name]) ? $_REQUEST[$name] :
-			(isset($_COOKIE[$name]) ? $_COOKIE[$name] :
-			(isset($_COOKIE[$name=ucfirst($name)]) ? $_COOKIE[$name] : null));
+		return isset($_REQUEST[$name]) ? $_REQUEST[$name] : (isset($_COOKIE[$name]) ? $_COOKIE[$name] : (isset($_COOKIE[$name = ucfirst($name)]) ? $_COOKIE[$name] : null));
 	}
 
 	/**
@@ -879,13 +876,13 @@ 
 	 * @param string $kp3 ?? to be verified
 	 * @return bool is the session valid?
 	 */
-	function verify($sessionid=null,$kp3=null)
+	function verify($sessionid = null, $kp3 = null)
 	{
 		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."('$sessionid','$kp3') ".function_backtrace());
 
 		$fill_egw_info_and_repositories = !$GLOBALS['egw_info']['flags']['restored_from_session'];
 
-		if(!$sessionid)
+		if (!$sessionid)
 		{
 			$sessionid = self::get_sessionid();
 			$kp3       = self::get_request('kp3');
@@ -912,23 +909,23 @@ 
 			if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."('$sessionid') session does NOT exist!");
 			return false;
 		}
-		$session =& $_SESSION[self::EGW_SESSION_VAR];
+		$session = & $_SESSION[self::EGW_SESSION_VAR];
 
 		if ($session['session_dla'] <= time() - $GLOBALS['egw_info']['server']['sessions_timeout'])
 		{
 			if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."('$sessionid') session timed out!");
-			$this->destroy($sessionid,$kp3);
+			$this->destroy($sessionid, $kp3);
 			return false;
 		}
 
 		$this->session_flags = $session['session_flags'];
 
-		$this->split_login_domain($session['session_lid'],$this->account_lid,$this->account_domain);
+		$this->split_login_domain($session['session_lid'], $this->account_lid, $this->account_domain);
 
 		// This is to ensure that we authenticate to the correct domain (might not be default)
-		if($GLOBALS['egw_info']['user']['domain'] && $this->account_domain != $GLOBALS['egw_info']['user']['domain'])
+		if ($GLOBALS['egw_info']['user']['domain'] && $this->account_domain != $GLOBALS['egw_info']['user']['domain'])
 		{
-			return false;	// session not verified, domain changed
+			return false; // session not verified, domain changed
 		}
 		$GLOBALS['egw_info']['user']['kp3'] = $this->kp3;
 
@@ -941,7 +938,7 @@ 
 		{
 			$this->update_notification_heartbeat();
 		}
-		$this->account_id = $GLOBALS['egw']->accounts->name2id($this->account_lid,'account_lid','u');
+		$this->account_id = $GLOBALS['egw']->accounts->name2id($this->account_lid, 'account_lid', 'u');
 		if (!$this->account_id)
 		{
 			if (self::ERROR_LOG_DEBUG) error_log("*** session::verify($sessionid) !accounts::name2id('$this->account_lid')");
@@ -979,7 +976,7 @@ 
 
 		if ($GLOBALS['egw_info']['server']['sessions_checkip'])
 		{
-			if (strtoupper(substr(PHP_OS,0,3)) != 'WIN' && (!$GLOBALS['egw_info']['user']['session_ip'] ||
+			if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN' && (!$GLOBALS['egw_info']['user']['session_ip'] ||
 				$GLOBALS['egw_info']['user']['session_ip'] != $this->getuser_ip()))
 			{
 				if (self::ERROR_LOG_DEBUG) error_log("*** session::verify($sessionid) wrong IP");
@@ -1002,9 +999,9 @@ 
 		// query accesslog-id, if not set in session (session is made persistent after login!)
 		if (!$this->sessionid_access_log && $this->session_flags != 'A')
 		{
-			$this->sessionid_access_log = $GLOBALS['egw']->db->select(self::ACCESS_LOG_TABLE,'sessionid',array(
+			$this->sessionid_access_log = $GLOBALS['egw']->db->select(self::ACCESS_LOG_TABLE, 'sessionid', array(
 				'session_php' => $this->sessionid,
-			),__LINE__,__FILE__)->fetchColumn();
+			), __LINE__, __FILE__)->fetchColumn();
 			//error_log(__METHOD__."() sessionid=$this->sessionid --> sessionid_access_log=$this->sessionid_access_log");
 		}
 
@@ -1015,9 +1012,9 @@ 
 			(!isset($_COOKIE[self::EGW_SESSION_NAME]) || $_COOKIE[self::EGW_SESSION_NAME] !== $_REQUEST[self::EGW_SESSION_NAME]))
 		{
 			if (self::ERROR_LOG_DEBUG) error_log("--> session::verify($sessionid) SUCCESS, but NO required cookies set --> setting them now");
-			self::egw_setcookie(self::EGW_SESSION_NAME,$this->sessionid);
-			self::egw_setcookie('kp3',$this->kp3);
-			self::egw_setcookie('domain',$this->account_domain);
+			self::egw_setcookie(self::EGW_SESSION_NAME, $this->sessionid);
+			self::egw_setcookie('kp3', $this->kp3);
+			self::egw_setcookie('domain', $this->account_domain);
 		}
 
 		if (self::ERROR_LOG_DEBUG) error_log("--> session::verify($sessionid) SUCCESS");
@@ -1032,27 +1029,27 @@ 
 	 * @param string $kp3
 	 * @return boolean true on success, false on error
 	 */
-	function destroy($sessionid, $kp3='')
+	function destroy($sessionid, $kp3 = '')
 	{
 		if (!$sessionid && $kp3)
 		{
 			return false;
 		}
-		$this->log_access($sessionid);	// log logout-time
+		$this->log_access($sessionid); // log logout-time
 
 		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."($sessionid,$kp3)");
 
 		if (is_numeric($sessionid))	// do we have a access-log-id --> get PHP session id
 		{
-			$sessionid = $GLOBALS['egw']->db->select(self::ACCESS_LOG_TABLE,'session_php',array(
+			$sessionid = $GLOBALS['egw']->db->select(self::ACCESS_LOG_TABLE, 'session_php', array(
 					'sessionid' => $sessionid,
-				),__LINE__,__FILE__)->fetchColumn();
+				), __LINE__, __FILE__)->fetchColumn();
 		}
 
 		$GLOBALS['egw']->hooks->process(array(
 			'location'  => 'session_destroyed',
 			'sessionid' => $sessionid,
-		),'',true);	// true = run hooks from all apps, not just the ones the current user has perms to run
+		), '', true); // true = run hooks from all apps, not just the ones the current user has perms to run
 
 		// Only do the following, if where working with the current user
 		if (!$GLOBALS['egw_info']['user']['sessionid'] || $sessionid == $GLOBALS['egw_info']['user']['sessionid'])
@@ -1074,7 +1071,7 @@ 
 		}
 		else
 		{
-			$this->commit_session();	// close our own session
+			$this->commit_session(); // close our own session
 
 			session_id($sessionid);
 			if (session_start())
@@ -1114,25 +1111,25 @@ 
 		// as $webserver_url may be part of $url (as /egw is part of phpgwapi/js/egw_instant_load.html)
 		if (($url[0] != '/' || $webserver_url != '/') && (!$webserver_url || strpos($url, $webserver_url.'/') === false))
 		{
-			if($url[0] != '/' && substr($webserver_url,-1) != '/')
+			if ($url[0] != '/' && substr($webserver_url, -1) != '/')
 			{
-				$url = $webserver_url .'/'. $url;
+				$url = $webserver_url.'/'.$url;
 			}
 			else
 			{
-				$url = $webserver_url . $url;
+				$url = $webserver_url.$url;
 			}
 		}
 
-		if(isset($GLOBALS['egw_info']['server']['enforce_ssl']) && $GLOBALS['egw_info']['server']['enforce_ssl'])
+		if (isset($GLOBALS['egw_info']['server']['enforce_ssl']) && $GLOBALS['egw_info']['server']['enforce_ssl'])
 		{
-			if(substr($url ,0,4) != 'http')
+			if (substr($url, 0, 4) != 'http')
 			{
 				$url = 'https://'.$_SERVER['HTTP_HOST'].$url;
 			}
 			else
 			{
-				$url = str_replace ( 'http:', 'https:', $url);
+				$url = str_replace('http:', 'https:', $url);
 			}
 		}
 		$vars = array();
@@ -1145,7 +1142,7 @@ 
 		}
 
 		// check if the url already contains a query and ensure that vars is an array and all strings are in extravars
-		list($ret_url,$othervars) = explode('?', $url, 2);
+		list($ret_url, $othervars) = explode('?', $url, 2);
 		if ($extravars && is_array($extravars))
 		{
 			$vars += $extravars;
@@ -1153,19 +1150,19 @@ 
 		}
 		else
 		{
-			if ($othervars) $extravars .= ($extravars?'&':'').$othervars;
+			if ($othervars) $extravars .= ($extravars ? '&' : '').$othervars;
 		}
 
 		// parse extravars string into the vars array
 		if ($extravars)
 		{
-			foreach(explode('&',$extravars) as $expr)
+			foreach (explode('&', $extravars) as $expr)
 			{
-				list($var,$val) = explode('=', $expr,2);
-				if (strpos($val,'%26') != false) $val = str_replace('%26','&',$val);	// make sure to not double encode &
-				if (substr($var,-2) == '[]')
+				list($var, $val) = explode('=', $expr, 2);
+				if (strpos($val, '%26') != false) $val = str_replace('%26', '&', $val); // make sure to not double encode &
+				if (substr($var, -2) == '[]')
 				{
-					$vars[substr($var,0,-2)][] = $val;
+					$vars[substr($var, 0, -2)][] = $val;
 				}
 				else
 				{
@@ -1178,11 +1175,11 @@ 
 		if (count($vars))
 		{
 			$query = array();
-			foreach($vars as $key => $value)
+			foreach ($vars as $key => $value)
 			{
 				if (is_array($value))
 				{
-					foreach($value as $val)
+					foreach ($value as $val)
 					{
 						$query[] = $key.'[]='.urlencode($val);
 					}
@@ -1192,7 +1189,7 @@ 
 					$query[] = $key.'='.urlencode($value);
 				}
 			}
-			$ret_url .= '?' . implode('&',$query);
+			$ret_url .= '?'.implode('&', $query);
 		}
 		return $ret_url;
 	}
@@ -1211,7 +1208,7 @@ 
 		if (isset($_SESSION[self::EGW_SESSION_ENCRYPTED]))
 		{
 			if (self::ERROR_LOG_DEBUG) error_log(__METHOD__.' called after session was encrypted --> ignored!');
-			return false;	// can no longer store something in the session, eg. because commit_session() was called
+			return false; // can no longer store something in the session, eg. because commit_session() was called
 		}
 		if (!$appname)
 		{
@@ -1221,9 +1218,9 @@ 
 		// allow to store eg. '' as the value.
 		if ($data === '##NOTHING##')
 		{
-			if(isset($_SESSION[self::EGW_APPSESSION_VAR][$appname]) && array_key_exists($location,$_SESSION[self::EGW_APPSESSION_VAR][$appname]))
+			if (isset($_SESSION[self::EGW_APPSESSION_VAR][$appname]) && array_key_exists($location, $_SESSION[self::EGW_APPSESSION_VAR][$appname]))
 			{
-				$ret =& $_SESSION[self::EGW_APPSESSION_VAR][$appname][$location];
+				$ret = & $_SESSION[self::EGW_APPSESSION_VAR][$appname][$location];
 			}
 			else
 			{
@@ -1232,14 +1229,13 @@ 
 		}
 		else
 		{
-			$_SESSION[self::EGW_APPSESSION_VAR][$appname][$location] =& $data;
-			$ret =& $_SESSION[self::EGW_APPSESSION_VAR][$appname][$location];
+			$_SESSION[self::EGW_APPSESSION_VAR][$appname][$location] = & $data;
+			$ret = & $_SESSION[self::EGW_APPSESSION_VAR][$appname][$location];
 		}
 		if (self::ERROR_LOG_DEBUG === 'appsession')
 		{
 			error_log(__METHOD__."($location,$appname,$data) === ".(is_scalar($ret) && strlen($ret) < 50 ?
-				(is_bool($ret) ? ($ret ? '(bool)true' : '(bool)false') : $ret) :
-				(strlen($r = array2string($ret)) < 50 ? $r : substr($r,0,50).' ...')));
+				(is_bool($ret) ? ($ret ? '(bool)true' : '(bool)false') : $ret) : (strlen($r = array2string($ret)) < 50 ? $r : substr($r, 0, 50).' ...')));
 		}
 		return $ret;
 	}
@@ -1284,7 +1280,7 @@ 
 	 * @param int $cookietime =0 when cookie should expire, 0 for session only (optional)
 	 * @param string $cookiepath =null optional path (eg. '/') if the eGW install-dir should not be used
 	 */
-	public static function egw_setcookie($cookiename,$cookievalue='',$cookietime=0,$cookiepath=null)
+	public static function egw_setcookie($cookiename, $cookievalue = '', $cookietime = 0, $cookiepath = null)
 	{
 		if (empty(self::$cookie_domain) || empty(self::$cookie_path))
 		{
@@ -1297,11 +1293,11 @@ 
 		static $is_iOS = null;
 		if (!$cookietime && !isset($is_iOS)) $is_iOS = (bool)preg_match('/^(iPhone|iPad|iPod)/i', html::$ua_mobile);
 
-		if(!headers_sent())	// gives only a warning, but can not send the cookie anyway
+		if (!headers_sent())	// gives only a warning, but can not send the cookie anyway
 		{
 			setcookie($cookiename, $cookievalue,
-				!$cookietime && $is_iOS ? time()+self::IOS_SESSION_COOKIE_LIFETIME : $cookietime,
-				is_null($cookiepath) ? self::$cookie_path : $cookiepath,self::$cookie_domain,
+				!$cookietime && $is_iOS ? time() + self::IOS_SESSION_COOKIE_LIFETIME : $cookietime,
+				is_null($cookiepath) ? self::$cookie_path : $cookiepath, self::$cookie_domain,
 				// if called via HTTPS, only send cookie for https and only allow cookie access via HTTP (true)
 				empty($GLOBALS['egw_info']['server']['insecure_cookies']) && !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off', true);
 		}
@@ -1320,21 +1316,21 @@ 
 		else
 		{
 			// Use HTTP_X_FORWARDED_HOST if set, which is the case behind a none-transparent proxy
-			self::$cookie_domain = isset($_SERVER['HTTP_X_FORWARDED_HOST']) ?  $_SERVER['HTTP_X_FORWARDED_HOST'] : $_SERVER['HTTP_HOST'];
+			self::$cookie_domain = isset($_SERVER['HTTP_X_FORWARDED_HOST']) ? $_SERVER['HTTP_X_FORWARDED_HOST'] : $_SERVER['HTTP_HOST'];
 		}
 		// remove port from HTTP_HOST
 		$arr = null;
-		if (preg_match("/^(.*):(.*)$/",self::$cookie_domain,$arr))
+		if (preg_match("/^(.*):(.*)$/", self::$cookie_domain, $arr))
 		{
 			self::$cookie_domain = $arr[1];
 		}
-		if (count(explode('.',self::$cookie_domain)) <= 1)
+		if (count(explode('.', self::$cookie_domain)) <= 1)
 		{
 			// setcookie dont likes domains without dots, leaving it empty, gets setcookie to fill the domain in
 			self::$cookie_domain = '';
 		}
 		if (!$GLOBALS['egw_info']['server']['cookiepath'] ||
-			!(self::$cookie_path = parse_url($GLOBALS['egw_info']['server']['webserver_url'],PHP_URL_PATH)))
+			!(self::$cookie_path = parse_url($GLOBALS['egw_info']['server']['webserver_url'], PHP_URL_PATH)))
 		{
 			self::$cookie_path = '/';
 		}
@@ -1355,7 +1351,7 @@ 
 	 * @param array $domains =null defaults to $GLOBALS['egw_domain'] from the header
 	 * @return string $GLOBALS['egw_info']['user']['domain'] set with the domain/instance to use
 	 */
-	public static function search_instance($login,$domain_requested,&$default_domain,$server_names,array $domains=null)
+	public static function search_instance($login, $domain_requested, &$default_domain, $server_names, array $domains = null)
 	{
 		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."('$login','$domain_requested',".array2string($default_domain).".".array2string($server_names).".".array2string($domains).")");
 
@@ -1363,10 +1359,10 @@ 
 
 		if (!isset($default_domain) || !isset($domains[$default_domain]))	// allow to overwrite the default domain
 		{
-			foreach((array)$server_names as $server_name)
+			foreach ((array)$server_names as $server_name)
 			{
-				list($server_name) = explode(':', $server_name);	// remove port from HTTP_HOST
-				if(isset($domains[$server_name]))
+				list($server_name) = explode(':', $server_name); // remove port from HTTP_HOST
+				if (isset($domains[$server_name]))
 				{
 					$default_domain = $server_name;
 					break;
@@ -1376,7 +1372,7 @@ 
 					$parts = explode('.', $server_name);
 					array_shift($parts);
 					$domain_part = implode('.', $parts);
-					if(isset($domains[$domain_part]))
+					if (isset($domains[$domain_part]))
 					{
 						$default_domain = $domain_part;
 						break;
@@ -1392,11 +1388,11 @@ 
 		}
 		if (isset($login))	// on login
 		{
-			if (strpos($login,'@') === false || count($domains) == 1)
+			if (strpos($login, '@') === false || count($domains) == 1)
 			{
-				$login .= '@' . (isset($_POST['logindomain']) ? $_POST['logindomain'] : $default_domain);
+				$login .= '@'.(isset($_POST['logindomain']) ? $_POST['logindomain'] : $default_domain);
 			}
-			$parts = explode('@',$login);
+			$parts = explode('@', $login);
 			$domain = array_pop($parts);
 			$GLOBALS['login'] = $login;
 		}
@@ -1419,7 +1415,7 @@ 
 	 * @param boolean $update_access_log =true false: dont update egw_access_log table
 	 * @return string action as written to egw_access_log.session_action
 	 */
-	private function update_dla($update_access_log=true)
+	private function update_dla($update_access_log = true)
 	{
 		// This way XML-RPC users aren't always listed as xmlrpc.php
 		if ($this->xmlrpc_method_called)
@@ -1435,27 +1431,27 @@ 
 			$action = $_SERVER['PHP_SELF'];
 			// remove EGroupware path, if not installed in webroot
 			$egw_path = $GLOBALS['egw_info']['server']['webserver_url'];
-			if ($egw_path[0] != '/') $egw_path = parse_url($egw_path,PHP_URL_PATH);
+			if ($egw_path[0] != '/') $egw_path = parse_url($egw_path, PHP_URL_PATH);
 			if ($action == '/Microsoft-Server-ActiveSync')
 			{
 				$action .= '?Cmd='.$_GET['Cmd'].'&DeviceId='.$_GET['DeviceId'];
 			}
 			elseif ($egw_path)
 			{
-				list(,$action) = explode($egw_path,$action,2);
+				list(,$action) = explode($egw_path, $action, 2);
 			}
 		}
 
 		// update dla in access-log table, if we have an access-log row (non-anonymous session)
 		if ($this->sessionid_access_log && $update_access_log)
 		{
-			$GLOBALS['egw']->db->update(self::ACCESS_LOG_TABLE,array(
+			$GLOBALS['egw']->db->update(self::ACCESS_LOG_TABLE, array(
 				'session_dla' => time(),
 				'session_action' => $action,
-				'lo' => null,	// just in case it was (automatic) timed out before
-			),array(
+				'lo' => null, // just in case it was (automatic) timed out before
+			), array(
 				'sessionid' => $this->sessionid_access_log,
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 		}
 
 		$_SESSION[self::EGW_SESSION_VAR]['session_dla'] = time();
@@ -1473,12 +1469,12 @@ 
 		// update dla in access-log table, if we have an access-log row (non-anonymous session)
 		if ($this->sessionid_access_log)
 		{
-			$GLOBALS['egw']->db->update(self::ACCESS_LOG_TABLE,array(
+			$GLOBALS['egw']->db->update(self::ACCESS_LOG_TABLE, array(
 				'notification_heartbeat' => time(),
-			),array(
+			), array(
 				'sessionid' => $this->sessionid_access_log,
 				'lo IS NULL',
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 		}
 	}
 
@@ -1499,7 +1495,7 @@ 
 		{
 			// authentication happens in login.php, which does NOT yet create egw-object in session
 			// --> need to store homedirectory in session
-			if(isset($GLOBALS['auto_create_acct']['homedirectory']))
+			if (isset($GLOBALS['auto_create_acct']['homedirectory']))
 			{
 				egw_cache::setSession(__CLASS__, 'homedirectory',
 					$user['homedirectory'] = $GLOBALS['auto_create_acct']['homedirectory']);
@@ -1512,7 +1508,7 @@ 
 		$user['preferences'] = $GLOBALS['egw']->preferences->read_repository();
 		if (is_object($GLOBALS['egw']->datetime))
 		{
-			$GLOBALS['egw']->datetime->datetime();		// to set tz_offset from the now read prefs
+			$GLOBALS['egw']->datetime->datetime(); // to set tz_offset from the now read prefs
 		}
 		$user['apps']        = $GLOBALS['egw']->applications->read_repository();
 		$user['domain']      = $this->account_domain;
@@ -1535,9 +1531,9 @@ 
 	 * @param string &$account_lid returned account_lid (ie. user)
 	 * @param string &$domain returned domain (ie. domain)
 	 */
-	private function split_login_domain($login,&$account_lid,&$domain)
+	private function split_login_domain($login, &$account_lid, &$domain)
 	{
-		$parts = explode('@',$login);
+		$parts = explode('@', $login);
 
 		//conference - for strings like vinicius@thyamad.com@default ,
 		//allows that user have a login that is his e-mail. (viniciuscb)
@@ -1545,11 +1541,11 @@ 
 		{
 			$probable_domain = array_pop($parts);
 			//Last part of login string, when separated by @, is a domain name
-			if (in_array($probable_domain,$this->egw_domains))
+			if (in_array($probable_domain, $this->egw_domains))
 			{
 				$got_login = true;
 				$domain = $probable_domain;
-				$account_lid = implode('@',$parts);
+				$account_lid = implode('@', $parts);
 			}
 		}
 
@@ -1572,9 +1568,9 @@ 
 	 * @param boolean $allow_password_md5 =false can password alread be an md5 hash
 	 * @return string
 	 */
-	static function user_pw_hash($user,$password,$allow_password_md5=false)
+	static function user_pw_hash($user, $password, $allow_password_md5 = false)
 	{
-		$password_md5 = $allow_password_md5 && preg_match('/^[a-f0-9]{32}$/',$password) ? $password : md5($password);
+		$password_md5 = $allow_password_md5 && preg_match('/^[a-f0-9]{32}$/', $password) ? $password : md5($password);
 
 		$hash = sha1(strtolower($user).$password_md5);
 		//echo "<p>".__METHOD__."('$user','$password',$allow_password_md5) sha1('".strtolower($user)."$password_md5')='$hash'</p>\n";
@@ -1603,11 +1599,11 @@ 
 		}
 		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__.'() session_handler='.self::$session_handler.', egw_info[server][session_handler]='.$GLOBALS['egw_info']['server']['session_handler'].' called from:'.function_backtrace());
 
-		if (method_exists(self::$session_handler,'init_session_handler'))
+		if (method_exists(self::$session_handler, 'init_session_handler'))
 		{
-			call_user_func(array(self::$session_handler,'init_session_handler'));
+			call_user_func(array(self::$session_handler, 'init_session_handler'));
 		}
-		ini_set('session.use_cookies',0);	// disable the automatic use of cookies, as it uses the path / by default
+		ini_set('session.use_cookies', 0); // disable the automatic use of cookies, as it uses the path / by default
 		session_name(self::EGW_SESSION_NAME);
 		if (($sessionid = self::get_sessionid()))
 		{
@@ -1631,7 +1627,7 @@ 
 	 *
 	 * @param int $expire =null expiration time in seconds, default $GLOBALS['egw_info']['flags']['nocachecontrol'] or php.ini session.cache_expire
 	 */
-	public static function cache_control($expire=null)
+	public static function cache_control($expire = null)
 	{
 		if (is_null($expire) && isset($GLOBALS['egw_info']['flags']['nocachecontrol']) && is_int($GLOBALS['egw_info']['flags']['nocachecontrol']))
 		{
@@ -1641,7 +1637,7 @@ 
 		if (!isset($_SESSION))
 		{
 			// controling caching and expires header
-			if(!isset($GLOBALS['egw_info']['flags']['nocachecontrol']) || !$GLOBALS['egw_info']['flags']['nocachecontrol'])
+			if (!isset($GLOBALS['egw_info']['flags']['nocachecontrol']) || !$GLOBALS['egw_info']['flags']['nocachecontrol'])
 			{
 				session_cache_limiter('nocache');
 			}
@@ -1650,7 +1646,7 @@ 
 				// allow public caching: proxys, cdns, ...
 				if (isset($expire))
 				{
-					session_cache_expire((int)ceil($expire/60));	// in minutes
+					session_cache_expire((int)ceil($expire / 60)); // in minutes
 				}
 				session_cache_limiter('public');
 			}
@@ -1663,8 +1659,8 @@ 
 		// session already started
 		if (isset($_SESSION))
 		{
-			if ($expire && (session_cache_limiter() !== ($expire===true?'private_no_expire':'public') ||
-				is_int($expire) && $expire/60 !== session_cache_expire()))
+			if ($expire && (session_cache_limiter() !== ($expire === true ? 'private_no_expire' : 'public') ||
+				is_int($expire) && $expire / 60 !== session_cache_expire()))
 			{
 				$file = $line = null;
 				if (headers_sent($file, $line))
@@ -1672,15 +1668,15 @@ 
 					error_log(__METHOD__."($expire) called, but header already sent in $file: $line");
 					return;
 				}
-				if($expire === true)	// same behavior as session_cache_limiter('private_no_expire')
+				if ($expire === true)	// same behavior as session_cache_limiter('private_no_expire')
 				{
-					header('Cache-Control: private, max-age='.(60*session_cache_expire()));
+					header('Cache-Control: private, max-age='.(60 * session_cache_expire()));
 					header_remove('Expires');
 				}
 				else
 				{
 					header('Cache-Control: public, max-age='.$expire);
-					header('Expires: ' . gmdate('D, d M Y H:i:s', time()+$expire) . ' GMT');
+					header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expire).' GMT');
 				}
 				// remove Pragma header, might be set by old header
 				if (function_exists('header_remove'))	// PHP 5.3+
@@ -1705,10 +1701,10 @@ 
 	 * @param array $filter =array() extra filter for sessions
 	 * @return array with sessions (values for keys as in $sort)
 	 */
-	public static function session_list($start,$sort='DESC',$order='session_dla',$all_no_sort=False,array $filter=array())
+	public static function session_list($start, $sort = 'DESC', $order = 'session_dla', $all_no_sort = False, array $filter = array())
 	{
 		$sessions = array();
-		if (!preg_match('/^[a-z0-9_ ,]+$/i',$order_by=$order.' '.$sort) || $order_by == ' ')
+		if (!preg_match('/^[a-z0-9_ ,]+$/i', $order_by = $order.' '.$sort) || $order_by == ' ')
 		{
 			$order_by = 'session_dla DESC';
 		}
@@ -1716,7 +1712,7 @@ 
 		$filter[] = 'account_id>0';
 		$filter[] = 'session_dla > '.(int)(time() - $GLOBALS['egw_info']['server']['sessions_timeout']);
 		$filter[] = '(notification_heartbeat IS NULL OR notification_heartbeat > '.self::heartbeat_limit().')';
-		foreach($GLOBALS['egw']->db->select(self::ACCESS_LOG_TABLE, '*', $filter, __LINE__, __FILE__,
+		foreach ($GLOBALS['egw']->db->select(self::ACCESS_LOG_TABLE, '*', $filter, __LINE__, __FILE__,
 			$all_no_sort ? false : $start, 'ORDER BY '.$order_by) as $row)
 		{
 			$sessions[$row['sessionid']] = $row;
@@ -1730,7 +1726,7 @@ 
 	 * @param array $filter =array() extra filter for sessions
 	 * @return int number of active sessions
 	 */
-	public static function session_count(array $filter=array())
+	public static function session_count(array $filter = array())
 	{
 		$filter['lo'] = null;
 		$filter[] = 'account_id>0';
@@ -1746,16 +1742,16 @@ 
 	 */
 	public static function heartbeat_limit()
 	{
-		static $limit=null;
+		static $limit = null;
 
 		if (is_null($limit))
 		{
 			$config = config::read('notifications');
-			if (!($popup_poll_interval  = $config['popup_poll_interval']))
+			if (!($popup_poll_interval = $config['popup_poll_interval']))
 			{
 				$popup_poll_interval = 60;
 			}
-			$limit = (int)(time() - $popup_poll_interval-10);	// 10s grace periode
+			$limit = (int)(time() - $popup_poll_interval - 10); // 10s grace periode
 		}
 		return $limit;
 	}
@@ -1788,8 +1784,8 @@ 
 	 * @param int $accountid user account id, defaults to current user (optional)
 	 * @deprecated not longer used / necessary
 	 */
-	function delete_cache($accountid='')
+	function delete_cache($accountid = '')
 	{
-		unset($accountid);	// not used, but required by function signature
+		unset($accountid); // not used, but required by function signature
 	}
 }

Braces +180 added lines, -46 removed lines

@@ -252,7 +252,7 @@ 
 
 		// set session_timeout from global php.ini and default to 14400=4h, if not set
 		if (!($GLOBALS['egw_info']['server']['sessions_timeout'] = ini_get('session.gc_maxlifetime')))
-      	{
+		{
       		ini_set('session.gc_maxlifetime', $GLOBALS['egw_info']['server']['sessions_timeout']=14400);
       	}
 	}
@@ -286,7 +286,10 @@ 
 	 */
 	function commit_session()
 	{
-		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."() sessionid=$this->sessionid, _SESSION[".self::EGW_SESSION_VAR.']='.array2string($_SESSION[self::EGW_SESSION_VAR]).' '.function_backtrace());
+		if (self::ERROR_LOG_DEBUG)
+		{
+			error_log(__METHOD__."() sessionid=$this->sessionid, _SESSION[".self::EGW_SESSION_VAR.']='.array2string($_SESSION[self::EGW_SESSION_VAR]).' '.function_backtrace());
+		}
 		self::encrypt($this->kp3);
 
 		session_write_close();
@@ -348,7 +351,10 @@ 
 	 */
 	static function log_session_usage(&$arr,$label,$recursion=true,$limit=1000)
 	{
-		if (!is_array($arr)) return;
+		if (!is_array($arr))
+		{
+			return;
+		}
 
 		$sizes = array();
 		foreach($arr as $key => &$data)
@@ -363,7 +369,10 @@ 
 			if ($diff > $limit)
 			{
 				error_log("strlen({$label}[$key])=".egw_vfs::hsize($size).", diff=".egw_vfs::hsize($diff));
-				if ($recursion) self::log_session_usage($arr[$key],$label.'['.$key.']',$recursion,$limit);
+				if ($recursion)
+				{
+					self::log_session_usage($arr[$key],$label.'['.$key.']',$recursion,$limit);
+				}
 			}
 		}
 	}
@@ -461,7 +470,10 @@ 
 				$this->passwd      = $passwd;
 				$this->passwd_type = $passwd_type;
 			}
-			if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check) starting ...");
+			if (self::ERROR_LOG_DEBUG)
+			{
+				error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check) starting ...");
+			}
 
 			self::split_login_domain($login,$this->account_lid,$this->account_domain);
 			// add domain to the login, if not already there
@@ -506,7 +518,10 @@ 
 				{
 					$this->log_access($this->reason,$login,$user_ip,0);	// log unsuccessfull login
 				}
-				if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check) UNSUCCESSFULL ($this->reason)");
+				if (self::ERROR_LOG_DEBUG)
+				{
+					error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check) UNSUCCESSFULL ($this->reason)");
+				}
 				return false;
 			}
 			if ($fail_on_forced_password_change && auth::check_password_change($this->reason) === false)
@@ -557,7 +572,10 @@ 
 				$this->reason = 'account is expired';
 				$this->cd_reason = self::CD_ACCOUNT_EXPIRED;
 
-				if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check) UNSUCCESSFULL ($this->reason)");
+				if (self::ERROR_LOG_DEBUG)
+				{
+					error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check) UNSUCCESSFULL ($this->reason)");
+				}
 				return false;
 			}
 
@@ -581,25 +599,34 @@ 
 				'passwd'         => $this->passwd,
 				'account_domain' => $this->account_domain,
 				'user_ip'        => $user_ip,
-			),'',true)))	// true = run hooks from all apps, not just the ones the current user has perms to run
+			),'',true)))
+			{
+				// true = run hooks from all apps, not just the ones the current user has perms to run
 			{
 				foreach($hook_result as $reason)
 				{
 					if ($reason)	// called hook requests to deny the session
 					{
 						$this->reason = $this->cd_reason = $reason;
+			}
 						$this->log_access($this->reason,$login,$user_ip,0);		// log unsuccessfull login
-						if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check) UNSUCCESSFULL ($this->reason)");
+						if (self::ERROR_LOG_DEBUG)
+						{
+							error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check) UNSUCCESSFULL ($this->reason)");
+						}
 						return false;
 					}
 				}
 			}
 			$GLOBALS['egw']->db->transaction_begin();
 			$this->register_session($this->login,$user_ip,$now,$this->session_flags);
-			if ($this->session_flags != 'A')		// dont log anonymous sessions
+			if ($this->session_flags != 'A')
+			{
+				// dont log anonymous sessions
 			{
 				$this->sessionid_access_log = $this->log_access($this->sessionid,$login,$user_ip,$this->account_id);
 			}
+			}
 			self::appsession('account_previous_login','phpgwapi',$GLOBALS['egw']->auth->previous_login);
 			$GLOBALS['egw']->accounts->update_lastlogin($this->account_id,$user_ip);
 			$GLOBALS['egw']->db->transaction_commit();
@@ -616,7 +643,10 @@ 
 				self::egw_setcookie('last_domain',$this->account_domain,$now+1209600);
 			}
 			//if (!$this->sessionid) echo "<p>session::create(login='$login') = '$this->sessionid': lid='$this->account_lid', domain='$this->account_domain'</p>\n";
-			if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check) successfull sessionid=$this->sessionid");
+			if (self::ERROR_LOG_DEBUG)
+			{
+				error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check) successfull sessionid=$this->sessionid");
+			}
 
 			return $this->sessionid;
 		}
@@ -770,10 +800,13 @@ 
 		//error_log(__METHOD__."('$login', '$ip') false_ip=$false_ip, false_id=$false_id --> blocked=".array2string($blocked));
 
 		if ($blocked && $GLOBALS['egw_info']['server']['admin_mails'] &&
-			$GLOBALS['egw_info']['server']['login_blocked_mail_time'] < time()-5*60)	// max. one mail every 5mins
+			$GLOBALS['egw_info']['server']['login_blocked_mail_time'] < time()-5*60)
+		{
+			// max. one mail every 5mins
 		{
 			try {
 				$mailer = new egw_mailer();
+		}
 				// notify admin(s) via email
 				$mailer->setFrom('eGroupWare@'.$GLOBALS['egw_info']['server']['mail_suffix']);
 				$mailer->addHeader('Subject', lang("eGroupWare: login blocked for user '%1', IP %2",$login,$ip));
@@ -851,7 +884,10 @@ 
 		{
 			$sessionid = false;
 		}
-		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."() _SERVER[REQUEST_URI]='$_SERVER[REQUEST_URI]' returning ".print_r($sessionid,true));
+		if (self::ERROR_LOG_DEBUG)
+		{
+			error_log(__METHOD__."() _SERVER[REQUEST_URI]='$_SERVER[REQUEST_URI]' returning ".print_r($sessionid,true));
+		}
 		return $sessionid;
 	}
 
@@ -881,7 +917,10 @@ 
 	 */
 	function verify($sessionid=null,$kp3=null)
 	{
-		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."('$sessionid','$kp3') ".function_backtrace());
+		if (self::ERROR_LOG_DEBUG)
+		{
+			error_log(__METHOD__."('$sessionid','$kp3') ".function_backtrace());
+		}
 
 		$fill_egw_info_and_repositories = !$GLOBALS['egw_info']['flags']['restored_from_session'];
 
@@ -897,7 +936,10 @@ 
 
 		if (!$this->sessionid)
 		{
-			if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."('$sessionid') get_sessionid()='".self::get_sessionid()."' No session ID");
+			if (self::ERROR_LOG_DEBUG)
+			{
+				error_log(__METHOD__."('$sessionid') get_sessionid()='".self::get_sessionid()."' No session ID");
+			}
 			return false;
 		}
 
@@ -909,14 +951,20 @@ 
 		// check if we have a eGroupware session --> return false if not (but dont destroy it!)
 		if (is_null($_SESSION) || !isset($_SESSION[self::EGW_SESSION_VAR]))
 		{
-			if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."('$sessionid') session does NOT exist!");
+			if (self::ERROR_LOG_DEBUG)
+			{
+				error_log(__METHOD__."('$sessionid') session does NOT exist!");
+			}
 			return false;
 		}
 		$session =& $_SESSION[self::EGW_SESSION_VAR];
 
 		if ($session['session_dla'] <= time() - $GLOBALS['egw_info']['server']['sessions_timeout'])
 		{
-			if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."('$sessionid') session timed out!");
+			if (self::ERROR_LOG_DEBUG)
+			{
+				error_log(__METHOD__."('$sessionid') session timed out!");
+			}
 			$this->destroy($sessionid,$kp3);
 			return false;
 		}
@@ -944,7 +992,10 @@ 
 		$this->account_id = $GLOBALS['egw']->accounts->name2id($this->account_lid,'account_lid','u');
 		if (!$this->account_id)
 		{
-			if (self::ERROR_LOG_DEBUG) error_log("*** session::verify($sessionid) !accounts::name2id('$this->account_lid')");
+			if (self::ERROR_LOG_DEBUG)
+			{
+				error_log("*** session::verify($sessionid) !accounts::name2id('$this->account_lid')");
+			}
 			return false;
 		}
 
@@ -962,7 +1013,10 @@ 
 
 		if ($GLOBALS['egw']->accounts->is_expired($GLOBALS['egw_info']['user']))
 		{
-			if (self::ERROR_LOG_DEBUG) error_log("*** session::verify($sessionid) accounts is expired");
+			if (self::ERROR_LOG_DEBUG)
+			{
+				error_log("*** session::verify($sessionid) accounts is expired");
+			}
 			return false;
 		}
 		$this->passwd = base64_decode(egw_cache::getSession('phpgwapi', 'password'));
@@ -973,7 +1027,10 @@ 
 		}
 		if ($this->account_domain != $GLOBALS['egw_info']['user']['domain'])
 		{
-			if (self::ERROR_LOG_DEBUG) error_log("*** session::verify($sessionid) wrong domain");
+			if (self::ERROR_LOG_DEBUG)
+			{
+				error_log("*** session::verify($sessionid) wrong domain");
+			}
 			return false;
 		}
 
@@ -982,7 +1039,10 @@ 
 			if (strtoupper(substr(PHP_OS,0,3)) != 'WIN' && (!$GLOBALS['egw_info']['user']['session_ip'] ||
 				$GLOBALS['egw_info']['user']['session_ip'] != $this->getuser_ip()))
 			{
-				if (self::ERROR_LOG_DEBUG) error_log("*** session::verify($sessionid) wrong IP");
+				if (self::ERROR_LOG_DEBUG)
+				{
+					error_log("*** session::verify($sessionid) wrong IP");
+				}
 				return false;
 			}
 		}
@@ -995,7 +1055,10 @@ 
 		}
 		if (!$this->account_lid)
 		{
-			if (self::ERROR_LOG_DEBUG) error_log("*** session::verify($sessionid) !account_lid");
+			if (self::ERROR_LOG_DEBUG)
+			{
+				error_log("*** session::verify($sessionid) !account_lid");
+			}
 			return false;
 		}
 
@@ -1014,13 +1077,19 @@ 
 			$_REQUEST[self::EGW_SESSION_NAME] === $this->sessionid &&
 			(!isset($_COOKIE[self::EGW_SESSION_NAME]) || $_COOKIE[self::EGW_SESSION_NAME] !== $_REQUEST[self::EGW_SESSION_NAME]))
 		{
-			if (self::ERROR_LOG_DEBUG) error_log("--> session::verify($sessionid) SUCCESS, but NO required cookies set --> setting them now");
+			if (self::ERROR_LOG_DEBUG)
+			{
+				error_log("--> session::verify($sessionid) SUCCESS, but NO required cookies set --> setting them now");
+			}
 			self::egw_setcookie(self::EGW_SESSION_NAME,$this->sessionid);
 			self::egw_setcookie('kp3',$this->kp3);
 			self::egw_setcookie('domain',$this->account_domain);
 		}
 
-		if (self::ERROR_LOG_DEBUG) error_log("--> session::verify($sessionid) SUCCESS");
+		if (self::ERROR_LOG_DEBUG)
+		{
+			error_log("--> session::verify($sessionid) SUCCESS");
+		}
 
 		return true;
 	}
@@ -1040,14 +1109,20 @@ 
 		}
 		$this->log_access($sessionid);	// log logout-time
 
-		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."($sessionid,$kp3)");
+		if (self::ERROR_LOG_DEBUG)
+		{
+			error_log(__METHOD__."($sessionid,$kp3)");
+		}
 
-		if (is_numeric($sessionid))	// do we have a access-log-id --> get PHP session id
+		if (is_numeric($sessionid))
+		{
+			// do we have a access-log-id --> get PHP session id
 		{
 			$sessionid = $GLOBALS['egw']->db->select(self::ACCESS_LOG_TABLE,'session_php',array(
 					'sessionid' => $sessionid,
 				),__LINE__,__FILE__)->fetchColumn();
 		}
+		}
 
 		$GLOBALS['egw']->hooks->process(array(
 			'location'  => 'session_destroyed',
@@ -1057,7 +1132,10 @@ 
 		// Only do the following, if where working with the current user
 		if (!$GLOBALS['egw_info']['user']['sessionid'] || $sessionid == $GLOBALS['egw_info']['user']['sessionid'])
 		{
-			if (self::ERROR_LOG_DEBUG) error_log(__METHOD__." ********* about to call session_destroy!");
+			if (self::ERROR_LOG_DEBUG)
+			{
+				error_log(__METHOD__." ********* about to call session_destroy!");
+			}
 			session_unset();
 			//echo '<p>'.__METHOD__.": session_destroy() returned ".(session_destroy() ? 'true' : 'false')."</p>\n";
 			@session_destroy();
@@ -1153,7 +1231,10 @@ 
 		}
 		else
 		{
-			if ($othervars) $extravars .= ($extravars?'&':'').$othervars;
+			if ($othervars)
+			{
+				$extravars .= ($extravars?'&':'').$othervars;
+			}
 		}
 
 		// parse extravars string into the vars array
@@ -1162,7 +1243,11 @@ 
 			foreach(explode('&',$extravars) as $expr)
 			{
 				list($var,$val) = explode('=', $expr,2);
-				if (strpos($val,'%26') != false) $val = str_replace('%26','&',$val);	// make sure to not double encode &
+				if (strpos($val,'%26') != false)
+				{
+					$val = str_replace('%26','&',$val);
+				}
+				// make sure to not double encode &
 				if (substr($var,-2) == '[]')
 				{
 					$vars[substr($var,0,-2)][] = $val;
@@ -1210,7 +1295,10 @@ 
 	{
 		if (isset($_SESSION[self::EGW_SESSION_ENCRYPTED]))
 		{
-			if (self::ERROR_LOG_DEBUG) error_log(__METHOD__.' called after session was encrypted --> ignored!');
+			if (self::ERROR_LOG_DEBUG)
+			{
+				error_log(__METHOD__.' called after session was encrypted --> ignored!');
+			}
 			return false;	// can no longer store something in the session, eg. because commit_session() was called
 		}
 		if (!$appname)
@@ -1290,14 +1378,22 @@ 
 		{
 			self::set_cookiedomain();
 		}
-		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."($cookiename,$cookievalue,$cookietime,$cookiepath,".self::$cookie_domain.")");
+		if (self::ERROR_LOG_DEBUG)
+		{
+			error_log(__METHOD__."($cookiename,$cookievalue,$cookietime,$cookiepath,".self::$cookie_domain.")");
+		}
 
 		// if we are installed in iOS as web-app, we must not set a cookietime==0 (session-cookie),
 		// as every change between apps will cause the cookie to get lost
 		static $is_iOS = null;
-		if (!$cookietime && !isset($is_iOS)) $is_iOS = (bool)preg_match('/^(iPhone|iPad|iPod)/i', html::$ua_mobile);
+		if (!$cookietime && !isset($is_iOS))
+		{
+			$is_iOS = (bool)preg_match('/^(iPhone|iPad|iPod)/i', html::$ua_mobile);
+		}
 
-		if(!headers_sent())	// gives only a warning, but can not send the cookie anyway
+		if(!headers_sent())
+		{
+			// gives only a warning, but can not send the cookie anyway
 		{
 			setcookie($cookiename, $cookievalue,
 				!$cookietime && $is_iOS ? time()+self::IOS_SESSION_COOKIE_LIFETIME : $cookietime,
@@ -1305,6 +1401,7 @@ 
 				// if called via HTTPS, only send cookie for https and only allow cookie access via HTTP (true)
 				empty($GLOBALS['egw_info']['server']['insecure_cookies']) && !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off', true);
 		}
+		}
 	}
 
 	/**
@@ -1357,15 +1454,25 @@ 
 	 */
 	public static function search_instance($login,$domain_requested,&$default_domain,$server_names,array $domains=null)
 	{
-		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."('$login','$domain_requested',".array2string($default_domain).".".array2string($server_names).".".array2string($domains).")");
+		if (self::ERROR_LOG_DEBUG)
+		{
+			error_log(__METHOD__."('$login','$domain_requested',".array2string($default_domain).".".array2string($server_names).".".array2string($domains).")");
+		}
 
-		if (is_null($domains)) $domains = $GLOBALS['egw_domain'];
+		if (is_null($domains))
+		{
+			$domains = $GLOBALS['egw_domain'];
+		}
 
-		if (!isset($default_domain) || !isset($domains[$default_domain]))	// allow to overwrite the default domain
+		if (!isset($default_domain) || !isset($domains[$default_domain]))
+		{
+			// allow to overwrite the default domain
 		{
 			foreach((array)$server_names as $server_name)
 			{
-				list($server_name) = explode(':', $server_name);	// remove port from HTTP_HOST
+				list($server_name) = explode(':', $server_name);
+		}
+		// remove port from HTTP_HOST
 				if(isset($domains[$server_name]))
 				{
 					$default_domain = $server_name;
@@ -1390,11 +1497,14 @@ 
 				}
 			}
 		}
-		if (isset($login))	// on login
+		if (isset($login))
+		{
+			// on login
 		{
 			if (strpos($login,'@') === false || count($domains) == 1)
 			{
 				$login .= '@' . (isset($_POST['logindomain']) ? $_POST['logindomain'] : $default_domain);
+		}
 			}
 			$parts = explode('@',$login);
 			$domain = array_pop($parts);
@@ -1408,7 +1518,10 @@ 
 		{
 			$domain = $default_domain;
 		}
-		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."() default_domain=".array2string($default_domain).', login='.array2string($login)." returning ".array2string($domain));
+		if (self::ERROR_LOG_DEBUG)
+		{
+			error_log(__METHOD__."() default_domain=".array2string($default_domain).', login='.array2string($login)." returning ".array2string($domain));
+		}
 
 		return $domain;
 	}
@@ -1435,7 +1548,10 @@ 
 			$action = $_SERVER['PHP_SELF'];
 			// remove EGroupware path, if not installed in webroot
 			$egw_path = $GLOBALS['egw_info']['server']['webserver_url'];
-			if ($egw_path[0] != '/') $egw_path = parse_url($egw_path,PHP_URL_PATH);
+			if ($egw_path[0] != '/')
+			{
+				$egw_path = parse_url($egw_path,PHP_URL_PATH);
+			}
 			if ($action == '/Microsoft-Server-ActiveSync')
 			{
 				$action .= '?Cmd='.$_GET['Cmd'].'&DeviceId='.$_GET['DeviceId'];
@@ -1460,7 +1576,10 @@ 
 
 		$_SESSION[self::EGW_SESSION_VAR]['session_dla'] = time();
 		$_SESSION[self::EGW_SESSION_VAR]['session_action'] = $action;
-		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__.'() _SESSION['.self::EGW_SESSION_VAR.']='.array2string($_SESSION[self::EGW_SESSION_VAR]));
+		if (self::ERROR_LOG_DEBUG)
+		{
+			error_log(__METHOD__.'() _SESSION['.self::EGW_SESSION_VAR.']='.array2string($_SESSION[self::EGW_SESSION_VAR]));
+		}
 
 		return $action;
 	}
@@ -1601,7 +1720,10 @@ 
 		{
 			self::$session_handler = $GLOBALS['egw_info']['server']['session_handler'];
 		}
-		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__.'() session_handler='.self::$session_handler.', egw_info[server][session_handler]='.$GLOBALS['egw_info']['server']['session_handler'].' called from:'.function_backtrace());
+		if (self::ERROR_LOG_DEBUG)
+		{
+			error_log(__METHOD__.'() session_handler='.self::$session_handler.', egw_info[server][session_handler]='.$GLOBALS['egw_info']['server']['session_handler'].' called from:'.function_backtrace());
+		}
 
 		if (method_exists(self::$session_handler,'init_session_handler'))
 		{
@@ -1615,10 +1737,16 @@ 
 		 	self::cache_control();
 			$ok = session_start();
 			self::decrypt();
-			if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."() sessionid=$sessionid, _SESSION[".self::EGW_SESSION_VAR.']='.array2string($_SESSION[self::EGW_SESSION_VAR]));
+			if (self::ERROR_LOG_DEBUG)
+			{
+				error_log(__METHOD__."() sessionid=$sessionid, _SESSION[".self::EGW_SESSION_VAR.']='.array2string($_SESSION[self::EGW_SESSION_VAR]));
+			}
 			return $ok;
 		}
-		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."() no active session!");
+		if (self::ERROR_LOG_DEBUG)
+		{
+			error_log(__METHOD__."() no active session!");
+		}
 
 		return false;
 	}
@@ -1672,9 +1800,12 @@ 
 					error_log(__METHOD__."($expire) called, but header already sent in $file: $line");
 					return;
 				}
-				if($expire === true)	// same behavior as session_cache_limiter('private_no_expire')
+				if($expire === true)
+				{
+					// same behavior as session_cache_limiter('private_no_expire')
 				{
 					header('Cache-Control: private, max-age='.(60*session_cache_expire()));
+				}
 					header_remove('Expires');
 				}
 				else
@@ -1683,10 +1814,13 @@ 
 					header('Expires: ' . gmdate('D, d M Y H:i:s', time()+$expire) . ' GMT');
 				}
 				// remove Pragma header, might be set by old header
-				if (function_exists('header_remove'))	// PHP 5.3+
+				if (function_exists('header_remove'))
+				{
+					// PHP 5.3+
 				{
 					header_remove('Pragma');
 				}
+				}
 				else
 				{
 					header('Pragma:');

phpgwapi/inc/class.egw_session_files.inc.php

Doc Comments +1 added lines, -3 removed lines

@@ -32,9 +32,7 @@
 	 * The data from the session-files get cached in $_SESSION['egw_files_session_cache']
 	 *
 	 * @param int $start
-	 * @param string $sort='session_dla' session_lid, session_id, session_started, session_logintime, session_action, or (default) session_dla
-	 * @param string $order='DESC' ASC or DESC
-	 * @param boolean $all_no_sort=False skip sorting and limiting to maxmatchs if set to true
+	 * @param boolean $all_no_sort skip sorting and limiting to maxmatchs if set to true
 	 * @return array with sessions (values for keys as in $sort) or array() if not supported by session-handler
 	 */
 	public static function session_list($start,$sort='DESC',$order='session_dla',$all_no_sort=False)

Spacing +24 added lines, -24 removed lines

@@ -37,14 +37,14 @@ 
 	 * @param boolean $all_no_sort=False skip sorting and limiting to maxmatchs if set to true
 	 * @return array with sessions (values for keys as in $sort) or array() if not supported by session-handler
 	 */
-	public static function session_list($start,$sort='DESC',$order='session_dla',$all_no_sort=False)
+	public static function session_list($start, $sort = 'DESC', $order = 'session_dla', $all_no_sort = False)
 	{
 		if (session_module_name() != 'files')
 		{
 			return array();
 		}
 		//echo '<p>'.__METHOD__."($start,sort='$sort',order='$order',$all)</p>\n".function_backtrace();
-		$session_cache =& $_SESSION['egw_files_session_cache'];
+		$session_cache = & $_SESSION['egw_files_session_cache'];
 
 		$values = array();
 		$maxmatchs = $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
@@ -54,14 +54,14 @@ 
 			return $values;
 		}
 		if (!($max_session_size = ini_get('memory_limit'))) $max_session_size = '16M';
-		if($max_session_size > 0)
+		if ($max_session_size > 0)
 		{
-			switch(strtoupper(substr($max_session_size,-1)))
+			switch (strtoupper(substr($max_session_size, -1)))
 			{
-				case 'M': $max_session_size *= 1024*1024; break;
+				case 'M': $max_session_size *= 1024 * 1024; break;
 				case 'K': $max_session_size *= 1024; break;
 			}
-			$max_session_size /= 4;	// use at max 1/4 of the memory_limit to read sessions, the others get ignored
+			$max_session_size /= 4; // use at max 1/4 of the memory_limit to read sessions, the others get ignored
 		}
 
 		while (($file = readdir($dir)))
@@ -69,7 +69,7 @@ 
 			if ($file{0} == '.') continue;
 			if ($max_session_size > 0 && filesize($path.'/'.$file) >= $max_session_size) continue;
 
-			if (substr($file,0,5) != 'sess_' || $session_cache[$file] === false)
+			if (substr($file, 0, 5) != 'sess_' || $session_cache[$file] === false)
 			{
 				continue;
 			}
@@ -82,7 +82,7 @@ 
 			{
 				$session = $session_cache[$file];
 
-				if (!$all_no_sort || 			// we need the up-to-date data --> unset and reread it
+				if (!$all_no_sort || // we need the up-to-date data --> unset and reread it
 					$session['session_dla'] <= (time() - $GLOBALS['egw_info']['server']['sessions_timeout']))	// cached dla is timeout
 				{
 					unset($session_cache[$file]);
@@ -90,34 +90,34 @@ 
 			}
 			if (!isset($session_cache[$file]))	// not in cache, read and cache it
 			{
-				if (!is_readable($path. '/' . $file))
+				if (!is_readable($path.'/'.$file))
 				{
-					$session_cache[$file] = false;	// dont try reading it again
-					continue;	// happens if webserver runs multiple user-ids
+					$session_cache[$file] = false; // dont try reading it again
+					continue; // happens if webserver runs multiple user-ids
 				}
 				unset($session);
-				list(,$session) = explode(egw_session::EGW_SESSION_VAR.'|',file_get_contents($path . '/' . $file,'r'));
+				list(,$session) = explode(egw_session::EGW_SESSION_VAR.'|', file_get_contents($path.'/'.$file, 'r'));
 				if (!$session || !($session = unserialize($session)))
 				{
-					$session_cache[$file] = false;	// dont try reading it again
+					$session_cache[$file] = false; // dont try reading it again
 					continue;
 				}
-				unset($session[egw_session::EGW_APPSESSION_VAR]);	// not needed, saves memory
-				$session['php_session_file'] = $path . '/' . $file;
+				unset($session[egw_session::EGW_APPSESSION_VAR]); // not needed, saves memory
+				$session['php_session_file'] = $path.'/'.$file;
 				$session_cache[$file] = $session;
 
-				if($session['session_flags'] == 'A' || !$session['session_id'] ||
+				if ($session['session_flags'] == 'A' || !$session['session_id'] ||
 					$session['session_install_id'] != $GLOBALS['egw_info']['server']['install_id'])
 				{
-					$session_cache[$file] = false;	// dont try reading it again
-					continue;	// no anonymous sessions or other domains or installations
+					$session_cache[$file] = false; // dont try reading it again
+					continue; // no anonymous sessions or other domains or installations
 				}
 				// check for and terminate sessions which are timed out ==> destroy them
 				// this should be not necessary if php is configured right, but I'm sick of the questions on the list
 				if ($session['session_dla'] <= (time() - $GLOBALS['egw_info']['server']['sessions_timeout']))
 				{
 					//echo "session $session[session_id] is timed out !!!<br>\n";
-					@unlink($path . '/' . $file);
+					@unlink($path.'/'.$file);
 					$session_cache[$file] = false;
 					continue;
 				}
@@ -130,14 +130,14 @@ 
 		}
 		closedir($dir);
 
-		if(!$all_no_sort)
+		if (!$all_no_sort)
 		{
-			if(!$order || !in_array($order,array('session_lid','session_ip','session_logintime','session_action','session_dla')))
+			if (!$order || !in_array($order, array('session_lid', 'session_ip', 'session_logintime', 'session_action', 'session_dla')))
 			{
 				$order = 'session_dla';
 			}
-			uasort($values,create_function('$a,$b','return '.(!strcasecmp($sort,'ASC') ? '' : '-').'strcasecmp($a['.$order.'],$b['.$order.']);'));
-			return array_slice($values,(int)$start,$maxmatchs);
+			uasort($values, create_function('$a,$b', 'return '.(!strcasecmp($sort, 'ASC') ? '' : '-').'strcasecmp($a['.$order.'],$b['.$order.']);'));
+			return array_slice($values, (int)$start, $maxmatchs);
 		}
 		return $values;
 	}
@@ -149,6 +149,6 @@ 
 	 */
 	public static function session_count()
 	{
-		return count(self::session_list(0,'','',True));
+		return count(self::session_list(0, '', '', True));
 	}
 }

Braces +38 added lines, -10 removed lines

@@ -49,11 +49,17 @@ 
 		$values = array();
 		$maxmatchs = $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
 		$dir = @opendir($path = ini_get('session.save_path'));
-		if (!$dir || !@file_exists($path.'/.'))	// eg. openbasedir restrictions, or dir not listable
+		if (!$dir || !@file_exists($path.'/.'))
+		{
+			// eg. openbasedir restrictions, or dir not listable
 		{
 			return $values;
 		}
-		if (!($max_session_size = ini_get('memory_limit'))) $max_session_size = '16M';
+		}
+		if (!($max_session_size = ini_get('memory_limit')))
+		{
+			$max_session_size = '16M';
+		}
 		if($max_session_size > 0)
 		{
 			switch(strtoupper(substr($max_session_size,-1)))
@@ -66,33 +72,52 @@ 
 
 		while (($file = readdir($dir)))
 		{
-			if ($file{0} == '.') continue;
-			if ($max_session_size > 0 && filesize($path.'/'.$file) >= $max_session_size) continue;
+			if ($file{0} == '.')
+			{
+				continue;
+			}
+			if ($max_session_size > 0 && filesize($path.'/'.$file) >= $max_session_size)
+			{
+				continue;
+			}
 
 			if (substr($file,0,5) != 'sess_' || $session_cache[$file] === false)
 			{
 				continue;
 			}
 			//echo "<p>$path/$file: ".substr(file_get_contents($path . '/' . $file,'r'),0,256)."</p>\n";
-			if (isset($session_cache[$file]) && !$session_cache[$file])		// session is marked as not to list (not ours or anonymous)
+			if (isset($session_cache[$file]) && !$session_cache[$file])
+			{
+				// session is marked as not to list (not ours or anonymous)
 			{
 				continue;
 			}
-			if (isset($session_cache[$file]))	// use copy from cache
+			}
+			if (isset($session_cache[$file]))
+			{
+				// use copy from cache
 			{
 				$session = $session_cache[$file];
+			}
 
 				if (!$all_no_sort || 			// we need the up-to-date data --> unset and reread it
-					$session['session_dla'] <= (time() - $GLOBALS['egw_info']['server']['sessions_timeout']))	// cached dla is timeout
+					$session['session_dla'] <= (time() - $GLOBALS['egw_info']['server']['sessions_timeout']))
+				{
+					// cached dla is timeout
 				{
 					unset($session_cache[$file]);
 				}
+				}
 			}
-			if (!isset($session_cache[$file]))	// not in cache, read and cache it
+			if (!isset($session_cache[$file]))
+			{
+				// not in cache, read and cache it
 			{
 				if (!is_readable($path. '/' . $file))
 				{
-					$session_cache[$file] = false;	// dont try reading it again
+					$session_cache[$file] = false;
+			}
+			// dont try reading it again
 					continue;	// happens if webserver runs multiple user-ids
 				}
 				unset($session);
@@ -123,7 +148,10 @@ 
 				}
 			}
 			// ignore (empty) login sessions created by IE and konqueror, when clicking on [login] (double submission of the form)
-			if ($session['session_action'] == $GLOBALS['egw_info']['server']['webserver_url'].'/login.php') continue;
+			if ($session['session_action'] == $GLOBALS['egw_info']['server']['webserver_url'].'/login.php')
+			{
+				continue;
+			}
 
 			//echo "file='$file'=<pre>"; print_r($session); echo "</pre>";
 			$values[$session['session_id']] = $session;

phpgwapi/inc/class.egw_session_memcache.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -109,7 +109,7 @@
 	 * with a fatal error!
 	 *
 	 * @param string $id
-	 * @return string|boolean false on error, '' for not found session otherwise session data
+	 * @return false|string false on error, '' for not found session otherwise session data
 	 */
 	public static function read($id)
 	{

Spacing +29 added lines, -29 removed lines

@@ -58,7 +58,7 @@ 
 	 */
 	public static function init_session_handler()
 	{
-		self::$mbstring_func_overload = @extension_loaded('mbstring') && (ini_get('mbstring.func_overload') & 2);
+		self::$mbstring_func_overload = @extension_loaded('mbstring') && (ini_get('mbstring.func_overload')&2);
 
 		// session needs to be closed before objects get destroyed, as this session-handler is an object ;-)
 		register_shutdown_function('session_write_close');
@@ -73,13 +73,13 @@ 
 	 */
 	public static function open($save_path, $session_name)
 	{
-		check_load_extension('memcache',true);	// true = throw exception if not loadable
+		check_load_extension('memcache', true); // true = throw exception if not loadable
 
 		self::$memcache = new Memcache;
-		foreach(explode(',',$save_path) as $path)
+		foreach (explode(',', $save_path) as $path)
 		{
 			$parts = parse_url($path);
-			self::$memcache->addServer($parts['host'],$parts['port']);	// todo parse query
+			self::$memcache->addServer($parts['host'], $parts['port']); // todo parse query
 		}
 		return true;
 	}
@@ -117,9 +117,9 @@ 
 
 		if (!self::_acquire_and_wait($id)) return false;
 
-		for($data='',$n=0; ($read = self::$memcache->get($id.($n?'-'.$n:''))); ++$n)
+		for ($data = '', $n = 0; ($read = self::$memcache->get($id.($n ? '-'.$n : ''))); ++$n)
 		{
-			if (self::DEBUG > 0) error_log("\n memcache ".$_SERVER["REQUEST_TIME"]." read $id:$n:".print_r(self::_bytes($read),true));
+			if (self::DEBUG > 0) error_log("\n memcache ".$_SERVER["REQUEST_TIME"]." read $id:$n:".print_r(self::_bytes($read), true));
 			$data .= $read;
 		}
 		self::_release($id);
@@ -140,7 +140,7 @@ 
 
 		if ($id == 'no-session')
 		{
-			return true;	// no need to save
+			return true; // no need to save
 		}
 		// give anon sessions only a lifetime of 10min
 		if (is_object($GLOBALS['egw']->session) && $GLOBALS['egw']->session->session_flags == 'A' ||
@@ -152,17 +152,17 @@ 
 
 		if (!self::_acquire_and_wait($id)) return false;
 
-		for($n=$i=0,$len=self::_bytes($sess_data); $i < $len; $i += self::MEMCACHED_MAX_JUNK,++$n)
+		for ($n = $i = 0, $len = self::_bytes($sess_data); $i < $len; $i += self::MEMCACHED_MAX_JUNK, ++$n)
 		{
-			if (self::DEBUG > 1) error_log("\n memcache ".$_SERVER["REQUEST_TIME"]." in :$n write $id:$i:".print_r(self::_bytes($sess_data),true));
+			if (self::DEBUG > 1) error_log("\n memcache ".$_SERVER["REQUEST_TIME"]." in :$n write $id:$i:".print_r(self::_bytes($sess_data), true));
 
-			if (!self::$memcache->set($id.($n?'-'.$n:''),self::_cut_bytes($sess_data,$i,self::MEMCACHED_MAX_JUNK),0,$lifetime)) {
+			if (!self::$memcache->set($id.($n ? '-'.$n : ''), self::_cut_bytes($sess_data, $i, self::MEMCACHED_MAX_JUNK), 0, $lifetime)) {
 				self::_release($id);
 				return false;
 			}
 		}
 		if (self::DEBUG > 0) error_log("\n memcache ".$_SERVER["REQUEST_TIME"]." DELETE :$n");
-		for($n=$n; self::$memcache->delete($id.($n?'-'.$n:'')); ++$n) ;
+		for ($n = $n; self::$memcache->delete($id.($n ? '-'.$n : '')); ++$n);
 
 		self::_release($id);
 
@@ -179,26 +179,26 @@ 
 	{
 		if (self::DEBUG > 0) error_log("\n memcache ".$_SERVER["REQUEST_TIME"]." ACQUIRE :$id");
 
-		$i=0;
+		$i = 0;
 		// Acquire lock for 3 seconds, after that i should have done my job
-		while(!self::$memcache->add($id.'-lock',1,0,3))
+		while (!self::$memcache->add($id.'-lock', 1, 0, 3))
 		{
 			if (self::DEBUG > 0) error_log("\n memcache ".$_SERVER["REQUEST_TIME"]." ACQUIRE Lock Loop :$id:$i");
 			usleep(100000);
 			$i++;
 			if ($i > 40)
 			{
-				if (self::DEBUG > 1) error_log("\n memcache ".print_r(getenv('HOSTNAME'),true).$_SERVER["REQUEST_TIME"]." blocked :$id");
+				if (self::DEBUG > 1) error_log("\n memcache ".print_r(getenv('HOSTNAME'), true).$_SERVER["REQUEST_TIME"]." blocked :$id");
 				// Could not acquire lock after 3 seconds, Continue, and pretend the locking process get stuck
 				// return false;A
 				break;
 			}
 		}
-		if($i > 1)
+		if ($i > 1)
 		{
 			if (self::DEBUG > 0) error_log("\n memcache ".$_SERVER["REQUEST_TIME"]." ACQUIRE LOOP $i :$id");
 		}
-		if (self::DEBUG > 0) error_log("\n memcache ".print_r(getenv('HOSTNAME'),true).$_SERVER["REQUEST_TIME"]." Lock ACQUIRED $i:$id");
+		if (self::DEBUG > 0) error_log("\n memcache ".print_r(getenv('HOSTNAME'), true).$_SERVER["REQUEST_TIME"]." Lock ACQUIRED $i:$id");
 
 		return true;
 	}
@@ -224,7 +224,7 @@ 
 	 */
 	private static function _bytes(&$data)
 	{
-		return self::$mbstring_func_overload ? mb_strlen($data,'ascii') : strlen($data);
+		return self::$mbstring_func_overload ? mb_strlen($data, 'ascii') : strlen($data);
 	}
 
 	/**
@@ -235,16 +235,16 @@ 
 	 * @param int $len
 	 * @return string
 	 */
-	private static function _cut_bytes(&$data,$offset,$len=null)
+	private static function _cut_bytes(&$data, $offset, $len = null)
 	{
-		if (self::DEBUG > 1) error_log("\n memcache in cutbyte mb $id:$n:".print_r(mb_substr($data,$offset,$len,'ascii'),true));
-		if (self::DEBUG > 1) error_log("\n memcache in cutbyte norm $id:$n:".print_r(substr($data,$offset,$len),true));
+		if (self::DEBUG > 1) error_log("\n memcache in cutbyte mb $id:$n:".print_r(mb_substr($data, $offset, $len, 'ascii'), true));
+		if (self::DEBUG > 1) error_log("\n memcache in cutbyte norm $id:$n:".print_r(substr($data, $offset, $len), true));
 
 		if (is_null($len))
 		{
-			return self::$mbstring_func_overload ? mb_substr($data,$offset,self::_bytes($data),'ascii') : substr($data,$offset);
+			return self::$mbstring_func_overload ? mb_substr($data, $offset, self::_bytes($data), 'ascii') : substr($data, $offset);
 		}
-		return self::$mbstring_func_overload ? mb_substr($data,$offset,$len,'ascii') : substr($data,$offset,$len);
+		return self::$mbstring_func_overload ? mb_substr($data, $offset, $len, 'ascii') : substr($data, $offset, $len);
 	}
 
 	/**
@@ -257,7 +257,7 @@ 
 	{
 		if (!self::_acquire_and_wait($id)) return false;
 
-		for($n=0; self::$memcache->delete($id.($n?'-'.$n:'')); ++$n)
+		for ($n = 0; self::$memcache->delete($id.($n ? '-'.$n : '')); ++$n)
 		{
 			if (self::DEBUG > 0) error_log("******* memcache destroy  $id:$n:");
 		}
@@ -281,12 +281,12 @@ 
 {
 	$ses = 'egw_session_memcache';
 	$ret = session_set_save_handler(
-		array($ses,'open'),
-		array($ses,'close'),
-		array($ses,'read'),
-		array($ses,'write'),
-		array($ses,'destroy'),
-		array($ses,'gc'));
+		array($ses, 'open'),
+		array($ses, 'close'),
+		array($ses, 'read'),
+		array($ses, 'write'),
+		array($ses, 'destroy'),
+		array($ses, 'gc'));
 	if (!$ret) error_log(__METHOD__.'() session_set_save_handler(...)='.(int)$ret.', session_module_name()='.session_module_name().' *******************************');
 }
 init_session_handler();

Braces +75 added lines, -20 removed lines

@@ -113,13 +113,22 @@ 
 	 */
 	public static function read($id)
 	{
-		if (self::DEBUG > 0) error_log("\n memcache ".$_SERVER["REQUEST_TIME"]." READ start $id:");
+		if (self::DEBUG > 0)
+		{
+			error_log("\n memcache ".$_SERVER["REQUEST_TIME"]." READ start $id:");
+		}
 
-		if (!self::_acquire_and_wait($id)) return false;
+		if (!self::_acquire_and_wait($id))
+		{
+			return false;
+		}
 
 		for($data='',$n=0; ($read = self::$memcache->get($id.($n?'-'.$n:''))); ++$n)
 		{
-			if (self::DEBUG > 0) error_log("\n memcache ".$_SERVER["REQUEST_TIME"]." read $id:$n:".print_r(self::_bytes($read),true));
+			if (self::DEBUG > 0)
+			{
+				error_log("\n memcache ".$_SERVER["REQUEST_TIME"]." read $id:$n:".print_r(self::_bytes($read),true));
+			}
 			$data .= $read;
 		}
 		self::_release($id);
@@ -148,20 +157,33 @@ 
 		{
 			$lifetime = 600;
 		}
-		if (self::DEBUG > 0) error_log("\n memcache ".$_SERVER["REQUEST_TIME"]." WRITE start $id:");
+		if (self::DEBUG > 0)
+		{
+			error_log("\n memcache ".$_SERVER["REQUEST_TIME"]." WRITE start $id:");
+		}
 
-		if (!self::_acquire_and_wait($id)) return false;
+		if (!self::_acquire_and_wait($id))
+		{
+			return false;
+		}
 
 		for($n=$i=0,$len=self::_bytes($sess_data); $i < $len; $i += self::MEMCACHED_MAX_JUNK,++$n)
 		{
-			if (self::DEBUG > 1) error_log("\n memcache ".$_SERVER["REQUEST_TIME"]." in :$n write $id:$i:".print_r(self::_bytes($sess_data),true));
+			if (self::DEBUG > 1)
+			{
+				error_log("\n memcache ".$_SERVER["REQUEST_TIME"]." in :$n write $id:$i:".print_r(self::_bytes($sess_data),true));
+			}
 
-			if (!self::$memcache->set($id.($n?'-'.$n:''),self::_cut_bytes($sess_data,$i,self::MEMCACHED_MAX_JUNK),0,$lifetime)) {
+			if (!self::$memcache->set($id.($n?'-'.$n:''),self::_cut_bytes($sess_data,$i,self::MEMCACHED_MAX_JUNK),0,$lifetime))
+			{
 				self::_release($id);
 				return false;
 			}
 		}
-		if (self::DEBUG > 0) error_log("\n memcache ".$_SERVER["REQUEST_TIME"]." DELETE :$n");
+		if (self::DEBUG > 0)
+		{
+			error_log("\n memcache ".$_SERVER["REQUEST_TIME"]." DELETE :$n");
+		}
 		for($n=$n; self::$memcache->delete($id.($n?'-'.$n:'')); ++$n) ;
 
 		self::_release($id);
@@ -177,18 +199,27 @@ 
 	 */
 	private static function _acquire_and_wait($id)
 	{
-		if (self::DEBUG > 0) error_log("\n memcache ".$_SERVER["REQUEST_TIME"]." ACQUIRE :$id");
+		if (self::DEBUG > 0)
+		{
+			error_log("\n memcache ".$_SERVER["REQUEST_TIME"]." ACQUIRE :$id");
+		}
 
 		$i=0;
 		// Acquire lock for 3 seconds, after that i should have done my job
 		while(!self::$memcache->add($id.'-lock',1,0,3))
 		{
-			if (self::DEBUG > 0) error_log("\n memcache ".$_SERVER["REQUEST_TIME"]." ACQUIRE Lock Loop :$id:$i");
+			if (self::DEBUG > 0)
+			{
+				error_log("\n memcache ".$_SERVER["REQUEST_TIME"]." ACQUIRE Lock Loop :$id:$i");
+			}
 			usleep(100000);
 			$i++;
 			if ($i > 40)
 			{
-				if (self::DEBUG > 1) error_log("\n memcache ".print_r(getenv('HOSTNAME'),true).$_SERVER["REQUEST_TIME"]." blocked :$id");
+				if (self::DEBUG > 1)
+				{
+					error_log("\n memcache ".print_r(getenv('HOSTNAME'),true).$_SERVER["REQUEST_TIME"]." blocked :$id");
+				}
 				// Could not acquire lock after 3 seconds, Continue, and pretend the locking process get stuck
 				// return false;A
 				break;
@@ -196,9 +227,15 @@ 
 		}
 		if($i > 1)
 		{
-			if (self::DEBUG > 0) error_log("\n memcache ".$_SERVER["REQUEST_TIME"]." ACQUIRE LOOP $i :$id");
+			if (self::DEBUG > 0)
+			{
+				error_log("\n memcache ".$_SERVER["REQUEST_TIME"]." ACQUIRE LOOP $i :$id");
+			}
+		}
+		if (self::DEBUG > 0)
+		{
+			error_log("\n memcache ".print_r(getenv('HOSTNAME'),true).$_SERVER["REQUEST_TIME"]." Lock ACQUIRED $i:$id");
 		}
-		if (self::DEBUG > 0) error_log("\n memcache ".print_r(getenv('HOSTNAME'),true).$_SERVER["REQUEST_TIME"]." Lock ACQUIRED $i:$id");
 
 		return true;
 	}
@@ -211,7 +248,10 @@ 
 	 */
 	private static function _release($id)
 	{
-		if (self::DEBUG > 0) error_log("\n memcache ".$_SERVER["REQUEST_TIME"]." RELEASE :$id");
+		if (self::DEBUG > 0)
+		{
+			error_log("\n memcache ".$_SERVER["REQUEST_TIME"]." RELEASE :$id");
+		}
 
 		return self::$memcache->delete($id.'-lock');
 	}
@@ -237,8 +277,14 @@ 
 	 */
 	private static function _cut_bytes(&$data,$offset,$len=null)
 	{
-		if (self::DEBUG > 1) error_log("\n memcache in cutbyte mb $id:$n:".print_r(mb_substr($data,$offset,$len,'ascii'),true));
-		if (self::DEBUG > 1) error_log("\n memcache in cutbyte norm $id:$n:".print_r(substr($data,$offset,$len),true));
+		if (self::DEBUG > 1)
+		{
+			error_log("\n memcache in cutbyte mb $id:$n:".print_r(mb_substr($data,$offset,$len,'ascii'),true));
+		}
+		if (self::DEBUG > 1)
+		{
+			error_log("\n memcache in cutbyte norm $id:$n:".print_r(substr($data,$offset,$len),true));
+		}
 
 		if (is_null($len))
 		{
@@ -255,11 +301,17 @@ 
 	 */
 	public static function destroy($id)
 	{
-		if (!self::_acquire_and_wait($id)) return false;
+		if (!self::_acquire_and_wait($id))
+		{
+			return false;
+		}
 
 		for($n=0; self::$memcache->delete($id.($n?'-'.$n:'')); ++$n)
 		{
-			if (self::DEBUG > 0) error_log("******* memcache destroy  $id:$n:");
+			if (self::DEBUG > 0)
+			{
+				error_log("******* memcache destroy  $id:$n:");
+			}
 		}
 		self::_release($id);
 
@@ -287,6 +339,9 @@ 
 		array($ses,'write'),
 		array($ses,'destroy'),
 		array($ses,'gc'));
-	if (!$ret) error_log(__METHOD__.'() session_set_save_handler(...)='.(int)$ret.', session_module_name()='.session_module_name().' *******************************');
-}
+	if (!$ret)
+	{
+		error_log(__METHOD__.'() session_set_save_handler(...)='.(int)$ret.', session_module_name()='.session_module_name().' *******************************');
+	}
+	}
 init_session_handler();

phpgwapi/inc/class.egw_sharing.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -98,7 +98,6 @@ 
 	/**
 	 * Protected constructor called via self::create_session
 	 *
-	 * @param string $token
 	 * @param array $share
 	 */
 	protected function __construct(array $share)
@@ -109,6 +108,7 @@ 
 
 	/**
 	 * Get token from url
+	 * @return string
 	 */
 	public static function get_token()
 	{

Indentation +13 added lines, -13 removed lines

@@ -72,10 +72,10 @@ 
 	const WRITABLE = 'share_rw';
 
  	/**
-	 * Modes for sharing files
-	 *
-	 * @var array
-	 */
+ 	 * Modes for sharing files
+ 	 *
+ 	 * @var array
+ 	 */
 	static $modes = array(
 		self::ATTACH => array(
 			'label' => 'Attachment',
@@ -112,16 +112,16 @@ 
 	 */
 	public static function get_token()
 	{
-        // WebDAV has no concept of a query string and clients (including cadaver)
-        // seem to pass '?' unencoded, so we need to extract the path info out
-        // of the request URI ourselves
-        // if request URI contains a full url, remove schema and domain
+		// WebDAV has no concept of a query string and clients (including cadaver)
+		// seem to pass '?' unencoded, so we need to extract the path info out
+		// of the request URI ourselves
+		// if request URI contains a full url, remove schema and domain
 		$matches = null;
-        if (preg_match('|^https?://[^/]+(/.*)$|', $path_info=$_SERVER['REQUEST_URI'], $matches))
-        {
-        	$path_info = $matches[1];
-        }
-        $path_info = substr($path_info, strlen($_SERVER['SCRIPT_NAME']));
+		if (preg_match('|^https?://[^/]+(/.*)$|', $path_info=$_SERVER['REQUEST_URI'], $matches))
+		{
+			$path_info = $matches[1];
+		}
+		$path_info = substr($path_info, strlen($_SERVER['SCRIPT_NAME']));
 		list(, $token/*, $path*/) = preg_split('|[/?]|', $path_info, 3);
 
 		return $token;

Spacing +26 added lines, -27 removed lines

@@ -103,7 +103,7 @@ 
         // of the request URI ourselves
         // if request URI contains a full url, remove schema and domain
 		$matches = null;
-        if (preg_match('|^https?://[^/]+(/.*)$|', $path_info=$_SERVER['REQUEST_URI'], $matches))
+        if (preg_match('|^https?://[^/]+(/.*)$|', $path_info = $_SERVER['REQUEST_URI'], $matches))
         {
         	$path_info = $matches[1];
         }
@@ -141,7 +141,7 @@ 
 	 * @param boolean $keep_session =null null: create a new session, true: try mounting it into existing (already verified) session
 	 * @return string with sessionid, does NOT return if no session created
 	 */
-	public static function create_session($keep_session=null)
+	public static function create_session($keep_session = null)
 	{
 		self::$db = $GLOBALS['egw']->db;
 
@@ -194,11 +194,11 @@ 
 		// need to reset fs_tab, as resolve_url does NOT work with just share mounted
 		if (count($GLOBALS['egw_info']['server']['vfs_fstab']) <= 1)
 		{
-			unset($GLOBALS['egw_info']['server']['vfs_fstab']);	// triggers reset of fstab in mount()
+			unset($GLOBALS['egw_info']['server']['vfs_fstab']); // triggers reset of fstab in mount()
 			$GLOBALS['egw_info']['server']['vfs_fstab'] = egw_vfs::mount();
 			egw_vfs::clearstatcache();
 		}
-		$share['resolve_url'] = egw_vfs::resolve_url($share['share_path'], true, true, true, true);	// true = fix evtl. contained url parameter
+		$share['resolve_url'] = egw_vfs::resolve_url($share['share_path'], true, true, true, true); // true = fix evtl. contained url parameter
 		// if share not writable append ro=1 to mount url to make it readonly
 		if (!self::$db->from_bool($share['share_writable']))
 		{
@@ -243,7 +243,7 @@ 
 
 		// update accessed timestamp
 		self::$db->update(self::TABLE, array(
-			'share_last_accessed' => $share['share_last_accessed']=time(),
+			'share_last_accessed' => $share['share_last_accessed'] = time(),
 		), array(
 			'share_id' => $share['share_id'],
 		), __LINE__, __FILE__);
@@ -285,7 +285,7 @@ 
 		if ($keep_session || $sessionid)
 		{
 			$_SESSION[egw_session::EGW_INFO_CACHE] = $GLOBALS['egw_info'];
-			unset($_SESSION[egw_session::EGW_INFO_CACHE]['flags']);	// dont save the flags, they change on each request
+			unset($_SESSION[egw_session::EGW_INFO_CACHE]['flags']); // dont save the flags, they change on each request
 
 			$_SESSION[egw_session::EGW_OBJECT_CACHE] = serialize($GLOBALS['egw']);
 		}
@@ -354,8 +354,7 @@ 
 		// generate random token (using oppenssl if available otherwise mt_rand based auth::randomstring)
 		do {
 			$token = function_exists('openssl_random_pseudo_bytes') ?
-				base64_encode(openssl_random_pseudo_bytes(3*self::TOKEN_LENGTH/4)) :
-				auth::randomstring(self::TOKEN_LENGTH);
+				base64_encode(openssl_random_pseudo_bytes(3 * self::TOKEN_LENGTH / 4)) : auth::randomstring(self::TOKEN_LENGTH);
 			// base64 can contain chars not allowed in our vfs-urls eg. / or #
 		} while ($token != egw_vfs::encodePathComponent($token));
 
@@ -375,13 +374,13 @@ 
 	 * @throw egw_excpetion_assertion_failed if user temp. directory does not exist and can not be created
 	 * @return array with share data, eg. value for key 'share_token'
 	 */
-	public static function create($path, $mode, $name, $recipients, $extra=array())
+	public static function create($path, $mode, $name, $recipients, $extra = array())
 	{
 		if (!isset(self::$db)) self::$db = $GLOBALS['egw']->db;
 
 		if (empty($name)) $name = $path;
 
-		$path2tmp =& egw_cache::getSession(__CLASS__, 'path2tmp');
+		$path2tmp = & egw_cache::getSession(__CLASS__, 'path2tmp');
 
 		// allow filesystem path only for temp_dir
 		$temp_dir = $GLOBALS['egw_info']['server']['temp_dir'].'/';
@@ -392,7 +391,7 @@ 
 		}
 		else
 		{
-			if(parse_url($path, PHP_URL_SCHEME) !== 'vfs')
+			if (parse_url($path, PHP_URL_SCHEME) !== 'vfs')
 			{
 				$path = 'vfs://default'.($path[0] == '/' ? '' : '/').$path;
 			}
@@ -406,7 +405,7 @@ 
 		}
 		// check if file has been shared before, with identical attributes
 		if (($mode != self::LINK || isset($path2tmp[$path])) &&
-			($share = self::$db->select(self::TABLE, '*', $extra+array(
+			($share = self::$db->select(self::TABLE, '*', $extra + array(
 				'share_path' => $mode == 'link' ? $path2tmp[$path] : $vfs_path,
 				'share_owner' => $GLOBALS['egw_info']['user']['account_id'],
 				'share_expires' => null,
@@ -417,7 +416,7 @@ 
 			// if yes, just add additional recipients
 			$share['share_with'] = $share['share_with'] ? explode(',', $share['share_with']) : array();
 			$need_save = false;
-			foreach((array)$recipients as $recipient)
+			foreach ((array)$recipients as $recipient)
 			{
 				if (!in_array($recipient, $share['share_with']))
 				{
@@ -447,9 +446,9 @@ 
 				}
 				$n = 0;
 				do {
-					$tmp_file = egw_vfs::concat($user_tmp, ($n?$n.'.':'').egw_vfs::basename($name));
+					$tmp_file = egw_vfs::concat($user_tmp, ($n ? $n.'.' : '').egw_vfs::basename($name));
 				}
-				while(!(is_dir($path) && egw_vfs::mkdir($tmp_file, null, STREAM_MKDIR_RECURSIVE) ||
+				while (!(is_dir($path) && egw_vfs::mkdir($tmp_file, null, STREAM_MKDIR_RECURSIVE) ||
 					!is_dir($path) && (!egw_vfs::file_exists($tmp_file) && ($fp = egw_vfs::fopen($tmp_file, 'x')) ||
 						// do not copy identical files again to users tmp dir, just re-use them
 						egw_vfs::file_exists($tmp_file) && egw_vfs::compare(egw_vfs::PREFIX.$tmp_file, $path))) && $n++ < 100);
@@ -474,12 +473,12 @@ 
 				$async = new asyncservice();
 				if (!$async->read('egw_sharing-tmp-cleanup'))
 				{
-					$async->set_timer(array('day' => 28),'egw_sharing-tmp_cleanup','egw_sharing::tmp_cleanup',null);
+					$async->set_timer(array('day' => 28), 'egw_sharing-tmp_cleanup', 'egw_sharing::tmp_cleanup', null);
 				}
 			}
 
 			$i = 0;
-			while(true)	// self::token() can return an existing value
+			while (true)	// self::token() can return an existing value
 			{
 				try {
 					self::$db->insert(self::TABLE, $share = array(
@@ -488,12 +487,12 @@ 
 						'share_owner' => $GLOBALS['egw_info']['user']['account_id'],
 						'share_with' => implode(',', (array)$recipients),
 						'share_created' => time(),
-					)+$extra, false, __LINE__, __FILE__);
+					) + $extra, false, __LINE__, __FILE__);
 
 					$share['share_id'] = self::$db->get_last_insert_id(self::TABLE, 'share_id');
 					break;
 				}
-				catch(egw_exception_db $e) {
+				catch (egw_exception_db $e) {
 					if ($i++ > 3) throw $e;
 					unset($e);
 				}
@@ -536,8 +535,8 @@ 
 
 		// get all temp. files, to be able to delete them
 		$tmp_paths = array();
-		foreach(self::$db->select(self::TABLE, 'share_path', array(
-			"share_path LIKE '/home/%/.tmp/%'")+$keys, __LINE__, __FILE__, false) as $row)
+		foreach (self::$db->select(self::TABLE, 'share_path', array(
+			"share_path LIKE '/home/%/.tmp/%'") + $keys, __LINE__, __FILE__, false) as $row)
 		{
 			$tmp_paths[] = $row['share_path'];
 		}
@@ -549,7 +548,7 @@ 
 		// check if temp. files are used elsewhere
 		if ($tmp_paths)
 		{
-			foreach(self::$db->select(self::TABLE, 'share_path,COUNT(*) AS cnt', array(
+			foreach (self::$db->select(self::TABLE, 'share_path,COUNT(*) AS cnt', array(
 				'share_path' => $tmp_paths,
 			), __LINE__, __FILE__, false, 'GROUP BY share_path') as $row)
 			{
@@ -559,7 +558,7 @@ 
 				}
 			}
 			// if not delete them
-			foreach($tmp_paths as $path)
+			foreach ($tmp_paths as $path)
 			{
 				egw_vfs::remove($path);
 			}
@@ -593,11 +592,11 @@ 
 			// remove expired tmp-files unconditionally
 			$having = 'HAVING share_expires < '.self::$db->quote(self::$db->to_timestamp(time())).' OR '.
 				// remove without expiration date, when created over 100 days ago AND
-				'share_expires IS NULL AND share_created < '.self::$db->quote(self::$db->to_timestamp(time()-self::TMP_KEEP)). ' AND '.
+				'share_expires IS NULL AND share_created < '.self::$db->quote(self::$db->to_timestamp(time() - self::TMP_KEEP)).' AND '.
 					// (last accessed over 100 days ago OR never)
-					'(share_last_accessed IS NULL OR share_last_accessed < '.self::$db->quote(self::$db->to_timestamp(time()-self::TMP_KEEP)).')';
+					'(share_last_accessed IS NULL OR share_last_accessed < '.self::$db->quote(self::$db->to_timestamp(time() - self::TMP_KEEP)).')';
 
-			foreach(self::$db->select(self::TABLE, $cols, array(
+			foreach (self::$db->select(self::TABLE, $cols, array(
 				"share_path LIKE '/home/%/.tmp/%'",
 			), __LINE__, __FILE__, false, 'GROUP BY share_path '.$having) as $row)
 			{
@@ -610,7 +609,7 @@ 
 				else
 				{
 					$share_ids = array();
-					foreach(self::$db->selec(self::TABLE, 'share_id', array(
+					foreach (self::$db->selec(self::TABLE, 'share_id', array(
 						'share_path' => $row['share_path'],
 					), __LINE__, __FILE__) as $id)
 					{

Braces +48 added lines, -12 removed lines

@@ -166,7 +166,10 @@ 
 		if ($token && !$keep_session)
 		{
 			$_SERVER['PHP_AUTH_USER'] = $token;
-			if (!isset($_SERVER['PHP_AUTH_PW'])) $_SERVER['PHP_AUTH_PW'] = '';
+			if (!isset($_SERVER['PHP_AUTH_PW']))
+			{
+				$_SERVER['PHP_AUTH_PW'] = '';
+			}
 
 			unset($GLOBALS['egw_info']['flags']['autocreate_session_callback']);
 			if ($GLOBALS['egw']->session->verify() && isset($GLOBALS['egw']->sharing) &&
@@ -220,9 +223,12 @@ 
 		}
 		//_debug_array($share);
 
-		if ($keep_session)	// add share to existing session
+		if ($keep_session)
+		{
+			// add share to existing session
 		{
 			$share['share_root'] = '/'.$share['share_token'];
+		}
 
 			// if current user is not the share owner, we cant just mount share
 			if (Vfs::$user != $share['share_owner'])
@@ -230,12 +236,15 @@ 
 				$keep_session = false;
 			}
 		}
-		if (!$keep_session)	// do NOT change to else, as we might have set $keep_session=false!
+		if (!$keep_session)
+		{
+			// do NOT change to else, as we might have set $keep_session=false!
 		{
 			// only allow filemanager app
 			$GLOBALS['egw_info']['user']['apps'] = array(
 				'filemanager' => $GLOBALS['egw_info']['apps']['filemanager']
 			);
+		}
 
 			$share['share_root'] = '/';
 			Vfs::$user = $share['share_owner'];
@@ -391,9 +400,15 @@ 
 	 */
 	public static function create($path, $mode, $name, $recipients, $extra=array())
 	{
-		if (!isset(self::$db)) self::$db = $GLOBALS['egw']->db;
+		if (!isset(self::$db))
+		{
+			self::$db = $GLOBALS['egw']->db;
+		}
 
-		if (empty($name)) $name = $path;
+		if (empty($name))
+		{
+			$name = $path;
+		}
 
 		$path2tmp =& Api\Cache::getSession(__CLASS__, 'path2tmp');
 
@@ -472,7 +487,10 @@ 
 				{
 					throw new Api\Exception\AssertionFailed("Could NOT create temp. file '$tmp_file'!");
 				}
-				if ($fp) fclose($fp);
+				if ($fp)
+				{
+					fclose($fp);
+				}
 
 				if (is_dir($path) && !Vfs::copy_files(array($path), $tmp_file) ||
 					!is_dir($path) && !copy($path, Vfs::PREFIX.$tmp_file))
@@ -493,7 +511,9 @@ 
 			}
 
 			$i = 0;
-			while(true)	// self::token() can return an existing value
+			while(true)
+			{
+				// self::token() can return an existing value
 			{
 				try {
 					self::$db->insert(self::TABLE, $share = array(
@@ -503,12 +523,16 @@ 
 						'share_with' => implode(',', (array)$recipients),
 						'share_created' => time(),
 					)+$extra, false, __LINE__, __FILE__);
+			}
 
 					$share['share_id'] = self::$db->get_last_insert_id(self::TABLE, 'share_id');
 					break;
 				}
 				catch(Api\Db\Exception $e) {
-					if ($i++ > 3) throw $e;
+					if ($i++ > 3)
+					{
+						throw $e;
+					}
 					unset($e);
 				}
 			}
@@ -546,7 +570,10 @@ 
 	{
 		self::$db = $GLOBALS['egw']->db;
 
-		if (is_scalar($keys)) $keys = array('share_id' => $keys);
+		if (is_scalar($keys))
+		{
+			$keys = array('share_id' => $keys);
+		}
 
 		// get all temp. files, to be able to delete them
 		$tmp_paths = array();
@@ -593,7 +620,10 @@ 
 	 */
 	public static function tmp_cleanup()
 	{
-		if (!isset(self::$db)) self::$db = $GLOBALS['egw']->db;
+		if (!isset(self::$db))
+		{
+			self::$db = $GLOBALS['egw']->db;
+		}
 		Vfs::$is_root = true;
 
 		try {
@@ -603,7 +633,10 @@ 
 				'MAX(share_created) AS share_created',
 				'MAX(share_last_accessed) AS share_last_accessed',
 			);
-			if (($group_concat = self::$db->group_concat('share_id'))) $cols[] = $group_concat.' AS share_id';
+			if (($group_concat = self::$db->group_concat('share_id')))
+			{
+				$cols[] = $group_concat.' AS share_id';
+			}
 			// remove expired tmp-files unconditionally
 			$having = 'HAVING share_expires < '.self::$db->quote(self::$db->to_timestamp(time())).' OR '.
 				// remove without expiration date, when created over 100 days ago AND
@@ -651,7 +684,10 @@ 
 	 */
 	public static function share2link($share)
 	{
-		if (is_array($share)) $share = $share['share_token'];
+		if (is_array($share))
+		{
+			$share = $share['share_token'];
+		}
 
 		$link = Api\Framework::link('/share.php').'/'.$share;
 		if ($link[0] == '/')

phpgwapi/inc/class.egw_tail.inc.php

Doc Comments +4 added lines, -4 removed lines

@@ -62,7 +62,7 @@ 
 	/**
 	 * Constructor
 	 *
-	 * @param string $filename=null if not starting with as slash relative to EGw files dir (this is strongly prefered for security reasons)
+	 * @param string $filename if not starting with as slash relative to EGw files dir (this is strongly prefered for security reasons)
 	 */
 	public function __construct($filename=null)
 	{
@@ -80,7 +80,7 @@ 
 	 * Ajax callback to load next chunk of log-file
 	 *
 	 * @param string $filename
-	 * @param int $start=0 last position in log-file
+	 * @param int $start last position in log-file
 	 * @throws egw_exception_wrong_parameter
 	 */
 	public function ajax_chunk($filename,$start=0)
@@ -124,7 +124,7 @@ 
 	 * Ajax callback to delete log-file
 	 *
 	 * @param string $filename
-	 * @param boolean $truncate=false true: truncate file, false: delete file
+	 * @param boolean $truncate true: truncate file, false: delete file
 	 * @throws egw_exception_wrong_parameter
 	 */
 	public function ajax_delete($filename,$truncate=false)
@@ -147,7 +147,7 @@ 
 	/**
 	 * Return html & javascript for logviewer
 	 *
-	 * @param string $header=null default $this->filename
+	 * @param string $header default $this->filename
 	 * @return string
 	 * @throws egw_exception_wrong_parameter
 	 */

Spacing +18 added lines, -18 removed lines

@@ -64,15 +64,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 =& egw_cache::getSession('phpgwapi', __CLASS__);
+		$this->filenames = & egw_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;
 		}
 	}
 
@@ -83,9 +83,9 @@ 
 	 * @param int $start=0 last position in log-file
 	 * @throws egw_exception_wrong_parameter
 	 */
-	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 egw_exception_wrong_parameter("Not allowed to view '$filename'!");
 		}
@@ -94,9 +94,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;
 			}
 			$size = egw_vfs::hsize($size);
@@ -127,9 +127,9 @@ 
 	 * @param boolean $truncate=false true: truncate file, false: delete file
 	 * @throws egw_exception_wrong_parameter
 	 */
-	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 egw_exception_wrong_parameter("Not allowed to view '$filename'!");
 		}
@@ -151,7 +151,7 @@ 
 	 * @return string
 	 * @throws egw_exception_wrong_parameter
 	 */
-	public function show($header=null)
+	public function show($header = null)
 	{
 		if (!isset($this->filename))
 		{
@@ -163,11 +163,11 @@ 
 <p style="float: left; margin: 5px"><b>'.htmlspecialchars($header).'</b></p>
 <div style="float: right; margin: 2px; margin-right: 5px">
 	'.html::form(
-		html::input('clear_log',lang('Clear window'),'button','id="clear_log"')."\n".
-		html::input('delete_log',lang('Delete file'),'button','id="purge_log"')."\n".
-		html::input('empty_log',lang('Empty file'),'button','id="empty_log"')."\n".
-		html::input('download_log',lang('Download'),'submit','id="download_log"'),
-		'','/index.php',array(
+		html::input('clear_log', lang('Clear window'), 'button', 'id="clear_log"')."\n".
+		html::input('delete_log', lang('Delete file'), 'button', 'id="purge_log"')."\n".
+		html::input('empty_log', lang('Empty file'), 'button', 'id="empty_log"')."\n".
+		html::input('download_log', lang('Download'), 'submit', 'id="download_log"'),
+		'', '/index.php', array(
 		'menuaction' => 'phpgwapi.egw_tail.download',
 		'filename' => $this->filename,
 	)).'
@@ -183,13 +183,13 @@ 
 	public function download()
 	{
 		$filename = $_GET['filename'];
-		if (!in_array($filename,$this->filenames))
+		if (!in_array($filename, $this->filenames))
 		{
 			throw new egw_exception_wrong_parameter("Not allowed to download '$filename'!");
 		}
-		html::content_header(basename($filename),'text/plain');
+		html::content_header(basename($filename), 'text/plain');
 		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
+		for ($n = ob_get_level(); $n > 0; --$n) ob_end_clean(); // stop all output buffering, to NOT run into memory_limit
 		readfile($filename);
 		common::egw_exit();
 	}

Braces +29 added lines, -7 removed lines

@@ -72,7 +72,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;
+			}
 		}
 	}
 
@@ -89,7 +92,10 @@ 
 		{
 			throw new egw_exception_wrong_parameter("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))
 		{
@@ -97,7 +103,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;
+				}
 			}
 			$size = egw_vfs::hsize($size);
 			$content = file_get_contents($filename, false, null, $start, self::MAX_CHUNK_SIZE);
@@ -133,7 +142,10 @@ 
 		{
 			throw new egw_exception_wrong_parameter("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, '');
@@ -157,7 +169,10 @@ 
 		{
 			throw new egw_exception_wrong_parameter("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>
@@ -188,8 +203,15 @@ 
 			throw new egw_exception_wrong_parameter("Not allowed to download '$filename'!");
 		}
 		html::content_header(basename($filename),'text/plain');
-		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
+		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
 		readfile($filename);
 		common::egw_exit();
 	}

phpgwapi/inc/class.egw_time.inc.php

Doc Comments +6 added lines, -10 removed lines

@@ -76,10 +76,8 @@ 
 	/**
 	 * Constructor
 	 *
-	 * @param int|string|array|DateTime $time='now' integer timestamp, string with date+time, DateTime object or
-	 * 	array with values for keys('year','month','day') or 'full' plus 'hour','minute' and optional 'second'
-	 * @param DateTimeZone $tz=null timezone, default user time (PHP DateTime default to server time!)
 	 * @param string &$type=null on return type of $time (optional)
+	 * @param string $type
 	 * @throws Exception if $time can NOT be parsed
 	 * @return egw_time
 	 */
@@ -164,7 +162,7 @@ 
 	/**
 	 * Like DateTime::add, but additional allow to use a string run through DateInterval::createFromDateString
 	 *
-	 * @param DateInterval|string $interval eg. '1 day', '-2 weeks'
+	 * @param string $interval eg. '1 day', '-2 weeks'
 	 */
 	public function add($interval)
 	{
@@ -384,7 +382,7 @@ 
 	 * Convert a server time into a user time
 	 *
 	 * @param int|string|array|DateTime $time
-	 * @param string $type=null type or return-value, default (null) same as $time
+	 * @param string $type
 	 * @return int|string|array|datetime null if time could not be parsed
 	 */
 	public static function server2user($time,$type=null)
@@ -413,8 +411,8 @@ 
 	 * Convert a user time into a server time
 	 *
 	 * @param int|string|array|datetime $time
-	 * @param string $type=null type or return-value, default (null) same as $time
-	 * @return int|string|array|datetime null if time could not be parsed
+	 * @param string $type
+	 * @return integer|null null if time could not be parsed
 	 */
 	public static function user2server($time,$type=null)
 	{
@@ -441,7 +439,6 @@ 
 	/**
 	 * Convert time to a specific format or string, static version of egw_time::format()
 	 *
-	 * @param int|string|array|DateTime $time='now' see constructor
 	 * @param string $type='' 'integer'|'ts'=timestamp, 'server'=timestamp in servertime, 'string'='Y-m-d H:i:s', 'object'=DateTime,
 	 * 		'array'=array with values for keys ('year','month','day','hour','minute','second','full','raw') or string with format
 	 * 		true = date only, false = time only as in user prefs, '' = date+time as in user prefs
@@ -507,7 +504,6 @@ 
 	 *
 	 * Compatibility method for old code. It is only valid for the given time, because of possible daylight saving changes!
 	 *
-	 * @param int|string|DateTime $time='now'
 	 * @return int difference in seconds between user and server time (for the given time!)
 	 */
 	public static function tz_offset_s($time='now')
@@ -558,7 +554,7 @@ 
 	 * - return UTC and oceans at the end
 	 * - if (user lang is a european language), move Europe to top
 	 *
-	 * @return array continent|ocean => array(tz-name => tz-label incl. current time)
+	 * @return string continent|ocean => array(tz-name => tz-label incl. current time)
 	 */
 	public static function getTimezones()
 	{

Spacing +76 added lines, -76 removed lines

@@ -83,11 +83,11 @@ 
 	 * @throws Exception if $time can NOT be parsed
 	 * @return egw_time
 	 */
-	public function __construct($time='now',DateTimeZone $tz=null,&$type=null)
+	public function __construct($time = 'now', DateTimeZone $tz = null, &$type = null)
 	{
-		if (is_null($tz)) $tz = self::$user_timezone;	// default user timezone
+		if (is_null($tz)) $tz = self::$user_timezone; // default user timezone
 
-		switch(($type = gettype($time)))
+		switch (($type = gettype($time)))
 		{
 			case 'NULL':
 			case 'boolean':	// depricated use in calendar for 'now'
@@ -98,13 +98,13 @@ 
 				if (!(is_numeric($time) && ($time > 21000000 || $time < 19000000)))
 				{
 					$t_str = $time;
-					if (is_numeric($time) && strlen($time) == 8) $t_str .= 'T000000';	// 'Ymd' string used in calendar to represent a date
+					if (is_numeric($time) && strlen($time) == 8) $t_str .= 'T000000'; // 'Ymd' string used in calendar to represent a date
 					// $time ending in a Z (Zulu or UTC time), is unterstood by DateTime class itself
 					try {
-						parent::__construct($t_str,$tz);
+						parent::__construct($t_str, $tz);
 						break;
 					}
-					catch(Exception $e) {
+					catch (Exception $e) {
 						// if string is nummeric, ignore the exception and treat string as timestamp
 						if (!is_numeric($time)) throw $e;
 					}
@@ -121,12 +121,12 @@ 
 				}
 				else*/
 				{
-					parent::__construct(date('Y-m-d H:i:s',$time),$tz);
+					parent::__construct(date('Y-m-d H:i:s', $time), $tz);
 				}
 				break;
 
 			case 'array':
-				parent::__construct('now',$tz);
+				parent::__construct('now', $tz);
 				if (isset($time['Y']))	// array format used in eTemplate
 				{
 					$time = array(
@@ -140,18 +140,18 @@ 
 				}
 				if (!empty($time['full']) && empty($time['year']))
 				{
-					$time['year']  = (int)substr($time['full'],0,4);
-					$time['month'] = (int)substr($time['full'],4,2);
-					$time['day']   = (int)substr($time['full'],6,2);
+					$time['year']  = (int)substr($time['full'], 0, 4);
+					$time['month'] = (int)substr($time['full'], 4, 2);
+					$time['day']   = (int)substr($time['full'], 6, 2);
 				}
-				if (isset($time['year'])) $this->setDate((int)$time['year'],(int)$time['month'],isset($time['day']) ? (int)$time['day'] : (int)$time['mday']);
-				$this->setTime((int)$time['hour'],(int)$time['minute'],(int)$time['second']);
+				if (isset($time['year'])) $this->setDate((int)$time['year'], (int)$time['month'], isset($time['day']) ? (int)$time['day'] : (int)$time['mday']);
+				$this->setTime((int)$time['hour'], (int)$time['minute'], (int)$time['second']);
 				break;
 
 			case 'object':
 				if ($time instanceof DateTime)
 				{
-					parent::__construct($time->format('Y-m-d H:i:s'),$time->getTimezone());
+					parent::__construct($time->format('Y-m-d H:i:s'), $time->getTimezone());
 					$this->setTimezone($tz);
 					break;
 				}
@@ -178,18 +178,18 @@ 
 	 */
 	public function setWeekstart()
 	{
-		$wday = (int) $this->format('w'); // 0=sun, ..., 6=sat
-		switch($GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts'])
+		$wday = (int)$this->format('w'); // 0=sun, ..., 6=sat
+		switch ($GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts'])
 		{
 			case 'Sunday':
 				$wstart = -$wday;
 				break;
 			case 'Saturday':
-				$wstart =  -(6-$wday);
+				$wstart = -(6 - $wday);
 				break;
 			case 'Moday':
 			default:
-				$wstart = -($wday ? $wday-1 : 6);
+				$wstart = -($wday ? $wday - 1 : 6);
 				break;
 		}
 		if ($wstart) $this->add($wstart.'days');
@@ -205,7 +205,7 @@ 
 	 * @param array $filters $name => list($syear,$smonth,$sday,$sweek,$eyear,$emonth,$eday,$eweek) pairs with offsets
 	 * @return string
 	 */
-	public static function sql_filter($name, &$start, &$end, $column, array $filters=array())
+	public static function sql_filter($name, &$start, &$end, $column, array $filters = array())
 	{
 		if ($name == 'custom' && $start)
 		{
@@ -235,26 +235,26 @@ 
 			$end   = new egw_time('now');
 			$end->setTime(0, 0, 0);
 
-			$year  = (int) $start->format('Y');
-			$month = (int) $start->format('m');
+			$year  = (int)$start->format('Y');
+			$month = (int)$start->format('m');
 
-			list($syear,$smonth,$sday,$sweek,$eyear,$emonth,$eday,$eweek) = $filters[$name];
+			list($syear, $smonth, $sday, $sweek, $eyear, $emonth, $eday, $eweek) = $filters[$name];
 
 			// Handle quarters
-			if(stripos($name, 'quarter') !== false)
+			if (stripos($name, 'quarter') !== false)
 			{
-				$start->setDate($year, ((int)floor(($smonth+$month) / 3.1)) * 3 + 1, 1);
-				$end->setDate($year, ((int)floor(($emonth+$month) / 3.1)+1) * 3 + 1, 1);
+				$start->setDate($year, ((int)floor(($smonth + $month) / 3.1)) * 3 + 1, 1);
+				$end->setDate($year, ((int)floor(($emonth + $month) / 3.1) + 1) * 3 + 1, 1);
 			}
 			elseif ($syear || $eyear)
 			{
-				$start->setDate($year+$syear, 1, 1);
-				$end->setDate($year+$eyear, 1, 1);
+				$start->setDate($year + $syear, 1, 1);
+				$end->setDate($year + $eyear, 1, 1);
 			}
 			elseif ($smonth || $emonth)
 			{
-				$start->setDate($year, $month+$smonth, 1);
-				$end->setDate($year, $month+$emonth, 1);
+				$start->setDate($year, $month + $smonth, 1);
+				$end->setDate($year, $month + $emonth, 1);
 			}
 			elseif ($sday || $eday)
 			{
@@ -309,9 +309,9 @@ 
 	 * 		true = date only, false = time only as in user prefs, '' = date+time as in user prefs
 	 * @return int|string|array|datetime see $type
 	 */
-	public function format($type='')
+	public function format($type = '')
 	{
-		switch((string)$type)
+		switch ((string)$type)
 		{
 			case '':	// empty string:  date and time as in user prefs
 			//case '':	// boolean false: time as in user prefs
@@ -336,7 +336,7 @@ 
 			case 'integer':
 			case 'ts':
 				// ToDo: Check if PHP5.3 getTimestamp does the same, or always returns UTC timestamp
-				return mktime(parent::format('H'),parent::format('i'),parent::format('s'),parent::format('m'),parent::format('d'),parent::format('Y'));
+				return mktime(parent::format('H'), parent::format('i'), parent::format('s'), parent::format('m'), parent::format('d'), parent::format('Y'));
 
 			case 'object':
 			case 'datetime':
@@ -353,7 +353,7 @@ 
 					'second' => (int)parent::format('s'),
 					'full'   => parent::format('Ymd'),
 				);
-				$arr['raw'] = mktime($arr['hour'],$arr['minute'],$arr['second'],$arr['month'],$arr['day'],$arr['year']);
+				$arr['raw'] = mktime($arr['hour'], $arr['minute'], $arr['second'], $arr['month'], $arr['day'], $arr['year']);
 				return $arr;
 
 			case 'date_array':	// array with short keys used by date: Y, m, d, H, i, s (used in eTemplate)
@@ -387,18 +387,18 @@ 
 	 * @param string $type=null type or return-value, default (null) same as $time
 	 * @return int|string|array|datetime null if time could not be parsed
 	 */
-	public static function server2user($time,$type=null)
+	public static function server2user($time, $type = null)
 	{
-		$typeof='egw_time';
+		$typeof = 'egw_time';
 		if (!($time instanceof egw_time))
 		{
 			try
 			{
-				$time = new egw_time($time,self::$server_timezone,$typeof);
+				$time = new egw_time($time, self::$server_timezone, $typeof);
 			}
-			catch(Exception $e)
+			catch (Exception $e)
 			{
-				return null;	// time could not be parsed
+				return null; // time could not be parsed
 			}
 		}
 		$time->setUser();
@@ -416,18 +416,18 @@ 
 	 * @param string $type=null type or return-value, default (null) same as $time
 	 * @return int|string|array|datetime null if time could not be parsed
 	 */
-	public static function user2server($time,$type=null)
+	public static function user2server($time, $type = null)
 	{
-		$typeof='egw_time';
+		$typeof = 'egw_time';
 		if (!($time instanceof egw_time))
 		{
 			try
 			{
-				$time = new egw_time($time,self::$user_timezone,$typeof);
+				$time = new egw_time($time, self::$user_timezone, $typeof);
 			}
-			catch(Exception $e)
+			catch (Exception $e)
 			{
-				return null;	// time could not be parsed
+				return null; // time could not be parsed
 			}
 		}
 		$time->setServer();
@@ -447,7 +447,7 @@ 
 	 * 		true = date only, false = time only as in user prefs, '' = date+time as in user prefs
 	 * @return int|string|array|datetime see $type, null if time could not be parsed
 	 */
-	public static function to($time='now',$type='')
+	public static function to($time = 'now', $type = '')
 	{
 		if (!($time instanceof egw_time))
 		{
@@ -455,9 +455,9 @@ 
 			{
 				$time = new egw_time($time);
 			}
-			catch(Exception $e)
+			catch (Exception $e)
 			{
-				return null;	// time could not be parsed
+				return null; // time could not be parsed
 			}
 		}
 		return $time->format($type);
@@ -472,12 +472,12 @@ 
 	 * @throws egw_exception_wrong_userinput if invalid $tz parameter
 	 * @return DateTimeZone
 	 */
-	public static function setUserPrefs($tz,$dateformat='',$timeformat='')
+	public static function setUserPrefs($tz, $dateformat = '', $timeformat = '')
 	{
 		//echo "<p>".__METHOD__."('$tz','$dateformat','$timeformat') ".function_backtrace()."</p>\n";
 		if (!empty($dateformat)) self::$user_dateformat = $dateformat;
 
-		switch($timeformat)
+		switch ($timeformat)
 		{
 			case '':
 				break;
@@ -494,7 +494,7 @@ 
 		try {
 			self::$user_timezone = new DateTimeZone($tz);
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			// silently use server timezone, as we have no means to report the wrong timezone to the user from this class
 			self::$user_timezone = clone(self::$server_timezone);
@@ -510,7 +510,7 @@ 
 	 * @param int|string|DateTime $time='now'
 	 * @return int difference in seconds between user and server time (for the given time!)
 	 */
-	public static function tz_offset_s($time='now')
+	public static function tz_offset_s($time = 'now')
 	{
 		if (!($time instanceof DateTime)) $time = new egw_time($time);
 
@@ -531,17 +531,17 @@ 
 		try {
 			self::$server_timezone = new DateTimeZone($GLOBALS['egw_info']['server']['server_timezone']);
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			try {
 				self::$server_timezone = new DateTimeZone(date_default_timezone_get());
 			}
-			catch(Exception $e)
+			catch (Exception $e)
 			{
 				self::$server_timezone = new DateTimeZone('Europe/Berlin');
 			}
 			error_log(__METHOD__."() invalid server_timezone='{$GLOBALS['egw_info']['server']['server_timezone']}' setting now '".self::$server_timezone->getName()."'!");
-			config::save_value('server_timezone',$GLOBALS['egw_info']['server']['server_timezone'] = self::$server_timezone->getName(),'phpgwapi');
+			config::save_value('server_timezone', $GLOBALS['egw_info']['server']['server_timezone'] = self::$server_timezone->getName(), 'phpgwapi');
 		}
 		if (!isset($GLOBALS['egw_info']['user']['preferences']['common']['tz']))
 		{
@@ -564,15 +564,15 @@ 
 	{
 		// prepare list of timezones from php, ignoring depricated ones and sort as follows
 		$tzs = array(
-			'Africa'     => array(),	// Contients
+			'Africa'     => array(), // Contients
 			'America'    => array(),
 			'Asia'       => array(),
 			'Australia'  => array(),
 			'Europe'     => array(),
-			'Atlantic'   => array(),	// Oceans
+			'Atlantic'   => array(), // Oceans
 			'Pacific'    => array(),
 			'Indian'     => array(),
-			'Antarctica' => array(),	// Poles
+			'Antarctica' => array(), // Poles
 			'Arctic'     => array(),
 			'UTC'        => array('UTC' => 'UTC'),
 		);
@@ -618,27 +618,27 @@ 
 			'Australia/Yancowinna',
 			'Pacific/Samoa',
 		);
-		foreach(DateTimeZone::listIdentifiers() as $name)
+		foreach (DateTimeZone::listIdentifiers() as $name)
 		{
-			if (in_array($name,$no_vtimezone)) continue;	// do NOT allow to set in EGroupware, as we have not VTIMEZONE component for it
-			list($continent,$rest) = explode('/',$name,2);
-			if (!isset($tzs[$continent])) continue;	// old depricated timezones
-			$datetime = new egw_time('now',new DateTimeZone($name));
-			$tzs[$continent][$name] = str_replace(array('_','/'),array(' ',' / '),$name)."  ".$datetime->format();
+			if (in_array($name, $no_vtimezone)) continue; // do NOT allow to set in EGroupware, as we have not VTIMEZONE component for it
+			list($continent, $rest) = explode('/', $name, 2);
+			if (!isset($tzs[$continent])) continue; // old depricated timezones
+			$datetime = new egw_time('now', new DateTimeZone($name));
+			$tzs[$continent][$name] = str_replace(array('_', '/'), array(' ', ' / '), $name)."  ".$datetime->format();
 			unset($datetime);
 		}
-		foreach($tzs as $continent => &$data)
+		foreach ($tzs as $continent => &$data)
 		{
-			natcasesort($data);	// sort cities
+			natcasesort($data); // sort cities
 		}
 		unset($data);
 
 		// if user lang or installed langs contain a european language --> move Europe to top of tz list
 		$langs = class_exists('translation') ? translation::get_installed_langs() : array();
-		if (array_intersect(array($GLOBALS['egw_info']['user']['preferences']['common']['lang'])+array_keys($langs),
-			array('de','fr','it','nl','bg','ca','cs','da','el','es-es','et','eu','fi','hr','hu','lt','no','pl','pt','sk','sl','sv','tr','uk')))
+		if (array_intersect(array($GLOBALS['egw_info']['user']['preferences']['common']['lang']) + array_keys($langs),
+			array('de', 'fr', 'it', 'nl', 'bg', 'ca', 'cs', 'da', 'el', 'es-es', 'et', 'eu', 'fi', 'hr', 'hu', 'lt', 'no', 'pl', 'pt', 'sk', 'sl', 'sv', 'tr', 'uk')))
 		{
-			$tzs = array_merge(array('Europe' => $tzs['Europe']),$tzs);
+			$tzs = array_merge(array('Europe' => $tzs['Europe']), $tzs);
 		}
 		return $tzs;
 	}
@@ -649,30 +649,30 @@ 
 	 * @param string $extra extra timezone to add, if not already included in user timezones
 	 * @return array tzid => label
 	 */
-	public static function getUserTimezones($extra=null)
+	public static function getUserTimezones($extra = null)
 	{
 		$tz = $GLOBALS['egw_info']['user']['preferences']['common']['tz'];
-		$user_tzs = explode(',',$GLOBALS['egw_info']['user']['preferences']['common']['tz_selection']);
+		$user_tzs = explode(',', $GLOBALS['egw_info']['user']['preferences']['common']['tz_selection']);
 		if (count($user_tzs) <= 1)
 		{
 			$user_tzs = $tz ? array($tz) : array();
 		}
-		if ($tz && !in_array($tz,$user_tzs))
+		if ($tz && !in_array($tz, $user_tzs))
 		{
-			$user_tzs = array_merge(array($tz),$user_tzs);
+			$user_tzs = array_merge(array($tz), $user_tzs);
 		}
 		if (!$user_tzs)	// if we have no user timezones, eg. user set no pref --> use server default
 		{
 			$user_tzs = array($GLOBALS['egw_info']['server']['server_timezone']);
 		}
-		if ($extra && !in_array($extra,$user_tzs))
+		if ($extra && !in_array($extra, $user_tzs))
 		{
-			$user_tzs = array_merge(array($extra),$user_tzs);
+			$user_tzs = array_merge(array($extra), $user_tzs);
 		}
-		$user_tzs = array_combine($user_tzs,$user_tzs);
-		foreach($user_tzs as $name => &$label)
+		$user_tzs = array_combine($user_tzs, $user_tzs);
+		foreach ($user_tzs as $name => &$label)
 		{
-			$label = str_replace(array('_','/'),array(' ',' / '),$label);
+			$label = str_replace(array('_', '/'), array(' ', ' / '), $label);
 		}
 		//_debug_array($user_tzs);
 		return $user_tzs;

Braces +76 added lines, -18 removed lines

@@ -85,7 +85,11 @@ 
 	 */
 	public function __construct($time='now',DateTimeZone $tz=null,&$type=null)
 	{
-		if (is_null($tz)) $tz = self::$user_timezone;	// default user timezone
+		if (is_null($tz))
+		{
+			$tz = self::$user_timezone;
+		}
+		// default user timezone
 
 		switch(($type = gettype($time)))
 		{
@@ -98,7 +102,11 @@ 
 				if (!(is_numeric($time) && ($time > 21000000 || $time < 19000000)))
 				{
 					$t_str = $time;
-					if (is_numeric($time) && strlen($time) == 8) $t_str .= 'T000000';	// 'Ymd' string used in calendar to represent a date
+					if (is_numeric($time) && strlen($time) == 8)
+					{
+						$t_str .= 'T000000';
+					}
+					// 'Ymd' string used in calendar to represent a date
 					// $time ending in a Z (Zulu or UTC time), is unterstood by DateTime class itself
 					try {
 						parent::__construct($t_str,$tz);
@@ -106,7 +114,10 @@ 
 					}
 					catch(Exception $e) {
 						// if string is nummeric, ignore the exception and treat string as timestamp
-						if (!is_numeric($time)) throw $e;
+						if (!is_numeric($time))
+						{
+							throw $e;
+						}
 					}
 				}
 				$type = 'integer';
@@ -127,7 +138,9 @@ 
 
 			case 'array':
 				parent::__construct('now',$tz);
-				if (isset($time['Y']))	// array format used in eTemplate
+				if (isset($time['Y']))
+				{
+					// array format used in eTemplate
 				{
 					$time = array(
 						'year'   => $time['Y'],
@@ -138,13 +151,17 @@ 
 						'second' => $time['s'],
 					);
 				}
+				}
 				if (!empty($time['full']) && empty($time['year']))
 				{
 					$time['year']  = (int)substr($time['full'],0,4);
 					$time['month'] = (int)substr($time['full'],4,2);
 					$time['day']   = (int)substr($time['full'],6,2);
 				}
-				if (isset($time['year'])) $this->setDate((int)$time['year'],(int)$time['month'],isset($time['day']) ? (int)$time['day'] : (int)$time['mday']);
+				if (isset($time['year']))
+				{
+					$this->setDate((int)$time['year'],(int)$time['month'],isset($time['day']) ? (int)$time['day'] : (int)$time['mday']);
+				}
 				$this->setTime((int)$time['hour'],(int)$time['minute'],(int)$time['second']);
 				break;
 
@@ -168,7 +185,10 @@ 
 	 */
 	public function add($interval)
 	{
-		if (is_string($interval)) $interval = DateInterval::createFromDateString($interval);
+		if (is_string($interval))
+		{
+			$interval = DateInterval::createFromDateString($interval);
+		}
 
 		parent::add($interval);
 	}
@@ -192,7 +212,10 @@ 
 				$wstart = -($wday ? $wday-1 : 6);
 				break;
 		}
-		if ($wstart) $this->add($wstart.'days');
+		if ($wstart)
+		{
+			$this->add($wstart.'days');
+		}
 	}
 
 	/**
@@ -258,15 +281,27 @@ 
 			}
 			elseif ($sday || $eday)
 			{
-				if ($sday) $start->add($sday.'days');
-				if ($eday) $end->add($eday.'days');
+				if ($sday)
+				{
+					$start->add($sday.'days');
+				}
+				if ($eday)
+				{
+					$end->add($eday.'days');
+				}
 			}
 			elseif ($sweek || $eweek)
 			{
 				$start->setWeekstart();
-				if ($sweek) $start->add($sweek.'weeks');
+				if ($sweek)
+				{
+					$start->add($sweek.'weeks');
+				}
 				$end->setWeekstart();
-				if ($eweek) $end->add($eweek.'weeks');
+				if ($eweek)
+				{
+					$end->add($eweek.'weeks');
+				}
 			}
 		}
 		// convert start + end from user to servertime for the filter
@@ -403,7 +438,10 @@ 
 		}
 		$time->setUser();
 
-		if (is_null($type)) $type = $typeof;
+		if (is_null($type))
+		{
+			$type = $typeof;
+		}
 
 		//echo "<p>".__METHOD__."($time,$type) = ".print_r($format->format($type),true)."</p>\n";
 		return $time->format($type);
@@ -432,7 +470,10 @@ 
 		}
 		$time->setServer();
 
-		if (is_null($type)) $type = $typeof;
+		if (is_null($type))
+		{
+			$type = $typeof;
+		}
 
 		//echo "<p>".__METHOD__."($time,$type) = ".print_r($format->format($type),true)."</p>\n";
 		return $time->format($type);
@@ -475,7 +516,10 @@ 
 	public static function setUserPrefs($tz,$dateformat='',$timeformat='')
 	{
 		//echo "<p>".__METHOD__."('$tz','$dateformat','$timeformat') ".function_backtrace()."</p>\n";
-		if (!empty($dateformat)) self::$user_dateformat = $dateformat;
+		if (!empty($dateformat))
+		{
+			self::$user_dateformat = $dateformat;
+		}
 
 		switch($timeformat)
 		{
@@ -512,7 +556,10 @@ 
 	 */
 	public static function tz_offset_s($time='now')
 	{
-		if (!($time instanceof DateTime)) $time = new egw_time($time);
+		if (!($time instanceof DateTime))
+		{
+			$time = new egw_time($time);
+		}
 
 		return egw_time::$user_timezone->getOffset($time) - egw_time::$server_timezone->getOffset($time);
 	}
@@ -620,9 +667,17 @@ 
 		);
 		foreach(DateTimeZone::listIdentifiers() as $name)
 		{
-			if (in_array($name,$no_vtimezone)) continue;	// do NOT allow to set in EGroupware, as we have not VTIMEZONE component for it
+			if (in_array($name,$no_vtimezone))
+			{
+				continue;
+			}
+			// do NOT allow to set in EGroupware, as we have not VTIMEZONE component for it
 			list($continent,$rest) = explode('/',$name,2);
-			if (!isset($tzs[$continent])) continue;	// old depricated timezones
+			if (!isset($tzs[$continent]))
+			{
+				continue;
+			}
+			// old depricated timezones
 			$datetime = new egw_time('now',new DateTimeZone($name));
 			$tzs[$continent][$name] = str_replace(array('_','/'),array(' ',' / '),$name)."  ".$datetime->format();
 			unset($datetime);
@@ -661,10 +716,13 @@ 
 		{
 			$user_tzs = array_merge(array($tz),$user_tzs);
 		}
-		if (!$user_tzs)	// if we have no user timezones, eg. user set no pref --> use server default
+		if (!$user_tzs)
+		{
+			// if we have no user timezones, eg. user set no pref --> use server default
 		{
 			$user_tzs = array($GLOBALS['egw_info']['server']['server_timezone']);
 		}
+		}
 		if ($extra && !in_array($extra,$user_tzs))
 		{
 			$user_tzs = array_merge(array($extra),$user_tzs);