EGroupware / egroupware

api/src/Vfs.php

Indentation +33 added lines, -33 removed lines

@@ -672,7 +672,7 @@ 
 			return;	// not found, should not happen
 		}
 		if ($type && (($type == 'd') == !($stat['mode'] & Vfs\Sqlfs\StreamWrapper::MODE_DIR) ||	// != is_dir() which can be true for symlinks
-		    $type == 'F' && is_dir($path)))	// symlink to a directory
+			$type == 'F' && is_dir($path)))	// symlink to a directory
 		{
 			return;	// wrong type
 		}
@@ -1621,13 +1621,13 @@ 
 		{
 			return false;
 		}
-    	// remove the lock info evtl. set in the cache
-    	unset(self::$lock_cache[$path]);
+		// remove the lock info evtl. set in the cache
+		unset(self::$lock_cache[$path]);
 
-    	if ($timeout < 1000000)	// < 1000000 is a relative timestamp, so we add the current time
-    	{
-    		$timeout += time();
-    	}
+		if ($timeout < 1000000)	// < 1000000 is a relative timestamp, so we add the current time
+		{
+			$timeout += time();
+		}
 
 		if ($update)	// Lock Update
 		{
@@ -1688,32 +1688,32 @@ 
 		return $ret;
 	}
 
-    /**
-     * unlock a ressource/path
-     *
-     * @param string $path path to unlock
-     * @param string $token locktoken
+	/**
+	 * unlock a ressource/path
+	 *
+	 * @param string $path path to unlock
+	 * @param string $token locktoken
 	 * @param boolean $check_writable =true should we check if the ressource is writable, before granting locks, default yes
-     * @return boolean true on success
-     */
-    static function unlock($path,$token,$check_writable=true)
-    {
+	 * @return boolean true on success
+	 */
+	static function unlock($path,$token,$check_writable=true)
+	{
 		// we require write rights to lock/unlock a resource
 		if ($check_writable && !self::is_writable($path))
 		{
 			return false;
 		}
-        if (($ret = self::$db->delete(self::LOCK_TABLE,array(
-        	'lock_path' => $path,
-        	'lock_token' => $token,
-        ),__LINE__,__FILE__) && self::$db->affected_rows()))
-        {
-        	// remove the lock from the cache too
-        	unset(self::$lock_cache[$path]);
-        }
+		if (($ret = self::$db->delete(self::LOCK_TABLE,array(
+			'lock_path' => $path,
+			'lock_token' => $token,
+		),__LINE__,__FILE__) && self::$db->affected_rows()))
+		{
+			// remove the lock from the cache too
+			unset(self::$lock_cache[$path]);
+		}
 		if (self::LOCK_DEBUG) error_log(__METHOD__."($path,$token,$check_writable) returns ".($ret ? 'true' : 'false'));
 		return $ret;
-    }
+	}
 
 	/**
 	 * checkLock() helper
@@ -1741,13 +1741,13 @@ 
 		}
 		if ($result && $result['expires'] < time())	// lock is expired --> remove it
 		{
-	        self::$db->delete(self::LOCK_TABLE,array(
-	        	'lock_path' => $result['path'],
-	        	'lock_token' => $result['token'],
-	        ),__LINE__,__FILE__);
+			self::$db->delete(self::LOCK_TABLE,array(
+				'lock_path' => $result['path'],
+				'lock_token' => $result['token'],
+			),__LINE__,__FILE__);
 
 			if (self::LOCK_DEBUG) error_log(__METHOD__."($path) lock is expired at ".date('Y-m-d H:i:s',$result['expires'])." --> removed");
-	        $result = false;
+			$result = false;
 		}
 		if (self::LOCK_DEBUG) error_log(__METHOD__."($path) returns ".($result?array2string($result):'false'));
 		return self::$lock_cache[$path] = $result;
@@ -1887,9 +1887,9 @@ 
 			$image = Image::find($mime_sub, 'navbar');
 		}
 		else if ($file && $mime_main == 'image' && in_array($mime_sub, array('png','jpeg','jpg','gif','bmp')) &&
-		         (string)$GLOBALS['egw_info']['server']['link_list_thumbnail'] != '0' &&
-		         (string)$GLOBALS['egw_info']['user']['preferences']['common']['link_list_thumbnail'] != '0' &&
-		         ($stat = self::stat($file)) && $stat['size'] < 1500000)
+				 (string)$GLOBALS['egw_info']['server']['link_list_thumbnail'] != '0' &&
+				 (string)$GLOBALS['egw_info']['user']['preferences']['common']['link_list_thumbnail'] != '0' &&
+				 ($stat = self::stat($file)) && $stat['size'] < 1500000)
 		{
 			if (substr($file, 0, 6) == '/apps/')
 			{

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -1415,7 +1415,7 @@
 	 *
 	 * @todo use https://github.com/maennchen/ZipStream-PHP to not assamble all files in memmory
 	 */
-	public static function download_zip(Array $_files, $name = false)
+	public static function download_zip(array $_files, $name = false)
 	{
 		//error_log(__METHOD__ . ': '.implode(',',$_files));
 

Doc Comments +5 added lines, -6 removed lines

@@ -174,7 +174,7 @@ 
 	 * dir working on just the eGW VFS: returns directory object
 	 *
 	 * @param string $path filename with absolute path in the eGW VFS
-	 * @return Directory
+	 * @return \Directory
 	 */
 	static function dir($path)
 	{
@@ -1326,7 +1326,7 @@ 
 	 * Also works around PHP under Windows returning dirname('/something') === '\\', which is NOT understood by EGroupware's VFS!
 	 *
 	 * @param string $_url path or url
-	 * @return string|boolean parent or false if there's none ($path == '/')
+	 * @return false|string parent or false if there's none ($path == '/')
 	 */
 	static function dirname($_url)
 	{
@@ -1753,7 +1753,7 @@ 
 	 * checkLock() helper
 	 *
 	 * @param  string resource path to check for locks
-	 * @return array|boolean false if there's no lock, else array with lock info
+	 * @return string|null false if there's no lock, else array with lock info
 	 */
 	static function checkLock($path)
 	{
@@ -1969,7 +1969,7 @@ 
 	/**
 	 * Copies the files given in $src to $dst.
 	 *
-	 * @param array $src contains the source file
+	 * @param string[] $src contains the source file
 	 * @param string $dst is the destination directory
 	 * @param int& $errs =null on return number of errors happened
 	 * @param array& $copied =null on return files copied
@@ -2221,7 +2221,6 @@ 
 	 * In order for the appropriate error message to be returned, do not define this method if your wrapper does not support removing directories.
 	 *
 	 * @param string $path
-	 * @param int $options Possible values include STREAM_REPORT_ERRORS.
 	 * @return boolean TRUE on success or FALSE on failure.
 	 */
 	static function rmdir($path)
@@ -2347,7 +2346,7 @@ 
 	 * Requires root rights!
 	 *
 	 * @param string $path
-	 * @param int|string $owner numeric user id or account-name
+	 * @param integer $owner numeric user id or account-name
 	 * @return boolean true on success, false otherwise
 	 */
 	static function chown($path,$owner)

Braces +213 added lines, -56 removed lines

@@ -246,7 +246,10 @@ 
 		}
 		foreach($props as &$prop)
 		{
-			if ($prop['name'] == $name && $prop['ns'] == $ns) return $prop;
+			if ($prop['name'] == $name && $prop['ns'] == $ns)
+			{
+				return $prop;
+			}
 		}
 		return null;
 	}
@@ -416,17 +419,27 @@ 
 		$dirs_last = $options['depth'];	// put content of dirs before the dir itself
 		// show dirs on top by default, if no recursive listing (allways disabled if $type specified, as unnecessary)
 		$dirsontop = !$type && (isset($options['dirsontop']) ? (boolean)$options['dirsontop'] : isset($options['maxdepth'])&&$options['maxdepth']>0);
-		if ($dirsontop) $options['need_mime'] = true;	// otherwise dirsontop can NOT work
+		if ($dirsontop)
+		{
+			$options['need_mime'] = true;
+		}
+		// otherwise dirsontop can NOT work
 
 		// process some of the options (need to be done only once)
-		if (isset($options['name']) && !isset($options['name_preg']))	// change from simple *,? wildcards to preg regular expression once
+		if (isset($options['name']) && !isset($options['name_preg']))
+		{
+			// change from simple *,? wildcards to preg regular expression once
 		{
 			$options['name_preg'] = '/^'.str_replace(array('\\?','\\*'),array('.{1}','.*'),preg_quote($options['name'])).'$/i';
 		}
-		if (isset($options['path']) && !isset($options['preg_path']))	// change from simple *,? wildcards to preg regular expression once
+		}
+		if (isset($options['path']) && !isset($options['preg_path']))
+		{
+			// change from simple *,? wildcards to preg regular expression once
 		{
 			$options['path_preg'] = '/^'.str_replace(array('\\?','\\*'),array('.{1}','.*'),preg_quote($options['path'])).'$/i';
 		}
+		}
 		if (!isset($options['uid']))
 		{
 			if (isset($options['user']))
@@ -473,7 +486,10 @@ 
 		{
 			if (!$url)
 			{
-				if ($path[0] != '/' || !self::stat($path)) continue;
+				if ($path[0] != '/' || !self::stat($path))
+				{
+					continue;
+				}
 				$path = self::PREFIX . $path;
 			}
 			if (!isset($options['remove']))
@@ -491,9 +507,17 @@ 
 			{
 				while(($fname = readdir($dir)) !== false)
 				{
-					if ($fname == '.' || $fname == '..') continue;	// ignore current and parent dir!
+					if ($fname == '.' || $fname == '..')
+					{
+						continue;
+					}
+					// ignore current and parent dir!
 
-					if (self::is_hidden($fname, $options['show-deleted']) && !$options['hidden']) continue;	// ignore hidden files
+					if (self::is_hidden($fname, $options['show-deleted']) && !$options['hidden'])
+					{
+						continue;
+					}
+					// ignore hidden files
 
 					$file = self::concat($path, $fname);
 
@@ -505,8 +529,14 @@ 
 					if (is_dir($file) && ($options['follow'] || !is_link($file)) && (!isset($options['maxdepth']) || $options['maxdepth'] > 1))
 					{
 						$opts = $options;
-						if ($opts['mindepth']) $opts['mindepth']--;
-						if ($opts['maxdepth']) $opts['depth']++;
+						if ($opts['mindepth'])
+						{
+							$opts['mindepth']--;
+						}
+						if ($opts['maxdepth'])
+						{
+							$opts['depth']++;
+						}
 						unset($opts['order']);
 						unset($opts['limit']);
 						foreach(self::find($options['url']?$file:self::parse_url($file,PHP_URL_PATH),$opts,true) as $p => $s)
@@ -571,7 +601,10 @@ 
 		if (isset($options['limit']))
 		{
 			list($limit,$start) = explode(',',$options['limit']);
-			if (!$limit && !($limit = $GLOBALS['egw_info']['user']['preferences']['comman']['maxmatches'])) $limit = 15;
+			if (!$limit && !($limit = $GLOBALS['egw_info']['user']['preferences']['comman']['maxmatches']))
+			{
+				$limit = 15;
+			}
 			//echo "total=".self::$find_total.", limit=$options[limit] --> start=$start, limit=$limit<br>\n";
 
 			if ((int)$start || self::$find_total > $limit)
@@ -631,9 +664,13 @@ 
 			return;	// not found, should not happen
 		}
 		if ($type && (($type == 'd') == !($stat['mode'] & Vfs\Sqlfs\StreamWrapper::MODE_DIR) ||	// != is_dir() which can be true for symlinks
-		    $type == 'F' && is_dir($path)))	// symlink to a directory
+		    $type == 'F' && is_dir($path)))
 		{
-			return;	// wrong type
+			// symlink to a directory
+		{
+			return;
+		}
+		// wrong type
 		}
 		$stat['path'] = self::parse_url($path,PHP_URL_PATH);
 		$stat['name'] = $options['remove'] > 0 ? implode('/',array_slice(explode('/',$stat['path']),$options['remove'])) : self::basename($path);
@@ -655,11 +692,15 @@ 
 		}
 		if (isset($options['mime']) && $options['mime'] != $stat['mime'])
 		{
-			if ($options['mime'][0] == '/')	// perl regular expression given
+			if ($options['mime'][0] == '/')
+			{
+				// perl regular expression given
 			{
 				if (!preg_match($options['mime'], $stat['mime']))
 				{
-					return;	// wrong mime-type
+					return;
+			}
+			// wrong mime-type
 				}
 			}
 			else
@@ -722,7 +763,10 @@ 
 	 */
 	static function isProtectedDir($dir)
 	{
-		if ($dir[0] != '/') $dir = self::parse_url($dir, PHP_URL_PATH);
+		if ($dir[0] != '/')
+		{
+			$dir = self::parse_url($dir, PHP_URL_PATH);
+		}
 
 		return preg_match('#^/(apps(/[^/]+)?|home|templates(/[^/]+)?)?/*$#', $dir) > 0;
 	}
@@ -809,7 +853,10 @@ 
 			{
 				self::clearstatcache($path);
 
-				if (!isset($vfs)) $vfs = new Vfs\StreamWrapper();
+				if (!isset($vfs))
+				{
+					$vfs = new Vfs\StreamWrapper();
+				}
 				$path_user_stat[$path][$user] = $vfs->url_stat($path, 0);
 
 				self::clearstatcache($path);	// we need to clear the stat-cache after the call too, as the next call might be the regular user again!
@@ -852,7 +899,10 @@ 
 		// query stat array, if not given
 		if (is_null($stat))
 		{
-			if (!isset($vfs)) $vfs = new Vfs\StreamWrapper();
+			if (!isset($vfs))
+			{
+				$vfs = new Vfs\StreamWrapper();
+			}
 			$stat = $vfs->url_stat($path,0);
 		}
 		//error_log(__METHOD__."(path=$path||stat[name]={$stat['name']},stat[mode]=".sprintf('%o',$stat['mode']).",$check)");
@@ -1000,7 +1050,8 @@ 
 			}
 
 			// sort by length descending, to show precedence
-			usort($eacls, function($a, $b) {
+			usort($eacls, function($a, $b)
+			{
 				return strlen($b['path']) - strlen($a['path']);
 			});
 		}
@@ -1055,14 +1106,21 @@ 
 	 */
 	static function mode2int($set,$mode=0)
 	{
-		if (is_int($set))		// already an integer
+		if (is_int($set))
+		{
+			// already an integer
 		{
 			return $set;
 		}
-		if (is_numeric($set))	// octal string
+		}
+		if (is_numeric($set))
+		{
+			// octal string
 		{
 			//error_log(__METHOD__."($set,$mode) returning ".(int)base_convert($set,8,10));
-			return (int)base_convert($set,8,10);	// convert octal to decimal
+			return (int)base_convert($set,8,10);
+		}
+		// convert octal to decimal
 		}
 		foreach(explode(',',$set) as $s)
 		{
@@ -1118,34 +1176,55 @@ 
 	 */
 	static function int2mode( $mode )
 	{
-		if(($mode & self::MODE_LINK) == self::MODE_LINK) // Symbolic Link
+		if(($mode & self::MODE_LINK) == self::MODE_LINK)
+		{
+			// Symbolic Link
 		{
 			$sP = 'l';
 		}
-		elseif(($mode & 0xC000) == 0xC000) // Socket
+		}
+		elseif(($mode & 0xC000) == 0xC000)
+		{
+			// Socket
 		{
 			$sP = 's';
 		}
-		elseif($mode & 0x1000)     // FIFO pipe
+		}
+		elseif($mode & 0x1000)
+		{
+			// FIFO pipe
 		{
 			$sP = 'p';
 		}
-		elseif($mode & 0x2000) // Character special
+		}
+		elseif($mode & 0x2000)
+		{
+			// Character special
 		{
 			$sP = 'c';
 		}
-		elseif($mode & 0x4000) // Directory
+		}
+		elseif($mode & 0x4000)
+		{
+			// Directory
 		{
 			$sP = 'd';
 		}
-		elseif($mode & 0x6000) // Block special
+		}
+		elseif($mode & 0x6000)
+		{
+			// Block special
 		{
 			$sP = 'b';
 		}
-		elseif($mode & 0x8000) // Regular
+		}
+		elseif($mode & 0x8000)
+		{
+			// Regular
 		{
 			$sP = '-';
 		}
+		}
 		else                         // UNKNOWN
 		{
 			$sP = 'u';
@@ -1212,9 +1291,18 @@ 
 	 */
 	static function hsize($size)
 	{
-		if ($size < 1024) return $size;
-		if ($size < 1024*1024) return sprintf('%3.1lfk',(float)$size/1024);
-		if ($size < 1024*1024*1024) return sprintf('%3.1lfM',(float)$size/(1024*1024));
+		if ($size < 1024)
+		{
+			return $size;
+		}
+		if ($size < 1024*1024)
+		{
+			return sprintf('%3.1lfk',(float)$size/1024);
+		}
+		if ($size < 1024*1024*1024)
+		{
+			return sprintf('%3.1lfM',(float)$size/(1024*1024));
+		}
 		return sprintf('%3.1lfG',(float)$size/(1024*1024*1024));
 	}
 
@@ -1225,7 +1313,10 @@ 
 	 */
 	static function int_size($_val)
 	{
-		if(empty($_val))return 0;
+		if(empty($_val))
+		{
+			return 0;
+		}
 
 		$val = trim($_val);
 
@@ -1233,11 +1324,13 @@ 
 		preg_match('#([0-9]+)[\s]*([a-z]+)#i', $val, $matches);
 
 		$last = '';
-		if(isset($matches[2])){
+		if(isset($matches[2]))
+		{
 			$last = $matches[2];
 		}
 
-		if(isset($matches[1])){
+		if(isset($matches[1]))
+		{
 			$val = (int) $matches[1];
 		}
 
@@ -1302,7 +1395,10 @@ 
 			static $entities = array('%21', '%2A', '%27', '%28', '%29', '%3B', '%3A', '%40', '%26', '%3D', '%24', '%2C', '%2F', '%3F', '%23', '%5B', '%5D');
 			static $replacements = array('!', '*', "'", "(", ")", ";", ":", "@", "&", "=", "$", ",", "/", "?", "#", "[", "]");
 			static $str_replace = null;
-			if (!isset($str_replace)) $str_replace = function_exists('mb_str_replace') ? 'mb_str_replace' : 'str_replace';
+			if (!isset($str_replace))
+			{
+				$str_replace = function_exists('mb_str_replace') ? 'mb_str_replace' : 'str_replace';
+			}
 
 			// Create encoded URL with special URL characters decoded so it can be parsed
 			// All other characters will be encoded
@@ -1342,7 +1438,10 @@ 
 			return false;
 		}
 		$parts = explode('/',$url);
-		if (substr($url,-1) == '/') array_pop($parts);
+		if (substr($url,-1) == '/')
+		{
+			array_pop($parts);
+		}
 		array_pop($parts);
 		if ($url[0] != '/' && count($parts) == 3 || count($parts) == 1 && $parts[0] === '')
 		{
@@ -1385,7 +1484,10 @@ 
 	static function concat($_url,$relative)
 	{
 		list($url,$query) = explode('?',$_url,2);
-		if (substr($url,-1) == '/') $url = substr($url,0,-1);
+		if (substr($url,-1) == '/')
+		{
+			$url = substr($url,0,-1);
+		}
 		$ret = ($relative === '' || $relative[0] == '/' ? $url.$relative : $url.'/'.$relative);
 
 		// now normalize the path (remove "/something/..")
@@ -1478,7 +1580,8 @@ 
 		if(count($paths) > 0)
 		{
 			// Shortest to longest
-			usort($paths, function($a, $b) {
+			usort($paths, function($a, $b)
+			{
 				return strlen($a) - strlen($b);
 			});
 
@@ -1551,7 +1654,10 @@ 
 			// Don't go infinite with app entries
 			if(self::is_link($addfile))
 			{
-				if(in_array($addfile, $links)) continue;
+				if(in_array($addfile, $links))
+				{
+					continue;
+				}
 				$links[] = $addfile;
 			}
 			// Add directory - if empty, client app might not show it though
@@ -1662,12 +1768,17 @@ 
     	// remove the lock info evtl. set in the cache
     	unset(self::$lock_cache[$path]);
 
-    	if ($timeout < 1000000)	// < 1000000 is a relative timestamp, so we add the current time
+    	if ($timeout < 1000000)
+    	{
+    		// < 1000000 is a relative timestamp, so we add the current time
     	{
     		$timeout += time();
     	}
+    	}
 
-		if ($update)	// Lock Update
+		if ($update)
+		{
+			// Lock Update
 		{
 			if (($ret = (boolean)($row = self::$db->select(self::LOCK_TABLE,array('lock_owner','lock_exclusive','lock_write'),array(
 				'lock_path' => $path,
@@ -1675,6 +1786,7 @@ 
 			),__LINE__,__FILE__)->fetch())))
 			{
 				$owner = $row['lock_owner'];
+		}
 				$scope = Db::from_bool($row['lock_exclusive']) ? 'exclusive' : 'shared';
 				$type  = Db::from_bool($row['lock_write']) ? 'write' : 'read';
 
@@ -1722,7 +1834,10 @@ 
 				$ret = false;	// there's already a lock
 			}
 		}
-		if (self::LOCK_DEBUG) error_log(__METHOD__."($path,$token,$timeout,$owner,$scope,$type,update=$update,check_writable=$check_writable) returns ".($ret ? 'true' : 'false'));
+		if (self::LOCK_DEBUG)
+		{
+			error_log(__METHOD__."($path,$token,$timeout,$owner,$scope,$type,update=$update,check_writable=$check_writable) returns ".($ret ? 'true' : 'false'));
+		}
 		return $ret;
 	}
 
@@ -1749,7 +1864,10 @@ 
         	// remove the lock from the cache too
         	unset(self::$lock_cache[$path]);
         }
-		if (self::LOCK_DEBUG) error_log(__METHOD__."($path,$token,$check_writable) returns ".($ret ? 'true' : 'false'));
+		if (self::LOCK_DEBUG)
+		{
+			error_log(__METHOD__."($path,$token,$check_writable) returns ".($ret ? 'true' : 'false'));
+		}
 		return $ret;
     }
 
@@ -1763,7 +1881,10 @@ 
 	{
 		if (isset(self::$lock_cache[$path]))
 		{
-			if (self::LOCK_DEBUG) error_log(__METHOD__."($path) returns from CACHE ".str_replace(array("\n",'    '),'',print_r(self::$lock_cache[$path],true)));
+			if (self::LOCK_DEBUG)
+			{
+				error_log(__METHOD__."($path) returns from CACHE ".str_replace(array("\n",'    '),'',print_r(self::$lock_cache[$path],true)));
+			}
 			return self::$lock_cache[$path];
 		}
 		$where = 'lock_path='.self::$db->quote($path);
@@ -1777,17 +1898,26 @@ 
 			$result['scope'] = Db::from_bool($result['exclusive']) ? 'exclusive' : 'shared';
 			$result['depth'] = Db::from_bool($result['recursive']) ? 'infinite' : 0;
 		}
-		if ($result && $result['expires'] < time())	// lock is expired --> remove it
+		if ($result && $result['expires'] < time())
+		{
+			// lock is expired --> remove it
 		{
 	        self::$db->delete(self::LOCK_TABLE,array(
 	        	'lock_path' => $result['path'],
 	        	'lock_token' => $result['token'],
 	        ),__LINE__,__FILE__);
+		}
 
-			if (self::LOCK_DEBUG) error_log(__METHOD__."($path) lock is expired at ".date('Y-m-d H:i:s',$result['expires'])." --> removed");
+			if (self::LOCK_DEBUG)
+			{
+				error_log(__METHOD__."($path) lock is expired at ".date('Y-m-d H:i:s',$result['expires'])." --> removed");
+			}
 	        $result = false;
 		}
-		if (self::LOCK_DEBUG) error_log(__METHOD__."($path) returns ".($result?array2string($result):'false'));
+		if (self::LOCK_DEBUG)
+		{
+			error_log(__METHOD__."($path) returns ".($result?array2string($result):'false'));
+		}
 		return self::$lock_cache[$path] = $result;
 	}
 
@@ -1801,10 +1931,13 @@ 
 	static function getExtraInfo($path,array $content=null)
 	{
 		$extra = array();
-		if (($extra_info = self::_call_on_backend('extra_info',array($path,$content),true)))	// true = fail silent if backend does NOT support it
+		if (($extra_info = self::_call_on_backend('extra_info',array($path,$content),true)))
+		{
+			// true = fail silent if backend does NOT support it
 		{
 			$extra[] = $extra_info;
 		}
+		}
 
 		if (($vfs_extra = Hooks::process(array(
 			'location' => 'vfs_extra',
@@ -2083,30 +2216,42 @@ 
 		}
 		if ($check_is_uploaded_file && !is_resource($tmp_name) && !is_uploaded_file($tmp_name))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($tmp_name, $target, ".array2string($props).",$check_is_uploaded_file) returning FALSE !is_uploaded_file()");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($tmp_name, $target, ".array2string($props).",$check_is_uploaded_file) returning FALSE !is_uploaded_file()");
+			}
 			return false;
 		}
 		if (!(self::is_writable($target) || ($dir = self::dirname($target)) && self::is_writable($dir)))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($tmp_name, $target, ".array2string($props).",$check_is_uploaded_file) returning FALSE !writable");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($tmp_name, $target, ".array2string($props).",$check_is_uploaded_file) returning FALSE !writable");
+			}
 			return false;
 		}
 		if ($props)
 		{
-			if (!is_array($props)) $props = array(array('name' => 'comment','val' => $props));
+			if (!is_array($props))
+			{
+				$props = array(array('name' => 'comment','val' => $props));
+			}
 
 			// if $props is name => value pairs, convert it to internal array or array with values for keys 'name', 'val' and optional 'ns'
 			if (!isset($props[0]))
 			{
 				foreach($props as $name => $val)
 				{
-					if (($name == 'comment' || $name[0] == '#') && $val)	// only copy 'comment' and cfs
+					if (($name == 'comment' || $name[0] == '#') && $val)
+					{
+						// only copy 'comment' and cfs
 					{
 						$vfs_props[] = array(
 							'name' => $name,
 							'val'  => $val,
 						);
 					}
+					}
 				}
 				$props = $vfs_props;
 			}
@@ -2138,7 +2283,10 @@ 
 				copy($tmp_name, self::PREFIX.$target)) ?
 				self::stat($target) : false;
 		}
-		if (self::LOG_LEVEL > 1 || !$ret && self::LOG_LEVEL) error_log(__METHOD__."($tmp_name, $target, ".array2string($props).") returning ".array2string($ret));
+		if (self::LOG_LEVEL > 1 || !$ret && self::LOG_LEVEL)
+		{
+			error_log(__METHOD__."($tmp_name, $target, ".array2string($props).") returning ".array2string($ret));
+		}
 		return $ret;
 	}
 
@@ -2271,7 +2419,10 @@ 
 				return false;
 			}
 			$k=(string)self::parse_url($url,PHP_URL_SCHEME);
-			if (!(is_array($scheme2urls[$k]))) $scheme2urls[$k] = array();
+			if (!(is_array($scheme2urls[$k])))
+			{
+				$scheme2urls[$k] = array();
+			}
 			$scheme2urls[$k][$path] = $url;
 		}
 		$ret = array();
@@ -2281,7 +2432,10 @@ 
 			{
 				if (!class_exists($class = self::scheme2class($scheme)) || !method_exists($class,$name))
 				{
-					if (!$fail_silent) trigger_error("Can't $name for scheme $scheme!\n",E_USER_WARNING);
+					if (!$fail_silent)
+					{
+						trigger_error("Can't $name for scheme $scheme!\n",E_USER_WARNING);
+					}
 					return false;
 				}
 				if (!is_array($pathes))
@@ -2399,10 +2553,13 @@ 
 	 */
 	static function symlink($target,$link)
 	{
-		if (($ret = self::_call_on_backend('symlink',array($target,$link),false,1)))	// 1=path is in $link!
+		if (($ret = self::_call_on_backend('symlink',array($target,$link),false,1)))
+		{
+			// 1=path is in $link!
 		{
 			Vfs\StreamWrapper::symlinkCache_remove($link);
 		}
+		}
 		return $ret;
 	}
 

Spacing +289 added lines, -294 removed lines

@@ -145,7 +145,7 @@ 
 	 * @param resource $context =null context to pass to stream-wrapper
 	 * @return resource
 	 */
-	static function fopen($path, $mode, $context=null)
+	static function fopen($path, $mode, $context = null)
 	{
 		if ($path[0] != '/')
 		{
@@ -161,7 +161,7 @@ 
 	 * @param resource $context =null context to pass to stream-wrapper
 	 * @return resource
 	 */
-	static function opendir($path, $context=null)
+	static function opendir($path, $context = null)
 	{
 		if ($path[0] != '/')
 		{
@@ -192,13 +192,13 @@ 
 	 * @param int $sorting_order =0 !$sorting_order (default) alphabetical in ascending order, $sorting_order alphabetical in descending order.
 	 * @return array
 	 */
-	static function scandir($path,$sorting_order=0)
+	static function scandir($path, $sorting_order = 0)
 	{
 		if ($path[0] != '/')
 		{
 			throw new Exception\AssertionFailed("Directory '$path' is not an absolute path!");
 		}
-		return scandir(self::PREFIX.$path,$sorting_order);
+		return scandir(self::PREFIX.$path, $sorting_order);
 	}
 
 	/**
@@ -208,25 +208,25 @@ 
 	 * @param string $to
 	 * @return boolean
 	 */
-	static function copy($from,$to)
+	static function copy($from, $to)
 	{
-		$old_props = self::file_exists($to) ? self::propfind($to,null) : array();
+		$old_props = self::file_exists($to) ? self::propfind($to, null) : array();
 		// copy properties (eg. file comment), if there are any and evtl. existing old properties
-		$props = self::propfind($from,null);
-		if(!$props)
+		$props = self::propfind($from, null);
+		if (!$props)
 		{
 			$props = array();
 		}
-		foreach($old_props as $prop)
+		foreach ($old_props as $prop)
 		{
-			if (!self::find_prop($props,$prop))
+			if (!self::find_prop($props, $prop))
 			{
-				$prop['val'] = null;	// null = delete prop
+				$prop['val'] = null; // null = delete prop
 				$props[] = $prop;
 			}
 		}
 		// using self::copy_uploaded() to treat copying incl. properties as atomar operation in respect of notifications
-		return self::copy_uploaded(self::PREFIX.$from,$to,$props,false);	// false = no is_uploaded_file check!
+		return self::copy_uploaded(self::PREFIX.$from, $to, $props, false); // false = no is_uploaded_file check!
 	}
 
 	/**
@@ -237,14 +237,14 @@ 
 	 * @param string $ns =self::DEFAULT_PROP_NAMESPACE namespace, only if $prop is no array
 	 * @return &array reference to property in $props or null if not found
 	 */
-	static function &find_prop(array &$props,$name,$ns=self::DEFAULT_PROP_NAMESPACE)
+	static function &find_prop(array &$props, $name, $ns = self::DEFAULT_PROP_NAMESPACE)
 	{
 		if (is_array($name))
 		{
 			$ns = $name['ns'];
 			$name = $name['name'];
 		}
-		foreach($props as &$prop)
+		foreach ($props as &$prop)
 		{
 			if ($prop['name'] == $name && $prop['ns'] == $ns) return $prop;
 		}
@@ -258,16 +258,16 @@ 
 	 * @param boolean $try_create_home =false should a non-existing home-directory be automatically created
 	 * @return array
 	 */
-	static function stat($path,$try_create_home=false)
+	static function stat($path, $try_create_home = false)
 	{
 		if ($path[0] != '/' && strpos($path, self::PREFIX.'/') !== 0)
 		{
 			throw new Exception\AssertionFailed("File '$path' is not an absolute path!");
 		}
 		$vfs = new Vfs\StreamWrapper();
-		if (($stat = $vfs->url_stat($path,0,$try_create_home)))
+		if (($stat = $vfs->url_stat($path, 0, $try_create_home)))
 		{
-			$stat = array_slice($stat,13);	// remove numerical indices 0-12
+			$stat = array_slice($stat, 13); // remove numerical indices 0-12
 		}
 		return $stat;
 	}
@@ -279,16 +279,16 @@ 
 	 * @param boolean $try_create_home =false should a non-existing home-directory be automatically created
 	 * @return array
 	 */
-	static function lstat($path,$try_create_home=false)
+	static function lstat($path, $try_create_home = false)
 	{
 		if ($path[0] != '/' && strpos($path, self::PREFIX.'/') !== 0)
 		{
 			throw new Exception\AssertionFailed("File '$path' is not an absolute path!");
 		}
 		$vfs = new Vfs\StreamWrapper();
-		if (($stat = $vfs->url_stat($path,STREAM_URL_STAT_LINK,$try_create_home)))
+		if (($stat = $vfs->url_stat($path, STREAM_URL_STAT_LINK, $try_create_home)))
 		{
-			$stat = array_slice($stat,13);	// remove numerical indices 0-12
+			$stat = array_slice($stat, 13); // remove numerical indices 0-12
 		}
 		return $stat;
 	}
@@ -339,7 +339,7 @@ 
 	 * @param boolean $clear_fstab =false true clear current fstab, false (default) only add given mount
 	 * @return array|boolean array with fstab, if called without parameter or true on successful mount
 	 */
-	static function mount($url=null,$path=null,$check_url=null,$persitent_mount=true,$clear_fstab=false)
+	static function mount($url = null, $path = null, $check_url = null, $persitent_mount = true, $clear_fstab = false)
 	{
 		return Vfs\StreamWrapper::mount($url, $path, $check_url, $persitent_mount, $clear_fstab);
 	}
@@ -372,7 +372,7 @@ 
 	 * @param boolean $allow_versions =false allow .versions or .attic
 	 * @return boolean
 	 */
-	public static function is_hidden($path, $allow_versions=false)
+	public static function is_hidden($path, $allow_versions = false)
 	{
 		$file = self::basename($path);
 
@@ -408,30 +408,30 @@ 
 	 * @param array $exec_params =null further params for exec as array, path is always the first param and stat the last!
 	 * @return array of pathes if no $exec, otherwise path => stat pairs
 	 */
-	static function find($base,$options=null,$exec=null,$exec_params=null)
+	static function find($base, $options = null, $exec = null, $exec_params = null)
 	{
 		//error_log(__METHOD__."(".print_r($base,true).",".print_r($options,true).",".print_r($exec,true).",".print_r($exec_params,true).")\n");
 
-		$type = $options['type'];	// 'd', 'f' or 'F'
-		$dirs_last = $options['depth'];	// put content of dirs before the dir itself
+		$type = $options['type']; // 'd', 'f' or 'F'
+		$dirs_last = $options['depth']; // put content of dirs before the dir itself
 		// show dirs on top by default, if no recursive listing (allways disabled if $type specified, as unnecessary)
-		$dirsontop = !$type && (isset($options['dirsontop']) ? (boolean)$options['dirsontop'] : isset($options['maxdepth'])&&$options['maxdepth']>0);
-		if ($dirsontop) $options['need_mime'] = true;	// otherwise dirsontop can NOT work
+		$dirsontop = !$type && (isset($options['dirsontop']) ? (boolean)$options['dirsontop'] : isset($options['maxdepth']) && $options['maxdepth'] > 0);
+		if ($dirsontop) $options['need_mime'] = true; // otherwise dirsontop can NOT work
 
 		// process some of the options (need to be done only once)
 		if (isset($options['name']) && !isset($options['name_preg']))	// change from simple *,? wildcards to preg regular expression once
 		{
-			$options['name_preg'] = '/^'.str_replace(array('\\?','\\*'),array('.{1}','.*'),preg_quote($options['name'])).'$/i';
+			$options['name_preg'] = '/^'.str_replace(array('\\?', '\\*'), array('.{1}', '.*'), preg_quote($options['name'])).'$/i';
 		}
 		if (isset($options['path']) && !isset($options['preg_path']))	// change from simple *,? wildcards to preg regular expression once
 		{
-			$options['path_preg'] = '/^'.str_replace(array('\\?','\\*'),array('.{1}','.*'),preg_quote($options['path'])).'$/i';
+			$options['path_preg'] = '/^'.str_replace(array('\\?', '\\*'), array('.{1}', '.*'), preg_quote($options['path'])).'$/i';
 		}
 		if (!isset($options['uid']))
 		{
 			if (isset($options['user']))
 			{
-				$options['uid'] = $GLOBALS['egw']->accounts->name2id($options['user'],'account_lid','u');
+				$options['uid'] = $GLOBALS['egw']->accounts->name2id($options['user'], 'account_lid', 'u');
 			}
 			elseif (isset($options['nouser']))
 			{
@@ -442,7 +442,7 @@ 
 		{
 			if (isset($options['group']))
 			{
-				$options['gid'] = abs($GLOBALS['egw']->accounts->name2id($options['group'],'account_lid','g'));
+				$options['gid'] = abs($GLOBALS['egw']->accounts->name2id($options['group'], 'account_lid', 'g'));
 			}
 			elseif (isset($options['nogroup']))
 			{
@@ -451,7 +451,7 @@ 
 		}
 		if ($options['order'] == 'mime')
 		{
-			$options['need_mime'] = true;	// we need to return the mime colum
+			$options['need_mime'] = true; // we need to return the mime colum
 		}
 		// implicit show deleted files, if hidden is enabled (requires versioning!)
 		if (!empty($options['hidden']) && !isset($options['show-deleted']))
@@ -469,37 +469,37 @@ 
 			$base = array($base);
 		}
 		$result = array();
-		foreach($base as $path)
+		foreach ($base as $path)
 		{
 			if (!$url)
 			{
 				if ($path[0] != '/' || !self::stat($path)) continue;
-				$path = self::PREFIX . $path;
+				$path = self::PREFIX.$path;
 			}
 			if (!isset($options['remove']))
 			{
-				$options['remove'] = count($base) == 1 ? count(explode('/',$path))-3+(int)(substr($path,-1)!='/') : 0;
+				$options['remove'] = count($base) == 1 ? count(explode('/', $path)) - 3 + (int)(substr($path, -1) != '/') : 0;
 			}
 			$is_dir = is_dir($path);
 			if ((int)$options['mindepth'] == 0 && (!$dirs_last || !$is_dir))
 			{
-				self::_check_add($options,$path,$result);
+				self::_check_add($options, $path, $result);
 			}
 			if ($is_dir && (!isset($options['maxdepth']) || ($options['maxdepth'] > 0 &&
 				$options['depth'] < $options['maxdepth'])) &&
 				($dir = @opendir($path, $context)))
 			{
-				while(($fname = readdir($dir)) !== false)
+				while (($fname = readdir($dir)) !== false)
 				{
-					if ($fname == '.' || $fname == '..') continue;	// ignore current and parent dir!
+					if ($fname == '.' || $fname == '..') continue; // ignore current and parent dir!
 
-					if (self::is_hidden($fname, $options['show-deleted']) && !$options['hidden']) continue;	// ignore hidden files
+					if (self::is_hidden($fname, $options['show-deleted']) && !$options['hidden']) continue; // ignore hidden files
 
 					$file = self::concat($path, $fname);
 
 					if ((int)$options['mindepth'] <= 1)
 					{
-						self::_check_add($options,$file,$result);
+						self::_check_add($options, $file, $result);
 					}
 					// only descend into subdirs, if it's a real dir (no link to a dir) or we should follow symlinks
 					if (is_dir($file) && ($options['follow'] || !is_link($file)) && (!isset($options['maxdepth']) || $options['maxdepth'] > 1))
@@ -509,7 +509,7 @@ 
 						if ($opts['maxdepth']) $opts['depth']++;
 						unset($opts['order']);
 						unset($opts['limit']);
-						foreach(self::find($options['url']?$file:self::parse_url($file,PHP_URL_PATH),$opts,true) as $p => $s)
+						foreach (self::find($options['url'] ? $file : self::parse_url($file, PHP_URL_PATH), $opts, true) as $p => $s)
 						{
 							unset($result[$p]);
 							$result[$p] = $s;
@@ -520,7 +520,7 @@ 
 			}
 			if ($is_dir && (int)$options['mindepth'] == 0 && $dirs_last)
 			{
-				self::_check_add($options,$path,$result);
+				self::_check_add($options, $path, $result);
 			}
 		}
 		// sort code, to place directories before files, if $dirsontop enabled
@@ -530,7 +530,7 @@ 
 		if (isset($options['order']))
 		{
 			$sort = strtolower($options['sort']) == 'desc' ? '-' : '';
-			switch($options['order'])
+			switch ($options['order'])
 			{
 				// sort numerical
 				case 'size':
@@ -542,7 +542,7 @@ 
 					$code = $dirsfirst.$sort.'($a[\''.$options['order'].'\']-$b[\''.$options['order'].'\']);';
 					// always use name as second sort criteria
 					$code = '$cmp = '.$code.' return $cmp ? $cmp : strcasecmp($a[\'name\'],$b[\'name\']);';
-					$ok = uasort($result,create_function('$a,$b',$code));
+					$ok = uasort($result, create_function('$a,$b', $code));
 					break;
 
 				// sort alphanumerical
@@ -561,7 +561,7 @@ 
 					{
 						$code = 'return '.$code;
 					}
-					$ok = uasort($result,create_function('$a,$b',$code));
+					$ok = uasort($result, create_function('$a,$b', $code));
 					break;
 			}
 			//echo "<p>order='$options[order]', sort='$options[sort]' --> uasort($result,create_function(,'$code'))=".array2string($ok)."</p>>\n";
@@ -570,13 +570,13 @@ 
 		self::$find_total = count($result);
 		if (isset($options['limit']))
 		{
-			list($limit,$start) = explode(',',$options['limit']);
+			list($limit, $start) = explode(',', $options['limit']);
 			if (!$limit && !($limit = $GLOBALS['egw_info']['user']['preferences']['comman']['maxmatches'])) $limit = 15;
 			//echo "total=".self::$find_total.", limit=$options[limit] --> start=$start, limit=$limit<br>\n";
 
 			if ((int)$start || self::$find_total > $limit)
 			{
-				$result = array_slice($result,(int)$start,(int)$limit,true);
+				$result = array_slice($result, (int)$start, (int)$limit, true);
 			}
 		}
 		//echo $path; _debug_array($result);
@@ -586,13 +586,13 @@ 
 			{
 				$exec_params = is_null($exec_params) ? array() : array($exec_params);
 			}
-			foreach($result as $path => &$stat)
+			foreach ($result as $path => &$stat)
 			{
 				$options = $exec_params;
-				array_unshift($options,$path);
-				array_push($options,$stat);
+				array_unshift($options, $path);
+				array_push($options, $stat);
 				//echo "calling ".print_r($exec,true).print_r($options,true)."\n";
-				$stat = call_user_func_array($exec,$options);
+				$stat = call_user_func_array($exec, $options);
 			}
 			return $result;
 		}
@@ -611,15 +611,15 @@ 
 	 * @param string $path name of path to add
 	 * @param array &$result here we add the stat for the key $path, if the checks are successful
 	 */
-	private static function _check_add($options,$path,&$result)
+	private static function _check_add($options, $path, &$result)
 	{
-		$type = $options['type'];	// 'd' or 'f'
+		$type = $options['type']; // 'd' or 'f'
 
 		if ($options['url'])
 		{
 			if (($stat = @lstat($path)))
 			{
-				$stat = array_slice($stat,13);	// remove numerical indices 0-12
+				$stat = array_slice($stat, 13); // remove numerical indices 0-12
 			}
 		}
 		else
@@ -628,30 +628,30 @@ 
 		}
 		if (!$stat)
 		{
-			return;	// not found, should not happen
+			return; // not found, should not happen
 		}
-		if ($type && (($type == 'd') == !($stat['mode'] & Vfs\Sqlfs\StreamWrapper::MODE_DIR) ||	// != is_dir() which can be true for symlinks
+		if ($type && (($type == 'd') == !($stat['mode']&Vfs\Sqlfs\StreamWrapper::MODE_DIR) || // != is_dir() which can be true for symlinks
 		    $type == 'F' && is_dir($path)))	// symlink to a directory
 		{
-			return;	// wrong type
+			return; // wrong type
 		}
-		$stat['path'] = self::parse_url($path,PHP_URL_PATH);
-		$stat['name'] = $options['remove'] > 0 ? implode('/',array_slice(explode('/',$stat['path']),$options['remove'])) : self::basename($path);
+		$stat['path'] = self::parse_url($path, PHP_URL_PATH);
+		$stat['name'] = $options['remove'] > 0 ? implode('/', array_slice(explode('/', $stat['path']), $options['remove'])) : self::basename($path);
 
 		if ($options['mime'] || $options['need_mime'])
 		{
 			$stat['mime'] = self::mime_content_type($path);
 		}
-		if (isset($options['name_preg']) && !preg_match($options['name_preg'],$stat['name']) ||
-			isset($options['path_preg']) && !preg_match($options['path_preg'],$path))
+		if (isset($options['name_preg']) && !preg_match($options['name_preg'], $stat['name']) ||
+			isset($options['path_preg']) && !preg_match($options['path_preg'], $path))
 		{
 			//echo "<p>!preg_match('{$options['name_preg']}','{$stat['name']}')</p>\n";
-			return;	// wrong name or path
+			return; // wrong name or path
 		}
 		if (isset($options['gid']) && $stat['gid'] != $options['gid'] ||
 			isset($options['uid']) && $stat['uid'] != $options['uid'])
 		{
-			return;	// wrong user or group
+			return; // wrong user or group
 		}
 		if (isset($options['mime']) && $options['mime'] != $stat['mime'])
 		{
@@ -659,40 +659,40 @@ 
 			{
 				if (!preg_match($options['mime'], $stat['mime']))
 				{
-					return;	// wrong mime-type
+					return; // wrong mime-type
 				}
 			}
 			else
 			{
-				list($type,$subtype) = explode('/',$options['mime']);
+				list($type, $subtype) = explode('/', $options['mime']);
 				// no subtype (eg. 'image') --> check only the main type
-				if ($subtype || substr($stat['mime'],0,strlen($type)+1) != $type.'/')
+				if ($subtype || substr($stat['mime'], 0, strlen($type) + 1) != $type.'/')
 				{
-					return;	// wrong mime-type
+					return; // wrong mime-type
 				}
 			}
 		}
-		if (isset($options['size']) && !self::_check_num($stat['size'],$options['size']) ||
+		if (isset($options['size']) && !self::_check_num($stat['size'], $options['size']) ||
 			(isset($options['empty']) && !!$options['empty'] !== !$stat['size']))
 		{
-			return;	// wrong size
+			return; // wrong size
 		}
-		if (isset($options['cmin']) && !self::_check_num(round((time()-$stat['ctime'])/60),$options['cmin']) ||
-			isset($options['mmin']) && !self::_check_num(round((time()-$stat['mtime'])/60),$options['mmin']) ||
-			isset($options['ctime']) && !self::_check_num(round((time()-$stat['ctime'])/86400),$options['ctime']) ||
-			isset($options['mtime']) && !self::_check_num(round((time()-$stat['mtime'])/86400),$options['mtime']))
+		if (isset($options['cmin']) && !self::_check_num(round((time() - $stat['ctime']) / 60), $options['cmin']) ||
+			isset($options['mmin']) && !self::_check_num(round((time() - $stat['mtime']) / 60), $options['mmin']) ||
+			isset($options['ctime']) && !self::_check_num(round((time() - $stat['ctime']) / 86400), $options['ctime']) ||
+			isset($options['mtime']) && !self::_check_num(round((time() - $stat['mtime']) / 86400), $options['mtime']))
 		{
-			return;	// not create/modified in the spezified time
+			return; // not create/modified in the spezified time
 		}
 		// do we return url or just vfs pathes
 		if (!$options['url'])
 		{
-			$path = self::parse_url($path,PHP_URL_PATH);
+			$path = self::parse_url($path, PHP_URL_PATH);
 		}
 		$result[$path] = $stat;
 	}
 
-	private static function _check_num($value,$argument)
+	private static function _check_num($value, $argument)
 	{
 		if (is_int($argument) && $argument >= 0 || $argument[0] != '-' && $argument[0] != '+')
 		{
@@ -705,7 +705,7 @@ 
 			return $value < abs($argument);
 		}
 		//echo "_check_num($value,$argument) check > == ".(int)($value > (int)substr($argument,1))."\n";
-		return $value > (int) substr($argument,1);
+		return $value > (int)substr($argument, 1);
 	}
 
 	/**
@@ -735,10 +735,10 @@ 
 	 * @throws Vfs\Exception\ProtectedDirectory if trying to delete a protected directory, see Vfs::isProtected()
 	 * @return array
 	 */
-	static function remove($urls,$allow_urls=false)
+	static function remove($urls, $allow_urls = false)
 	{
 		//error_log(__METHOD__.'('.array2string($urls).')');
-		foreach((array)$urls as $url)
+		foreach ((array)$urls as $url)
 		{
 			// some precaution to never allow to (recursivly) remove /, /apps or /home, see Vfs::isProtected()
 			if (self::isProtectedDir($url))
@@ -746,7 +746,7 @@ 
 				throw new Vfs\Exception\ProtectedDirectory("Deleting protected directory '$url' rejected!");
 			}
 		}
-		return self::find($urls, array('depth'=>true,'url'=>$allow_urls,'hidden'=>true), __CLASS__.'::_rm_rmdir');
+		return self::find($urls, array('depth'=>true, 'url'=>$allow_urls, 'hidden'=>true), __CLASS__.'::_rm_rmdir');
 	}
 
 	/**
@@ -759,12 +759,12 @@ 
 	{
 		if ($url[0] == '/')
 		{
-			$url = self::PREFIX . $url;
+			$url = self::PREFIX.$url;
 		}
 		$vfs = new Vfs\StreamWrapper();
 		if (is_dir($url) && !is_link($url))
 		{
-			return $vfs->rmdir($url,0);
+			return $vfs->rmdir($url, 0);
 		}
 		return $vfs->unlink($url);
 	}
@@ -778,9 +778,9 @@ 
 	 * 	2 = self::WRITABLE, 1 = self::EXECUTABLE
 	 * @return boolean
 	 */
-	static function is_readable($path,$check = self::READABLE)
+	static function is_readable($path, $check = self::READABLE)
 	{
-		return self::check_access($path,$check);
+		return self::check_access($path, $check);
 	}
 
 	/**
@@ -794,7 +794,7 @@ 
 	 * @param int $user =null user used for check, if not current user (self::$user)
 	 * @return boolean
 	 */
-	static function check_access($path, $check, $stat=null, $user=null)
+	static function check_access($path, $check, $stat = null, $user = null)
 	{
 		static $vfs = null;
 
@@ -812,7 +812,7 @@ 
 				if (!isset($vfs)) $vfs = new Vfs\StreamWrapper();
 				$path_user_stat[$path][$user] = $vfs->url_stat($path, 0);
 
-				self::clearstatcache($path);	// we need to clear the stat-cache after the call too, as the next call might be the regular user again!
+				self::clearstatcache($path); // we need to clear the stat-cache after the call too, as the next call might be the regular user again!
 			}
 			if (($stat = $path_user_stat[$path][$user]))
 			{
@@ -828,7 +828,7 @@ 
 			}
 			else
 			{
-				$ret = false;	// no access, if we can not stat the file
+				$ret = false; // no access, if we can not stat the file
 			}
 			self::$user = $backup_user;
 
@@ -853,20 +853,20 @@ 
 		if (is_null($stat))
 		{
 			if (!isset($vfs)) $vfs = new Vfs\StreamWrapper();
-			$stat = $vfs->url_stat($path,0);
+			$stat = $vfs->url_stat($path, 0);
 		}
 		//error_log(__METHOD__."(path=$path||stat[name]={$stat['name']},stat[mode]=".sprintf('%o',$stat['mode']).",$check)");
 
 		if (!$stat)
 		{
 			//error_log(__METHOD__."(path=$path||stat[name]={$stat['name']},stat[mode]=".sprintf('%o',$stat['mode']).",$check) no stat array!");
-			return false;	// file not found
+			return false; // file not found
 		}
 		// check if we use an EGroupwre stream wrapper, or a stock php one
 		// if it's not an EGroupware one, we can NOT use uid, gid and mode!
-		if (($scheme = self::parse_url($stat['url'],PHP_URL_SCHEME)) && !(class_exists(self::scheme2class($scheme))))
+		if (($scheme = self::parse_url($stat['url'], PHP_URL_SCHEME)) && !(class_exists(self::scheme2class($scheme))))
 		{
-			switch($check)
+			switch ($check)
 			{
 				case self::READABLE:
 					return is_readable($stat['url']);
@@ -877,19 +877,19 @@ 
 			}
 		}
 		// check if other rights grant access
-		if (($stat['mode'] & $check) == $check)
+		if (($stat['mode']&$check) == $check)
 		{
 			//error_log(__METHOD__."(path=$path||stat[name]={$stat['name']},stat[mode]=".sprintf('%o',$stat['mode']).",$check) access via other rights!");
 			return true;
 		}
 		// check if there's owner access and we are the owner
-		if (($stat['mode'] & ($check << 6)) == ($check << 6) && $stat['uid'] && $stat['uid'] == self::$user)
+		if (($stat['mode']&($check << 6)) == ($check << 6) && $stat['uid'] && $stat['uid'] == self::$user)
 		{
 			//error_log(__METHOD__."(path=$path||stat[name]={$stat['name']},stat[mode]=".sprintf('%o',$stat['mode']).",$check) access via owner rights!");
 			return true;
 		}
 		// check if there's a group access and we have the right membership
-		if (($stat['mode'] & ($check << 3)) == ($check << 3) && $stat['gid'])
+		if (($stat['mode']&($check << 3)) == ($check << 3) && $stat['gid'])
 		{
 			if (($memberships = $GLOBALS['egw']->accounts->memberships(self::$user, true)) && in_array(-abs($stat['gid']), $memberships))
 			{
@@ -898,7 +898,7 @@ 
 			}
 		}
 		// check backend for extended acls (only if path given)
-		$ret = $path && self::_call_on_backend('check_extended_acl',array(isset($stat['url'])?$stat['url']:$path,$check),true);	// true = fail silent if backend does not support
+		$ret = $path && self::_call_on_backend('check_extended_acl', array(isset($stat['url']) ? $stat['url'] : $path, $check), true); // true = fail silent if backend does not support
 
 		//error_log(__METHOD__."(path=$path||stat[name]={$stat['name']},stat[mode]=".sprintf('%o',$stat['mode']).",$check) ".($ret ? 'backend extended acl granted access.' : 'no access!!!'));
 		return $ret;
@@ -913,7 +913,7 @@ 
 	 */
 	static function is_writable($path)
 	{
-		return self::is_readable($path,self::WRITABLE);
+		return self::is_readable($path, self::WRITABLE);
 	}
 
 	/**
@@ -925,7 +925,7 @@ 
 	 */
 	static function is_executable($path)
 	{
-		return self::is_readable($path,self::EXECUTABLE);
+		return self::is_readable($path, self::EXECUTABLE);
 	}
 
 	/**
@@ -936,7 +936,7 @@ 
 	 */
 	static function deny_script($path)
 	{
-		return self::_call_on_backend('deny_script',array($path),true);
+		return self::_call_on_backend('deny_script', array($path), true);
 	}
 
 	/**
@@ -955,11 +955,11 @@ 
 	 * @param boolean $session_only =false true: set eacl only for this session, does NO further checks currently!
 	 * @return boolean true if acl is set/deleted, false on error
 	 */
-	static function eacl($url,$rights=null,$owner=null,$session_only=false)
+	static function eacl($url, $rights = null, $owner = null, $session_only = false)
 	{
 		if ($session_only)
 		{
-			$session_eacls =& Cache::getSession(__CLASS__, self::SESSION_EACL);
+			$session_eacls = & Cache::getSession(__CLASS__, self::SESSION_EACL);
 			$session_eacls[] = array(
 				'path'   => $url[0] == '/' ? $url : self::parse_url($url, PHP_URL_PATH),
 				'owner'  => $owner ? $owner : self::$user,
@@ -967,7 +967,7 @@ 
 			);
 			return true;
 		}
-		return self::_call_on_backend('eacl',array($url,$rights,$owner));
+		return self::_call_on_backend('eacl', array($url, $rights, $owner));
 	}
 
 	/**
@@ -980,9 +980,9 @@ 
 	 */
 	static function get_eacl($path)
 	{
-		$eacls = self::_call_on_backend('get_eacl',array($path),true);	// true = fail silent (no PHP Warning)
+		$eacls = self::_call_on_backend('get_eacl', array($path), true); // true = fail silent (no PHP Warning)
 
-		$session_eacls =& Cache::getSession(__CLASS__, self::SESSION_EACL);
+		$session_eacls = & Cache::getSession(__CLASS__, self::SESSION_EACL);
 		if ($session_eacls)
 		{
 			// eacl is recursive, therefore we have to match all parent-dirs too
@@ -991,7 +991,7 @@ 
 			{
 				$paths[] = $path = self::dirname($path);
 			}
-			foreach((array)$session_eacls as $eacl)
+			foreach ((array)$session_eacls as $eacl)
 			{
 				if (in_array($eacl['path'], $paths))
 				{
@@ -1014,9 +1014,9 @@ 
 	 * @param array $props array of array with values for keys 'name', 'ns', 'val' (null to delete the prop)
 	 * @return boolean true if props are updated, false otherwise (eg. ressource not found)
 	 */
-	static function proppatch($path,array $props)
+	static function proppatch($path, array $props)
 	{
-		return self::_call_on_backend('proppatch',array($path,$props));
+		return self::_call_on_backend('proppatch', array($path, $props));
 	}
 
 	/**
@@ -1033,9 +1033,9 @@ 
 	 * @return array|boolean array with props (values for keys 'name', 'ns', 'val'), or path => array of props for is_array($path)
 	 * 	false if $path does not exist
 	 */
-	static function propfind($path,$ns=self::DEFAULT_PROP_NAMESPACE)
+	static function propfind($path, $ns = self::DEFAULT_PROP_NAMESPACE)
 	{
-		return self::_call_on_backend('propfind',array($path,$ns),true);	// true = fail silent (no PHP Warning)
+		return self::_call_on_backend('propfind', array($path, $ns), true); // true = fail silent (no PHP Warning)
 	}
 
 	/**
@@ -1053,7 +1053,7 @@ 
 	 * @param int $mode =0 current mode of the file, necessary for +/- operation
 	 * @return int
 	 */
-	static function mode2int($set,$mode=0)
+	static function mode2int($set, $mode = 0)
 	{
 		if (is_int($set))		// already an integer
 		{
@@ -1062,23 +1062,23 @@ 
 		if (is_numeric($set))	// octal string
 		{
 			//error_log(__METHOD__."($set,$mode) returning ".(int)base_convert($set,8,10));
-			return (int)base_convert($set,8,10);	// convert octal to decimal
+			return (int)base_convert($set, 8, 10); // convert octal to decimal
 		}
-		foreach(explode(',',$set) as $s)
+		foreach (explode(',', $set) as $s)
 		{
 			$matches = null;
-			if (!preg_match($use='/^([ugoa]*)([+=-]+)([rwx]+)$/',$s,$matches))
+			if (!preg_match($use = '/^([ugoa]*)([+=-]+)([rwx]+)$/', $s, $matches))
 			{
-				$use = str_replace(array('/','^','$','(',')'),'',$use);
+				$use = str_replace(array('/', '^', '$', '(', ')'), '', $use);
 				throw new Exception\WrongUserinput("$s is not an allowed mode, use $use !");
 			}
-			$base = (strpos($matches[3],'r') !== false ? self::READABLE : 0) |
-				(strpos($matches[3],'w') !== false ? self::WRITABLE : 0) |
-				(strpos($matches[3],'x') !== false ? self::EXECUTABLE : 0);
+			$base = (strpos($matches[3], 'r') !== false ? self::READABLE : 0)|
+				(strpos($matches[3], 'w') !== false ? self::WRITABLE : 0)|
+				(strpos($matches[3], 'x') !== false ? self::EXECUTABLE : 0);
 
-			for($n = $m = 0; $n < strlen($matches[1]); $n++)
+			for ($n = $m = 0; $n < strlen($matches[1]); $n++)
 			{
-				switch($matches[1][$n])
+				switch ($matches[1][$n])
 				{
 					case 'o':
 						$m |= $base;
@@ -1091,10 +1091,10 @@ 
 						break;
 					default:
 					case 'a':
-						$m = $base | ($base << 3) | ($base << 6);
+						$m = $base|($base << 3)|($base << 6);
 				}
 			}
-			switch($matches[2])
+			switch ($matches[2])
 			{
 				case '+':
 					$mode |= $m;
@@ -1116,33 +1116,33 @@ 
 	 * @param int $mode
 	 * @return string
 	 */
-	static function int2mode( $mode )
+	static function int2mode($mode)
 	{
-		if(($mode & self::MODE_LINK) == self::MODE_LINK) // Symbolic Link
+		if (($mode&self::MODE_LINK) == self::MODE_LINK) // Symbolic Link
 		{
 			$sP = 'l';
 		}
-		elseif(($mode & 0xC000) == 0xC000) // Socket
+		elseif (($mode&0xC000) == 0xC000) // Socket
 		{
 			$sP = 's';
 		}
-		elseif($mode & 0x1000)     // FIFO pipe
+		elseif ($mode&0x1000)     // FIFO pipe
 		{
 			$sP = 'p';
 		}
-		elseif($mode & 0x2000) // Character special
+		elseif ($mode&0x2000) // Character special
 		{
 			$sP = 'c';
 		}
-		elseif($mode & 0x4000) // Directory
+		elseif ($mode&0x4000) // Directory
 		{
 			$sP = 'd';
 		}
-		elseif($mode & 0x6000) // Block special
+		elseif ($mode&0x6000) // Block special
 		{
 			$sP = 'b';
 		}
-		elseif($mode & 0x8000) // Regular
+		elseif ($mode&0x8000) // Regular
 		{
 			$sP = '-';
 		}
@@ -1152,22 +1152,19 @@ 
 		}
 
 		// owner
-		$sP .= (($mode & 0x0100) ? 'r' : '-') .
-		(($mode & 0x0080) ? 'w' : '-') .
-		(($mode & 0x0040) ? (($mode & 0x0800) ? 's' : 'x' ) :
-		(($mode & 0x0800) ? 'S' : '-'));
+		$sP .= (($mode&0x0100) ? 'r' : '-').
+		(($mode&0x0080) ? 'w' : '-').
+		(($mode&0x0040) ? (($mode&0x0800) ? 's' : 'x') : (($mode&0x0800) ? 'S' : '-'));
 
 		// group
-		$sP .= (($mode & 0x0020) ? 'r' : '-') .
-		(($mode & 0x0010) ? 'w' : '-') .
-		(($mode & 0x0008) ? (($mode & 0x0400) ? 's' : 'x' ) :
-		(($mode & 0x0400) ? 'S' : '-'));
+		$sP .= (($mode&0x0020) ? 'r' : '-').
+		(($mode&0x0010) ? 'w' : '-').
+		(($mode&0x0008) ? (($mode&0x0400) ? 's' : 'x') : (($mode&0x0400) ? 'S' : '-'));
 
 		// world
-		$sP .= (($mode & 0x0004) ? 'r' : '-') .
-		(($mode & 0x0002) ? 'w' : '-') .
-		(($mode & 0x0001) ? (($mode & 0x0200) ? 't' : 'x' ) :
-		(($mode & 0x0200) ? 'T' : '-'));
+		$sP .= (($mode&0x0004) ? 'r' : '-').
+		(($mode&0x0002) ? 'w' : '-').
+		(($mode&0x0001) ? (($mode&0x0200) ? 't' : 'x') : (($mode&0x0200) ? 'T' : '-'));
 
 		return $sP;
 	}
@@ -1180,26 +1177,26 @@ 
 	 * @param int $size =128
 	 * @return string
 	 */
-	static function mime_icon($mime_type, $et_image=true, $size=128)
+	static function mime_icon($mime_type, $et_image = true, $size = 128)
 	{
 		if ($mime_type == self::DIR_MIME_TYPE)
 		{
 			$mime_type = 'Directory';
 		}
-		if(!$mime_type)
+		if (!$mime_type)
 		{
 			$mime_type = 'unknown';
 		}
-		$mime_full = strtolower(str_replace	('/','_',$mime_type));
-		list($mime_part) = explode('_',$mime_full);
+		$mime_full = strtolower(str_replace('/', '_', $mime_type));
+		list($mime_part) = explode('_', $mime_full);
 
-		if (!($img=Image::find('etemplate',$icon='mime'.$size.'_'.$mime_full)) &&
+		if (!($img = Image::find('etemplate', $icon = 'mime'.$size.'_'.$mime_full)) &&
 			// check mime-alias-map before falling back to more generic icons
 			!(isset(MimeMagic::$mime_alias_map[$mime_type]) &&
-				($img=Image::find('etemplate',$icon='mime'.$size.'_'.str_replace('/','_',MimeMagic::$mime_alias_map[$mime_full])))) &&
-			!($img=Image::find('etemplate',$icon='mime'.$size.'_'.$mime_part)))
+				($img = Image::find('etemplate', $icon = 'mime'.$size.'_'.str_replace('/', '_', MimeMagic::$mime_alias_map[$mime_full])))) &&
+			!($img = Image::find('etemplate', $icon = 'mime'.$size.'_'.$mime_part)))
 		{
-			$img = Image::find('etemplate',$icon='mime'.$size.'_unknown');
+			$img = Image::find('etemplate', $icon = 'mime'.$size.'_unknown');
 		}
 		return $et_image ? 'etemplate/'.$icon : $img;
 	}
@@ -1213,9 +1210,9 @@ 
 	static function hsize($size)
 	{
 		if ($size < 1024) return $size;
-		if ($size < 1024*1024) return sprintf('%3.1lfk',(float)$size/1024);
-		if ($size < 1024*1024*1024) return sprintf('%3.1lfM',(float)$size/(1024*1024));
-		return sprintf('%3.1lfG',(float)$size/(1024*1024*1024));
+		if ($size < 1024 * 1024) return sprintf('%3.1lfk', (float)$size / 1024);
+		if ($size < 1024 * 1024 * 1024) return sprintf('%3.1lfM', (float)$size / (1024 * 1024));
+		return sprintf('%3.1lfG', (float)$size / (1024 * 1024 * 1024));
 	}
 
 	/**
@@ -1225,7 +1222,7 @@ 
 	 */
 	static function int_size($_val)
 	{
-		if(empty($_val))return 0;
+		if (empty($_val))return 0;
 
 		$val = trim($_val);
 
@@ -1233,12 +1230,12 @@ 
 		preg_match('#([0-9]+)[\s]*([a-z]+)#i', $val, $matches);
 
 		$last = '';
-		if(isset($matches[2])){
+		if (isset($matches[2])) {
 			$last = $matches[2];
 		}
 
-		if(isset($matches[1])){
-			$val = (int) $matches[1];
+		if (isset($matches[1])) {
+			$val = (int)$matches[1];
 		}
 
 		switch (strtolower($last))
@@ -1254,7 +1251,7 @@ 
 			$val *= 1024;
 		}
 
-		return (int) $val;
+		return (int)$val;
 	}
 
 	/**
@@ -1265,8 +1262,8 @@ 
 	 */
 	static function basename($_path)
 	{
-		list($path) = explode('?',$_path);	// remove query
-		$parts = explode('/',$path);
+		list($path) = explode('?', $_path); // remove query
+		$parts = explode('/', $path);
 
 		return array_pop($parts);
 	}
@@ -1280,7 +1277,7 @@ 
 	 * @param int $component =-1 PHP_URL_* constants
 	 * @return array|string|boolean on success array or string, if $component given, or false on failure
 	 */
-	static function parse_url($url, $component=-1)
+	static function parse_url($url, $component = -1)
 	{
 		static $component2str = array(
 			PHP_URL_SCHEME => 'scheme',
@@ -1292,9 +1289,9 @@ 
 			PHP_URL_QUERY => 'query',
 			PHP_URL_FRAGMENT => 'fragment',
 		);
-		static $cache = array();	// some caching
+		static $cache = array(); // some caching
 
-		$result =& $cache[$url];
+		$result = & $cache[$url];
 
 		if (!isset($result))
 		{
@@ -1334,22 +1331,22 @@ 
 	 */
 	static function dirname($_url)
 	{
-		list($url,$query) = explode('?',$_url,2);	// strip the query first, as it can contain slashes
+		list($url, $query) = explode('?', $_url, 2); // strip the query first, as it can contain slashes
 
-		if ($url == '/' || $url[0] != '/' && self::parse_url($url,PHP_URL_PATH) == '/')
+		if ($url == '/' || $url[0] != '/' && self::parse_url($url, PHP_URL_PATH) == '/')
 		{
 			//error_log(__METHOD__."($url) returning FALSE: already in root!");
 			return false;
 		}
-		$parts = explode('/',$url);
-		if (substr($url,-1) == '/') array_pop($parts);
+		$parts = explode('/', $url);
+		if (substr($url, -1) == '/') array_pop($parts);
 		array_pop($parts);
 		if ($url[0] != '/' && count($parts) == 3 || count($parts) == 1 && $parts[0] === '')
 		{
-			array_push($parts,'');	// scheme://host is wrong (no path), has to be scheme://host/
+			array_push($parts, ''); // scheme://host is wrong (no path), has to be scheme://host/
 		}
 		//error_log(__METHOD__."($url)=".implode('/',$parts).($query ? '?'.$query : ''));
-		return implode('/',$parts).($query ? '?'.$query : '');
+		return implode('/', $parts).($query ? '?'.$query : '');
 	}
 
 	/**
@@ -1361,16 +1358,16 @@ 
 	 * @param array $stat =null stat for path, default queried by this function
 	 * @return boolean
 	 */
-	static function has_owner_rights($path,array $stat=null)
+	static function has_owner_rights($path, array $stat = null)
 	{
 		if (!$stat)
 		{
 			$vfs = new Vfs\StreamWrapper();
-			$stat = $vfs->url_stat($path,0);
+			$stat = $vfs->url_stat($path, 0);
 		}
-		return $stat['uid'] == self::$user ||	// user is the owner
-			self::$is_root ||					// class runs with root rights
-			!$stat['uid'] && $stat['gid'] && self::$is_admin;	// group directory and user is an eGW admin
+		return $stat['uid'] == self::$user || // user is the owner
+			self::$is_root || // class runs with root rights
+			!$stat['uid'] && $stat['gid'] && self::$is_admin; // group directory and user is an eGW admin
 	}
 
 	/**
@@ -1382,22 +1379,22 @@ 
 	 * @param string $relative relative path to add to $url
 	 * @return string
 	 */
-	static function concat($_url,$relative)
+	static function concat($_url, $relative)
 	{
-		list($url,$query) = explode('?',$_url,2);
-		if (substr($url,-1) == '/') $url = substr($url,0,-1);
+		list($url, $query) = explode('?', $_url, 2);
+		if (substr($url, -1) == '/') $url = substr($url, 0, -1);
 		$ret = ($relative === '' || $relative[0] == '/' ? $url.$relative : $url.'/'.$relative);
 
 		// now normalize the path (remove "/something/..")
-		while (strpos($ret,'/../') !== false)
+		while (strpos($ret, '/../') !== false)
 		{
-			list($a_str,$b_str) = explode('/../',$ret,2);
-			$a = explode('/',$a_str);
+			list($a_str, $b_str) = explode('/../', $ret, 2);
+			$a = explode('/', $a_str);
 			array_pop($a);
-			$b = explode('/',$b_str);
-			$ret = implode('/',array_merge($a,$b));
+			$b = explode('/', $b_str);
+			$ret = implode('/', array_merge($a, $b));
 		}
-		return $ret.($query ? (strpos($url,'?')===false ? '?' : '&').$query : '');
+		return $ret.($query ? (strpos($url, '?') === false ? '?' : '&').$query : '');
 	}
 
 	/**
@@ -1408,11 +1405,11 @@ 
 	 */
 	static function build_url(array $url_parts)
 	{
-		$url = (!isset($url_parts['scheme'])?'':$url_parts['scheme'].'://'.
-			(!isset($url_parts['user'])?'':$url_parts['user'].(!isset($url_parts['pass'])?'':':'.$url_parts['pass']).'@').
+		$url = (!isset($url_parts['scheme']) ? '' : $url_parts['scheme'].'://'.
+			(!isset($url_parts['user']) ? '' : $url_parts['user'].(!isset($url_parts['pass']) ? '' : ':'.$url_parts['pass']).'@').
 			$url_parts['host']).$url_parts['path'].
-			(!isset($url_parts['query'])?'':'?'.$url_parts['query']).
-			(!isset($url_parts['fragment'])?'':'?'.$url_parts['fragment']);
+			(!isset($url_parts['query']) ? '' : '?'.$url_parts['query']).
+			(!isset($url_parts['fragment']) ? '' : '?'.$url_parts['fragment']);
 		//error_log(__METHOD__.'('.array2string($url_parts).") = '".$url."'");
 		return $url;
 	}
@@ -1430,19 +1427,19 @@ 
 	 * @todo get $force_download working through webdav
 	 * @return string
 	 */
-	static function download_url($path,$force_download=false)
+	static function download_url($path, $force_download = false)
 	{
-		if (($url = self::_call_on_backend('download_url',array($path,$force_download),true)))
+		if (($url = self::_call_on_backend('download_url', array($path, $force_download), true)))
 		{
 			return $url;
 		}
 		if ($path[0] != '/')
 		{
-			$path = self::parse_url($path,PHP_URL_PATH);
+			$path = self::parse_url($path, PHP_URL_PATH);
 		}
 		// we do NOT need to encode % itself, as our path are already url encoded, with the exception of ' ' and '+'
 		// we urlencode double quotes '"', as that fixes many problems in html markup
-		return '/webdav.php'.strtr($path,array('+' => '%2B',' ' => '%20','"' => '%22')).($force_download ? '?download' : '');
+		return '/webdav.php'.strtr($path, array('+' => '%2B', ' ' => '%20', '"' => '%22')).($force_download ? '?download' : '');
 	}
 
 	/**
@@ -1470,12 +1467,12 @@ 
 		// eg: User selected /home/nathan/picture.jpg, /home/Pictures/logo.jpg
 		// We want /home
 		$dirs = array();
-		foreach($_files as $file)
+		foreach ($_files as $file)
 		{
 			$dirs[] = self::dirname($file);
 		}
 		$paths = array_unique($dirs);
-		if(count($paths) > 0)
+		if (count($paths) > 0)
 		{
 			// Shortest to longest
 			usort($paths, function($a, $b) {
@@ -1483,13 +1480,13 @@ 
 			});
 
 			// Start with shortest, pop off sub-directories that don't match
-			$parts = explode('/',$paths[0]);
-			foreach($paths as $path)
+			$parts = explode('/', $paths[0]);
+			foreach ($paths as $path)
 			{
-				$dirs = explode('/',$path);
-				foreach($dirs as $dir_index => $dir)
+				$dirs = explode('/', $path);
+				foreach ($dirs as $dir_index => $dir)
 				{
-					if($parts[$dir_index] && $parts[$dir_index] != $dir)
+					if ($parts[$dir_index] && $parts[$dir_index] != $dir)
 					{
 						unset($parts[$dir_index]);
 					}
@@ -1508,24 +1505,23 @@ 
 			// Linux
 			'/',
 			// Windows
-			'\\','?','%','*',':','|',/*'.',*/ '"','<','>'
+			'\\', '?', '%', '*', ':', '|', /*'.',*/ '"', '<', '>'
 		);
 
 		// A nice name for the user,
-		$filename = $GLOBALS['egw_info']['server']['site_title'] . '_' .
-			str_replace($replace,'_',(
+		$filename = $GLOBALS['egw_info']['server']['site_title'].'_'.
+			str_replace($replace, '_', (
 			$name ? $name : (
 			count($_files) == 1 ?
 			// Just one file (hopefully a directory?) selected
-			self::basename($_files[0]) :
-			// Use the lowest common directory (eg: Infolog, Open, nathan)
+			self::basename($_files[0]) : // Use the lowest common directory (eg: Infolog, Open, nathan)
 			self::basename($base_dir))
-		)) . '.zip';
+		)).'.zip';
 
 		// Make sure basename is a dir
-		if(substr($base_dir, -1) != '/')
+		if (substr($base_dir, -1) != '/')
 		{
-			$base_dir .='/';
+			$base_dir .= '/';
 		}
 
 		// Go into directories, find them all
@@ -1536,37 +1532,37 @@ 
 		$tempfiles = array();
 
 		// Give 1 second per file, but try to allow more time for big files when amount of files is low
-		set_time_limit((count($files)<=9?10:count($files)));
+		set_time_limit((count($files) <= 9 ? 10 : count($files)));
 
 		// Add files to archive
-		foreach($files as &$addfile)
+		foreach ($files as &$addfile)
 		{
 			// Use relative paths inside zip
 			$relative = substr($addfile, strlen($base_dir));
 
 			// Use safe names - replace unsafe chars, convert to ASCII (ZIP spec says CP437, but we'll try)
-			$path = explode('/',$relative);
-			$_name = Translation::convert(Translation::to_ascii(implode('/', str_replace($replace,'_',$path))),false,'ASCII');
+			$path = explode('/', $relative);
+			$_name = Translation::convert(Translation::to_ascii(implode('/', str_replace($replace, '_', $path))), false, 'ASCII');
 
 			// Don't go infinite with app entries
-			if(self::is_link($addfile))
+			if (self::is_link($addfile))
 			{
-				if(in_array($addfile, $links)) continue;
+				if (in_array($addfile, $links)) continue;
 				$links[] = $addfile;
 			}
 			// Add directory - if empty, client app might not show it though
-			if(self::is_dir($addfile))
+			if (self::is_dir($addfile))
 			{
 				// Zip directories
 				$zip->addEmptyDir($addfile);
 			}
-			else if(self::is_readable($addfile))
+			else if (self::is_readable($addfile))
 			{
 				// Copy to temp file, as ZipArchive fails to read VFS
 				$temp = tempnam($GLOBALS['egw_info']['server']['temp_dir'], 'zip_');
-				$from = self::fopen($addfile,'r');
-		 		$to = fopen($temp,'w');
-				if(!stream_copy_to_stream($from,$to) || !$zip->addFile($temp, $_name))
+				$from = self::fopen($addfile, 'r');
+		 		$to = fopen($temp, 'w');
+				if (!stream_copy_to_stream($from, $to) || !$zip->addFile($temp, $_name))
 				{
 					unlink($temp);
 					trigger_error("Could not add $addfile to ZIP file", E_USER_ERROR);
@@ -1577,10 +1573,10 @@ 
 
 				// Add comment in
 				$props = self::propfind($addfile);
-				if($props)
+				if ($props)
 				{
-					$comment = self::find_prop($props,'comment');
-					if($comment)
+					$comment = self::find_prop($props, 'comment');
+					if ($comment)
 					{
 						$zip->setCommentName($_name, $comment);
 					}
@@ -1590,34 +1586,34 @@ 
 		}
 
 		// Set a comment to help tell them apart
-		$zip->setArchiveComment(lang('Created by %1', $GLOBALS['egw_info']['user']['account_lid']) . ' ' .DateTime::to());
+		$zip->setArchiveComment(lang('Created by %1', $GLOBALS['egw_info']['user']['account_lid']).' '.DateTime::to());
 
 		// Record total for debug, not available after close()
 		$total_files = $zip->numFiles;
 
 		$result = $zip->close();
-		if(!$result || !filesize($zip_file))
+		if (!$result || !filesize($zip_file))
 		{
 			error_log('close() result: '.array2string($result));
 			return 'Error creating zip file';
 		}
 
-		error_log("Total files: " . $total_files . " Peak memory to zip: " . self::hsize(memory_get_peak_usage(true)));
+		error_log("Total files: ".$total_files." Peak memory to zip: ".self::hsize(memory_get_peak_usage(true)));
 
 		// Stop any buffering
-		while(ob_get_level() > 0)
+		while (ob_get_level() > 0)
 		{
 			ob_end_clean();
 		}
 
 		// Stream the file to the client
 		header("Content-Type: application/zip");
-		header("Content-Length: " . filesize($zip_file));
+		header("Content-Length: ".filesize($zip_file));
 		header("Content-Disposition: attachment; filename=\"$filename\"");
 		readfile($zip_file);
 
 		unlink($zip_file);
-		foreach($tempfiles as $temp_file)
+		foreach ($tempfiles as $temp_file)
 		{
 			unlink($temp_file);
 		}
@@ -1651,11 +1647,11 @@ 
 	 * @param boolean $check_writable =true should we check if the ressource is writable, before granting locks, default yes
 	 * @return boolean true on success
 	 */
-	static function lock($path,&$token,&$timeout,&$owner,&$scope,&$type,$update=false,$check_writable=true)
+	static function lock($path, &$token, &$timeout, &$owner, &$scope, &$type, $update = false, $check_writable = true)
 	{
 		// we require write rights to lock/unlock a resource
 		if (!$path || $update && !$token || $check_writable &&
-			!(self::is_writable($path) || !self::file_exists($path) && ($dir=self::dirname($path)) && self::is_writable($dir)))
+			!(self::is_writable($path) || !self::file_exists($path) && ($dir = self::dirname($path)) && self::is_writable($dir)))
 		{
 			return false;
 		}
@@ -1669,28 +1665,28 @@ 
 
 		if ($update)	// Lock Update
 		{
-			if (($ret = (boolean)($row = self::$db->select(self::LOCK_TABLE,array('lock_owner','lock_exclusive','lock_write'),array(
+			if (($ret = (boolean)($row = self::$db->select(self::LOCK_TABLE, array('lock_owner', 'lock_exclusive', 'lock_write'), array(
 				'lock_path' => $path,
 				'lock_token' => $token,
-			),__LINE__,__FILE__)->fetch())))
+			), __LINE__, __FILE__)->fetch())))
 			{
 				$owner = $row['lock_owner'];
 				$scope = Db::from_bool($row['lock_exclusive']) ? 'exclusive' : 'shared';
 				$type  = Db::from_bool($row['lock_write']) ? 'write' : 'read';
 
-				self::$db->update(self::LOCK_TABLE,array(
+				self::$db->update(self::LOCK_TABLE, array(
 					'lock_expires' => $timeout,
 					'lock_modified' => time(),
-				),array(
+				), array(
 					'lock_path' => $path,
 					'lock_token' => $token,
-				),__LINE__,__FILE__);
+				), __LINE__, __FILE__);
 			}
 		}
 		// HTTP_WebDAV_Server does this check before calling LOCK, but we want to be complete and usable outside WebDAV
-		elseif(($lock = self::checkLock($path)) && ($lock['scope'] == 'exclusive' || $scope == 'exclusive'))
+		elseif (($lock = self::checkLock($path)) && ($lock['scope'] == 'exclusive' || $scope == 'exclusive'))
 		{
-			$ret = false;	// there's alread a lock
+			$ret = false; // there's alread a lock
 		}
 		else
 		{
@@ -1705,7 +1701,7 @@ 
 				$token = HTTP_WebDAV_Server::_new_locktoken();
 			}
 			try {
-				self::$db->insert(self::LOCK_TABLE,array(
+				self::$db->insert(self::LOCK_TABLE, array(
 					'lock_token' => $token,
 					'lock_path'  => $path,
 					'lock_created' => time(),
@@ -1714,12 +1710,12 @@ 
 					'lock_expires' => $timeout,
 					'lock_exclusive' => $scope == 'exclusive',
 					'lock_write' => $type == 'write',
-				),false,__LINE__,__FILE__);
+				), false, __LINE__, __FILE__);
 				$ret = true;
 			}
-			catch(Db\Exception $e) {
+			catch (Db\Exception $e) {
 				unset($e);
-				$ret = false;	// there's already a lock
+				$ret = false; // there's already a lock
 			}
 		}
 		if (self::LOCK_DEBUG) error_log(__METHOD__."($path,$token,$timeout,$owner,$scope,$type,update=$update,check_writable=$check_writable) returns ".($ret ? 'true' : 'false'));
@@ -1734,17 +1730,17 @@ 
 	 * @param boolean $check_writable =true should we check if the ressource is writable, before granting locks, default yes
      * @return boolean true on success
      */
-    static function unlock($path,$token,$check_writable=true)
+    static function unlock($path, $token, $check_writable = true)
     {
 		// we require write rights to lock/unlock a resource
 		if ($check_writable && !self::is_writable($path))
 		{
 			return false;
 		}
-        if (($ret = self::$db->delete(self::LOCK_TABLE,array(
+        if (($ret = self::$db->delete(self::LOCK_TABLE, array(
         	'lock_path' => $path,
         	'lock_token' => $token,
-        ),__LINE__,__FILE__) && self::$db->affected_rows()))
+        ), __LINE__, __FILE__) && self::$db->affected_rows()))
         {
         	// remove the lock from the cache too
         	unset(self::$lock_cache[$path]);
@@ -1763,31 +1759,31 @@ 
 	{
 		if (isset(self::$lock_cache[$path]))
 		{
-			if (self::LOCK_DEBUG) error_log(__METHOD__."($path) returns from CACHE ".str_replace(array("\n",'    '),'',print_r(self::$lock_cache[$path],true)));
+			if (self::LOCK_DEBUG) error_log(__METHOD__."($path) returns from CACHE ".str_replace(array("\n", '    '), '', print_r(self::$lock_cache[$path], true)));
 			return self::$lock_cache[$path];
 		}
 		$where = 'lock_path='.self::$db->quote($path);
 		// ToDo: additional check parent dirs for locks and children of the requested directory
 		//$where .= ' OR '.self::$db->quote($path).' LIKE '.self::$db->concat('lock_path',"'%'").' OR lock_path LIKE '.self::$db->quote($path.'%');
 		// ToDo: shared locks can return multiple rows
-		if (($result = self::$db->select(self::LOCK_TABLE,'*',$where,__LINE__,__FILE__)->fetch()))
+		if (($result = self::$db->select(self::LOCK_TABLE, '*', $where, __LINE__, __FILE__)->fetch()))
 		{
-			$result = Db::strip_array_keys($result,'lock_');
+			$result = Db::strip_array_keys($result, 'lock_');
 			$result['type']  = Db::from_bool($result['write']) ? 'write' : 'read';
 			$result['scope'] = Db::from_bool($result['exclusive']) ? 'exclusive' : 'shared';
 			$result['depth'] = Db::from_bool($result['recursive']) ? 'infinite' : 0;
 		}
 		if ($result && $result['expires'] < time())	// lock is expired --> remove it
 		{
-	        self::$db->delete(self::LOCK_TABLE,array(
+	        self::$db->delete(self::LOCK_TABLE, array(
 	        	'lock_path' => $result['path'],
 	        	'lock_token' => $result['token'],
-	        ),__LINE__,__FILE__);
+	        ), __LINE__, __FILE__);
 
-			if (self::LOCK_DEBUG) error_log(__METHOD__."($path) lock is expired at ".date('Y-m-d H:i:s',$result['expires'])." --> removed");
+			if (self::LOCK_DEBUG) error_log(__METHOD__."($path) lock is expired at ".date('Y-m-d H:i:s', $result['expires'])." --> removed");
 	        $result = false;
 		}
-		if (self::LOCK_DEBUG) error_log(__METHOD__."($path) returns ".($result?array2string($result):'false'));
+		if (self::LOCK_DEBUG) error_log(__METHOD__."($path) returns ".($result ?array2string($result) : 'false'));
 		return self::$lock_cache[$path] = $result;
 	}
 
@@ -1798,10 +1794,10 @@ 
 	 * @param array $content =null
 	 * @return array|boolean array with values for keys 'data','etemplate','name','label','help' or false if not supported by backend
 	 */
-	static function getExtraInfo($path,array $content=null)
+	static function getExtraInfo($path, array $content = null)
 	{
 		$extra = array();
-		if (($extra_info = self::_call_on_backend('extra_info',array($path,$content),true)))	// true = fail silent if backend does NOT support it
+		if (($extra_info = self::_call_on_backend('extra_info', array($path, $content), true)))	// true = fail silent if backend does NOT support it
 		{
 			$extra[] = $extra_info;
 		}
@@ -1812,7 +1808,7 @@ 
 			'content' => $content,
 		))))
 		{
-			foreach($vfs_extra as $data)
+			foreach ($vfs_extra as $data)
 			{
 				$extra = $extra ? array_merge($extra, $data) : $data;
 			}
@@ -1827,7 +1823,7 @@ 
 	 * @param int|string $id
 	 * @return string
 	 */
-	static function app_entry_lock_path($app,$id)
+	static function app_entry_lock_path($app, $id)
 	{
 		return "/apps/$app/entry/$id";
 	}
@@ -1841,7 +1837,7 @@ 
 		//'%' => '%25',	// % should be encoded, but easily leads to double encoding, therefore better NOT encodig it
 		'#' => '%23',
 		'?' => '%3F',
-		'/' => '',	// better remove it completly
+		'/' => '', // better remove it completly
 	);
 
 	/**
@@ -1856,7 +1852,7 @@ 
 	 */
 	static public function encodePathComponent($component)
 	{
-		return str_replace(array_keys(self::$encode),array_values(self::$encode),$component);
+		return str_replace(array_keys(self::$encode), array_values(self::$encode), $component);
 	}
 
 	/**
@@ -1869,7 +1865,7 @@ 
 	 */
 	static public function encodePath($path)
 	{
-		return implode('/',self::encodePathComponent(explode('/',$path)));
+		return implode('/', self::encodePathComponent(explode('/', $path)));
 	}
 
 	/**
@@ -1924,7 +1920,7 @@ 
 		{
 			$image = Image::find($mime_sub, 'navbar');
 		}
-		else if ($file && $mime_main == 'image' && in_array($mime_sub, array('png','jpeg','jpg','gif','bmp')) &&
+		else if ($file && $mime_main == 'image' && in_array($mime_sub, array('png', 'jpeg', 'jpg', 'gif', 'bmp')) &&
 		         (string)$GLOBALS['egw_info']['server']['link_list_thumbnail'] != '0' &&
 		         (string)$GLOBALS['egw_info']['user']['preferences']['common']['link_list_thumbnail'] != '0' &&
 		         ($stat = self::stat($file)) && $stat['size'] < 1500000)
@@ -1979,7 +1975,7 @@ 
 	 * @param array& $copied =null on return files copied
 	 * @return boolean true for no errors, false otherwise
 	 */
-	static public function copy_files(array $src, $dst, &$errs=null, array &$copied=null)
+	static public function copy_files(array $src, $dst, &$errs = null, array &$copied = null)
 	{
 		if (self::is_dir($dst))
 		{
@@ -1997,7 +1993,7 @@ 
 						if ($file !== $target)
 						{
 							// Create the target directory
-							self::mkdir($target,null,STREAM_MKDIR_RECURSIVE);
+							self::mkdir($target, null, STREAM_MKDIR_RECURSIVE);
 
 							$copied[] = $file;
 							$copied[] = $target; // < newly created folder must not be copied again!
@@ -2041,7 +2037,7 @@ 
 		if (self::is_dir($dst))
 		{
 			$vfs = new Vfs\StreamWrapper();
-			foreach($src as $file)
+			foreach ($src as $file)
 			{
 				$target = self::concat($dst, self::basename($file));
 
@@ -2073,7 +2069,7 @@ 
 	 * @param boolean $check_is_uploaded_file =true should method perform an is_uploaded_file check, default yes
 	 * @return boolean|array stat array on success, false on error
 	 */
-	static public function copy_uploaded($src,$target,$props=null,$check_is_uploaded_file=true)
+	static public function copy_uploaded($src, $target, $props = null, $check_is_uploaded_file = true)
 	{
 		$tmp_name = is_array($src) ? $src['tmp_name'] : $src;
 
@@ -2093,12 +2089,12 @@ 
 		}
 		if ($props)
 		{
-			if (!is_array($props)) $props = array(array('name' => 'comment','val' => $props));
+			if (!is_array($props)) $props = array(array('name' => 'comment', 'val' => $props));
 
 			// if $props is name => value pairs, convert it to internal array or array with values for keys 'name', 'val' and optional 'ns'
 			if (!isset($props[0]))
 			{
-				foreach($props as $name => $val)
+				foreach ($props as $name => $val)
 				{
 					if (($name == 'comment' || $name[0] == '#') && $val)	// only copy 'comment' and cfs
 					{
@@ -2116,7 +2112,7 @@ 
 			// set props before copying the file, so notifications already contain them
 			if (!self::stat($target))
 			{
-				self::touch($target);	// create empty file, to be able to attach properties
+				self::touch($target); // create empty file, to be able to attach properties
 				// tell vfs stream-wrapper to treat file in following copy as a new file notification-wises
 				$context = stream_context_create(array(
 					self::SCHEME => array('treat_as_new' => true)
@@ -2134,8 +2130,7 @@ 
 		}
 		else
 		{
-			$ret = ($context ? copy($tmp_name, self::PREFIX.$target, $context) :
-				copy($tmp_name, self::PREFIX.$target)) ?
+			$ret = ($context ? copy($tmp_name, self::PREFIX.$target, $context) : copy($tmp_name, self::PREFIX.$target)) ?
 				self::stat($target) : false;
 		}
 		if (self::LOG_LEVEL > 1 || !$ret && self::LOG_LEVEL) error_log(__METHOD__."($tmp_name, $target, ".array2string($props).") returning ".array2string($ret));
@@ -2181,7 +2176,7 @@ 
 	 * @param array|boolean &$stat=null on return: stat of existing file or false for non-existing files
 	 * @return string|boolean false if the url cant be resolved, should not happen if fstab has a root entry
 	 */
-	static function resolve_url_symlinks($_path,$file_exists=true,$resolve_last_symlink=true,&$stat=null)
+	static function resolve_url_symlinks($_path, $file_exists = true, $resolve_last_symlink = true, &$stat = null)
 	{
 		$vfs = new Vfs\StreamWrapper();
 		return $vfs->resolve_url_symlinks($_path, $file_exists, $resolve_last_symlink, $stat);
@@ -2197,7 +2192,7 @@ 
 	 * @param boolean $fix_url_query =false true append relativ path to url query parameter, default not
 	 * @return string|boolean false if the url cant be resolved, should not happen if fstab has a root entry
 	 */
-	static function resolve_url($_path,$do_symlink=true,$use_symlinkcache=true,$replace_user_pass_host=true,$fix_url_query=false)
+	static function resolve_url($_path, $do_symlink = true, $use_symlinkcache = true, $replace_user_pass_host = true, $fix_url_query = false)
 	{
 		return Vfs\StreamWrapper::resolve_url($_path, $do_symlink, $use_symlinkcache, $replace_user_pass_host, $fix_url_query);
 	}
@@ -2213,7 +2208,7 @@ 
 	 * @param boolean $recursive =false true: create missing parents too
 	 * @return boolean TRUE on success or FALSE on failure
 	 */
-	static function mkdir ($path, $mode=0750, $recursive=false)
+	static function mkdir($path, $mode = 0750, $recursive = false)
 	{
 		return $path[0] == '/' && mkdir(self::PREFIX.$path, $mode, $recursive);
 	}
@@ -2242,7 +2237,7 @@ 
 	 * @param string $path
 	 * @return boolean TRUE on success or FALSE on failure
 	 */
-	static function unlink ( $path )
+	static function unlink($path)
 	{
 		return $path[0] == '/' && unlink(self::PREFIX.$path);
 	}
@@ -2259,60 +2254,60 @@ 
 	 * @param int $path_param_key =0 key in params containing the path, default 0
 	 * @return mixed return value of backend or false if function does not exist on backend
 	 */
-	static protected function _call_on_backend($name,$params,$fail_silent=false,$path_param_key=0)
+	static protected function _call_on_backend($name, $params, $fail_silent = false, $path_param_key = 0)
 	{
 		$pathes = $params[$path_param_key];
 
 		$scheme2urls = array();
-		foreach(is_array($pathes) ? $pathes : array($pathes) as $path)
+		foreach (is_array($pathes) ? $pathes : array($pathes) as $path)
 		{
-			if (!($url = self::resolve_url_symlinks($path,false,false)))
+			if (!($url = self::resolve_url_symlinks($path, false, false)))
 			{
 				return false;
 			}
-			$k=(string)self::parse_url($url,PHP_URL_SCHEME);
+			$k = (string)self::parse_url($url, PHP_URL_SCHEME);
 			if (!(is_array($scheme2urls[$k]))) $scheme2urls[$k] = array();
 			$scheme2urls[$k][$path] = $url;
 		}
 		$ret = array();
-		foreach($scheme2urls as $scheme => $urls)
+		foreach ($scheme2urls as $scheme => $urls)
 		{
 			if ($scheme)
 			{
-				if (!class_exists($class = self::scheme2class($scheme)) || !method_exists($class,$name))
+				if (!class_exists($class = self::scheme2class($scheme)) || !method_exists($class, $name))
 				{
-					if (!$fail_silent) trigger_error("Can't $name for scheme $scheme!\n",E_USER_WARNING);
+					if (!$fail_silent) trigger_error("Can't $name for scheme $scheme!\n", E_USER_WARNING);
 					return false;
 				}
 				if (!is_array($pathes))
 				{
 					$params[$path_param_key] = $url;
 
-					return call_user_func_array(array($class,$name),$params);
+					return call_user_func_array(array($class, $name), $params);
 				}
 				$params[$path_param_key] = $urls;
-				if (!is_array($r = call_user_func_array(array($class,$name),$params)))
+				if (!is_array($r = call_user_func_array(array($class, $name), $params)))
 				{
 					return $r;
 				}
 				// we need to re-translate the urls to pathes, as they can eg. contain symlinks
-				foreach($urls as $path => $url)
+				foreach ($urls as $path => $url)
 				{
-					if (isset($r[$url]) || isset($r[$url=self::parse_url($url,PHP_URL_PATH)]))
+					if (isset($r[$url]) || isset($r[$url = self::parse_url($url, PHP_URL_PATH)]))
 					{
 						$ret[$path] = $r[$url];
 					}
 				}
 			}
 			// call the filesystem specific function (dont allow to use arrays!)
-			elseif(!function_exists($name) || is_array($pathes))
+			elseif (!function_exists($name) || is_array($pathes))
 			{
 				return false;
 			}
 			else
 			{
 				$time = null;
-				return $name($url,$time);
+				return $name($url, $time);
 			}
 		}
 		return $ret;
@@ -2326,7 +2321,7 @@ 
 	 * @param int $atime =null access time (unix timestamp), default null = current time, not implemented in the vfs!
 	 * @return boolean true on success, false otherwise
 	 */
-	static function touch($path,$time=null,$atime=null)
+	static function touch($path, $time = null, $atime = null)
 	{
 		return $path[0] == '/' && touch(self::PREFIX.$path, $time, $atime);
 	}
@@ -2340,7 +2335,7 @@ 
 	 * @param string $mode mode string see Vfs::mode2int
 	 * @return boolean true on success, false otherwise
 	 */
-	static function chmod($path,$mode)
+	static function chmod($path, $mode)
 	{
 		return $path[0] == '/' && chmod(self::PREFIX.$path, $mode);
 	}
@@ -2354,7 +2349,7 @@ 
 	 * @param int|string $owner numeric user id or account-name
 	 * @return boolean true on success, false otherwise
 	 */
-	static function chown($path,$owner)
+	static function chown($path, $owner)
 	{
 		return $path[0] == '/' && chown(self::PREFIX.$path, is_numeric($owner) ? abs($owner) : $owner);
 	}
@@ -2368,7 +2363,7 @@ 
 	 * @param int|string $group numeric group id or group-name
 	 * @return boolean true on success, false otherwise
 	 */
-	static function chgrp($path,$group)
+	static function chgrp($path, $group)
 	{
 		return $path[0] == '/' && chgrp(self::PREFIX.$path, is_numeric($group) ? abs($group) : $group);
 	}
@@ -2383,7 +2378,7 @@ 
 	 */
 	static function readlink($path)
 	{
-		$ret = self::_call_on_backend('readlink',array($path),true);	// true = fail silent, if backend does not support readlink
+		$ret = self::_call_on_backend('readlink', array($path), true); // true = fail silent, if backend does not support readlink
 		//error_log(__METHOD__."('$path') returning ".array2string($ret).' '.function_backtrace());
 		return $ret;
 	}
@@ -2397,9 +2392,9 @@ 
 	 * @param string $link path of the link to create
 	 * @return boolean true on success, false on error
 	 */
-	static function symlink($target,$link)
+	static function symlink($target, $link)
 	{
-		if (($ret = self::_call_on_backend('symlink',array($target,$link),false,1)))	// 1=path is in $link!
+		if (($ret = self::_call_on_backend('symlink', array($target, $link), false, 1)))	// 1=path is in $link!
 		{
 			Vfs\StreamWrapper::symlinkCache_remove($link);
 		}
@@ -2419,13 +2414,13 @@ 
 	 * @param boolean $recheck =false true = do a new check, false = rely on stored mime type (if existing)
 	 * @return string mime-type (self::DIR_MIME_TYPE for directories)
 	 */
-	static function mime_content_type($path,$recheck=false)
+	static function mime_content_type($path, $recheck = false)
 	{
 		if (!($url = self::resolve_url_symlinks($path)))
 		{
 			return false;
 		}
-		if (($scheme = self::parse_url($url,PHP_URL_SCHEME)) && !$recheck)
+		if (($scheme = self::parse_url($url, PHP_URL_SCHEME)) && !$recheck)
 		{
 			// check it it's an eGW stream wrapper returning mime-type via url_stat
 			// we need to first check if the constant is defined, as we get a fatal error in php5.3 otherwise
@@ -2434,7 +2429,7 @@ 
 				($mime_attr = constant($class.'::STAT_RETURN_MIME_TYPE')))
 			{
 				$inst = new $class;
-				$stat = $inst->url_stat(self::parse_url($url,PHP_URL_PATH),0);
+				$stat = $inst->url_stat(self::parse_url($url, PHP_URL_PATH), 0);
 				if ($stat && $stat[$mime_attr])
 				{
 					$mime = $stat[$mime_attr];
@@ -2453,7 +2448,7 @@ 
 		// using EGw's own mime magic (currently only checking the extension!)
 		if (!$mime)
 		{
-			$mime = MimeMagic::filename2mime(self::parse_url($url,PHP_URL_PATH));
+			$mime = MimeMagic::filename2mime(self::parse_url($url, PHP_URL_PATH));
 		}
 		//error_log(__METHOD__."($path,$recheck) mime=$mime");
 		return $mime;
@@ -2483,7 +2478,7 @@ 
 	 *
 	 * @param string $path ='/' path of backend, whos cache to clear
 	 */
-	static function clearstatcache($path='/')
+	static function clearstatcache($path = '/')
 	{
 		//error_log(__METHOD__."('$path')");
 		Vfs\StreamWrapper::clearstatcache($path);
@@ -2503,7 +2498,7 @@ 
 	 * @param string $path_to
 	 * @return boolean TRUE on success or FALSE on failure
 	 */
-	static function rename ( $path_from, $path_to )
+	static function rename($path_from, $path_to)
 	{
 		$vfs = new Vfs\StreamWrapper();
 		return $vfs->rename($path_from, $path_to);

api/src/Framework.php

Indentation +63 added lines, -63 removed lines

@@ -62,16 +62,16 @@ 
 	var $template_dirs = array();
 
 	/**
-	* true if $this->header() was called
-	*
-	* @var boolean
-	*/
+	 * true if $this->header() was called
+	 *
+	 * @var boolean
+	 */
 	static $header_done = false;
 	/**
-	* true if $this->navbar() was called
-	*
-	* @var boolean
-	*/
+	 * true if $this->navbar() was called
+	 *
+	 * @var boolean
+	 */
 	static $navbar_done = false;
 
 	/**
@@ -1044,13 +1044,13 @@ 
 	}
 
 	/**
-	* Compile entries for topmenu:
-	* - regular items: links
-	* - info items
-	*
-	* @param array $vars
-	* @param array $apps
-	*/
+	 * Compile entries for topmenu:
+	 * - regular items: links
+	 * - info items
+	 *
+	 * @param array $vars
+	 * @param array $apps
+	 */
 	function topmenu(array $vars,array $apps)
 	{
 		if($GLOBALS['egw_info']['user']['apps']['home'] && isset($apps['home']))
@@ -1154,39 +1154,39 @@ 
 	}
 
 	/**
-	* Add menu items to the topmenu template class to be displayed
-	*
-	* @param array $app application data
-	* @param mixed $alt_label string with alternative menu item label default value = null
-	* @param string $urlextra string with alternate additional code inside <a>-tag
-	* @access protected
-	* @return void
-	*/
+	 * Add menu items to the topmenu template class to be displayed
+	 *
+	 * @param array $app application data
+	 * @param mixed $alt_label string with alternative menu item label default value = null
+	 * @param string $urlextra string with alternate additional code inside <a>-tag
+	 * @access protected
+	 * @return void
+	 */
 	abstract function _add_topmenu_item(array $app_data,$alt_label=null);
 
 	/**
-	* Add info items to the topmenu template class to be displayed
-	*
-	* @param string $content Html of item
-	* @param string $id =null
-	* @access protected
-	* @return void
-	*/
+	 * Add info items to the topmenu template class to be displayed
+	 *
+	 * @param string $content Html of item
+	 * @param string $id =null
+	 * @access protected
+	 * @return void
+	 */
 	abstract function _add_topmenu_info_item($content, $id=null);
 
 	static $top_menu_extra = array();
 
 	/**
-	* Called by hooks to add an entry in the topmenu location.
-	* Extra entries will be added just before Logout.
-	*
-	* @param string $id unique element id
-	* @param string $url Address for the entry to link to
-	* @param string $title Text displayed for the entry
-	* @param string $target Optional, so the entry can open in a new page or popup
-	* @access public
-	* @return void
-	*/
+	 * Called by hooks to add an entry in the topmenu location.
+	 * Extra entries will be added just before Logout.
+	 *
+	 * @param string $id unique element id
+	 * @param string $url Address for the entry to link to
+	 * @param string $title Text displayed for the entry
+	 * @param string $target Optional, so the entry can open in a new page or popup
+	 * @access public
+	 * @return void
+	 */
 	public static function add_topmenu_item($id,$url,$title,$target = '')
 	{
 		$entry['name'] = $id;
@@ -1198,16 +1198,16 @@ 
 	}
 
 	/**
-	* called by hooks to add an icon in the topmenu info location
-	*
-	* @param string $id unique element id
-	* @param string $icon_src src of the icon image. Make sure this nog height then 18pixels
-	* @param string $iconlink where the icon links to
-	* @param booleon $blink set true to make the icon blink
-	* @param mixed $tooltip string containing the tooltip html, or null of no tooltip
-	* @access public
-	* @return void
-	*/
+	 * called by hooks to add an icon in the topmenu info location
+	 *
+	 * @param string $id unique element id
+	 * @param string $icon_src src of the icon image. Make sure this nog height then 18pixels
+	 * @param string $iconlink where the icon links to
+	 * @param booleon $blink set true to make the icon blink
+	 * @param mixed $tooltip string containing the tooltip html, or null of no tooltip
+	 * @access public
+	 * @return void
+	 */
 	abstract function topmenu_info_icon($id,$icon_src,$iconlink,$blink=false,$tooltip=null);
 
 	/**
@@ -1242,19 +1242,19 @@ 
 	protected static $js_include_mgr;
 
 	/**
-	* Checks to make sure a valid package and file name is provided
-	*
-	* Example call syntax:
-	* a) Api\Framework::includeJS('jscalendar','calendar')
-	*    --> /phpgwapi/js/jscalendar/calendar.js
-	* b) Api\Framework::includeJS('/phpgwapi/inc/calendar-setup.js',array('lang'=>'de'))
-	*    --> /phpgwapi/inc/calendar-setup.js?lang=de
-	*
-	* @param string $package package or complete path (relative to EGW_SERVER_ROOT) to be included
-	* @param string|array $file =null file to be included - no ".js" on the end or array with get params
-	* @param string $app ='phpgwapi' application directory to search - default = phpgwapi
-	* @param boolean $append =true should the file be added
-	*/
+	 * Checks to make sure a valid package and file name is provided
+	 *
+	 * Example call syntax:
+	 * a) Api\Framework::includeJS('jscalendar','calendar')
+	 *    --> /phpgwapi/js/jscalendar/calendar.js
+	 * b) Api\Framework::includeJS('/phpgwapi/inc/calendar-setup.js',array('lang'=>'de'))
+	 *    --> /phpgwapi/inc/calendar-setup.js?lang=de
+	 *
+	 * @param string $package package or complete path (relative to EGW_SERVER_ROOT) to be included
+	 * @param string|array $file =null file to be included - no ".js" on the end or array with get params
+	 * @param string $app ='phpgwapi' application directory to search - default = phpgwapi
+	 * @param boolean $append =true should the file be added
+	 */
 	static function includeJS($package, $file=null, $app='phpgwapi')
 	{
 		self::$js_include_mgr->include_js_file($package, $file, $app);

Upper-Lower-Casing +4 added lines, -4 removed lines

@@ -354,7 +354,7 @@ 
 	 */
 	public function _get_footer()
 	{
-		$var = Array(
+		$var = array(
 			'img_root'       => $GLOBALS['egw_info']['server']['webserver_url'] . $this->template_dir.'/images',
 			'version'        => $GLOBALS['egw_info']['server']['versions']['phpgwapi']
 		);
@@ -763,7 +763,7 @@ 
 
 				$icon = isset($data['icon']) ?  $data['icon'] : 'navbar';
 				$icon_app = isset($data['icon_app']) ? $data['icon_app'] : $app;
-				$apps[$app]['icon']  = $apps[$app]['icon_hover']  = Image::find($icon_app,Array($icon,'nonav'),'',$svg);
+				$apps[$app]['icon']  = $apps[$app]['icon_hover']  = Image::find($icon_app,array($icon,'nonav'),'',$svg);
 			}
 		}
 
@@ -796,13 +796,13 @@ 
 		// We handle this here because its special
 		$apps['about']['title'] = 'EGroupware';
 		$apps['about']['url']   = self::link('/about.php');
-		$apps['about']['icon']  = $apps['about']['icon_hover'] = Image::find('api',Array('about','nonav'));
+		$apps['about']['icon']  = $apps['about']['icon_hover'] = Image::find('api',array('about','nonav'));
 		$apps['about']['name']  = 'about';
 
 		$apps['logout']['title'] = lang('Logout');
 		$apps['logout']['name']  = 'logout';
 		$apps['logout']['url']   = self::link('/logout.php');
-		$apps['logout']['icon']  = $apps['logout']['icon_hover'] = Image::find('api',Array('logout','nonav'));
+		$apps['logout']['icon']  = $apps['logout']['icon_hover'] = Image::find('api',array('logout','nonav'));
 
 		return $apps;
 	}

Doc Comments +3 added lines, -9 removed lines

@@ -78,6 +78,7 @@ 
 	 * Constructor
 	 *
 	 * The constructor instanciates the class in $GLOBALS['egw']->framework, from where it should be used
+	 * @param string $template
 	 */
 	function __construct($template)
 	{
@@ -564,7 +565,7 @@ 
 	/**
 	 * Returns Html with user and time
 	 *
-	 * @return void
+	 * @return string
 	 */
 	protected static function _user_time_info()
 	{
@@ -993,7 +994,6 @@ 
 	 *
 	 * Themes are css file in the template directory
 	 *
-	 * @param string $themes_dir ='css'
 	 */
 	function list_themes()
 	{
@@ -1184,11 +1184,6 @@ 
 	/**
 	* Add menu items to the topmenu template class to be displayed
 	*
-	* @param array $app application data
-	* @param mixed $alt_label string with alternative menu item label default value = null
-	* @param string $urlextra string with alternate additional code inside <a>-tag
-	* @access protected
-	* @return void
 	*/
 	abstract function _add_topmenu_item(array $app_data,$alt_label=null);
 
@@ -1281,7 +1276,6 @@ 
 	* @param string $package package or complete path (relative to EGW_SERVER_ROOT) to be included
 	* @param string|array $file =null file to be included - no ".js" on the end or array with get params
 	* @param string $app ='phpgwapi' application directory to search - default = phpgwapi
-	* @param boolean $append =true should the file be added
 	*/
 	static function includeJS($package, $file=null, $app='phpgwapi')
 	{
@@ -1442,7 +1436,7 @@ 
 	 * @param string $action "add" or "delete"
 	 * @param boolean|int|string $group ID of the group to create the favorite for, or 'all' for all users
 	 * @param array $filters =array() key => value pairs for the filter
-	 * @return boolean Success
+	 * @return boolean|null Success
 	 */
 	public static function ajax_set_favorite($app, $name, $action, $group, $filters = array())
 	{

Braces +54 added lines, -15 removed lines

@@ -222,7 +222,10 @@ 
 		}
 
 		// commit session (if existing), to fix timing problems sometimes preventing session creation ("Your session can not be verified")
-		if (isset($GLOBALS['egw']->session)) $GLOBALS['egw']->session->commit_session();
+		if (isset($GLOBALS['egw']->session))
+		{
+			$GLOBALS['egw']->session->commit_session();
+		}
 
 		exit;
 	}
@@ -252,8 +255,14 @@ 
 	 */
 	function render($content,$app_header=null,$navbar=null)
 	{
-		if (!is_null($app_header)) $GLOBALS['egw_info']['flags']['app_header'] = $app_header;
-		if (!is_null($navbar)) $GLOBALS['egw_info']['flags']['nonavbar'] = !$navbar;
+		if (!is_null($app_header))
+		{
+			$GLOBALS['egw_info']['flags']['app_header'] = $app_header;
+		}
+		if (!is_null($navbar))
+		{
+			$GLOBALS['egw_info']['flags']['nonavbar'] = !$navbar;
+		}
 
 		echo $this->header();
 
@@ -450,7 +459,10 @@ 
 		// send appheader to clientside
 		$extra['app-header'] = $app_header;
 
-		if($GLOBALS['egw_info']['flags']['currentapp'] != 'wiki') $robots ='<meta name="robots" content="none" />';
+		if($GLOBALS['egw_info']['flags']['currentapp'] != 'wiki')
+		{
+			$robots ='<meta name="robots" content="none" />';
+		}
 
 		if (substr($GLOBALS['egw_info']['server']['favicon_file'],0,4) == 'http')
 		{
@@ -692,13 +704,19 @@ 
 		$ind_b = isset($arr[$b['name']]) ? $arr[$b['name']] : null;
 
 		if ($ind_a == $ind_b)
-			return 0;
+		{
+					return 0;
+		}
 
 		if ($ind_a == null)
-			return -1;
+		{
+					return -1;
+		}
 
 		if ($ind_b == null)
-			return 1;
+		{
+					return 1;
+		}
 
 		return $ind_a > $ind_b ? 1 : -1;
 	}
@@ -787,9 +805,12 @@ 
 			$app_title = $GLOBALS['egw_info']['apps'][$app]['title'];
 		}
 
-		if ($GLOBALS['egw_info']['user']['apps']['preferences'])	// Preferences last
+		if ($GLOBALS['egw_info']['user']['apps']['preferences'])
+		{
+			// Preferences last
 		{
 			$prefs = $apps['preferences'];
+		}
 			unset($apps['preferences']);
 			$apps['preferences'] = $prefs;
 		}
@@ -839,7 +860,10 @@ 
 			$themes_to_check[] = $this->template_dir.'/css/'.$this->template.'.css';
 			foreach($themes_to_check as $theme_css)
 			{
-				if (file_exists(EGW_SERVER_ROOT.$theme_css)) break;
+				if (file_exists(EGW_SERVER_ROOT.$theme_css))
+				{
+					break;
+				}
 			}
 			$debug_minify = $GLOBALS['egw_info']['server']['debug_minify'] === 'True';
 			if (!$debug_minify && file_exists(EGW_SERVER_ROOT.($theme_min_css = str_replace('.css', '.min.css', $theme_css))))
@@ -929,7 +953,9 @@ 
 		}
 
 		$extra['url'] = $GLOBALS['egw_info']['server']['webserver_url'];
-		$extra['include'] = array_map(function($str){return substr($str,1);}, self::get_script_links(true), array(1));
+		$extra['include'] = array_map(function($str)
+		{
+return substr($str,1);}, self::get_script_links(true), array(1));
 		$extra['app'] = $GLOBALS['egw_info']['flags']['currentapp'];
 
 		// Load LABjs ONCE here
@@ -941,7 +967,10 @@ 
 		// add values of extra parameter and class var as data attributes to script tag of egw.js
 		foreach($extra+self::$extra as $name => $value)
 		{
-			if (is_array($value)) $value = json_encode($value);
+			if (is_array($value))
+			{
+				$value = json_encode($value);
+			}
 			// we need to double encode (Html::htmlspecialchars( , TRUE)), as otherwise we get invalid json, eg. for quotes
 			$java_script .= ' data-'.$name."=\"". Html::htmlspecialchars($value, true)."\"";
 		}
@@ -991,7 +1020,10 @@ 
 				if (preg_match('/'."\.css$".'/i', $file))
 				{
 					list($name) = explode('.',$file);
-					if (!isset($list[$name])) $list[$name] = ucfirst ($name);
+					if (!isset($list[$name]))
+					{
+						$list[$name] = ucfirst ($name);
+					}
 				}
 			}
 			closedir($dh);
@@ -1070,7 +1102,8 @@ 
 
 		Hooks::process('topmenu_info',array(),true);
 		// Add extra items added by hooks
-		foreach(self::$top_menu_extra as $extra_item) {
+		foreach(self::$top_menu_extra as $extra_item)
+		{
 			$this->_add_topmenu_item($extra_item);
 		}
 
@@ -1095,7 +1128,10 @@ 
 	protected function add_preferences_topmenu($type='prefs')
 	{
 		static $memberships=null;
-		if (!isset($memberships)) $memberships = $GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'], true);
+		if (!isset($memberships))
+		{
+			$memberships = $GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'], true);
+		}
 		static $types = array(
 			'prefs' => array(
 				'title' => 'Preferences',
@@ -1123,7 +1159,10 @@ 
 			// as all apps answer, we need to remove none-true responses
 			foreach($apps as $app => $val)
 			{
-				if (!$val) unset($apps[$app]);
+				if (!$val)
+				{
+					unset($apps[$app]);
+				}
 			}
 		}
 		else

Spacing +114 added lines, -115 removed lines

@@ -116,7 +116,7 @@ 
 			$GLOBALS['egw_info']['server']['template_set'] = 'jdots';
 		}
 		// eg. "default" is only used for login at the moment
-		if (!class_exists($class=$GLOBALS['egw_info']['server']['template_set'].'_framework'))
+		if (!class_exists($class = $GLOBALS['egw_info']['server']['template_set'].'_framework'))
 		{
 			$class = __CLASS__.'\\Minimal';
 		}
@@ -134,7 +134,7 @@ 
 		Header\ContentSecurityPolicy::send();
 
 		// allow client-side to detect first load aka just logged in
-		$reload_count =& Cache::getSession(__CLASS__, 'framework-reload');
+		$reload_count = & Cache::getSession(__CLASS__, 'framework-reload');
 		self::$extra['framework-reload'] = (int)(bool)$reload_count++;
 	}
 
@@ -164,9 +164,9 @@ 
 	 * @param string $link_app =null if appname or true, some templates generate a special link-handler url
 	 * @return string	The full url after processing
 	 */
-	static function link($url, $extravars = '', $link_app=null)
+	static function link($url, $extravars = '', $link_app = null)
 	{
-		unset($link_app);	// not used by required by function signature
+		unset($link_app); // not used by required by function signature
 		return $GLOBALS['egw']->session->link($url, $extravars);
 	}
 
@@ -178,7 +178,7 @@ 
 	 * @param string $url url to redirect to
 	 * @param string $link_app =null appname to redirect for, default currentapp
 	 */
-	static function redirect($url, $link_app=null)
+	static function redirect($url, $link_app = null)
 	{
 		// Determines whether the current output buffer should be flushed
 		$do_flush = true;
@@ -200,7 +200,7 @@ 
 		else
 		{
 			$file = $line = null;
-			if (headers_sent($file,$line))
+			if (headers_sent($file, $line))
 			{
 				throw new Exception\AssertionFailed(__METHOD__."('".htmlspecialchars($url)."') can NOT redirect, output already started at $file line $line!");
 			}
@@ -235,7 +235,7 @@ 
 	 * @param string $link_app =null if appname or true, some templates generate a special link-handler url
 	 * @return string	The full url after processing
 	 */
-	static function redirect_link($url, $extravars='', $link_app=null)
+	static function redirect_link($url, $extravars = '', $link_app = null)
 	{
 		self::redirect(self::link($url, $extravars), $link_app);
 	}
@@ -250,7 +250,7 @@ 
 	 * @param string $navbar =null show the navigation, default !$GLOBALS['egw_info']['flags']['nonavbar'], false gives a typical popu
 	 *
 	 */
-	function render($content,$app_header=null,$navbar=null)
+	function render($content, $app_header = null, $navbar = null)
 	{
 		if (!is_null($app_header)) $GLOBALS['egw_info']['flags']['app_header'] = $app_header;
 		if (!is_null($navbar)) $GLOBALS['egw_info']['flags']['nonavbar'] = !$navbar;
@@ -271,7 +271,7 @@ 
 	 *
 	 * @return string with Html
 	 */
-	abstract function header(array $extra=array());
+	abstract function header(array $extra = array());
 
 	/**
 	 * Returns the Html from the body-tag til the main application area (incl. opening div tag)
@@ -291,7 +291,7 @@ 
 	 * @return boolean $consider_navbar_not_yet_called_as_true=true
 	 * @return boolean
 	 */
-	abstract function isTop($consider_navbar_not_yet_called_as_true=true);
+	abstract function isTop($consider_navbar_not_yet_called_as_true = true);
 
 	/**
 	 * Returns the content of one sidebox
@@ -301,7 +301,7 @@ 
 	 * @param array $file
 	 * @param string $type =null 'admin', 'preferences', 'favorites', ...
 	 */
-	abstract function sidebox($appname,$menu_title,$file,$type=null);
+	abstract function sidebox($appname, $menu_title, $file, $type = null);
 
 	/**
 	 * Returns the Html from the closing div of the main application area to the closing html-tag
@@ -316,7 +316,7 @@ 
 	 * @param string $extra_vars for login url
 	 * @param string $change_passwd =null string with message to render input fields for password change
 	 */
-	function login_screen($extra_vars, $change_passwd=null)
+	function login_screen($extra_vars, $change_passwd = null)
 	{
 		(new Framework\Login($this))->screen($extra_vars, $change_passwd);
 	}
@@ -354,11 +354,11 @@ 
 	public function _get_footer()
 	{
 		$var = Array(
-			'img_root'       => $GLOBALS['egw_info']['server']['webserver_url'] . $this->template_dir.'/images',
+			'img_root'       => $GLOBALS['egw_info']['server']['webserver_url'].$this->template_dir.'/images',
 			'version'        => $GLOBALS['egw_info']['server']['versions']['phpgwapi']
 		);
 		$var['page_generation_time'] = '';
-		if($GLOBALS['egw_info']['user']['preferences']['common']['show_generation_time'])
+		if ($GLOBALS['egw_info']['user']['preferences']['common']['show_generation_time'])
 		{
 			$times = self::get_page_generation_time();
 
@@ -398,16 +398,16 @@ 
 	static public function _get_body_attribs()
 	{
 		$js = '';
-		foreach(self::$body_tags as $what => $data)
+		foreach (self::$body_tags as $what => $data)
 		{
 			if (!empty($data))
 			{
-				if($what == 'onLoad')
+				if ($what == 'onLoad')
 				{
-					$js .= 'onLoad="egw_LAB.wait(function() {'. htmlspecialchars($data).'})"';
+					$js .= 'onLoad="egw_LAB.wait(function() {'.htmlspecialchars($data).'})"';
 					continue;
 				}
-				$js .= ' '.$what.'="' . htmlspecialchars($data) . '"';
+				$js .= ' '.$what.'="'.htmlspecialchars($data).'"';
 			}
 		}
 		return $js;
@@ -419,7 +419,7 @@ 
 	 * @param array $extra =array() extra attributes passed as data-attribute to egw.js
 	 * @return array
 	 */
-	protected function _get_header(array $extra=array())
+	protected function _get_header(array $extra = array())
 	{
 		// display password expires in N days message once per session
 		$message = null;
@@ -430,7 +430,7 @@ 
 		}
 
 		// get used language code (with a little xss check, if someone tries to sneak something in)
-		if (preg_match('/^[a-z]{2}(-[a-z]{2})?$/',$GLOBALS['egw_info']['user']['preferences']['common']['lang']))
+		if (preg_match('/^[a-z]{2}(-[a-z]{2})?$/', $GLOBALS['egw_info']['user']['preferences']['common']['lang']))
 		{
 			$lang_code = $GLOBALS['egw_info']['user']['preferences']['common']['lang'];
 		}
@@ -450,9 +450,9 @@ 
 		// send appheader to clientside
 		$extra['app-header'] = $app_header;
 
-		if($GLOBALS['egw_info']['flags']['currentapp'] != 'wiki') $robots ='<meta name="robots" content="none" />';
+		if ($GLOBALS['egw_info']['flags']['currentapp'] != 'wiki') $robots = '<meta name="robots" content="none" />';
 
-		if (substr($GLOBALS['egw_info']['server']['favicon_file'],0,4) == 'http')
+		if (substr($GLOBALS['egw_info']['server']['favicon_file'], 0, 4) == 'http')
 		{
 			$var['favicon_file'] = $GLOBALS['egw_info']['server']['favicon_file'];
 		}
@@ -468,7 +468,7 @@ 
 			$include_wz_tooltip = '<script src="'.$GLOBALS['egw_info']['server']['webserver_url'].
 				$wz_tooltip.'?'.filemtime(EGW_SERVER_ROOT.$wz_tooltip).'" type="text/javascript"></script>';
 		}
-		return $this->_get_css()+array(
+		return $this->_get_css() + array(
 			'img_icon'			=> $var['favicon_file'],
 			'img_shortcut'		=> $var['favicon_file'],
 			'pngfix'        	=> $pngfix,
@@ -492,15 +492,15 @@ 
 	 */
 	protected function _get_navbar($apps)
 	{
-		$var['img_root'] = $GLOBALS['egw_info']['server']['webserver_url'] . '/phpgwapi/templates/'.$this->template.'/images';
+		$var['img_root'] = $GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/templates/'.$this->template.'/images';
 
-		if(isset($GLOBALS['egw_info']['flags']['app_header']))
+		if (isset($GLOBALS['egw_info']['flags']['app_header']))
 		{
 			$var['current_app_title'] = $GLOBALS['egw_info']['flags']['app_header'];
 		}
 		else
 		{
-			$var['current_app_title']=$apps[$GLOBALS['egw_info']['flags']['currentapp']]['title'];
+			$var['current_app_title'] = $apps[$GLOBALS['egw_info']['flags']['currentapp']]['title'];
 		}
 		$var['currentapp'] = $GLOBALS['egw_info']['flags']['currentapp'];
 
@@ -512,32 +512,32 @@ 
 
 		$var['user_info'] = $this->_user_time_info();
 
-		if($GLOBALS['egw_info']['user']['account_lastpwd_change'] == 0)
+		if ($GLOBALS['egw_info']['user']['account_lastpwd_change'] == 0)
 		{
 			$api_messages = lang('You are required to change your password during your first login').'<br />'.
-				lang('Click this image on the navbar: %1','<img src="'.Image::find('preferences','navbar.gif').'">');
+				lang('Click this image on the navbar: %1', '<img src="'.Image::find('preferences', 'navbar.gif').'">');
 		}
-		elseif($GLOBALS['egw_info']['server']['change_pwd_every_x_days'] && $GLOBALS['egw_info']['user']['account_lastpwd_change'] < time() - (86400*$GLOBALS['egw_info']['server']['change_pwd_every_x_days']))
+		elseif ($GLOBALS['egw_info']['server']['change_pwd_every_x_days'] && $GLOBALS['egw_info']['user']['account_lastpwd_change'] < time() - (86400 * $GLOBALS['egw_info']['server']['change_pwd_every_x_days']))
 		{
-			$api_messages = lang('it has been more then %1 days since you changed your password',$GLOBALS['egw_info']['server']['change_pwd_every_x_days']);
+			$api_messages = lang('it has been more then %1 days since you changed your password', $GLOBALS['egw_info']['server']['change_pwd_every_x_days']);
 		}
 
-		if (substr($GLOBALS['egw_info']['server']['login_logo_file'],0,4) == 'http' ||
+		if (substr($GLOBALS['egw_info']['server']['login_logo_file'], 0, 4) == 'http' ||
 			$GLOBALS['egw_info']['server']['login_logo_file'][0] == '/')
 		{
 			$var['logo_file'] = $GLOBALS['egw_info']['server']['login_logo_file'];
 		}
 		else
 		{
-			$var['logo_file'] = Image::find('phpgwapi',$GLOBALS['egw_info']['server']['login_logo_file']?$GLOBALS['egw_info']['server']['login_logo_file']:'logo', '', null);	// null=explicit allow svg
+			$var['logo_file'] = Image::find('phpgwapi', $GLOBALS['egw_info']['server']['login_logo_file'] ? $GLOBALS['egw_info']['server']['login_logo_file'] : 'logo', '', null); // null=explicit allow svg
 		}
-		$var['logo_url'] = $GLOBALS['egw_info']['server']['login_logo_url']?$GLOBALS['egw_info']['server']['login_logo_url']:'http://www.eGroupWare.org';
+		$var['logo_url'] = $GLOBALS['egw_info']['server']['login_logo_url'] ? $GLOBALS['egw_info']['server']['login_logo_url'] : 'http://www.eGroupWare.org';
 
-		if (substr($var['logo_url'],0,4) != 'http')
+		if (substr($var['logo_url'], 0, 4) != 'http')
 		{
 			$var['logo_url'] = 'http://'.$var['logo_url'];
 		}
-		$var['logo_title'] = $GLOBALS['egw_info']['server']['login_logo_title']?$GLOBALS['egw_info']['server']['login_logo_title']:'www.eGroupWare.org';
+		$var['logo_title'] = $GLOBALS['egw_info']['server']['login_logo_title'] ? $GLOBALS['egw_info']['server']['login_logo_title'] : 'www.eGroupWare.org';
 
 		return $var;
 	}
@@ -550,14 +550,14 @@ 
 	protected static function _user_time_info()
 	{
 		$now = new DateTime();
-		$user_info = '<b>'.Accounts::format_username() .'</b>'. ' - ' . lang($now->format('l')) . ' ' . $now->format(true);
+		$user_info = '<b>'.Accounts::format_username().'</b>'.' - '.lang($now->format('l')).' '.$now->format(true);
 
 		$user_tzs = DateTime::getUserTimezones();
 		if (count($user_tzs) > 1)
 		{
 			$tz = $GLOBALS['egw_info']['user']['preferences']['common']['tz'];
-			$user_info .= Html::form(Html::select('tz',$tz,$user_tzs,true),array(),
-				'/index.php','','tz_selection',' style="display: inline;"','GET');
+			$user_info .= Html::form(Html::select('tz', $tz, $user_tzs, true), array(),
+				'/index.php', '', 'tz_selection', ' style="display: inline;"', 'GET');
 		}
 		return $user_info;
 	}
@@ -569,10 +569,10 @@ 
 	 */
 	protected static function _current_users()
 	{
-	   if( $GLOBALS['egw_info']['user']['apps']['admin'] && $GLOBALS['egw_info']['user']['preferences']['common']['show_currentusers'])
+	   if ($GLOBALS['egw_info']['user']['apps']['admin'] && $GLOBALS['egw_info']['user']['preferences']['common']['show_currentusers'])
 	   {
-		  $current_users = '<a href="' . self::link('/index.php','menuaction=admin.admin_accesslog.sessions') . '">' .
-		  	lang('Current users') . ': <span id="currentusers">' . $GLOBALS['egw']->session->session_count() . '</span></a>';
+		  $current_users = '<a href="'.self::link('/index.php', 'menuaction=admin.admin_accesslog.sessions').'">'.
+		  	lang('Current users').': <span id="currentusers">'.$GLOBALS['egw']->session->session_count().'</span></a>';
 		  return $current_users;
 	   }
 	}
@@ -606,14 +606,14 @@ 
 	 * @param array $opts =array() further params for http(s) context, eg. array('timeout' => 123)
 	 * @return resource|null context to use with file_get_context/fopen or null if no proxy configured
 	 */
-	public static function proxy_context($username=null, $password=null, array $opts = array())
+	public static function proxy_context($username = null, $password = null, array $opts = array())
 	{
 		$opts += array(
 			'method' => 'GET',
 		);
 		if (!empty($GLOBALS['egw_info']['server']['httpproxy_server']))
 		{
-			$opts += array (
+			$opts += array(
 				'proxy'  => 'tcp://'.$GLOBALS['egw_info']['server']['httpproxy_server'].':'.
 					($GLOBALS['egw_info']['server']['httpproxy_port'] ? $GLOBALS['egw_info']['server']['httpproxy_port'] : 8080),
 				'request_fulluri' => true,
@@ -642,7 +642,7 @@ 
 	 * @param string &$changelog on return path to changelog
 	 * @return string
 	 */
-	public static function api_version(&$changelog=null)
+	public static function api_version(&$changelog = null)
 	{
 		return Framework\Updates::api_version($changelog);
 	}
@@ -655,7 +655,7 @@ 
 	 */
 	public static function index($app)
 	{
-		$data =& $GLOBALS['egw_info']['user']['apps'][$app];
+		$data = & $GLOBALS['egw_info']['user']['apps'][$app];
 		if (!isset($data))
 		{
 			throw new Exception\WrongParameter("'$app' not a valid app for this user!");
@@ -672,7 +672,7 @@ 
 				$index = '/index.php?menuaction='.$data['index'];
 			}
 		}
-		return self::link($index,$GLOBALS['egw_info']['flags']['params'][$app]);
+		return self::link($index, $GLOBALS['egw_info']['flags']['params'][$app]);
 	}
 
 	/**
@@ -713,15 +713,15 @@ 
 	 *	true: always return svg, false: never return svg (current default), null: browser dependent, see svg_usable()
 	 * @return array
 	 */
-	protected static function _get_navbar_apps($svg=false)
+	protected static function _get_navbar_apps($svg = false)
 	{
 		list($first) = each($GLOBALS['egw_info']['user']['apps']);
-		if(is_array($GLOBALS['egw_info']['user']['apps']['admin']) && $first != 'admin')
+		if (is_array($GLOBALS['egw_info']['user']['apps']['admin']) && $first != 'admin')
 		{
 			$newarray['admin'] = $GLOBALS['egw_info']['user']['apps']['admin'];
-			foreach($GLOBALS['egw_info']['user']['apps'] as $index => $value)
+			foreach ($GLOBALS['egw_info']['user']['apps'] as $index => $value)
 			{
-				if($index != 'admin')
+				if ($index != 'admin')
 				{
 					$newarray[$index] = $value;
 				}
@@ -734,7 +734,7 @@ 
 		unset($newarray);
 
 		$apps = array();
-		foreach($GLOBALS['egw_info']['user']['apps'] as $app => $data)
+		foreach ($GLOBALS['egw_info']['user']['apps'] as $app => $data)
 		{
 			if (is_long($app))
 			{
@@ -751,21 +751,21 @@ 
 				if ($data['status'] == 4)
 				{
 					$apps[$app]['target'] = ' target="'.$app.'" onClick="'."if (this != '') { window.open(this+'".
-						(strpos($apps[$app]['url'],'?') !== false ? '&' : '?').
+						(strpos($apps[$app]['url'], '?') !== false ? '&' : '?').
 						"referer='+encodeURIComponent(location),this.target,'width=800,height=600,scrollbars=yes,resizable=yes'); return false; } else { return true; }".'"';
 				}
-				elseif(isset($GLOBALS['egw_info']['flags']['navbar_target']) && $GLOBALS['egw_info']['flags']['navbar_target'])
+				elseif (isset($GLOBALS['egw_info']['flags']['navbar_target']) && $GLOBALS['egw_info']['flags']['navbar_target'])
 				{
-					$apps[$app]['target'] = 'target="' . $GLOBALS['egw_info']['flags']['navbar_target'] . '"';
+					$apps[$app]['target'] = 'target="'.$GLOBALS['egw_info']['flags']['navbar_target'].'"';
 				}
 				else
 				{
 					$apps[$app]['target'] = '';
 				}
 
-				$icon = isset($data['icon']) ?  $data['icon'] : 'navbar';
+				$icon = isset($data['icon']) ? $data['icon'] : 'navbar';
 				$icon_app = isset($data['icon_app']) ? $data['icon_app'] : $app;
-				$apps[$app]['icon']  = $apps[$app]['icon_hover']  = Image::find($icon_app,Array($icon,'nonav'),'',$svg);
+				$apps[$app]['icon'] = $apps[$app]['icon_hover'] = Image::find($icon_app, Array($icon, 'nonav'), '', $svg);
 			}
 		}
 
@@ -798,13 +798,13 @@ 
 		// We handle this here because its special
 		$apps['about']['title'] = 'EGroupware';
 		$apps['about']['url']   = self::link('/about.php');
-		$apps['about']['icon']  = $apps['about']['icon_hover'] = Image::find('api',Array('about','nonav'));
+		$apps['about']['icon']  = $apps['about']['icon_hover'] = Image::find('api', Array('about', 'nonav'));
 		$apps['about']['name']  = 'about';
 
 		$apps['logout']['title'] = lang('Logout');
 		$apps['logout']['name']  = 'logout';
 		$apps['logout']['url']   = self::link('/logout.php');
-		$apps['logout']['icon']  = $apps['logout']['icon_hover'] = Image::find('api',Array('logout','nonav'));
+		$apps['logout']['icon']  = $apps['logout']['icon_hover'] = Image::find('api', Array('logout', 'nonav'));
 
 		return $apps;
 	}
@@ -838,7 +838,7 @@ 
 			}
 			$themes_to_check[] = $this->template_dir.'/css/'.$GLOBALS['egw_info']['user']['preferences']['common']['theme'].'.css';
 			$themes_to_check[] = $this->template_dir.'/css/'.$this->template.'.css';
-			foreach($themes_to_check as $theme_css)
+			foreach ($themes_to_check as $theme_css)
 			{
 				if (file_exists(EGW_SERVER_ROOT.$theme_css)) break;
 			}
@@ -872,7 +872,7 @@ 
 
 				// sending print css last, so it can overwrite anything
 				$print_css = $this->template_dir.'/print.css';
-				if(!file_exists(EGW_SERVER_ROOT.$print_css))
+				if (!file_exists(EGW_SERVER_ROOT.$print_css))
 				{
 					$print_css = '/api/templates/default/print.css';
 				}
@@ -898,7 +898,7 @@ 
 	 * @param array $extra =array() extra data to pass to egw.js as data-parameter
 	 * @return string the javascript to be included
 	 */
-	public static function _get_js(array $extra=array())
+	public static function _get_js(array $extra = array())
 	{
 		$java_script = '';
 
@@ -906,7 +906,7 @@ 
 		Think of conf vars etc...  (pim@lingewoud.nl) */
 		if (isset($GLOBALS['egw_info']['flags']['java_script_thirst']))
 		{
-			$java_script .= $GLOBALS['egw_info']['flags']['java_script_thirst'] . "\n";
+			$java_script .= $GLOBALS['egw_info']['flags']['java_script_thirst']."\n";
 		}
 		// add configuration, link-registry, images, user-data and -perferences for non-popup windows
 		// specifying etag in url to force reload, as we send expires header
@@ -918,7 +918,7 @@ 
 			self::includeJS('/api/images.php', array(
 				'template' => $GLOBALS['egw_info']['server']['template_set'],
 				'etag' => md5(json_encode(Image::map($GLOBALS['egw_info']['server']['template_set']))),
-				'svg' => Header\UserAgent::mobile(),	// always load non-svg image map, ATM we use svg icons only for mobile theme
+				'svg' => Header\UserAgent::mobile(), // always load non-svg image map, ATM we use svg icons only for mobile theme
 			));
 			self::includeJS('/api/user.php', array(
 				'user' => $GLOBALS['egw_info']['user']['account_lid'],
@@ -930,7 +930,7 @@ 
 		}
 
 		$extra['url'] = $GLOBALS['egw_info']['server']['webserver_url'];
-		$extra['include'] = array_map(function($str){return substr($str,1);}, self::get_script_links(true), array(1));
+		$extra['include'] = array_map(function($str) {return substr($str, 1); }, self::get_script_links(true), array(1));
 		$extra['app'] = $GLOBALS['egw_info']['flags']['currentapp'];
 
 		// Load LABjs ONCE here
@@ -940,18 +940,18 @@ 
 				'/api/js/jsapi/egw.js?'.filemtime(EGW_SERVER_ROOT.'/api/js/jsapi/egw.js').'" id="egw_script_id"';
 
 		// add values of extra parameter and class var as data attributes to script tag of egw.js
-		foreach($extra+self::$extra as $name => $value)
+		foreach ($extra + self::$extra as $name => $value)
 		{
 			if (is_array($value)) $value = json_encode($value);
 			// we need to double encode (Html::htmlspecialchars( , TRUE)), as otherwise we get invalid json, eg. for quotes
-			$java_script .= ' data-'.$name."=\"". Html::htmlspecialchars($value, true)."\"";
+			$java_script .= ' data-'.$name."=\"".Html::htmlspecialchars($value, true)."\"";
 		}
 		$java_script .= "></script>\n";
 
-		if(@isset($_GET['menuaction']))
+		if (@isset($_GET['menuaction']))
 		{
-			list(, $class) = explode('.',$_GET['menuaction']);
-			if(is_array($GLOBALS[$class]->public_functions) &&
+			list(, $class) = explode('.', $_GET['menuaction']);
+			if (is_array($GLOBALS[$class]->public_functions) &&
 				$GLOBALS[$class]->public_functions['java_script'])
 			{
 				$java_script .= $GLOBALS[$class]->java_script();
@@ -960,10 +960,10 @@ 
 		if (isset($GLOBALS['egw_info']['flags']['java_script']))
 		{
 			// Strip out any script tags, this needs to be executed as anonymous function
-			$GLOBALS['egw_info']['flags']['java_script'] = preg_replace(array('/(<script[^>]*>)([^<]*)/is','/<\/script>/'),array('$2',''),$GLOBALS['egw_info']['flags']['java_script']);
-			if(trim($GLOBALS['egw_info']['flags']['java_script']) != '')
+			$GLOBALS['egw_info']['flags']['java_script'] = preg_replace(array('/(<script[^>]*>)([^<]*)/is', '/<\/script>/'), array('$2', ''), $GLOBALS['egw_info']['flags']['java_script']);
+			if (trim($GLOBALS['egw_info']['flags']['java_script']) != '')
 			{
-				$java_script .= '<script type="text/javascript">window.egw_LAB.wait(function() {'.$GLOBALS['egw_info']['flags']['java_script'] . "});</script>\n";
+				$java_script .= '<script type="text/javascript">window.egw_LAB.wait(function() {'.$GLOBALS['egw_info']['flags']['java_script']."});</script>\n";
 			}
 		}
 
@@ -980,7 +980,7 @@ 
 	function list_themes()
 	{
 		$list = array();
-		if (file_exists($file=EGW_SERVER_ROOT.$this->template_dir.'/setup/setup.inc.php') &&
+		if (file_exists($file = EGW_SERVER_ROOT.$this->template_dir.'/setup/setup.inc.php') &&
 			(include $file) && isset($GLOBALS['egw_info']['template'][$this->template]['themes']))
 		{
 			$list = $GLOBALS['egw_info']['template'][$this->template]['themes'];
@@ -991,8 +991,8 @@ 
 			{
 				if (preg_match('/'."\.css$".'/i', $file))
 				{
-					list($name) = explode('.',$file);
-					if (!isset($list[$name])) $list[$name] = ucfirst ($name);
+					list($name) = explode('.', $file);
+					if (!isset($list[$name])) $list[$name] = ucfirst($name);
 				}
 			}
 			closedir($dh);
@@ -1006,21 +1006,20 @@ 
 	 * @param boolean $full_data =false true: value is array with values for keys 'name', 'title', ...
 	 * @returns array alphabetically sorted list of templates
 	 */
-	static function list_templates($full_data=false)
+	static function list_templates($full_data = false)
 	{
 		$list = array('pixelegg'=>null);
 		// templates packaged like apps in own directories (containing as setup/setup.inc.php file!)
 		$dr = dir(EGW_SERVER_ROOT);
-		while (($entry=$dr->read()))
+		while (($entry = $dr->read()))
 		{
 			if ($entry != '..' && !isset($GLOBALS['egw_info']['apps'][$entry]) && is_dir(EGW_SERVER_ROOT.'/'.$entry) &&
-				file_exists($f = EGW_SERVER_ROOT . '/' . $entry .'/setup/setup.inc.php'))
+				file_exists($f = EGW_SERVER_ROOT.'/'.$entry.'/setup/setup.inc.php'))
 			{
 				include($f);
 				if (isset($GLOBALS['egw_info']['template'][$entry]))
 				{
-					$list[$entry] = $full_data ? $GLOBALS['egw_info']['template'][$entry] :
-						$GLOBALS['egw_info']['template'][$entry]['title'];
+					$list[$entry] = $full_data ? $GLOBALS['egw_info']['template'][$entry] : $GLOBALS['egw_info']['template'][$entry]['title'];
 				}
 			}
 		}
@@ -1037,14 +1036,14 @@ 
 	* @param array $vars
 	* @param array $apps
 	*/
-	function topmenu(array $vars,array $apps)
+	function topmenu(array $vars, array $apps)
 	{
-		if($GLOBALS['egw_info']['user']['apps']['home'] && isset($apps['home']))
+		if ($GLOBALS['egw_info']['user']['apps']['home'] && isset($apps['home']))
 		{
 			$this->_add_topmenu_item($apps['home']);
 		}
 
-		if($GLOBALS['egw_info']['user']['apps']['preferences'])
+		if ($GLOBALS['egw_info']['user']['apps']['preferences'])
 		{
 			$this->add_preferences_topmenu('prefs');
 			$this->add_preferences_topmenu('acl');
@@ -1069,9 +1068,9 @@ 
 			$this->_add_topmenu_item(array_merge($apps['manual'],array('title' => lang('Help'))));
 		}*/
 
-		Hooks::process('topmenu_info',array(),true);
+		Hooks::process('topmenu_info', array(), true);
 		// Add extra items added by hooks
-		foreach(self::$top_menu_extra as $extra_item) {
+		foreach (self::$top_menu_extra as $extra_item) {
 			$this->_add_topmenu_item($extra_item);
 		}
 
@@ -1081,7 +1080,7 @@ 
 		{
 			$this->_add_topmenu_info_item($update, 'update');
 		}
-		if($GLOBALS['egw_info']['user']['apps']['notifications'])
+		if ($GLOBALS['egw_info']['user']['apps']['notifications'])
 		{
 			$this->_add_topmenu_info_item(self::_get_notification_bell(), 'notifications');
 		}
@@ -1093,9 +1092,9 @@ 
 	/**
 	 * Add Preferences link to topmenu using settings-hook to know if an app supports Preferences
 	 */
-	protected function add_preferences_topmenu($type='prefs')
+	protected function add_preferences_topmenu($type = 'prefs')
 	{
-		static $memberships=null;
+		static $memberships = null;
 		if (!isset($memberships)) $memberships = $GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'], true);
 		static $types = array(
 			'prefs' => array(
@@ -1109,20 +1108,20 @@ 
 			'cats' => array(
 				'title' => 'Categories',
 				'hook' => 'categories',
-				'run_hook' => true,	// acturally run hook, not just look it's implemented
+				'run_hook' => true, // acturally run hook, not just look it's implemented
 			),
 		);
 		if (!$GLOBALS['egw_info']['user']['apps']['preferences'] || $GLOBALS['egw_info']['server']['deny_'.$type] &&
 			array_intersect($memberships, (array)$GLOBALS['egw_info']['server']['deny_'.$type]) &&
 			!$GLOBALS['egw_info']['user']['apps']['admin'])
 		{
-			return;	// user has no access to Preferences app
+			return; // user has no access to Preferences app
 		}
 		if (isset($types[$type]['run_hook']))
 		{
 			$apps = Hooks::process($types[$type]['hook']);
 			// as all apps answer, we need to remove none-true responses
-			foreach($apps as $app => $val)
+			foreach ($apps as $app => $val)
 			{
 				if (!$val) unset($apps[$app]);
 			}
@@ -1148,7 +1147,7 @@ 
 	* @access protected
 	* @return void
 	*/
-	abstract function _add_topmenu_item(array $app_data,$alt_label=null);
+	abstract function _add_topmenu_item(array $app_data, $alt_label = null);
 
 	/**
 	* Add info items to the topmenu template class to be displayed
@@ -1158,7 +1157,7 @@ 
 	* @access protected
 	* @return void
 	*/
-	abstract function _add_topmenu_info_item($content, $id=null);
+	abstract function _add_topmenu_info_item($content, $id = null);
 
 	static $top_menu_extra = array();
 
@@ -1173,7 +1172,7 @@ 
 	* @access public
 	* @return void
 	*/
-	public static function add_topmenu_item($id,$url,$title,$target = '')
+	public static function add_topmenu_item($id, $url, $title, $target = '')
 	{
 		$entry['name'] = $id;
 		$entry['url'] = $url;
@@ -1194,7 +1193,7 @@ 
 	* @access public
 	* @return void
 	*/
-	abstract function topmenu_info_icon($id,$icon_src,$iconlink,$blink=false,$tooltip=null);
+	abstract function topmenu_info_icon($id, $icon_src, $iconlink, $blink = false, $tooltip = null);
 
 	/**
 	 * Call and return content of 'after_navbar' hook
@@ -1204,7 +1203,7 @@ 
 	protected function _get_after_navbar()
 	{
 		ob_start();
-		Hooks::process('after_navbar',null,true);
+		Hooks::process('after_navbar', null, true);
 		$content = ob_get_contents();
 		ob_end_clean();
 
@@ -1241,7 +1240,7 @@ 
 	* @param string $app ='phpgwapi' application directory to search - default = phpgwapi
 	* @param boolean $append =true should the file be added
 	*/
-	static function includeJS($package, $file=null, $app='phpgwapi')
+	static function includeJS($package, $file = null, $app = 'phpgwapi')
 	{
 		self::$js_include_mgr->include_js_file($package, $file, $app);
 	}
@@ -1253,7 +1252,7 @@ 
 	 * @param boolean $clear_files =false true clear files after returning them
 	 * @return array with pathes relative to EGW_SERVER_ROOT
 	 */
-	static function js_files(array $files=null, $clear_files=false)
+	static function js_files(array $files = null, $clear_files = false)
 	{
 		if (isset($files) && is_array($files))
 		{
@@ -1272,7 +1271,7 @@ 
 	 * @param boolean $clear_files =false true clear files after returning them
 	 * @return string|array see $return_pathes parameter
 	 */
-	static public function get_script_links($return_pathes=false, $clear_files=false)
+	static public function get_script_links($return_pathes = false, $clear_files = false)
 	{
 		$to_include = Framework\Bundle::js_includes(self::$js_include_mgr->get_included_files($clear_files));
 
@@ -1280,7 +1279,7 @@ 
 		{
 			return $to_include;
 		}
-		$start = '<script type="text/javascript" src="'. $GLOBALS['egw_info']['server']['webserver_url'];
+		$start = '<script type="text/javascript" src="'.$GLOBALS['egw_info']['server']['webserver_url'];
 		$end = '">'."</script>\n";
 		return "\n".$start.implode($end.$start, $to_include).$end;
 	}
@@ -1300,7 +1299,7 @@ 
 	 * @param boolean $no_default_css =false true do NOT load any default css, only what app explicitly includes
 	 * @return boolean false: css file not found, true: file found
 	 */
-	public static function includeCSS($app, $name=null, $append=true, $no_default_css=false)
+	public static function includeCSS($app, $name = null, $append = true, $no_default_css = false)
 	{
 		if ($no_default_css)
 		{
@@ -1320,16 +1319,16 @@ 
 
 		// try to add app specific css file
 		self::includeCSS($app, 'app-'.$GLOBALS['egw_info']['user']['preferences']['common']['theme']) ||
-			self::includeCSS($app,'app');
+			self::includeCSS($app, 'app');
 
 		// add all css files from Framework::includeCSS()
 		$query = null;
 		//error_log(__METHOD__."() Framework\CssIncludes::get()=".array2string(Framework\CssIncludes::get()));
-		foreach(Framework\CssIncludes::get() as $path)
+		foreach (Framework\CssIncludes::get() as $path)
 		{
 			unset($query);
-			list($path,$query) = explode('?',$path,2);
-			$path .= '?'. ($query ? $query : filemtime(EGW_SERVER_ROOT.$path));
+			list($path, $query) = explode('?', $path, 2);
+			$path .= '?'.($query ? $query : filemtime(EGW_SERVER_ROOT.$path));
 			$response->includeCSS($GLOBALS['egw_info']['server']['webserver_url'].$path);
 		}
 
@@ -1338,7 +1337,7 @@ 
 
 		// add all js files from Framework::includeJS()
 		$files = Framework\Bundle::js_includes(self::$js_include_mgr->get_included_files());
-		foreach($files as $path)
+		foreach ($files as $path)
 		{
 			$response->includeScript($GLOBALS['egw_info']['server']['webserver_url'].$path);
 		}
@@ -1414,17 +1413,17 @@ 
 	 */
 	public static function ajax_user_list()
 	{
-		$list = array('accounts' => array(),'groups' => array(), 'owngroups' => array());
-		if($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] == 'primary_group')
+		$list = array('accounts' => array(), 'groups' => array(), 'owngroups' => array());
+		if ($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] == 'primary_group')
 		{
 			$list['accounts']['filter']['group'] = $GLOBALS['egw_info']['user']['account_primary_group'];
 		}
-		foreach($list as $type => &$accounts)
+		foreach ($list as $type => &$accounts)
 		{
 			$options = array('account_type' => $type) + $accounts;
-			$key_pair = Accounts::link_query('',$options);
+			$key_pair = Accounts::link_query('', $options);
 			$accounts = array();
-			foreach($key_pair as $account_id => $name)
+			foreach ($key_pair as $account_id => $name)
 			{
 				$accounts[] = array('value' => $account_id, 'label' => $name);
 			}
@@ -1442,16 +1441,16 @@ 
 	 * @param boolean $_resolve_groups =false true: return attribute for all members, false return attribute for group itself
 	 * @return array account_id => data pairs
 	 */
-	public static function ajax_account_data($_account_ids, $_field, $_resolve_groups=false)
+	public static function ajax_account_data($_account_ids, $_field, $_resolve_groups = false)
 	{
 		$list = array();
-		foreach((array)$_account_ids as $account_id)
+		foreach ((array)$_account_ids as $account_id)
 		{
-			foreach($account_id < 0 && $_resolve_groups ?
+			foreach ($account_id < 0 && $_resolve_groups ?
 				$GLOBALS['egw']->accounts->members($account_id, true) : array($account_id) as $account_id)
 			{
 				// Make sure name is formatted according to preference
-				if($_field == 'account_fullname')
+				if ($_field == 'account_fullname')
 				{
 					$list[$account_id] = Accounts::format_username(
 						$GLOBALS['egw']->accounts->id2name($account_id, 'account_lid'),

api/src/Storage/Db2DataIterator.php

Spacing +8 added lines, -8 removed lines

@@ -46,13 +46,13 @@ 
 	 * @param Base $storage
 	 * @param \Traversable $rs
 	 */
-	public function __construct(Base $storage, \Traversable $rs=null)
+	public function __construct(Base $storage, \Traversable $rs = null)
 	{
 		$this->storage = $storage;
 
 		$this->total = $storage->total;
 
-		if (is_a($rs,'IteratorAggregate'))
+		if (is_a($rs, 'IteratorAggregate'))
 		{
 			$this->rs = $rs->getIterator();
 		}
@@ -69,7 +69,7 @@ 
 	 */
 	public function current()
 	{
-		if (is_a($this->rs,'iterator'))
+		if (is_a($this->rs, 'iterator'))
 		{
 			$data = $this->rs->current();
 
@@ -85,7 +85,7 @@ 
 	 */
 	public function key()
 	{
-		if (is_a($this->rs,'iterator'))
+		if (is_a($this->rs, 'iterator'))
 		{
 			return $this->rs->key();
 		}
@@ -97,7 +97,7 @@ 
 	 */
 	public function next()
 	{
-		if (is_a($this->rs,'iterator'))
+		if (is_a($this->rs, 'iterator'))
 		{
 			return $this->rs->next();
 		}
@@ -108,7 +108,7 @@ 
 	 */
 	public function rewind()
 	{
-		if (is_a($this->rs,'iterator'))
+		if (is_a($this->rs, 'iterator'))
 		{
 			return $this->rs->rewind();
 		}
@@ -119,9 +119,9 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function valid ()
+	public function valid()
 	{
-		if (is_a($this->rs,'iterator'))
+		if (is_a($this->rs, 'iterator'))
 		{
 			return $this->rs->valid();
 		}

api/src/Storage/Base.php

Indentation +8 added lines, -8 removed lines

@@ -1367,14 +1367,14 @@
 	}
 
 	/**
-	* Get a default list of columns to search
-	* This is to be used as a fallback, for when the extending class does not define
-	* $this->columns_to_search.  All the columns are considered, and any with $skip_columns_with in
-	* their name are discarded because these columns are expected to be foreign keys or other numeric
-	* values with no meaning to the user.
-	*
-	* @return array of column names
-	*/
+	 * Get a default list of columns to search
+	 * This is to be used as a fallback, for when the extending class does not define
+	 * $this->columns_to_search.  All the columns are considered, and any with $skip_columns_with in
+	 * their name are discarded because these columns are expected to be foreign keys or other numeric
+	 * values with no meaning to the user.
+	 *
+	 * @return array of column names
+	 */
 	protected function get_default_search_columns()
 	{
 		$skip_columns_with = array('_id', 'modified', 'modifier', 'status', 'cat_id', 'owner');

Braces +193 added lines, -51 removed lines

@@ -182,7 +182,10 @@ 
 	function __construct($app='',$table='',Api\Db $db=null,$column_prefix='',$no_clone=false,$timestamp_type=null)
 	{
 		// ease the transition to api
-		if ($app == 'phpgwapi') $app = 'api';
+		if ($app == 'phpgwapi')
+		{
+			$app = 'api';
+		}
 
 		if ($no_clone)
 		{
@@ -198,9 +201,15 @@ 
 		{
 			$this->app = $app;
 
-			if (!$no_clone) $this->db->set_app($app);
+			if (!$no_clone)
+			{
+				$this->db->set_app($app);
+			}
 
-			if ($table) $this->setup_table($app,$table,$column_prefix);
+			if ($table)
+			{
+				$this->setup_table($app,$table,$column_prefix);
+			}
 		}
 		$this->init();
 
@@ -221,7 +230,10 @@ 
 	 */
 	public function set_times($timestamp_type=false)
 	{
-		if ($timestamp_type !== false) $this->timestamp_type = $timestamp_type;
+		if ($timestamp_type !== false)
+		{
+			$this->timestamp_type = $timestamp_type;
+		}
 
 		// set current time
 		switch($this->timestamp_type)
@@ -279,7 +291,10 @@ 
 			{
 				$this->autoinc_id = $col;
 			}
-			if ($def['type'] == 'bool') $this->has_bools = true;
+			if ($def['type'] == 'bool')
+			{
+				$this->has_bools = true;
+			}
 
 			foreach($this->table_def['uc'] as $k => $uni_index)
 			{
@@ -318,7 +333,10 @@ 
 	 */
 	function data_merge($new)
 	{
-		if ((int) $this->debug >= 4) echo "<p>so_sql::data_merge(".print_r($new,true).")</p>\n";
+		if ((int) $this->debug >= 4)
+		{
+			echo "<p>so_sql::data_merge(".print_r($new,true).")</p>\n";
+		}
 
 		if (!is_array($new) || !count($new))
 		{
@@ -342,7 +360,10 @@ 
 		{
 			$this->data[self::USER_TIMEZONE_READ] = $new[self::USER_TIMEZONE_READ];
 		}
-		if ((int) $this->debug >= 4) _debug_array($this->data);
+		if ((int) $this->debug >= 4)
+		{
+			_debug_array($this->data);
+		}
 	}
 
 	/**
@@ -486,7 +507,10 @@ 
 		if (!is_array($keys))
 		{
 			$pk = array_values($this->db_key_cols);
-			if ($pk) $keys = array($pk[0] => $keys);
+			if ($pk)
+			{
+				$keys = array($pk[0] => $keys);
+			}
 		}
 
 		$this->init($keys);
@@ -500,13 +524,16 @@ 
 				$query[$db_col] = $this->data[$col];
 			}
 		}
-		if (!$query)	// no primary key in keys, lets try the data_cols for a unique key
+		if (!$query)
+		{
+			// no primary key in keys, lets try the data_cols for a unique key
 		{
 			foreach($this->db_uni_cols as $db_col => $col)
 			{
 				if (!is_array($col) && $this->data[$col] != '')
 				{
 					$query[$db_col] = $this->data[$col];
+		}
 				}
 				elseif(is_array($col))
 				{
@@ -520,31 +547,43 @@ 
 						}
 						$q[$db_c] = $this->data[$c];
 					}
-					if ($q) $query += $q;
+					if ($q)
+					{
+						$query += $q;
+					}
 				}
 			}
 		}
-		if (!$query)	// no unique key in keys, lets try everything else
+		if (!$query)
+		{
+			// no unique key in keys, lets try everything else
 		{
 			foreach($this->db_data_cols as $db_col => $col)
 			{
 				if ($this->data[$col] != '')
 				{
 					$query[$db_col] = $this->data[$col];
+		}
 				}
 			}
 		}
-		if (!$query)	// keys has no cols
+		if (!$query)
+		{
+			// keys has no cols
 		{
 			$this->db2data();
+		}
 
 			return False;
 		}
-		if ($join)	// Prefix the columns with the table-name, as they might exist in the join
+		if ($join)
+		{
+			// Prefix the columns with the table-name, as they might exist in the join
 		{
 			foreach($query as $col => $val)
 			{
 				if (is_int($col) || strpos($join,$col) === false) continue;
+		}
 				$query[] = $this->db->expression($this->table_name,$this->table_name.'.',array($col=>$val));
 				unset($query[$col]);
 			}
@@ -553,11 +592,14 @@ 
 			$query,__LINE__,__FILE__,False,'',$this->app,0,$join) as $row)
 		{
 			$cols = $this->db_cols;
-			if ($extra_cols)	// extra columns to report
+			if ($extra_cols)
+			{
+				// extra columns to report
 			{
 				foreach(is_array($extra_cols) ? $extra_cols : array($extra_cols) as $col)
 				{
 					if (FALSE!==stripos($col,' as ')) $col = preg_replace('/^.* as *([a-z0-9_]+) *$/i','\\1',$col);
+			}
 					$cols[$col] = $col;
 				}
 			}
@@ -580,7 +622,10 @@ 
 		{
 			unset($this->data[$this->db_key_cols[$this->autoinc_id]]);
 		}
-		if ((int) $this->debug >= 4) echo "nothing found !!!</p>\n";
+		if ((int) $this->debug >= 4)
+		{
+			echo "nothing found !!!</p>\n";
+		}
 
 		$this->db2data();
 
@@ -596,7 +641,10 @@ 
 	 */
 	function save($keys=null,$extra_where=null)
 	{
-		if (is_array($keys) && count($keys)) $this->data_merge($keys);
+		if (is_array($keys) && count($keys))
+		{
+			$this->data_merge($keys);
+		}
 
 		// check if data contains user timezone during read AND user changed timezone since then
 		// --> load old timezone for the rest of this request
@@ -613,9 +661,13 @@ 
 		}
 		$this->data2db();
 
-		if ((int) $this->debug >= 4) { echo "so_sql::save(".print_r($keys,true).") autoinc_id='$this->autoinc_id', data="; _debug_array($this->data); }
+		if ((int) $this->debug >= 4)
+		{
+echo "so_sql::save(".print_r($keys,true).") autoinc_id='$this->autoinc_id', data="; _debug_array($this->data); }
 
-		if ($this->autoinc_id && !$this->data[$this->db_key_cols[$this->autoinc_id]])	// insert with auto id
+		if ($this->autoinc_id && !$this->data[$this->db_key_cols[$this->autoinc_id]])
+		{
+			// insert with auto id
 		{
 			foreach($this->db_cols as $db_col => $col)
 			{
@@ -625,7 +677,9 @@ 
 						(isset($this->table_def['fd'][$db_col]['default']) ||	// we have a default value
 						 !isset($this->table_def['fd'][$db_col]['nullable']) || $this->table_def['fd'][$db_col]['nullable']))	// column is nullable
 					{
-						continue;	// no need to write that (unset) column
+						continue;
+		}
+		// no need to write that (unset) column
 					}
 					if ($this->table_def['fd'][$db_col]['type'] == 'varchar' &&
 						strlen($this->data[$col]) > $this->table_def['fd'][$db_col]['precision'])
@@ -656,9 +710,13 @@ 
 				if (!array_key_exists($col,$this->data) &&	// handling of unset columns in $this->data
 					($this->autoinc_id ||			// update of table with auto id or
 					 isset($this->table_def['fd'][$db_col]['default']) ||	// we have a default value or
-					 !isset($this->table_def['fd'][$db_col]['nullable']) || $this->table_def['fd'][$db_col]['nullable']))	// column is nullable
+					 !isset($this->table_def['fd'][$db_col]['nullable']) || $this->table_def['fd'][$db_col]['nullable']))
 				{
-					continue;	// no need to write that (unset) column
+					// column is nullable
+				{
+					continue;
+				}
+				// no need to write that (unset) column
 				}
 				$data[$db_col] = !is_object($this->data[$col]) && (string) $this->data[$col] === '' && $this->empty_on_write == 'NULL' ? null : $this->data[$col];
 			}
@@ -675,9 +733,12 @@ 
 			{
 				$keys[$db_col] = $this->data[$col];
 			}
-			if (!$data && !$this->autoinc_id)	// happens if all columns are in the primary key
+			if (!$data && !$this->autoinc_id)
+			{
+				// happens if all columns are in the primary key
 			{
 				$data = $keys;
+			}
 				$keys = False;
 			}
 			if ($this->autoinc_id)
@@ -708,7 +769,10 @@ 
 	 */
 	function update($_fields,$merge=true)
 	{
-		if ($merge) $this->data_merge($_fields);
+		if ($merge)
+		{
+			$this->data_merge($_fields);
+		}
 
 		$fields = $this->data2db($_fields);
 
@@ -761,9 +825,12 @@ 
 		{
 			$keys = array($this->autoinc_id => $keys);
 		}
-		if (!is_array($keys) || !count($keys))	// use internal data
+		if (!is_array($keys) || !count($keys))
+		{
+			// use internal data
 		{
 			$data = $this->data;
+		}
 			$keys = $this->db_key_cols;
 		}
 		else	// data and keys are supplied in $keys
@@ -783,7 +850,10 @@ 
 		{
 			$query[$db_col] = $data[$col];
 		}
-		if ($only_return_query) return $query;
+		if ($only_return_query)
+		{
+			return $query;
+		}
 
 		$this->db->delete($this->table_name,$query,__LINE__,__FILE__,$this->app);
 
@@ -816,7 +886,10 @@ 
 	function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false)
 	{
 		//error_log(__METHOD__.'('.array2string(array_combine(array_slice(array('criteria','only_keys','order_by','extra_cols','wildcard','empty','op','start','filter','join','need_full_no_count'), 0, count(func_get_args())), func_get_args())).')');
-		if ((int) $this->debug >= 4) echo "<p>so_sql::search(".print_r($criteria,true).",'$only_keys','$order_by',".print_r($extra_cols,true).",'$wildcard','$empty','$op','$start',".print_r($filter,true).",'$join')</p>\n";
+		if ((int) $this->debug >= 4)
+		{
+			echo "<p>so_sql::search(".print_r($criteria,true).",'$only_keys','$order_by',".print_r($extra_cols,true).",'$wildcard','$empty','$op','$start',".print_r($filter,true).",'$join')</p>\n";
+		}
 
 		// if extending class or instanciator set columns to search, convert string criteria to array
 		if ($criteria && !is_array($criteria))
@@ -880,9 +953,12 @@ 
 								($negate ? ') ' : '');
 						}
 					}
-					elseif (strpos($db_col,'.') !== false)	// we have a table-name specified
+					elseif (strpos($db_col,'.') !== false)
+					{
+						// we have a table-name specified
 					{
 						list($table,$only_col) = explode('.',$db_col);
+					}
 						$type = $this->db->get_column_attribute($only_col, $table, true, 'type');
 						if (empty($type))
 						{
@@ -907,13 +983,17 @@ 
 					}
 				}
 			}
-			if (is_array($query) && $op != 'AND') $query = $this->db->column_data_implode(' '.$op.' ',$query);
+			if (is_array($query) && $op != 'AND')
+			{
+				$query = $this->db->column_data_implode(' '.$op.' ',$query);
+			}
 		}
 		if (is_array($filter))
 		{
 			$db_filter = array();
 			$data2db_filter = $this->data2db($filter);
-			if (!is_array($data2db_filter)) {
+			if (!is_array($data2db_filter))
+			{
 				echo function_backtrace()."<br/>\n";
 				echo "filter=";_debug_array($filter);
 				echo "data2db(filter)=";_debug_array($data2db_filter);
@@ -1009,7 +1089,10 @@ 
 			}
 		}
 		$num_rows = 0;	// as spec. in max_matches in the user-prefs
-		if (is_array($start)) list($start,$num_rows) = $start;
+		if (is_array($start))
+		{
+			list($start,$num_rows) = $start;
+		}
 
 		// fix GROUP BY clause to contain all non-aggregate selected columns
 		if ($order_by && stripos($order_by,'GROUP BY') !== false)
@@ -1037,18 +1120,24 @@ 
 					'append' => $order_by,
 					'join'   => $join,
 				);
-				if (!$union_cols)	// union used the colum-names of the first query
+				if (!$union_cols)
+				{
+					// union used the colum-names of the first query
 				{
 					$union_cols = $this->_get_columns($only_keys,$extra_cols);
 				}
+				}
 				return true;	// waiting for further calls, before running the union-query
 			}
 			// running the union query now
-			if ($start !== false)	// need to get the total too, saved in $this->total
+			if ($start !== false)
+			{
+				// need to get the total too, saved in $this->total
 			{
 				if ($this->db->Type == 'mysql' && $this->db->ServerInfo['version'] >= 4.0)
 				{
 					$union[0]['cols'] = ($mysql_calc_rows = 'SQL_CALC_FOUND_ROWS ').$union[0]['cols'];
+			}
 				}
 				else	// cant do a count, have to run the query without limit
 				{
@@ -1056,18 +1145,24 @@ 
 				}
 			}
 			$rs = $this->db->union($union,__LINE__,__FILE__,$order_by,$start,$num_rows);
-			if ($this->debug) error_log(__METHOD__."() ".$this->db->Query_ID->sql);
+			if ($this->debug)
+			{
+				error_log(__METHOD__."() ".$this->db->Query_ID->sql);
+			}
 
 			$cols = $union_cols;
 			$union = $union_cols = array();
 		}
 		else	// no UNION
 		{
-			if ($start !== false)	// need to get the total too, saved in $this->total
+			if ($start !== false)
+			{
+				// need to get the total too, saved in $this->total
 			{
 				if ($this->db->Type == 'mysql' && $this->db->ServerInfo['version'] >= 4.0)
 				{
 					$mysql_calc_rows = 'SQL_CALC_FOUND_ROWS ';
+			}
 				}
 				elseif (!$need_full_no_count && (!$join || stripos($join,'LEFT JOIN')!==false))
 				{
@@ -1080,10 +1175,16 @@ 
 			}
 			$rs = $this->db->select($this->table_name,$mysql_calc_rows.$colums,$query,__LINE__,__FILE__,
 				$start,$order_by,$this->app,$num_rows,$join);
-			if ($this->debug) error_log(__METHOD__."() ".$this->db->Query_ID->sql);
+			if ($this->debug)
+			{
+				error_log(__METHOD__."() ".$this->db->Query_ID->sql);
+			}
 			$cols = $this->_get_columns($only_keys,$extra_cols);
 		}
-		if ((int) $this->debug >= 4) echo "<p>sql='{$this->db->Query_ID->sql}'</p>\n";
+		if ((int) $this->debug >= 4)
+		{
+			echo "<p>sql='{$this->db->Query_ID->sql}'</p>\n";
+		}
 
 		if ($mysql_calc_rows)
 		{
@@ -1096,9 +1197,12 @@ 
 		}
 		$arr = array();
 		$n = 0;
-		if ($rs) foreach($rs as $row)
+		if ($rs)
+		{
+			foreach($rs as $row)
 		{
 			$data = array();
+		}
 			foreach($cols as $db_col => $col)
 			{
 				$data[$col] = (isset($row[$db_col]) ? $row[$db_col] : $row[$col]);
@@ -1166,9 +1270,15 @@ 
 					$col = substr($col, $pos+9);
 				}
 				$alias = $col;
-				if (stripos($col, ' AS ')) list($col, $alias) = preg_split('/ +AS +/i', $col);
+				if (stripos($col, ' AS '))
+				{
+					list($col, $alias) = preg_split('/ +AS +/i', $col);
+				}
 				// do NOT group by constant expressions
-				if (preg_match('/^ *(-?[0-9]+|".*"|\'.*\'|NULL) *$/i', $col)) continue;
+				if (preg_match('/^ *(-?[0-9]+|".*"|\'.*\'|NULL) *$/i', $col))
+				{
+					continue;
+				}
 				if (!in_array($col, $group_by_cols) && !in_array($alias, $group_by_cols))
 				{
 					// instead of aliased primary key, we have to use original column incl. table-name as alias is ambigues
@@ -1201,7 +1311,10 @@ 
 	{
 		$pattern = trim($_pattern);
 		// This function can get called multiple times.  Make sure it doesn't re-process.
-		if (empty($pattern) || is_array($pattern)) return $pattern;
+		if (empty($pattern) || is_array($pattern))
+		{
+			return $pattern;
+		}
 		if(strpos($pattern, 'CAST(COALESCE(') !== false)
 		{
 			return $pattern;
@@ -1271,7 +1384,7 @@ 
 			{
 				$token = substr($token, 1,strlen($token));
  				if(substr($token, -1) != '"')
-				{
+ 				{
 					$token .= ' '.strtok('"');
 				}
 				else
@@ -1387,7 +1500,8 @@ 
 			foreach($search_cols as $key => &$col)
 			{
 				// If the name as given isn't a real column name, and adding the prefix doesn't help, skip it
-				if(!$this->table_def['fd'][$col] && !($col = $this->prefix.array_search($col, $search_cols))) {
+				if(!$this->table_def['fd'][$col] && !($col = $this->prefix.array_search($col, $search_cols)))
+				{
 					// Can't search this column
 					unset($search_cols[$key]);
 					continue;
@@ -1421,10 +1535,13 @@ 
 	function _get_columns($only_keys,$extra_cols)
 	{
 		//echo "_get_columns() only_keys="; _debug_array($only_keys); echo "extra_cols="; _debug_array($extra_cols);
-		if ($only_keys === true)	// only primary key
+		if ($only_keys === true)
+		{
+			// only primary key
 		{
 			$cols = $this->db_key_cols;
 		}
+		}
 		else
 		{
 			$cols = array();
@@ -1433,18 +1550,27 @@ 
 			{
 				if (!$distinct_checked)
 				{
-					if (stripos($col, 'DISTINCT ') === 0) $col = substr($col, 9);
+					if (stripos($col, 'DISTINCT ') === 0)
+					{
+						$col = substr($col, 9);
+					}
 					$distinct_checked = true;
 				}
-				if (!$col || $col == '*' || $col == $this->table_name.'.*')	// all columns
+				if (!$col || $col == '*' || $col == $this->table_name.'.*')
+				{
+					// all columns
 				{
 					$cols = array_merge($cols,$this->db_cols);
 				}
+				}
 				else	// only the specified columns
 				{
-					if (stripos($col,'as'))	// if there's already an explicit naming of the column, just use it
+					if (stripos($col,'as'))
+					{
+						// if there's already an explicit naming of the column, just use it
 					{
 						$col = preg_replace('/^.*as +([a-z0-9_]+) *$/i','\\1',$col);
+					}
 						$cols[$col] = $col;
 						continue;
 					}
@@ -1459,11 +1585,14 @@ 
 				}
 			}
 		}
-		if ($extra_cols)	// extra columns to report
+		if ($extra_cols)
+		{
+			// extra columns to report
 		{
 			foreach(is_array($extra_cols) ? $extra_cols : explode(',',$extra_cols) as $col)
 			{
 				if (stripos($col,'as ')!==false) $col = preg_replace('/^.*as +([a-z0-9_]+) *$/i','\\1',$col);
+		}
 				if (($db_col = array_search($col,$this->db_cols)) !== false)
 				{
 					$cols[$db_col] = $col;
@@ -1508,7 +1637,11 @@ 
 			'',false,$op,$query['num_rows']?array((int)$query['start'],$query['num_rows']):(int)$query['start'],
 			$query['col_filter'],$join,$need_full_no_count);
 
-		if (!$rows) $rows = array();	// otherwise false returned from search would be returned as array(false)
+		if (!$rows)
+		{
+			$rows = array();
+		}
+		// otherwise false returned from search would be returned as array(false)
 
 		return $this->total;
 	}
@@ -1587,7 +1720,10 @@ 
 		{
 			return $cache[$cache_key];
 		}
-		if (!is_array($value_col)) $value_col = array($value_col);
+		if (!is_array($value_col))
+		{
+			$value_col = array($value_col);
+		}
 
 		$cols = $ret = array();
 		foreach($value_col as $key => $col)
@@ -1595,7 +1731,10 @@ 
 			$matches = null;
 			$cols[$key] = preg_match('/AS ([a-z_0-9]+)$/i',$col,$matches) ? $matches[1] : $col;
 		}
-		if (!$order) $order = current($cols);
+		if (!$order)
+		{
+			$order = current($cols);
+		}
 
 		if (($search =& $this->search(array(),($key_col ? $key_col.',' : 'DISTINCT ').implode(',',$value_col),$order,'','',false,'AND',false,$filter)))
 		{
@@ -1621,7 +1760,10 @@ 
 				{
 					$data = $row[current($cols)];
 				}
-				if ($data) $ret[$row[$key_col]] = $data;
+				if ($data)
+				{
+					$ret[$row[$key_col]] = $data;
+				}
 			}
 		}
 		return $cache[$cache_key] =& $ret;

Doc Comments +1 added lines, -1 removed lines

@@ -1194,7 +1194,7 @@
 	 * @param string &$wildcard ='' on return wildcard char to use, if pattern does not already contain wildcards!
 	 * @param string &$op ='AND' on return boolean operation to use, if pattern does not start with ! we use OR else AND
 	 * @param string $extra_col =null extra column to search
-	 * @param array $search_cols =array() List of columns to search.  If not provided, all columns in $this->db_cols will be considered
+	 * @param string[] $search_cols =array() List of columns to search.  If not provided, all columns in $this->db_cols will be considered
 	 * @return array or column => value pairs
 	 */
 	public function search2criteria($_pattern,&$wildcard='',&$op='AND',$extra_col=null, $search_cols = array())

Spacing +219 added lines, -219 removed lines

@@ -179,7 +179,7 @@ 
 	 * @param string $timestamp_type =null default null=leave them as is, 'ts'|'integer' use integer unix timestamps,
 	 * 	'object' use Api\DateTime objects or 'string' use DB timestamp (Y-m-d H:i:s) string
 	 */
-	function __construct($app='',$table='',Api\Db $db=null,$column_prefix='',$no_clone=false,$timestamp_type=null)
+	function __construct($app = '', $table = '', Api\Db $db = null, $column_prefix = '', $no_clone = false, $timestamp_type = null)
 	{
 		// ease the transition to api
 		if ($app == 'phpgwapi') $app = 'api';
@@ -200,11 +200,11 @@ 
 
 			if (!$no_clone) $this->db->set_app($app);
 
-			if ($table) $this->setup_table($app,$table,$column_prefix);
+			if ($table) $this->setup_table($app, $table, $column_prefix);
 		}
 		$this->init();
 
-		if ((int) $this->debug >= 4)
+		if ((int)$this->debug >= 4)
 		{
 			echo "<p>".__METHOD__."('$app','$table')</p>\n";
 			_debug_array($this);
@@ -219,21 +219,21 @@ 
 	 * 	null=leave them as is, 'ts'|'integer' use integer unix timestamps, 'object' use Api\DateTime objects,
 	 *  'string' use DB timestamp (Y-m-d H:i:s) string
 	 */
-	public function set_times($timestamp_type=false)
+	public function set_times($timestamp_type = false)
 	{
 		if ($timestamp_type !== false) $this->timestamp_type = $timestamp_type;
 
 		// set current time
-		switch($this->timestamp_type)
+		switch ($this->timestamp_type)
 		{
 			case 'object':
 				$this->now = new Api\DateTime('now');
 				break;
 			case 'string':
-				$this->now = Api\DateTime::to('now',Api\DateTime::DATABASE);
+				$this->now = Api\DateTime::to('now', Api\DateTime::DATABASE);
 				break;
 			default:
-				$this->now = Api\DateTime::to('now','ts');
+				$this->now = Api\DateTime::to('now', 'ts');
 		}
 		$this->tz_offset_s = Api\DateTime::tz_offset_s();
 	}
@@ -247,10 +247,10 @@ 
 	 * @param string $table table-name
 	 * @param string $colum_prefix ='' column prefix to automatic remove from the column-name, if the column name starts with it
 	 */
-	function setup_table($app,$table,$colum_prefix='')
+	function setup_table($app, $table, $colum_prefix = '')
 	{
 		$this->table_name = $table;
-		$this->table_def = $this->db->get_table_definitions($app,$table);
+		$this->table_def = $this->db->get_table_definitions($app, $table);
 		if (!$this->table_def || !is_array($this->table_def['fd']))
 		{
 			throw new Api\Exception\WrongParameter(__METHOD__."('$app','$table'): No table definition for '$table' found !!!");
@@ -258,14 +258,14 @@ 
 		$this->db_key_cols = $this->db_data_cols = $this->db_cols = array();
 		$this->autoinc_id = '';
 		$len_prefix = strlen($colum_prefix);
-		foreach($this->table_def['fd'] as $col => $def)
+		foreach ($this->table_def['fd'] as $col => $def)
 		{
 			$name = $col;
-			if ($len_prefix && substr($name,0,$len_prefix) == $colum_prefix)
+			if ($len_prefix && substr($name, 0, $len_prefix) == $colum_prefix)
 			{
-				$name = substr($col,$len_prefix);
+				$name = substr($col, $len_prefix);
 			}
-			if (in_array($col,$this->table_def['pk']))
+			if (in_array($col, $this->table_def['pk']))
 			{
 				$this->db_key_cols[$col] = $name;
 			}
@@ -281,13 +281,13 @@ 
 			}
 			if ($def['type'] == 'bool') $this->has_bools = true;
 
-			foreach($this->table_def['uc'] as $k => $uni_index)
+			foreach ($this->table_def['uc'] as $k => $uni_index)
 			{
-				if (is_array($uni_index) && in_array($name,$uni_index))
+				if (is_array($uni_index) && in_array($name, $uni_index))
 				{
 					$this->db_uni_cols[$k][$col] = $name;
 				}
-				elseif($name === $uni_index)
+				elseif ($name === $uni_index)
 				{
 					$this->db_uni_cols[$col] = $name;
 				}
@@ -302,9 +302,9 @@ 
 	function convert_all_timestamps()
 	{
 		$check_already_included = !empty($this->timestamps);
-		foreach($this->table_def['fd'] as $name => $data)
+		foreach ($this->table_def['fd'] as $name => $data)
 		{
-			if ($data['type'] == 'timestamp' && (!$check_already_included || !in_array($name,$this->timestamps)))
+			if ($data['type'] == 'timestamp' && (!$check_already_included || !in_array($name, $this->timestamps)))
 			{
 				$this->timestamps[] = $name;
 			}
@@ -318,22 +318,22 @@ 
 	 */
 	function data_merge($new)
 	{
-		if ((int) $this->debug >= 4) echo "<p>so_sql::data_merge(".print_r($new,true).")</p>\n";
+		if ((int)$this->debug >= 4) echo "<p>so_sql::data_merge(".print_r($new, true).")</p>\n";
 
 		if (!is_array($new) || !count($new))
 		{
 			return;
 		}
-		foreach($this->db_cols as $db_col => $col)
+		foreach ($this->db_cols as $db_col => $col)
 		{
-			if (array_key_exists($col,$new))
+			if (array_key_exists($col, $new))
 			{
 				$this->data[$col] = $new[$col];
 			}
 		}
-		foreach($this->non_db_cols as $db_col => $col)
+		foreach ($this->non_db_cols as $db_col => $col)
 		{
-			if (array_key_exists($col,$new))
+			if (array_key_exists($col, $new))
 			{
 				$this->data[$col] = $new[$col];
 			}
@@ -342,7 +342,7 @@ 
 		{
 			$this->data[self::USER_TIMEZONE_READ] = $new[self::USER_TIMEZONE_READ];
 		}
-		if ((int) $this->debug >= 4) _debug_array($this->data);
+		if ((int)$this->debug >= 4) _debug_array($this->data);
 	}
 
 	/**
@@ -366,7 +366,7 @@ 
 	 * @param array $data =null if given works on that array and returns result, else works on internal data-array
 	 * @return array
 	 */
-	function db2data($data=null)
+	function db2data($data = null)
 	{
 		if (!is_array($data))
 		{
@@ -374,7 +374,7 @@ 
 		}
 		if ($this->timestamps)
 		{
-			foreach($this->timestamps as $name)
+			foreach ($this->timestamps as $name)
 			{
 				if (isset($data[$name]) && $data[$name])
 				{
@@ -384,7 +384,7 @@ 
 					}
 					else
 					{
-						$data[$name] = Api\DateTime::server2user($data[$name],$this->timestamp_type);
+						$data[$name] = Api\DateTime::server2user($data[$name], $this->timestamp_type);
 					}
 				}
 			}
@@ -400,7 +400,7 @@ 
 					throw new Api\Exception\WrongParameter(__METHOD__."(): No table definition for '$this->table' found !!!");
 				}
 			}
-			foreach($this->table_def['fd'] as $col => $def)
+			foreach ($this->table_def['fd'] as $col => $def)
 			{
 				if ($def['type'] == 'bool' && isset($data[$col]))
 				{
@@ -432,7 +432,7 @@ 
 	 * @param array $data =null if given works on that array and returns result, else works on internal data-array
 	 * @return array
 	 */
-	function data2db($data=null)
+	function data2db($data = null)
 	{
 		if (!is_array($data))
 		{
@@ -440,11 +440,11 @@ 
 		}
 		if ($this->timestamps)
 		{
-			foreach($this->timestamps as $name)
+			foreach ($this->timestamps as $name)
 			{
 				if (isset($data[$name]) && $data[$name])
 				{
-					$data[$name] = Api\DateTime::user2server($data[$name],$this->timestamp_type);
+					$data[$name] = Api\DateTime::user2server($data[$name], $this->timestamp_type);
 				}
 			}
 		}
@@ -457,7 +457,7 @@ 
 	 * @param array $keys =array() array with keys in form internalName => value
 	 * @return array internal data after init
 	 */
-	function init($keys=array())
+	function init($keys = array())
 	{
 		$this->data = array();
 
@@ -481,7 +481,7 @@ 
 	 * @param string $join ='' sql to do a join, added as is after the table-name, eg. ", table2 WHERE x=y" or
 	 * @return array|boolean data if row could be retrived else False
 	 */
-	function read($keys,$extra_cols='',$join='')
+	function read($keys, $extra_cols = '', $join = '')
 	{
 		if (!is_array($keys))
 		{
@@ -502,16 +502,16 @@ 
 		}
 		if (!$query)	// no primary key in keys, lets try the data_cols for a unique key
 		{
-			foreach($this->db_uni_cols as $db_col => $col)
+			foreach ($this->db_uni_cols as $db_col => $col)
 			{
 				if (!is_array($col) && $this->data[$col] != '')
 				{
 					$query[$db_col] = $this->data[$col];
 				}
-				elseif(is_array($col))
+				elseif (is_array($col))
 				{
 					$q = array();
-					foreach($col as $db_c => $c)
+					foreach ($col as $db_c => $c)
 					{
 						if ($this->data[$col] == '')
 						{
@@ -526,7 +526,7 @@ 
 		}
 		if (!$query)	// no unique key in keys, lets try everything else
 		{
-			foreach($this->db_data_cols as $db_col => $col)
+			foreach ($this->db_data_cols as $db_col => $col)
 			{
 				if ($this->data[$col] != '')
 				{
@@ -542,27 +542,27 @@ 
 		}
 		if ($join)	// Prefix the columns with the table-name, as they might exist in the join
 		{
-			foreach($query as $col => $val)
+			foreach ($query as $col => $val)
 			{
-				if (is_int($col) || strpos($join,$col) === false) continue;
-				$query[] = $this->db->expression($this->table_name,$this->table_name.'.',array($col=>$val));
+				if (is_int($col) || strpos($join, $col) === false) continue;
+				$query[] = $this->db->expression($this->table_name, $this->table_name.'.', array($col=>$val));
 				unset($query[$col]);
 			}
 		}
 		// copy direct SQL parts from $keys
-		for($i = 0; is_array($keys) && isset($keys[$i]); ++$i)
+		for ($i = 0; is_array($keys) && isset($keys[$i]); ++$i)
 		{
 			$query[] = $keys[$i];
 		}
-		foreach($this->db->select($this->table_name,'*'.($extra_cols?','.(is_array($extra_cols)?implode(',',$extra_cols):$extra_cols):''),
-			$query,__LINE__,__FILE__,False,'',$this->app,0,$join) as $row)
+		foreach ($this->db->select($this->table_name, '*'.($extra_cols ? ','.(is_array($extra_cols) ?implode(',', $extra_cols) : $extra_cols) : ''),
+			$query, __LINE__, __FILE__, False, '', $this->app, 0, $join) as $row)
 		{
 			$cols = $this->db_cols;
 			if ($extra_cols)	// extra columns to report
 			{
-				foreach(is_array($extra_cols) ? $extra_cols : array($extra_cols) as $col)
+				foreach (is_array($extra_cols) ? $extra_cols : array($extra_cols) as $col)
 				{
-					if (FALSE!==stripos($col,' as ')) $col = preg_replace('/^.* as *([a-z0-9_]+) *$/i','\\1',$col);
+					if (FALSE !== stripos($col, ' as ')) $col = preg_replace('/^.* as *([a-z0-9_]+) *$/i', '\\1', $col);
 					$cols[$col] = $col;
 				}
 			}
@@ -575,7 +575,7 @@ 
 			// store user timezone used for reading
 			$this->data[self::USER_TIMEZONE_READ] = Api\DateTime::$user_timezone->getName();
 
-			if ((int) $this->debug >= 4)
+			if ((int)$this->debug >= 4)
 			{
 				echo "data =\n"; _debug_array($this->data);
 			}
@@ -585,7 +585,7 @@ 
 		{
 			unset($this->data[$this->db_key_cols[$this->autoinc_id]]);
 		}
-		if ((int) $this->debug >= 4) echo "nothing found !!!</p>\n";
+		if ((int)$this->debug >= 4) echo "nothing found !!!</p>\n";
 
 		$this->db2data();
 
@@ -599,7 +599,7 @@ 
 	 * @param string|array $extra_where =null extra where clause, eg. to check an etag, returns true if no affected rows!
 	 * @return int|boolean 0 on success, or errno != 0 on error, or true if $extra_where is given and no rows affected
 	 */
-	function save($keys=null,$extra_where=null)
+	function save($keys = null, $extra_where = null)
 	{
 		if (is_array($keys) && count($keys)) $this->data_merge($keys);
 
@@ -618,65 +618,65 @@ 
 		}
 		$this->data2db();
 
-		if ((int) $this->debug >= 4) { echo "so_sql::save(".print_r($keys,true).") autoinc_id='$this->autoinc_id', data="; _debug_array($this->data); }
+		if ((int)$this->debug >= 4) { echo "so_sql::save(".print_r($keys, true).") autoinc_id='$this->autoinc_id', data="; _debug_array($this->data); }
 
 		if ($this->autoinc_id && !$this->data[$this->db_key_cols[$this->autoinc_id]])	// insert with auto id
 		{
-			foreach($this->db_cols as $db_col => $col)
+			foreach ($this->db_cols as $db_col => $col)
 			{
 				if (!$this->autoinc_id || $db_col != $this->autoinc_id)	// not write auto-inc-id
 				{
-					if (!array_key_exists($col,$this->data) && 	// handling of unset columns in $this->data
-						(isset($this->table_def['fd'][$db_col]['default']) ||	// we have a default value
+					if (!array_key_exists($col, $this->data) && // handling of unset columns in $this->data
+						(isset($this->table_def['fd'][$db_col]['default']) || // we have a default value
 						 !isset($this->table_def['fd'][$db_col]['nullable']) || $this->table_def['fd'][$db_col]['nullable']))	// column is nullable
 					{
-						continue;	// no need to write that (unset) column
+						continue; // no need to write that (unset) column
 					}
 					if ($this->table_def['fd'][$db_col]['type'] == 'varchar' &&
 						strlen($this->data[$col]) > $this->table_def['fd'][$db_col]['precision'])
 					{
 						// truncate the field to mamimum length, if upper layers didn't care
-						$data[$db_col] = substr($this->data[$col],0,$this->table_def['fd'][$db_col]['precision']);
+						$data[$db_col] = substr($this->data[$col], 0, $this->table_def['fd'][$db_col]['precision']);
 					}
 					else
 					{
-						$data[$db_col] = (string) $this->data[$col] === '' && $this->empty_on_write == 'NULL' ? null : $this->data[$col];
+						$data[$db_col] = (string)$this->data[$col] === '' && $this->empty_on_write == 'NULL' ? null : $this->data[$col];
 					}
 				}
 			}
-			$this->db->insert($this->table_name,$data,false,__LINE__,__FILE__,$this->app);
+			$this->db->insert($this->table_name, $data, false, __LINE__, __FILE__, $this->app);
 
 			if ($this->autoinc_id)
 			{
-				$this->data[$this->db_key_cols[$this->autoinc_id]] = $this->db->get_last_insert_id($this->table_name,$this->autoinc_id);
+				$this->data[$this->db_key_cols[$this->autoinc_id]] = $this->db->get_last_insert_id($this->table_name, $this->autoinc_id);
 			}
 		}
 		else // insert in table without auto id or update of existing row, dont write colums unset in $this->data
 		{
-			foreach($this->db_data_cols as $db_col => $col)
+			foreach ($this->db_data_cols as $db_col => $col)
 			{
 				// we need to update columns set to null: after a $this->data[$col]=null:
 				// - array_key_exits($col,$this->data) === true
 				// - isset($this->data[$col]) === false
-				if (!array_key_exists($col,$this->data) &&	// handling of unset columns in $this->data
-					($this->autoinc_id ||			// update of table with auto id or
-					 isset($this->table_def['fd'][$db_col]['default']) ||	// we have a default value or
+				if (!array_key_exists($col, $this->data) && // handling of unset columns in $this->data
+					($this->autoinc_id || // update of table with auto id or
+					 isset($this->table_def['fd'][$db_col]['default']) || // we have a default value or
 					 !isset($this->table_def['fd'][$db_col]['nullable']) || $this->table_def['fd'][$db_col]['nullable']))	// column is nullable
 				{
-					continue;	// no need to write that (unset) column
+					continue; // no need to write that (unset) column
 				}
-				$data[$db_col] = !is_object($this->data[$col]) && (string) $this->data[$col] === '' && $this->empty_on_write == 'NULL' ? null : $this->data[$col];
+				$data[$db_col] = !is_object($this->data[$col]) && (string)$this->data[$col] === '' && $this->empty_on_write == 'NULL' ? null : $this->data[$col];
 			}
 			// allow to add direct sql updates, eg. "etag=etag+1" with int keys
 			if (is_array($keys) && isset($keys[0]))
 			{
-				for($n=0; isset($keys[$n]); ++$n)
+				for ($n = 0; isset($keys[$n]); ++$n)
 				{
 					$data[] = $keys[$n];
 				}
 			}
 			$keys = $extra_where;
-			foreach($this->db_key_cols as $db_col => $col)
+			foreach ($this->db_key_cols as $db_col => $col)
 			{
 				$keys[$db_col] = $this->data[$col];
 			}
@@ -687,16 +687,16 @@ 
 			}
 			if ($this->autoinc_id)
 			{
-				$this->db->update($this->table_name,$data,$keys,__LINE__,__FILE__,$this->app);
+				$this->db->update($this->table_name, $data, $keys, __LINE__, __FILE__, $this->app);
 				if (($nothing_affected = !$this->db->Errno && !$this->db->affected_rows()) && $extra_where)
 				{
-					return true;	// extra_where not met, eg. etag wrong
+					return true; // extra_where not met, eg. etag wrong
 				}
 			}
 			// always try an insert if we have no autoinc_id, as we dont know if the data exists
 			if (!$this->autoinc_id || $nothing_affected)
 			{
-				$this->db->insert($this->table_name,$data,$keys,__LINE__,__FILE__,$this->app);
+				$this->db->insert($this->table_name, $data, $keys, __LINE__, __FILE__, $this->app);
 			}
 		}
 		$this->db2data();
@@ -711,7 +711,7 @@ 
 	 * @param boolean $merge =true if true $fields will be merged with $this->data (after update!), otherwise $this->data will be just $fields
 	 * @return int|boolean 0 on success, or errno != 0 on error, or true if $extra_where is given and no rows affected
 	 */
-	function update($_fields,$merge=true)
+	function update($_fields, $merge = true)
 	{
 		if ($merge) $this->data_merge($_fields);
 
@@ -719,23 +719,23 @@ 
 
 		// extract the keys from $fields or - if not set there - from $this->data
 		$keys = array();
-		foreach($this->db_key_cols as $col => $name)
+		foreach ($this->db_key_cols as $col => $name)
 		{
 			$keys[$col] = isset($fields[$name]) ? $fields[$name] : $this->data[$name];
 			unset($fields[$name]);
 		}
 		// extract the data from $fields
 		$data = array();
-		foreach($this->db_data_cols as $col => $name)
+		foreach ($this->db_data_cols as $col => $name)
 		{
-			if (array_key_exists($name,$fields))
+			if (array_key_exists($name, $fields))
 			{
 				$data[$col] = $fields[$name];
 				unset($fields[$name]);
 			}
 		}
 		// add direct sql like 'etag=etag+1' (it has integer keys)
-		foreach($fields as $key => $value)
+		foreach ($fields as $key => $value)
 		{
 			if (is_int($key))
 			{
@@ -744,9 +744,9 @@ 
 		}
 		if (!$data)
 		{
-			return 0;	// nothing to update
+			return 0; // nothing to update
 		}
-		if (!$this->db->update($this->table_name,$data,$keys,__LINE__,__FILE__,$this->app))
+		if (!$this->db->update($this->table_name, $data, $keys, __LINE__, __FILE__, $this->app))
 		{
 			return $this->db->Errno;
 		}
@@ -760,7 +760,7 @@ 
 	 * @param boolean $only_return_query =false return $query of delete call to db object, but not run it (used by so_sql_cf!)
 	 * @return int|array affected rows, should be 1 if ok, 0 if an error or array with id's if $only_return_ids
 	 */
-	function delete($keys=null,$only_return_query=false)
+	function delete($keys = null, $only_return_query = false)
 	{
 		if ($this->autoinc_id && $keys && !is_array($keys))
 		{
@@ -774,7 +774,7 @@ 
 		else	// data and keys are supplied in $keys
 		{
 			$data = $keys; $keys = array();
-			foreach($this->db_cols as $db_col => $col)
+			foreach ($this->db_cols as $db_col => $col)
 			{
 				if (isset($data[$col]))
 				{
@@ -784,13 +784,13 @@ 
 		}
 		$data = $this->data2db($data);
 
-		foreach($keys as $db_col => $col)
+		foreach ($keys as $db_col => $col)
 		{
 			$query[$db_col] = $data[$col];
 		}
 		if ($only_return_query) return $query;
 
-		$this->db->delete($this->table_name,$query,__LINE__,__FILE__,$this->app);
+		$this->db->delete($this->table_name, $query, __LINE__, __FILE__, $this->app);
 
 		return $this->db->affected_rows();
 	}
@@ -818,15 +818,15 @@ 
 	 * @todo return an interator instead of an array
 	 * @return array|NULL array of matching rows (the row is an array of the cols) or NULL
 	 */
-	function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false)
+	function &search($criteria, $only_keys = True, $order_by = '', $extra_cols = '', $wildcard = '', $empty = False, $op = 'AND', $start = false, $filter = null, $join = '', $need_full_no_count = false)
 	{
 		//error_log(__METHOD__.'('.array2string(array_combine(array_slice(array('criteria','only_keys','order_by','extra_cols','wildcard','empty','op','start','filter','join','need_full_no_count'), 0, count(func_get_args())), func_get_args())).')');
-		if ((int) $this->debug >= 4) echo "<p>so_sql::search(".print_r($criteria,true).",'$only_keys','$order_by',".print_r($extra_cols,true).",'$wildcard','$empty','$op','$start',".print_r($filter,true).",'$join')</p>\n";
+		if ((int)$this->debug >= 4) echo "<p>so_sql::search(".print_r($criteria, true).",'$only_keys','$order_by',".print_r($extra_cols, true).",'$wildcard','$empty','$op','$start',".print_r($filter, true).",'$join')</p>\n";
 
 		// if extending class or instanciator set columns to search, convert string criteria to array
 		if ($criteria && !is_array($criteria))
 		{
-			$search = $this->search2criteria($criteria,$wildcard,$op);
+			$search = $this->search2criteria($criteria, $wildcard, $op);
 			$criteria = array($search);
 		}
 		if (!is_array($criteria))
@@ -836,7 +836,7 @@ 
 		else
 		{
 			$criteria = $this->data2db($criteria);
-			foreach($criteria as $col => $val)
+			foreach ($criteria as $col => $val)
 			{
 				if (is_int($col))
 				{
@@ -844,7 +844,7 @@ 
 				}
 				elseif ($empty || $val != '')
 				{
-					if (!($db_col = array_search($col,$this->db_cols)))
+					if (!($db_col = array_search($col, $this->db_cols)))
 					{
 						$db_col = $col;
 					}
@@ -855,7 +855,7 @@ 
 							$this->table_def['fd'][$db_col]['nullable'] !== false)
 						{
 							unset($criteria[$col]);
-							$query[] =  '(' . $db_col . ' IS NULL OR ' . $db_col . " = '')";
+							$query[] = '('.$db_col.' IS NULL OR '.$db_col." = '')";
 						}
 						else
 						{
@@ -863,10 +863,10 @@ 
 						}
 					}
 					elseif ($wildcard || $criteria[$col][0] == '!' ||
-						is_string($criteria[$col]) && (strpos($criteria[$col],'*')!==false || strpos($criteria[$col],'?')!==false))
+						is_string($criteria[$col]) && (strpos($criteria[$col], '*') !== false || strpos($criteria[$col], '?') !== false))
 					{
 						// if search pattern alread contains a wildcard, do NOT add further ones automatic
-						if (is_string($criteria[$col]) && (strpos($criteria[$col],'*')!==false || strpos($criteria[$col],'?')!==false))
+						if (is_string($criteria[$col]) && (strpos($criteria[$col], '*') !== false || strpos($criteria[$col], '?') !== false))
 						{
 							$wildcard = '';
 						}
@@ -875,19 +875,19 @@ 
 						if ($criteria[$col][0] == '!')
 						{
 							$cmp_op = ' NOT'.$cmp_op;
-							$criteria[$col] = substr($criteria[$col],1);
+							$criteria[$col] = substr($criteria[$col], 1);
 							$negate = true;
 						}
-						foreach(explode(' ',$criteria[$col]) as $crit)
+						foreach (explode(' ', $criteria[$col]) as $crit)
 						{
 							$query[] = ($negate ? ' ('.$db_col.' IS NULL OR ' : '').$db_col.$cmp_op.
-								$this->db->quote($wildcard.str_replace(array('%','_','*','?'),array('\\%','\\_','%','_'),$crit).$wildcard).
+								$this->db->quote($wildcard.str_replace(array('%', '_', '*', '?'), array('\\%', '\\_', '%', '_'), $crit).$wildcard).
 								($negate ? ') ' : '');
 						}
 					}
-					elseif (strpos($db_col,'.') !== false)	// we have a table-name specified
+					elseif (strpos($db_col, '.') !== false)	// we have a table-name specified
 					{
-						list($table,$only_col) = explode('.',$db_col);
+						list($table, $only_col) = explode('.', $db_col);
 						$type = $this->db->get_column_attribute($only_col, $table, true, 'type');
 						if (empty($type))
 						{
@@ -895,15 +895,15 @@ 
 						}
 						if (is_array($val) && count($val) > 1)
 						{
-							foreach($val as &$v)
+							foreach ($val as &$v)
 							{
 								$v = $this->db->quote($v, $type);
 							}
-							$query[] = $sql = $db_col.' IN (' .implode(',',$val).')';
+							$query[] = $sql = $db_col.' IN ('.implode(',', $val).')';
 						}
 						else
 						{
-							$query[] = $db_col.'='.$this->db->quote(is_array($val)?array_shift($val):$val,$type);
+							$query[] = $db_col.'='.$this->db->quote(is_array($val) ?array_shift($val) : $val, $type);
 						}
 					}
 					else
@@ -912,7 +912,7 @@ 
 					}
 				}
 			}
-			if (is_array($query) && $op != 'AND') $query = $this->db->column_data_implode(' '.$op.' ',$query);
+			if (is_array($query) && $op != 'AND') $query = $this->db->column_data_implode(' '.$op.' ', $query);
 		}
 		if (is_array($filter))
 		{
@@ -920,19 +920,19 @@ 
 			$data2db_filter = $this->data2db($filter);
 			if (!is_array($data2db_filter)) {
 				echo function_backtrace()."<br/>\n";
-				echo "filter=";_debug_array($filter);
-				echo "data2db(filter)=";_debug_array($data2db_filter);
+				echo "filter="; _debug_array($filter);
+				echo "data2db(filter)="; _debug_array($data2db_filter);
 			}
-			foreach($data2db_filter as $col => $val)
+			foreach ($data2db_filter as $col => $val)
 			{
 				if ($val !== '')
 				{
 					// check if a db-internal name conversation necessary
-					if (!is_int($col) && ($c = array_search($col,$this->db_cols)))
+					if (!is_int($col) && ($c = array_search($col, $this->db_cols)))
 					{
-						$col = $this->table_name . '.' . $c;
+						$col = $this->table_name.'.'.$c;
 					}
-					if(is_int($col))
+					if (is_int($col))
 					{
 						$db_filter[] = $val;
 					}
@@ -950,35 +950,35 @@ 
 			{
 				if ($op != 'AND')
 				{
-					$db_filter[] = '('.$this->db->column_data_implode(' '.$op.' ',$query).')';
+					$db_filter[] = '('.$this->db->column_data_implode(' '.$op.' ', $query).')';
 				}
 				else
 				{
-					$db_filter = array_merge($db_filter,$query);
+					$db_filter = array_merge($db_filter, $query);
 				}
 			}
 			$query = $db_filter;
 		}
-		if ((int) $this->debug >= 4)
+		if ((int)$this->debug >= 4)
 		{
-			echo "<p>so_sql::search(,only_keys=$only_keys,order_by='$order_by',wildcard='$wildcard',empty=$empty,$op,start='$start',".print_r($filter,true).") query=".print_r($query,true).", total='$this->total'</p>\n";
+			echo "<p>so_sql::search(,only_keys=$only_keys,order_by='$order_by',wildcard='$wildcard',empty=$empty,$op,start='$start',".print_r($filter, true).") query=".print_r($query, true).", total='$this->total'</p>\n";
 			echo "<br>criteria = "; _debug_array($criteria);
 		}
 		if ($only_keys === true)
 		{
 			$colums = array_keys($this->db_key_cols);
-			foreach($colums as &$column)
+			foreach ($colums as &$column)
 			{
-				$column = $this->table_name . '.' . $column;
+				$column = $this->table_name.'.'.$column;
 			}
 		}
 		elseif (is_array($only_keys))
 		{
 			$colums = array();
-			foreach($only_keys as $key => $col)
+			foreach ($only_keys as $key => $col)
 			{
 				//Convert ambiguous columns to prefixed tablename.column name
-				$colums[] = ($db_col = array_search($col,$this->db_cols)) ?  $this->table_name .'.'.$db_col.' AS '.$col :$col;
+				$colums[] = ($db_col = array_search($col, $this->db_cols)) ? $this->table_name.'.'.$db_col.' AS '.$col : $col;
 			}
 		}
 		elseif (!$only_keys)
@@ -1008,20 +1008,20 @@ 
 			{
 				$colums[$key] = $this->table_name.'.'.$this->autoinc_id.' AS '.$this->autoinc_id;
 			}
-			elseif (!is_array($colums) && strpos($colums,$this->autoinc_id) !== false)
+			elseif (!is_array($colums) && strpos($colums, $this->autoinc_id) !== false)
 			{
-				$colums = preg_replace('/(?<! AS)([ ,]+)'.preg_quote($this->autoinc_id).'([ ,]+)/','\\1'.$this->table_name.'.'.$this->autoinc_id.' AS '.$this->autoinc_id.'\\2',$colums);
+				$colums = preg_replace('/(?<! AS)([ ,]+)'.preg_quote($this->autoinc_id).'([ ,]+)/', '\\1'.$this->table_name.'.'.$this->autoinc_id.' AS '.$this->autoinc_id.'\\2', $colums);
 			}
 		}
-		$num_rows = 0;	// as spec. in max_matches in the user-prefs
-		if (is_array($start)) list($start,$num_rows) = $start;
+		$num_rows = 0; // as spec. in max_matches in the user-prefs
+		if (is_array($start)) list($start, $num_rows) = $start;
 
 		// fix GROUP BY clause to contain all non-aggregate selected columns
-		if ($order_by && stripos($order_by,'GROUP BY') !== false)
+		if ($order_by && stripos($order_by, 'GROUP BY') !== false)
 		{
 			$order_by = $this->fix_group_by_columns($order_by, $colums, $this->table_name, $this->autoinc_id);
 		}
-		elseif ($order_by && stripos($order_by,'ORDER BY')===false && stripos($order_by,'GROUP BY')===false && stripos($order_by,'HAVING')===false)
+		elseif ($order_by && stripos($order_by, 'ORDER BY') === false && stripos($order_by, 'GROUP BY') === false && stripos($order_by, 'HAVING') === false)
 		{
 			$order_by = 'ORDER BY '.$order_by;
 		}
@@ -1044,9 +1044,9 @@ 
 				);
 				if (!$union_cols)	// union used the colum-names of the first query
 				{
-					$union_cols = $this->_get_columns($only_keys,$extra_cols);
+					$union_cols = $this->_get_columns($only_keys, $extra_cols);
 				}
-				return true;	// waiting for further calls, before running the union-query
+				return true; // waiting for further calls, before running the union-query
 			}
 			// running the union query now
 			if ($start !== false)	// need to get the total too, saved in $this->total
@@ -1057,10 +1057,10 @@ 
 				}
 				else	// cant do a count, have to run the query without limit
 				{
-					$this->total = $this->db->union($union,__LINE__,__FILE__)->NumRows();
+					$this->total = $this->db->union($union, __LINE__, __FILE__)->NumRows();
 				}
 			}
-			$rs = $this->db->union($union,__LINE__,__FILE__,$order_by,$start,$num_rows);
+			$rs = $this->db->union($union, __LINE__, __FILE__, $order_by, $start, $num_rows);
 			if ($this->debug) error_log(__METHOD__."() ".$this->db->Query_ID->sql);
 
 			$cols = $union_cols;
@@ -1074,21 +1074,21 @@ 
 				{
 					$mysql_calc_rows = 'SQL_CALC_FOUND_ROWS ';
 				}
-				elseif (!$need_full_no_count && (!$join || stripos($join,'LEFT JOIN')!==false))
+				elseif (!$need_full_no_count && (!$join || stripos($join, 'LEFT JOIN') !== false))
 				{
-					$this->total = $this->db->select($this->table_name,'COUNT(*)',$query,__LINE__,__FILE__,false,'',$this->app,0,$join)->fetchColumn();
+					$this->total = $this->db->select($this->table_name, 'COUNT(*)', $query, __LINE__, __FILE__, false, '', $this->app, 0, $join)->fetchColumn();
 				}
 				else	// cant do a count, have to run the query without limit
 				{
-					$this->total = $this->db->select($this->table_name,$colums,$query,__LINE__,__FILE__,false,$order_by,false,0,$join)->NumRows();
+					$this->total = $this->db->select($this->table_name, $colums, $query, __LINE__, __FILE__, false, $order_by, false, 0, $join)->NumRows();
 				}
 			}
-			$rs = $this->db->select($this->table_name,$mysql_calc_rows.$colums,$query,__LINE__,__FILE__,
-				$start,$order_by,$this->app,$num_rows,$join);
+			$rs = $this->db->select($this->table_name, $mysql_calc_rows.$colums, $query, __LINE__, __FILE__,
+				$start, $order_by, $this->app, $num_rows, $join);
 			if ($this->debug) error_log(__METHOD__."() ".$this->db->Query_ID->sql);
-			$cols = $this->_get_columns($only_keys,$extra_cols);
+			$cols = $this->_get_columns($only_keys, $extra_cols);
 		}
-		if ((int) $this->debug >= 4) echo "<p>sql='{$this->db->Query_ID->sql}'</p>\n";
+		if ((int)$this->debug >= 4) echo "<p>sql='{$this->db->Query_ID->sql}'</p>\n";
 
 		if ($mysql_calc_rows)
 		{
@@ -1097,14 +1097,14 @@ 
 		// ToDo: Implement that as an iterator, as $rs is also an interator and we could return one instead of an array
 		if ($this->search_return_iterator)
 		{
-			return new Db2DataIterator($this,$rs);
+			return new Db2DataIterator($this, $rs);
 		}
 		$arr = array();
 		$n = 0;
-		if ($rs) foreach($rs as $row)
+		if ($rs) foreach ($rs as $row)
 		{
 			$data = array();
-			foreach($cols as $db_col => $col)
+			foreach ($cols as $db_col => $col)
 			{
 				$data[$col] = (isset($row[$db_col]) ? $row[$db_col] : $row[$col]);
 			}
@@ -1134,7 +1134,7 @@ 
 		$matches = null;
 		if (substr($GLOBALS['egw']->db->Type, 0, 5) == 'mysql' || !preg_match('/(GROUP BY .*)(HAVING.*|ORDER BY.*)?$/iU', $group_by, $matches))
 		{
-			return $group_by;	// nothing to do
+			return $group_by; // nothing to do
 		}
 		$changes = 0;
 		$group_by_cols = preg_split('/, */', trim(substr($matches[1], 9)));
@@ -1144,9 +1144,9 @@ 
 			$columns = preg_split('/, */', $columns);
 
 			// fix columns containing commas as part of function calls
-			for($n = 0; $n < count($columns); ++$n)
+			for ($n = 0; $n < count($columns); ++$n)
 			{
-				$col =& $columns[$n];
+				$col = & $columns[$n];
 				while (substr_count($col, '(') > substr_count($col, ')') && ++$n < count($columns))
 				{
 					$col .= ','.$columns[$n];
@@ -1155,7 +1155,7 @@ 
 			}
 			unset($col);
 		}
-		foreach($columns as $n => $col)
+		foreach ($columns as $n => $col)
 		{
 			if ($col == '*')
 			{
@@ -1168,7 +1168,7 @@ 
 			{
 				if (($pos = stripos($col, 'DISTINCT ')) !== false)
 				{
-					$col = substr($col, $pos+9);
+					$col = substr($col, $pos + 9);
 				}
 				$alias = $col;
 				if (stripos($col, ' AS ')) list($col, $alias) = preg_split('/ +AS +/i', $col);
@@ -1186,7 +1186,7 @@ 
 		$ret = $group_by;
 		if ($changes)
 		{
-			$ret = str_replace($matches[1], 'GROUP BY '.implode(',', $group_by_cols).' ',  $group_by);
+			$ret = str_replace($matches[1], 'GROUP BY '.implode(',', $group_by_cols).' ', $group_by);
 			//error_log(__METHOD__."('$group_by', ".array2string($columns).") group_by_cols=".array2string($group_by_cols)." changed to $ret");
 		}
 		return $ret;
@@ -1206,12 +1206,12 @@ 
 	 * @param array $search_cols =array() List of columns to search.  If not provided, all columns in $this->db_cols will be considered
 	 * @return array or column => value pairs
 	 */
-	public function search2criteria($_pattern,&$wildcard='',&$op='AND',$extra_col=null, $search_cols = array())
+	public function search2criteria($_pattern, &$wildcard = '', &$op = 'AND', $extra_col = null, $search_cols = array())
 	{
 		$pattern = trim($_pattern);
 		// This function can get called multiple times.  Make sure it doesn't re-process.
 		if (empty($pattern) || is_array($pattern)) return $pattern;
-		if(strpos($pattern, 'CAST(COALESCE(') !== false)
+		if (strpos($pattern, 'CAST(COALESCE(') !== false)
 		{
 			return $pattern;
 		}
@@ -1228,24 +1228,24 @@ 
 		$numeric_columns = array();
 
 		// Special handling for an ID search, #<int>
-		if(strpos($_pattern, '#') === 0 && is_numeric(substr($_pattern, 1)))
+		if (strpos($_pattern, '#') === 0 && is_numeric(substr($_pattern, 1)))
 		{
-			return array('(' . $this->table_name.'.'. $this->autoinc_id . '=' . (int)substr($_pattern,1) . ')');
+			return array('('.$this->table_name.'.'.$this->autoinc_id.'='.(int)substr($_pattern, 1).')');
 		}
-		if(!$search_cols)
+		if (!$search_cols)
 		{
 			$search_cols = $this->get_default_search_columns();
 		}
 		// Concat all fields to be searched together, so the conditions operate across the whole record
-		foreach($search_cols as $col)
+		foreach ($search_cols as $col)
 		{
 			$col_name = $col;
 			$table = $this->table_name;
-			if (strpos($col,'.') !== false)
+			if (strpos($col, '.') !== false)
 			{
-				list($table,$col_name) = explode('.',$col);
+				list($table, $col_name) = explode('.', $col);
 			}
-			$table_def = $table == $this->table_name ? $this->table_def : $this->db->get_table_definitions(true,$table);
+			$table_def = $table == $this->table_name ? $this->table_def : $this->db->get_table_definitions(true, $table);
 			if ($table_def['fd'][$col_name] && in_array($table_def['fd'][$col_name]['type'], $numeric_types))
 			{
 				$numeric_columns[] = $col;
@@ -1253,11 +1253,11 @@ 
 			}
 			if ($this->db->Type == 'mysql' && $table_def['fd'][$col_name]['type'] === 'ascii' && preg_match('/[\x80-\xFF]/', $_pattern))
 			{
-				continue;	// will only give sql error
+				continue; // will only give sql error
 			}
-			$columns[] = sprintf($this->db->capabilities[Api\Db::CAPABILITY_CAST_AS_VARCHAR],"COALESCE($col,'')");
+			$columns[] = sprintf($this->db->capabilities[Api\Db::CAPABILITY_CAST_AS_VARCHAR], "COALESCE($col,'')");
 		}
-		if(!$columns)
+		if (!$columns)
 		{
 			return array();
 		}
@@ -1266,9 +1266,9 @@ 
 		$break = ' ';
 		$token = strtok($pattern, $break);
 
-		while($token)
+		while ($token)
 		{
-			if($token == strtoupper(lang('AND')) || $token == 'AND')
+			if ($token == strtoupper(lang('AND')) || $token == 'AND')
 			{
 				$token = '+'.strtok($break);
 			}
@@ -1281,10 +1281,10 @@ 
 			{
 				$token = '-'.strtok($break);
 			}
-			if ($token[0]=='"')
+			if ($token[0] == '"')
 			{
-				$token = substr($token, 1,strlen($token));
- 				if(substr($token, -1) != '"')
+				$token = substr($token, 1, strlen($token));
+ 				if (substr($token, -1) != '"')
 				{
 					$token .= ' '.strtok('"');
 				}
@@ -1295,16 +1295,16 @@ 
 			}
 
 			// prepend and append extra wildcard %, if pattern does NOT already contain wildcards
-			if (strpos($token,'*') === false && strpos($token,'?') === false)
+			if (strpos($token, '*') === false && strpos($token, '?') === false)
 			{
-				$wildcard = '%';	// if pattern contains no wildcards, add them before AND after the pattern
+				$wildcard = '%'; // if pattern contains no wildcards, add them before AND after the pattern
 			}
 			else
 			{
-				$wildcard = '';		// no extra wildcard, if pattern already contains some
+				$wildcard = ''; // no extra wildcard, if pattern already contains some
 			}
 
-			switch($token[0])
+			switch ($token[0])
 			{
 				case '+':
 					$op = 'AND';
@@ -1319,32 +1319,32 @@ 
 					$op = 'OR';
 					break;
 			}
-			$token_filter = ' '.call_user_func_array(array($GLOBALS['egw']->db,'concat'),$columns).' '.
-				$this->db->capabilities['case_insensitive_like'] . ' ' .
-				$GLOBALS['egw']->db->quote($wildcard.str_replace(array('%','_','*','?'),array('\\%','\\_','%','_'),$token).$wildcard);
+			$token_filter = ' '.call_user_func_array(array($GLOBALS['egw']->db, 'concat'), $columns).' '.
+				$this->db->capabilities['case_insensitive_like'].' '.
+				$GLOBALS['egw']->db->quote($wildcard.str_replace(array('%', '_', '*', '?'), array('\\%', '\\_', '%', '_'), $token).$wildcard);
 
 			// Compare numeric token as equality for numeric columns
 			// skip user-wildcards (*,?) in is_numeric test, but not SQL wildcards, which get escaped and give sql-error
-			if (is_numeric(str_replace(array('*','?'), '', $token)))
+			if (is_numeric(str_replace(array('*', '?'), '', $token)))
 			{
 				$numeric_filter = array();
-				foreach($numeric_columns as $col)
+				foreach ($numeric_columns as $col)
 				{
-					if($wildcard == '')
+					if ($wildcard == '')
 					{
 						// Token has a wildcard from user, use LIKE
-						$numeric_filter[] = "($col IS NOT NULL AND CAST($col AS CHAR) " .
-							$this->db->capabilities['case_insensitive_like'] . ' ' .
-							$GLOBALS['egw']->db->quote(str_replace(array('*','?'), array('%','_'), $token)) . ')';
+						$numeric_filter[] = "($col IS NOT NULL AND CAST($col AS CHAR) ".
+							$this->db->capabilities['case_insensitive_like'].' '.
+							$GLOBALS['egw']->db->quote(str_replace(array('*', '?'), array('%', '_'), $token)).')';
 					}
 					else
 					{
 						$numeric_filter[] = "($col IS NOT NULL AND $col = $token)";
 					}
 				}
-				if(count($numeric_filter) > 0)
+				if (count($numeric_filter) > 0)
 				{
-					$token_filter = '(' . $token_filter . ' OR ' . implode(' OR ', $numeric_filter) . ')';
+					$token_filter = '('.$token_filter.' OR '.implode(' OR ', $numeric_filter).')';
 				}
 			}
 			$criteria[$op][] = $token_filter;
@@ -1352,32 +1352,32 @@ 
 			$token = strtok($break);
 		}
 
-		if($criteria['NOT'])
+		if ($criteria['NOT'])
 		{
-			$filter[] = 'NOT (' . implode(' OR ', $criteria['NOT']) . ') ';
+			$filter[] = 'NOT ('.implode(' OR ', $criteria['NOT']).') ';
 		}
-		if($criteria['AND'])
+		if ($criteria['AND'])
 		{
-			$filter[] = implode(' AND ', $criteria['AND']) . ' ';
+			$filter[] = implode(' AND ', $criteria['AND']).' ';
 		}
-		if($criteria['OR'])
+		if ($criteria['OR'])
 		{
-			$filter[] = '(' . implode(' OR ', $criteria['OR']) . ') ';
+			$filter[] = '('.implode(' OR ', $criteria['OR']).') ';
 		}
 
-		if(count($filter))
+		if (count($filter))
 		{
-			$result = '(' . implode(' AND ', $filter) . ')';
+			$result = '('.implode(' AND ', $filter).')';
 		}
 
 		// OR extra column on the end so a null or blank won't block a hit in the main columns
 		if ($extra_col)
 		{
-			$result .= (strlen($result) ? ' OR ' : ' ') . "$extra_col = " . $GLOBALS['egw']->db->quote($pattern);
+			$result .= (strlen($result) ? ' OR ' : ' ')."$extra_col = ".$GLOBALS['egw']->db->quote($pattern);
 		}
 
 		$op = 'OR';
-		return array('(' . $result . ')');
+		return array('('.$result.')');
 	}
 
 	/**
@@ -1396,21 +1396,21 @@ 
 		$numeric_types = array('auto', 'int', 'float', 'double');
 
 		// Skip some numeric columns that don't make sense to search if we have to default to all columns
-		if(is_null($this->columns_to_search))
+		if (is_null($this->columns_to_search))
 		{
-			foreach($search_cols as $key => &$col)
+			foreach ($search_cols as $key => &$col)
 			{
 				// If the name as given isn't a real column name, and adding the prefix doesn't help, skip it
-				if(!$this->table_def['fd'][$col] && !($col = $this->prefix.array_search($col, $search_cols))) {
+				if (!$this->table_def['fd'][$col] && !($col = $this->prefix.array_search($col, $search_cols))) {
 					// Can't search this column
 					unset($search_cols[$key]);
 					continue;
 				}
-				if(in_array($this->table_def['fd'][$col]['type'], $numeric_types))
+				if (in_array($this->table_def['fd'][$col]['type'], $numeric_types))
 				{
-					foreach($skip_columns_with as $bad)
+					foreach ($skip_columns_with as $bad)
 					{
-						if(strpos($col, $bad) !== false)
+						if (strpos($col, $bad) !== false)
 						{
 							unset($search_cols[$key]);
 							continue 2;
@@ -1432,7 +1432,7 @@ 
 	 * @param string|array $extra_cols ='' string or array of strings to be added to the SELECT, eg. "count(*) as num"
 	 * @return array with columns as db-name => internal-name pairs
 	 */
-	function _get_columns($only_keys,$extra_cols)
+	function _get_columns($only_keys, $extra_cols)
 	{
 		//echo "_get_columns() only_keys="; _debug_array($only_keys); echo "extra_cols="; _debug_array($extra_cols);
 		if ($only_keys === true)	// only primary key
@@ -1443,7 +1443,7 @@ 
 		{
 			$cols = array();
 			$distinct_checked = false;
-			foreach(is_array($only_keys) ? $only_keys : explode(',', $only_keys) as $col)
+			foreach (is_array($only_keys) ? $only_keys : explode(',', $only_keys) as $col)
 			{
 				if (!$distinct_checked)
 				{
@@ -1452,17 +1452,17 @@ 
 				}
 				if (!$col || $col == '*' || $col == $this->table_name.'.*')	// all columns
 				{
-					$cols = array_merge($cols,$this->db_cols);
+					$cols = array_merge($cols, $this->db_cols);
 				}
 				else	// only the specified columns
 				{
-					if (stripos($col,'as'))	// if there's already an explicit naming of the column, just use it
+					if (stripos($col, 'as'))	// if there's already an explicit naming of the column, just use it
 					{
-						$col = preg_replace('/^.*as +([a-z0-9_]+) *$/i','\\1',$col);
+						$col = preg_replace('/^.*as +([a-z0-9_]+) *$/i', '\\1', $col);
 						$cols[$col] = $col;
 						continue;
 					}
-					if (($db_col = array_search($col,$this->db_cols)) !== false)
+					if (($db_col = array_search($col, $this->db_cols)) !== false)
 					{
 						$cols[$db_col] = $col;
 					}
@@ -1475,10 +1475,10 @@ 
 		}
 		if ($extra_cols)	// extra columns to report
 		{
-			foreach(is_array($extra_cols) ? $extra_cols : explode(',',$extra_cols) as $col)
+			foreach (is_array($extra_cols) ? $extra_cols : explode(',', $extra_cols) as $col)
 			{
-				if (stripos($col,'as ')!==false) $col = preg_replace('/^.*as +([a-z0-9_]+) *$/i','\\1',$col);
-				if (($db_col = array_search($col,$this->db_cols)) !== false)
+				if (stripos($col, 'as ') !== false) $col = preg_replace('/^.*as +([a-z0-9_]+) *$/i', '\\1', $col);
+				if (($db_col = array_search($col, $this->db_cols)) !== false)
 				{
 					$cols[$db_col] = $col;
 				}
@@ -1505,12 +1505,12 @@ 
 	 * @param string|array $extra_cols =array()
 	 * @return int total number of rows
 	 */
-	function get_rows($query,&$rows,&$readonlys,$join='',$need_full_no_count=false,$only_keys=false,$extra_cols=array())
+	function get_rows($query, &$rows, &$readonlys, $join = '', $need_full_no_count = false, $only_keys = false, $extra_cols = array())
 	{
-		unset($readonlys);	// required by function signature, but not used in this default implementation
-		if ((int) $this->debug >= 4)
+		unset($readonlys); // required by function signature, but not used in this default implementation
+		if ((int)$this->debug >= 4)
 		{
-			echo "<p>so_sql::get_rows(".print_r($query,true).",,)</p>\n";
+			echo "<p>so_sql::get_rows(".print_r($query, true).",,)</p>\n";
 		}
 		$criteria = array();
 		$op = 'AND';
@@ -1518,11 +1518,11 @@ 
 		{
 			$criteria = $query['search'];
 		}
-		$rows = $this->search($criteria,$only_keys,$query['order']?$query['order'].' '.$query['sort']:'',$extra_cols,
-			'',false,$op,$query['num_rows']?array((int)$query['start'],$query['num_rows']):(int)$query['start'],
-			$query['col_filter'],$join,$need_full_no_count);
+		$rows = $this->search($criteria, $only_keys, $query['order'] ? $query['order'].' '.$query['sort'] : '', $extra_cols,
+			'', false, $op, $query['num_rows'] ? array((int)$query['start'], $query['num_rows']) : (int)$query['start'],
+			$query['col_filter'], $join, $need_full_no_count);
 
-		if (!$rows) $rows = array();	// otherwise false returned from search would be returned as array(false)
+		if (!$rows) $rows = array(); // otherwise false returned from search would be returned as array(false)
 
 		return $this->total;
 	}
@@ -1533,7 +1533,7 @@ 
 	 * @param array $data =null data-set to check, defaults to $this->data
 	 * @return int 0: all keys are unique, 1: first key not unique, 2: ...
 	 */
-	function not_unique($data=null)
+	function not_unique($data = null)
 	{
 		if (!is_array($data))
 		{
@@ -1546,12 +1546,12 @@ 
 		{
 			$uni_keys[] = $this->db_key_cols;
 		}
-		foreach($uni_keys as $db_col => $col)
+		foreach ($uni_keys as $db_col => $col)
 		{
 			if (is_array($col))
 			{
 				$query = array();
-				foreach($col as $db_c => $c)
+				foreach ($col as $db_c => $c)
 				{
 					$query[$db_c] = $data[$c];
 				}
@@ -1560,17 +1560,17 @@ 
 			{
 				$query = array($db_col => $data[$col]);
 			}
-			foreach($this->db->select($this->table_name,$this->db_key_cols,$query,__LINE__,__FILE__,false,'',$this->app) as $other)
+			foreach ($this->db->select($this->table_name, $this->db_key_cols, $query, __LINE__, __FILE__, false, '', $this->app) as $other)
 			{
-				foreach($this->db_key_cols as $key_col)
+				foreach ($this->db_key_cols as $key_col)
 				{
 					if ($data[$key_col] != $other[$key_col])
 					{
-						if ((int) $this->debug >= 4)
+						if ((int)$this->debug >= 4)
 						{
 							echo "<p>not_unique in ".array2string($col)." as for '$key_col': '${data[$key_col]}' != '${other[$key_col]}'</p>\n";
 						}
-						return $n;	// different entry => $n not unique
+						return $n; // different entry => $n not unique
 					}
 				}
 			}
@@ -1591,7 +1591,7 @@ 
 	 * @param string $order ='' order, default '' = same as (first) $value_col
 	 * @return array with key_col => value_col pairs or array if more then one value_col given (keys as in value_col)
 	 */
-	function query_list($value_col,$key_col='',$filter=array(),$order='')
+	function query_list($value_col, $key_col = '', $filter = array(), $order = '')
 	{
 		static $cache = array();
 
@@ -1604,16 +1604,16 @@ 
 		if (!is_array($value_col)) $value_col = array($value_col);
 
 		$cols = $ret = array();
-		foreach($value_col as $key => $col)
+		foreach ($value_col as $key => $col)
 		{
 			$matches = null;
-			$cols[$key] = preg_match('/AS ([a-z_0-9]+)$/i',$col,$matches) ? $matches[1] : $col;
+			$cols[$key] = preg_match('/AS ([a-z_0-9]+)$/i', $col, $matches) ? $matches[1] : $col;
 		}
 		if (!$order) $order = current($cols);
 
-		if (($search =& $this->search(array(),($key_col ? $key_col.',' : 'DISTINCT ').implode(',',$value_col),$order,'','',false,'AND',false,$filter)))
+		if (($search = & $this->search(array(), ($key_col ? $key_col.',' : 'DISTINCT ').implode(',', $value_col), $order, '', '', false, 'AND', false, $filter)))
 		{
-			if (preg_match('/AS ([a-z_0-9]+)$/i',$key_col,$matches))
+			if (preg_match('/AS ([a-z_0-9]+)$/i', $key_col, $matches))
 			{
 				$key_col = $matches[1];
 			}
@@ -1621,12 +1621,12 @@ 
 			{
 				$key_col = current($cols);
 			}
-			foreach($search as $row)
+			foreach ($search as $row)
 			{
 				if (count($cols) > 1)
 				{
 					$data = array();
-					foreach($cols as $key => $col)
+					foreach ($cols as $key => $col)
 					{
 						$data[$key] = $row[$col];
 					}
@@ -1638,7 +1638,7 @@ 
 				if ($data) $ret[$row[$key_col]] = $data;
 			}
 		}
-		return $cache[$cache_key] =& $ret;
+		return $cache[$cache_key] = & $ret;
 	}
 
 	/**
@@ -1647,13 +1647,13 @@ 
 	 * @param string $column =null name of column or null for all (default)
 	 * @return array|string array with internal-name => comment pairs, or string with comment, if $column given
 	 */
-	public function get_comments($column=null)
+	public function get_comments($column = null)
 	{
-		static $comments=null;
+		static $comments = null;
 
 		if (is_null($comments))
 		{
-			foreach($this->db_cols as $db_col => $col)
+			foreach ($this->db_cols as $db_col => $col)
 			{
 				$comments[$col] = $this->table_def['fd'][$db_col]['comment'];
 			}

api/src/Storage/Base2.php

Spacing +7 added lines, -7 removed lines

@@ -53,9 +53,9 @@ 
 	 *
 	 * @return so_sql2
 	 */
-	function __construct($app='',$table='',Api\Db $db=null,$column_prefix='',$no_clone=false)
+	function __construct($app = '', $table = '', Api\Db $db = null, $column_prefix = '', $no_clone = false)
 	{
-		parent::__construct($app,$table,$db,$column_prefix,$no_clone);
+		parent::__construct($app, $table, $db, $column_prefix, $no_clone);
 	}
 
 	/**
@@ -68,13 +68,13 @@ 
 	 */
 	function __get($property)
 	{
-		switch($property)
+		switch ($property)
 		{
 			case 'id':
 				$property = $this->autoinc_id;
 				break;
 		}
-		if (in_array($property,$this->db_cols) || in_array($property,$this->non_db_cols))
+		if (in_array($property, $this->db_cols) || in_array($property, $this->non_db_cols))
 		{
 			return $this->data[$property];
 		}
@@ -88,15 +88,15 @@ 
 	 * @param string $property
 	 * @param mixed $value
 	 */
-	function __set($property,$value)
+	function __set($property, $value)
 	{
-		switch($property)
+		switch ($property)
 		{
 			case 'id':
 				$property = $this->autoinc_id;
 				break;
 		}
-		if (in_array($property,$this->db_cols) || in_array($property,$this->non_db_cols))
+		if (in_array($property, $this->db_cols) || in_array($property, $this->non_db_cols))
 		{
 			$this->data[$property] = $value;
 		}

api/src/Exception/NoPermission/App.php

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
  */
 class App extends Exception\NoPermission
 {
-	function __construct($msg=null,$code=101)
+	function __construct($msg = null, $code = 101)
 	{
 		if (isset($GLOBALS['egw_info']['apps'][$msg]))
 		{
@@ -39,6 +39,6 @@ 
 						'"'.$app.'"');
 			}
 		}
-		parent::__construct($msg,$code);
+		parent::__construct($msg, $code);
 	}
 }

api/src/Exception/NotFound.php

Spacing +2 added lines, -2 removed lines

@@ -26,10 +26,10 @@
 	 * @param string $msg =null message, default "Entry not found!"
 	 * @param int $code =99 numerical code, default 2
 	 */
-	function __construct($msg=null,$code=2)
+	function __construct($msg = null, $code = 2)
 	{
 		if (is_null($msg)) $msg = lang('Entry not found!');
 
-		parent::__construct($msg,$code);
+		parent::__construct($msg, $code);
 	}
 }

Braces +4 added lines, -1 removed lines

@@ -28,7 +28,10 @@
 	 */
 	function __construct($msg=null,$code=2)
 	{
-		if (is_null($msg)) $msg = lang('Entry not found!');
+		if (is_null($msg))
+		{
+			$msg = lang('Entry not found!');
+		}
 
 		parent::__construct($msg,$code);
 	}

api/src/Exception/Redirect.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 	 * @param string $msg
 	 * @param int $code
 	 */
-	function __construct($url,$app=null,$msg=null,$code=301)
+	function __construct($url, $app = null, $msg = null, $code = 301)
 	{
 		$this->url = $url;
 		$this->app = $app;

api/src/Exception/NoPermission.php

Spacing +2 added lines, -2 removed lines

@@ -27,10 +27,10 @@
 	 * @param string $msg =null message, default "Permission denied!"
 	 * @param int $code =100 numerical code, default 100
 	 */
-	function __construct($msg=null,$code=100)
+	function __construct($msg = null, $code = 100)
 	{
 		if (is_null($msg)) $msg = lang('Permisson denied!');
 
-		parent::__construct($msg,$code);
+		parent::__construct($msg, $code);
 	}
 }

Braces +4 added lines, -1 removed lines

@@ -29,7 +29,10 @@
 	 */
 	function __construct($msg=null,$code=100)
 	{
-		if (is_null($msg)) $msg = lang('Permisson denied!');
+		if (is_null($msg))
+		{
+			$msg = lang('Permisson denied!');
+		}
 
 		parent::__construct($msg,$code);
 	}