EGroupware / egroupware

api/src/Vfs/Filesystem/StreamWrapper.php

Spacing +94 added lines, -94 removed lines

@@ -51,7 +51,7 @@ 
 	/**
 	 * Mime type of directories, the old vfs used 'Directory', while eg. WebDAV uses 'httpd/unix-directory'
 	 */
-	const DIR_MIME_TYPE = Vfs::DIR_MIME_TYPE ;
+	const DIR_MIME_TYPE = Vfs::DIR_MIME_TYPE;
 
 	/**
 	 * mode-bits, which have to be set for files
@@ -60,7 +60,7 @@ 
 	/**
 	 * mode-bits, which have to be set for directories
 	 */
-	const MODE_DIR =   040000;
+	const MODE_DIR = 040000;
 
 	/**
 	 * optional context param when opening the stream, null if no context passed
@@ -123,50 +123,50 @@ 
 	 * @param string $opened_path full path of the file/resource, if the open was successfull and STREAM_USE_PATH was set
 	 * @return boolean true if the ressource was opened successful, otherwise false
 	 */
-	function stream_open ( $url, $mode, $options, &$opened_path )
+	function stream_open($url, $mode, $options, &$opened_path)
 	{
-		unset($opened_path);	// not used, but required by interface
+		unset($opened_path); // not used, but required by interface
 
 		$this->opened_stream = $this->opened_stream_url = null;
-		$read_only = str_replace('b','',$mode) == 'r';
+		$read_only = str_replace('b', '', $mode) == 'r';
 
 		// check access rights, based on the eGW mount perms
-		if (!($stat = self::url_stat($url,0)) || $mode[0] == 'x')	// file not found or file should NOT exist
+		if (!($stat = self::url_stat($url, 0)) || $mode[0] == 'x')	// file not found or file should NOT exist
 		{
 			$dir = Vfs::dirname($url);
-			if ($mode[0] == 'r' ||	// does $mode require the file to exist (r,r+)
-				$mode[0] == 'x' ||	// or file should not exist, but does
-				!Vfs::check_access($dir,Vfs::WRITABLE,$dir_stat=self::url_stat($dir,0)))	// or we are not allowed to 																																			create it
+			if ($mode[0] == 'r' || // does $mode require the file to exist (r,r+)
+				$mode[0] == 'x' || // or file should not exist, but does
+				!Vfs::check_access($dir, Vfs::WRITABLE, $dir_stat = self::url_stat($dir, 0)))	// or we are not allowed to 																																			create it
 			{
 				if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) file does not exist or can not be created!");
-				if (!($options & STREAM_URL_STAT_QUIET))
+				if (!($options&STREAM_URL_STAT_QUIET))
 				{
-					trigger_error(__METHOD__."($url,$mode,$options) file does not exist or can not be created!",E_USER_WARNING);
+					trigger_error(__METHOD__."($url,$mode,$options) file does not exist or can not be created!", E_USER_WARNING);
 				}
 				return false;
 			}
 		}
-		elseif (!$read_only && !Vfs::check_access($url,Vfs::WRITABLE,$stat))	// we are not allowed to edit it
+		elseif (!$read_only && !Vfs::check_access($url, Vfs::WRITABLE, $stat))	// we are not allowed to edit it
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) file can not be edited!");
-			if (!($options & STREAM_URL_STAT_QUIET))
+			if (!($options&STREAM_URL_STAT_QUIET))
 			{
-				trigger_error(__METHOD__."($url,$mode,$options) file can not be edited!",E_USER_WARNING);
+				trigger_error(__METHOD__."($url,$mode,$options) file can not be edited!", E_USER_WARNING);
 			}
 			return false;
 		}
 		if (!$read_only && self::deny_script($url))
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) permission denied, file is a script!");
-			if (!($options & STREAM_URL_STAT_QUIET))
+			if (!($options&STREAM_URL_STAT_QUIET))
 			{
-				trigger_error(__METHOD__."($url,$mode,$options) permission denied, file is a script!",E_USER_WARNING);
+				trigger_error(__METHOD__."($url,$mode,$options) permission denied, file is a script!", E_USER_WARNING);
 			}
 			return false;
 		}
 
 		// open the "real" file
-		if (!($this->opened_stream = fopen($path=Vfs::decodePath(Vfs::parse_url($url,PHP_URL_PATH)),$mode,$options)))
+		if (!($this->opened_stream = fopen($path = Vfs::decodePath(Vfs::parse_url($url, PHP_URL_PATH)), $mode, $options)))
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) fopen('$path','$mode',$options) returned false!");
 			return false;
@@ -181,7 +181,7 @@ 
 	 *
 	 * You must release any resources that were locked or allocated by the stream.
 	 */
-	function stream_close ( )
+	function stream_close( )
 	{
 		$ret = fclose($this->opened_stream);
 
@@ -201,9 +201,9 @@ 
 	 * @param int $count
 	 * @return string/false up to count bytes read or false on EOF
 	 */
-	function stream_read ( $count )
+	function stream_read($count)
 	{
-		return fread($this->opened_stream,$count);
+		return fread($this->opened_stream, $count);
 	}
 
 	/**
@@ -217,9 +217,9 @@ 
 	 * @param string $data
 	 * @return integer
 	 */
-	function stream_write ( $data )
+	function stream_write($data)
 	{
-		return fwrite($this->opened_stream,$data);
+		return fwrite($this->opened_stream, $data);
 	}
 
  	/**
@@ -234,7 +234,7 @@ 
   	 *
  	 * @return boolean true if the read/write position is at the end of the stream and no more data availible, false otherwise
  	 */
-	function stream_eof ( )
+	function stream_eof( )
 	{
 		return feof($this->opened_stream);
 	}
@@ -244,7 +244,7 @@ 
 	 *
 	 * @return integer current read/write position of the stream
 	 */
- 	function stream_tell ( )
+ 	function stream_tell( )
  	{
  		return ftell($this->opened_stream);
  	}
@@ -261,9 +261,9 @@ 
  	 * 							SEEK_END - 2 - Set position to end-of-file plus offset. (To move to a position before the end-of-file, you need to pass a negative value in offset.)
  	 * @return boolean TRUE if the position was updated, FALSE otherwise.
  	 */
-	function stream_seek ( $offset, $whence )
+	function stream_seek($offset, $whence)
 	{
-		return !fseek($this->opened_stream,$offset,$whence);	// fseek returns 0 on success and -1 on failure
+		return !fseek($this->opened_stream, $offset, $whence); // fseek returns 0 on success and -1 on failure
 	}
 
 	/**
@@ -273,7 +273,7 @@ 
 	 *
 	 * @return booelan TRUE if the cached data was successfully stored (or if there was no data to store), or FALSE if the data could not be stored.
 	 */
-	function stream_flush ( )
+	function stream_flush( )
 	{
 		return fflush($this->opened_stream);
 	}
@@ -292,9 +292,9 @@ 
 	 *
 	 * @return array containing the same values as appropriate for the stream.
 	 */
-	function stream_stat ( )
+	function stream_stat( )
 	{
-		return self::url_stat($this->opened_stream_url,0);
+		return self::url_stat($this->opened_stream_url, 0);
 	}
 
 	/**
@@ -306,15 +306,15 @@ 
 	 * @param string $url
 	 * @return boolean TRUE on success or FALSE on failure
 	 */
-	static function unlink ( $url )
+	static function unlink($url)
 	{
-		$path = Vfs::decodePath(Vfs::parse_url($url,PHP_URL_PATH));
+		$path = Vfs::decodePath(Vfs::parse_url($url, PHP_URL_PATH));
 
 		// check access rights (file need to exist and directory need to be writable
-		if (!file_exists($path) || is_dir($path) || !Vfs::check_access(Vfs::dirname($url),Vfs::WRITABLE))
+		if (!file_exists($path) || is_dir($path) || !Vfs::check_access(Vfs::dirname($url), Vfs::WRITABLE))
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url) permission denied!");
-			return false;	// no permission or file does not exist
+			return false; // no permission or file does not exist
 		}
 		return unlink($path);
 	}
@@ -331,22 +331,22 @@ 
 	 * @param string $url_to
 	 * @return boolean TRUE on success or FALSE on failure
 	 */
-	static function rename ( $url_from, $url_to )
+	static function rename($url_from, $url_to)
 	{
 		$from = Vfs::parse_url($url_from);
 		$to   = Vfs::parse_url($url_to);
 
 		// check access rights
-		if (!($from_stat = self::url_stat($url_from,0)) || !Vfs::check_access(Vfs::dirname($url_from),Vfs::WRITABLE))
+		if (!($from_stat = self::url_stat($url_from, 0)) || !Vfs::check_access(Vfs::dirname($url_from), Vfs::WRITABLE))
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url_from,$url_to): $from[path] permission denied!");
-			return false;	// no permission or file does not exist
+			return false; // no permission or file does not exist
 		}
 		$to_dir = Vfs::dirname($url_to);
-		if (!Vfs::check_access($to_dir,Vfs::WRITABLE,$to_dir_stat = self::url_stat($to_dir,0)))
+		if (!Vfs::check_access($to_dir, Vfs::WRITABLE, $to_dir_stat = self::url_stat($to_dir, 0)))
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url_from,$url_to): $to_dir permission denied!");
-			return false;	// no permission or parent-dir does not exist
+			return false; // no permission or parent-dir does not exist
 		}
 		if (self::deny_script($url_to))
 		{
@@ -355,12 +355,12 @@ 
 		}
 		// the filesystem stream-wrapper does NOT allow to rename files to directories, as this makes problems
 		// for our vfs too, we abort here with an error, like the filesystem one does
-		if (($to_stat = self::url_stat($to['path'],0)) &&
+		if (($to_stat = self::url_stat($to['path'], 0)) &&
 			($to_stat['mime'] === self::DIR_MIME_TYPE) !== ($from_stat['mime'] === self::DIR_MIME_TYPE))
 		{
 			$is_dir = $to_stat['mime'] === self::DIR_MIME_TYPE ? 'a' : 'no';
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url_to,$url_from) $to[path] is $is_dir directory!");
-			return false;	// no permission or file does not exist
+			return false; // no permission or file does not exist
 		}
 		// if destination file already exists, delete it
 		if ($to_stat && !self::unlink($url_to))
@@ -368,7 +368,7 @@ 
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url_to,$url_from) can't unlink existing $url_to!");
 			return false;
 		}
-		return rename(Vfs::decodePath($from['path']),Vfs::decodePath($to['path']));
+		return rename(Vfs::decodePath($from['path']), Vfs::decodePath($to['path']));
 	}
 
 	/**
@@ -382,12 +382,12 @@ 
 	 * @param int $options Posible values include STREAM_REPORT_ERRORS and STREAM_MKDIR_RECURSIVE
 	 * @return boolean TRUE on success or FALSE on failure
 	 */
-	static function mkdir ( $url, $mode, $options )
+	static function mkdir($url, $mode, $options)
 	{
-		unset($mode);	// not used, but required by interface
+		unset($mode); // not used, but required by interface
 
-		$path = Vfs::decodePath(Vfs::parse_url($url,PHP_URL_PATH));
-		$recursive = (bool)($options & STREAM_MKDIR_RECURSIVE);
+		$path = Vfs::decodePath(Vfs::parse_url($url, PHP_URL_PATH));
+		$recursive = (bool)($options&STREAM_MKDIR_RECURSIVE);
 
 		// find the real parent (might be more then one level if $recursive!)
 		do {
@@ -398,12 +398,12 @@ 
 		//echo __METHOD__."($url,$mode,$options) path=$path, recursive=$recursive, parent=$parent, Vfs::check_access(parent_url=$parent_url,Vfs::WRITABLE)=".(int)Vfs::check_access($parent_url,Vfs::WRITABLE)."\n";
 
 		// check access rights (in real filesystem AND by mount perms)
-		if (file_exists($path) || !file_exists($parent) || !is_writable($parent) || !Vfs::check_access($parent_url,Vfs::WRITABLE))
+		if (file_exists($path) || !file_exists($parent) || !is_writable($parent) || !Vfs::check_access($parent_url, Vfs::WRITABLE))
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url) permission denied!");
 			return false;
 		}
-		return mkdir($path, 0700, $recursive);	// setting mode 0700 allows (only) apache to write into the dir
+		return mkdir($path, 0700, $recursive); // setting mode 0700 allows (only) apache to write into the dir
 	}
 
 	/**
@@ -416,15 +416,15 @@ 
 	 * @param int $options Possible values include STREAM_REPORT_ERRORS.
 	 * @return boolean TRUE on success or FALSE on failure.
 	 */
-	static function rmdir ( $url, $options )
+	static function rmdir($url, $options)
 	{
-		unset($options);	// not used, but required by interface
+		unset($options); // not used, but required by interface
 
-		$path = Vfs::decodePath(Vfs::parse_url($url,PHP_URL_PATH));
+		$path = Vfs::decodePath(Vfs::parse_url($url, PHP_URL_PATH));
 		$parent = dirname($path);
 
 		// check access rights (in real filesystem AND by mount perms)
-		if (!file_exists($path) || !is_writable($parent) || !Vfs::check_access(Vfs::dirname($url),Vfs::WRITABLE))
+		if (!file_exists($path) || !is_writable($parent) || !Vfs::check_access(Vfs::dirname($url), Vfs::WRITABLE))
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url) permission denied!");
 			return false;
@@ -440,18 +440,18 @@ 
 	 * @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($url,$time=null,$atime=null)
+	static function touch($url, $time = null, $atime = null)
 	{
-		$path = Vfs::decodePath(Vfs::parse_url($url,PHP_URL_PATH));
+		$path = Vfs::decodePath(Vfs::parse_url($url, PHP_URL_PATH));
 		$parent = dirname($path);
 
 		// check access rights (in real filesystem AND by mount perms)
-		if (!file_exists($path) || !is_writable($parent) || !Vfs::check_access(Vfs::dirname($url),Vfs::WRITABLE))
+		if (!file_exists($path) || !is_writable($parent) || !Vfs::check_access(Vfs::dirname($url), Vfs::WRITABLE))
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url) permission denied!");
 			return false;
 		}
-		return touch($path,$time,$atime);
+		return touch($path, $time, $atime);
 	}
 
 	/**
@@ -463,9 +463,9 @@ 
 	 * @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)
 	{
-		unset($path, $mode);	// not used, but required by interface
+		unset($path, $mode); // not used, but required by interface
 
 		return false;
 	}
@@ -479,9 +479,9 @@ 
 	 * @param int $owner numeric user id
 	 * @return boolean true on success, false otherwise
 	 */
-	static function chown($path,$owner)
+	static function chown($path, $owner)
 	{
-		unset($path, $owner);	// not used, but required by interface
+		unset($path, $owner); // not used, but required by interface
 
 		return false;
 	}
@@ -495,9 +495,9 @@ 
 	 * @param int $group numeric group id
 	 * @return boolean true on success, false otherwise
 	 */
-	static function chgrp($path,$group)
+	static function chgrp($path, $group)
 	{
-		unset($path, $group);	// not used, but required by interface
+		unset($path, $group); // not used, but required by interface
 
 		return false;
 	}
@@ -509,13 +509,13 @@ 
 	 * @param int $options
 	 * @return booelan
 	 */
-	function dir_opendir ( $url, $options )
+	function dir_opendir($url, $options)
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$options)");
 
 		$this->opened_dir = null;
 
-		$path = Vfs::decodePath(Vfs::parse_url($this->opened_dir_url = $url,PHP_URL_PATH));
+		$path = Vfs::decodePath(Vfs::parse_url($this->opened_dir_url = $url, PHP_URL_PATH));
 
 		// ToDo: check access rights
 
@@ -553,31 +553,31 @@ 
 	 *                          stat triggers it's own warning anyway, so it makes no sense to trigger one by our stream-wrapper!
 	 * @return array
 	 */
-	static function url_stat ( $url, $flags )
+	static function url_stat($url, $flags)
 	{
 		$parts = Vfs::parse_url($url);
 		$path = Vfs::decodePath($parts['path']);
 
-		$stat = @stat($path);	// suppressed the stat failed warnings
+		$stat = @stat($path); // suppressed the stat failed warnings
 
 		if ($stat)
 		{
 			// set owner, group and mode from mount options
 			$uid = $gid = $mode = null;
-			if (!self::parse_query($parts['query'],$uid,$gid,$mode))
+			if (!self::parse_query($parts['query'], $uid, $gid, $mode))
 			{
 				return false;
 			}
 			$stat['uid'] = $stat[4] = $uid;
 			$stat['gid'] = $stat[5] = $gid;
-			$stat['mode'] = $stat[2] = $stat['mode'] & self::MODE_DIR ? self::MODE_DIR | $mode : self::MODE_FILE | ($mode & ~0111);
+			$stat['mode'] = $stat[2] = $stat['mode']&self::MODE_DIR ? self::MODE_DIR|$mode : self::MODE_FILE|($mode&~0111);
 			// write rights also depend on the write rights of the webserver
 			if (!is_writable($path))
 			{
-				$stat['mode'] = $stat[2] = $stat['mode'] & ~0222;
+				$stat['mode'] = $stat[2] = $stat['mode']&~0222;
 			}
 		}
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$flags) path=$path, mount_mode=".sprintf('0%o',$mode).", mode=".sprintf('0%o',$stat['mode']).'='.Vfs::int2mode($stat['mode']));
+		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$flags) path=$path, mount_mode=".sprintf('0%o', $mode).", mode=".sprintf('0%o', $stat['mode']).'='.Vfs::int2mode($stat['mode']));
 		return $stat;
 	}
 
@@ -591,13 +591,13 @@ 
 	 *
 	 * @return string
 	 */
-	function dir_readdir ( )
+	function dir_readdir( )
 	{
 		do {
 			$file = readdir($this->opened_dir);
 
-			$ignore = !($file === false ||							// stop if no more dirs or
-				($file != '.' && $file != '..' ));					// file not . or ..
+			$ignore = !($file === false || // stop if no more dirs or
+				($file != '.' && $file != '..')); // file not . or ..
 			if (self::LOG_LEVEL > 1 && $ignore) error_log(__METHOD__.'() ignoring '.array2string($file));
 		}
 		while ($ignore);
@@ -618,7 +618,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	function dir_rewinddir ( )
+	function dir_rewinddir( )
 	{
 		return rewinddir($this->opened_dir);
 	}
@@ -630,7 +630,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	function dir_closedir ( )
+	function dir_closedir( )
 	{
 		closedir($this->opened_dir);
 
@@ -648,18 +648,18 @@ 
 	 * @param int &$mode default if not set is 05 r-x for others
 	 * @return boolean true on successfull parse, false on error
 	 */
-	static function parse_query($query,&$uid,&$gid,&$mode)
+	static function parse_query($query, &$uid, &$gid, &$mode)
 	{
 		$params = null;
-		parse_str(is_array($query) ? $query['query'] : $query,$params);
+		parse_str(is_array($query) ? $query['query'] : $query, $params);
 
 		// setting the default perms root.root r-x for other
 		$uid = $gid = 0;
 		$mode = 05;
 
-		foreach($params as $name => $value)
+		foreach ($params as $name => $value)
 		{
-			switch($name)
+			switch ($name)
 			{
 				case 'user':
 					if (!is_numeric($value))
@@ -668,10 +668,10 @@ 
 						{
 							$value = 0;
 						}
-						elseif (($value = $GLOBALS['egw']->accounts->name2id($value,'account_lid','u')) === false)
+						elseif (($value = $GLOBALS['egw']->accounts->name2id($value, 'account_lid', 'u')) === false)
 						{
 							error_log(__METHOD__."('$query') unknown user-name '$value'!");
-							return false;	// wrong user-name
+							return false; // wrong user-name
 						}
 					}
 					// fall-through
@@ -690,12 +690,12 @@ 
 						{
 							$value = 0;
 						}
-						elseif (($value = $GLOBALS['egw']->accounts->name2id($value,'account_lid','g')) === false)
+						elseif (($value = $GLOBALS['egw']->accounts->name2id($value, 'account_lid', 'g')) === false)
 						{
 							error_log(__METHOD__."('$query') unknown group-name '$value'!");
-							return false;	// wrong group-name
+							return false; // wrong group-name
 						}
-						$value = -$value;	// vfs uses positiv gid's!
+						$value = -$value; // vfs uses positiv gid's!
 					}
 					// fall-through
 				case 'gid':
@@ -731,9 +731,9 @@ 
 	{
 		$parts = Vfs::parse_url($url);
 		$get = null;
-		parse_str($parts['query'],$get);
+		parse_str($parts['query'], $get);
 
-		$deny = !$get['exec'] && preg_match(self::SCRIPT_EXTENSIONS_PREG,$parts['path']);
+		$deny = !$get['exec'] && preg_match(self::SCRIPT_EXTENSIONS_PREG, $parts['path']);
 
 		if (self::LOG_LEVEL > 1 || self::LOG_LEVEL > 0 && $deny)
 		{
@@ -753,21 +753,21 @@ 
 	 * @todo get $force_download working through webdav
 	 * @return string|false string with full download url or false to use default webdav.php url
 	 */
-	static function download_url($_url,$force_download=false)
+	static function download_url($_url, $force_download = false)
 	{
-		unset($force_download);	// not used, but required by interface
+		unset($force_download); // not used, but required by interface
 
-		list($url,$query) = explode('?',$_url,2);
+		list($url, $query) = explode('?', $_url, 2);
 		$get = null;
-		parse_str($query,$get);
-		if (empty($get['url'])) return false;	// no download url given for this mount-point
+		parse_str($query, $get);
+		if (empty($get['url'])) return false; // no download url given for this mount-point
 
-		if (!($mount_url = Vfs::mount_url($_url))) return false;	// no mount url found, should not happen
-		list($mount_url) = explode('?',$mount_url);
+		if (!($mount_url = Vfs::mount_url($_url))) return false; // no mount url found, should not happen
+		list($mount_url) = explode('?', $mount_url);
 
-		$relpath = substr($url,strlen($mount_url));
+		$relpath = substr($url, strlen($mount_url));
 
-		$download_url = Vfs::concat($get['url'],$relpath);
+		$download_url = Vfs::concat($get['url'], $relpath);
 		if ($download_url[0] == '/')
 		{
 			$download_url = ($_SERVER['HTTPS'] ? 'https://' : 'http://').

api/src/Vfs/StreamWrapperIface.php

Spacing +18 added lines, -18 removed lines

@@ -39,14 +39,14 @@ 
 	 * @param string $opened_path full path of the file/resource, if the open was successfull and STREAM_USE_PATH was set
 	 * @return boolean true if the ressource was opened successful, otherwise false
 	 */
-	function stream_open ( $path, $mode, $options, &$opened_path );
+	function stream_open($path, $mode, $options, &$opened_path);
 
 	/**
 	 * This method is called when the stream is closed, using fclose().
 	 *
 	 * You must release any resources that were locked or allocated by the stream.
 	 */
-	function stream_close ( );
+	function stream_close( );
 
 	/**
 	 * This method is called in response to fread() and fgets() calls on the stream.
@@ -59,7 +59,7 @@ 
 	 * @param int $count
 	 * @return string/false up to count bytes read or false on EOF
 	 */
-	function stream_read ( $count );
+	function stream_read($count);
 
 	/**
 	 * This method is called in response to fwrite() calls on the stream.
@@ -72,7 +72,7 @@ 
 	 * @param string $data
 	 * @return integer
 	 */
-	function stream_write ( $data );
+	function stream_write($data);
 
  	/**
  	 * This method is called in response to feof() calls on the stream.
@@ -86,14 +86,14 @@ 
   	 *
  	 * @return boolean true if the read/write position is at the end of the stream and no more data availible, false otherwise
  	 */
-	function stream_eof ( );
+	function stream_eof( );
 
 	/**
 	 * This method is called in response to ftell() calls on the stream.
 	 *
 	 * @return integer current read/write position of the stream
 	 */
- 	function stream_tell ( );
+ 	function stream_tell( );
 
  	/**
  	 * This method is called in response to fseek() calls on the stream.
@@ -107,7 +107,7 @@ 
  	 * 							SEEK_END - Set position to end-of-file plus offset. (To move to a position before the end-of-file, you need to pass a negative value in offset.)
  	 * @return boolean TRUE if the position was updated, FALSE otherwise.
  	 */
-	function stream_seek ( $offset, $whence );
+	function stream_seek($offset, $whence);
 
 	/**
 	 * This method is called in response to fflush() calls on the stream.
@@ -116,7 +116,7 @@ 
 	 *
 	 * @return booelan TRUE if the cached data was successfully stored (or if there was no data to store), or FALSE if the data could not be stored.
 	 */
-	function stream_flush ( );
+	function stream_flush( );
 
 	/**
 	 * This method is called in response to fstat() calls on the stream.
@@ -132,7 +132,7 @@ 
 	 *
 	 * @return array containing the same values as appropriate for the stream.
 	 */
-	function stream_stat ( );
+	function stream_stat( );
 
 	/**
 	 * This method is called in response to unlink() calls on URL paths associated with the wrapper.
@@ -143,7 +143,7 @@ 
 	 * @param string $path
 	 * @return boolean TRUE on success or FALSE on failure
 	 */
-	static function unlink ( $path );
+	static function unlink($path);
 
 	/**
 	 * This method is called in response to rename() calls on URL paths associated with the wrapper.
@@ -157,7 +157,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);
 
 	/**
 	 * This method is called in response to mkdir() calls on URL paths associated with the wrapper.
@@ -170,7 +170,7 @@ 
 	 * @param int $options Posible values include STREAM_REPORT_ERRORS and STREAM_MKDIR_RECURSIVE
 	 * @return boolean TRUE on success or FALSE on failure
 	 */
-	static function mkdir ( $path, $mode, $options );
+	static function mkdir($path, $mode, $options);
 
 	/**
 	 * This method is called in response to rmdir() calls on URL paths associated with the wrapper.
@@ -182,7 +182,7 @@ 
 	 * @param int $options Possible values include STREAM_REPORT_ERRORS.
 	 * @return boolean TRUE on success or FALSE on failure.
 	 */
-	static function rmdir ( $path, $options );
+	static function rmdir($path, $options);
 
 	/**
 	 * This method is called immediately when your stream object is created for examining directory contents with opendir().
@@ -190,7 +190,7 @@ 
 	 * @param string $path URL that was passed to opendir() and that this object is expected to explore.
 	 * @return booelan
 	 */
-	function dir_opendir ( $path, $options );
+	function dir_opendir($path, $options);
 
 	/**
 	 * This method is called in response to stat() calls on the URL paths associated with the wrapper.
@@ -218,7 +218,7 @@ 
 	 *                          stat triggers it's own warning anyway, so it makes no sense to trigger one by our stream-wrapper!
 	 * @return array
 	 */
-	static function url_stat ( $path, $flags );
+	static function url_stat($path, $flags);
 
 	/**
 	 * This method is called in response to readdir().
@@ -227,7 +227,7 @@ 
 	 *
 	 * @return string
 	 */
-	function dir_readdir ( );
+	function dir_readdir( );
 
 	/**
 	 * This method is called in response to rewinddir().
@@ -237,7 +237,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	function dir_rewinddir ( );
+	function dir_rewinddir( );
 
 	/**
 	 * This method is called in response to closedir().
@@ -246,5 +246,5 @@ 
 	 *
 	 * @return boolean
 	 */
-	function dir_closedir ( );
+	function dir_closedir( );
 }

setup/fix_mysql_charset.php

Spacing +29 added lines, -29 removed lines

@@ -12,7 +12,7 @@ 
 // if we are NOT called as part of an update script, behave like a regular setup script
 if (!isset($GLOBALS['egw_setup']) || !is_object($GLOBALS['egw_setup']))
 {
-	$diagnostics = 1;	// can be set to 0=non, 1=some (default for now), 2=all
+	$diagnostics = 1; // can be set to 0=non, 1=some (default for now), 2=all
 
 	include('./inc/functions.inc.php');
 	// Authorize the user to use setup app and load the database
@@ -25,50 +25,50 @@ 
 	$GLOBALS['egw_setup']->loaddb();
 
 	$tpl_root = $GLOBALS['egw_setup']->html->setup_tpl_dir('setup');
-	$setup_tpl = CreateObject('phpgwapi.Template',$tpl_root);
+	$setup_tpl = CreateObject('phpgwapi.Template', $tpl_root);
 	$setup_tpl->set_file(array(
 		'T_head' => 'head.tpl',
 		'T_footer' => 'footer.tpl',
 	));
-	$GLOBALS['egw_setup']->html->show_header('',False,'config',$GLOBALS['egw_setup']->ConfigDomain . '(' . $GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'] . ')');
+	$GLOBALS['egw_setup']->html->show_header('', False, 'config', $GLOBALS['egw_setup']->ConfigDomain.'('.$GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'].')');
 	echo '<h3>'.'Fix mysql DB to match the eGroupWare system_charset'."</h3>\n";
 	$running_standalone = true;
 }
-$db =& $GLOBALS['egw_setup']->db;
-$charset2mysql =& $GLOBALS['egw_setup']->db->Link_ID->charset2mysql;
+$db = & $GLOBALS['egw_setup']->db;
+$charset2mysql = & $GLOBALS['egw_setup']->db->Link_ID->charset2mysql;
 $mysql2charset = array_flip($charset2mysql);
 
 $ServerInfo = $db->Link_ID->ServerInfo();
-$db_version = (float) $ServerInfo['version'];
+$db_version = (float)$ServerInfo['version'];
 
 if ($running_standalone || $_REQUEST['debug']) echo "<p>DB-Type='<b>{$GLOBALS['egw_setup']->db->Type}</b>', DB-Version=<b>$db_version</b> ($ServerInfo[description]), eGroupWare system_charset='<b>{$GLOBALS['egw_setup']->system_charset}</b>', DB-connection charset was '<b>{$GLOBALS['egw_setup']->db_charset_was}</b>'</p>\n";
 
 $mysql_system_charset = isset($charset2mysql[$GLOBALS['egw_setup']->system_charset]) ?
 	$charset2mysql[$GLOBALS['egw_setup']->system_charset] : $GLOBALS['egw_setup']->system_charset;
 
-if (substr($db->Type,0,5) == 'mysql' && $db_version >= 4.1 && $GLOBALS['egw_setup']->system_charset && $GLOBALS['egw_setup']->db_charset_was &&
+if (substr($db->Type, 0, 5) == 'mysql' && $db_version >= 4.1 && $GLOBALS['egw_setup']->system_charset && $GLOBALS['egw_setup']->db_charset_was &&
 	$GLOBALS['egw_setup']->system_charset != $GLOBALS['egw_setup']->db_charset_was)
 {
 	$tables_modified = 'no';
 
 	$tables = array();
-	$db->query("SHOW TABLE STATUS",__LINE__,__FILE__);
+	$db->query("SHOW TABLE STATUS", __LINE__, __FILE__);
 	while (($row = $db->row(true)))
 	{
 		$tables[$row['Name']] = $row['Collation'];
 	}
-	foreach($tables as $table => $collation)
+	foreach ($tables as $table => $collation)
 	{
 		$columns = array();
-		$db->query("SHOW FULL FIELDS FROM `$table`",__LINE__,__FILE__);
-		while(($row = $db->row(true)))
+		$db->query("SHOW FULL FIELDS FROM `$table`", __LINE__, __FILE__);
+		while (($row = $db->row(true)))
 		{
 			$columns[] = $row;
 		}
 		//echo $table; _debug_array($columns);
 		$fulltext = $fulltext_back = array();
-		$db->query("SHOW KEYS FROM `$table`",__LINE__,__FILE__);
-		while(($row = $db->row(true)))
+		$db->query("SHOW KEYS FROM `$table`", __LINE__, __FILE__);
+		while (($row = $db->row(true)))
 		{
 			if ($row['Index_type'] == 'FULLTEXT')
 			{
@@ -77,12 +77,12 @@ 
 		}
 
 		$alter_table = $alter_table_back = array();
-		foreach($columns as $column)
+		foreach ($columns as $column)
 		{
-			if ($column['Collation'] && preg_match('/^(char|varchar|.*text)\(?([0-9]*)\)?$/i',$column['Type'],$matches))
+			if ($column['Collation'] && preg_match('/^(char|varchar|.*text)\(?([0-9]*)\)?$/i', $column['Type'], $matches))
 			{
-				list(,$type,$size) = $matches;
-				list($charset) = explode('_',$column['Collation']);
+				list(,$type, $size) = $matches;
+				list($charset) = explode('_', $column['Collation']);
 
 				if (isset($mysql2charset[$charset])) $charset = $mysql2charset[$charset];
 
@@ -97,7 +97,7 @@ 
 					}
 					else
 					{
-						$bintype = str_replace('text','blob',$type);
+						$bintype = str_replace('text', 'blob', $type);
 					}
 					//echo "<p>$table.$col $type CHARACTER SET $charset $default $null</p>\n";
 
@@ -108,7 +108,7 @@ 
 					{
 						$idx_name = $fulltext[$col];
 						$idx_cols = array();
-						foreach($fulltext as $c => $i)
+						foreach ($fulltext as $c => $i)
 						{
 							if ($i == $idx_name)
 							{
@@ -124,7 +124,7 @@ 
 				}
 			}
 		}
-		list($charset) = explode('_',$collation);
+		list($charset) = explode('_', $collation);
 		if (isset($mysql2charset[$charset])) $charset = $mysql2charset[$charset];
 		if ($charset != $GLOBALS['egw_setup']->system_charset)
 		{
@@ -132,26 +132,26 @@ 
 		}
 		if (count($alter_table))
 		{
-			$alter_table = "ALTER TABLE $table\n".implode(",\n",$alter_table);
+			$alter_table = "ALTER TABLE $table\n".implode(",\n", $alter_table);
 
 			if ($running_standalone || $_REQUEST['debug']) echo '<p>'.nl2br($alter_table)."</p>\n";
-			if (!$db->query($alter_table,__LINE__,__FILE__))
+			if (!$db->query($alter_table, __LINE__, __FILE__))
 			{
 				echo "<p>SQL Error: ".nl2br($alter_table)."</p>\n";
 				echo "<b>{$db->Type} Error</b>: {$db->Errno} ({$db->Error})</p>\n";
 				echo "<p>continuing ...</p>\n";
 				continue;
 			}
-			foreach($fulltext_back as $idx_name => $idx_cols)
+			foreach ($fulltext_back as $idx_name => $idx_cols)
 			{
-				$alter_table_back[] = " ADD FULLTEXT `$idx_name` (`".implode('`,`',$idx_cols)."`)";
+				$alter_table_back[] = " ADD FULLTEXT `$idx_name` (`".implode('`,`', $idx_cols)."`)";
 			}
 			if (count($alter_table_back))
 			{
-				$alter_table_back = "ALTER TABLE $table\n".implode(",\n",$alter_table_back);
+				$alter_table_back = "ALTER TABLE $table\n".implode(",\n", $alter_table_back);
 
 				if ($running_standalone || $_REQUEST['debug']) echo '<p>'.nl2br($alter_table_back)."</p>\n";
-				if (!$db->query($alter_table_back,__LINE__,__FILE__))
+				if (!$db->query($alter_table_back, __LINE__, __FILE__))
 				{
 					echo "<p><b>SQL Error</b>: ".nl2br($alter_table_back)."</p>\n";
 					echo "<b>{$db->Type} Error</b>: {$db->Errno} ({$db->Error})</p>\n";
@@ -163,13 +163,13 @@ 
 		}
 	}
 	// change the default charset of the DB
-	$db->query("SHOW CREATE DATABASE `$db->Database`",__LINE__,__FILE__);
+	$db->query("SHOW CREATE DATABASE `$db->Database`", __LINE__, __FILE__);
 	$create_db = $db->next_record() ? $db->f(1) : '';
-	if (preg_match('/CHARACTER SET ([a-z1-9_-]+) /i',$create_db,$matches) && $matches[1] != $mysql_system_charset)
+	if (preg_match('/CHARACTER SET ([a-z1-9_-]+) /i', $create_db, $matches) && $matches[1] != $mysql_system_charset)
 	{
 		$alter_db = "ALTER DATABASE `$db->Database` DEFAULT CHARACTER SET $mysql_system_charset";
 		if ($running_standalone || $_REQUEST['debug']) echo '<p>'.$alter_db."</p>\n";
-		$db->query($alter_db,__LINE__,__FILE__);
+		$db->query($alter_db, __LINE__, __FILE__);
 	}
 }
 if ($running_standalone || $_REQUEST['debug'])

setup/inc/class.setup_cmd_hooks.inc.php

Spacing +6 added lines, -6 removed lines

@@ -23,7 +23,7 @@ 
 	 * @param string $config_passwd=null pw of above user
 	 * @param boolean $verbose=false if true, echos out some status information during the run
 	 */
-	function __construct($domain,$config_user=null,$config_passwd=null)
+	function __construct($domain, $config_user = null, $config_passwd = null)
 	{
 		if (!is_array($domain))
 		{
@@ -45,17 +45,17 @@ 
 	 * @throws Exception(lang('Wrong credentials to access the header.inc.php file!'),2);
 	 * @throws Exception('header.inc.php not found!');
 	 */
-	protected function exec($check_only=false)
+	protected function exec($check_only = false)
 	{
-		if ($check_only) return true;	// nothing to check, no arguments ...
+		if ($check_only) return true; // nothing to check, no arguments ...
 
 		// instanciate setup object and check authorisation
-		$this->check_setup_auth($this->config_user,$this->config_passwd,$this->domain);
+		$this->check_setup_auth($this->config_user, $this->config_passwd, $this->domain);
 
-		$this->check_installed($this->domain,15,$this->verbose);
+		$this->check_installed($this->domain, 15, $this->verbose);
 
 		global $setup_info;
-		foreach($setup_info as $appname => $info)
+		foreach ($setup_info as $appname => $info)
 		{
 			if ($info['currentver']) self::$egw_setup->register_hooks($appname);
 		}

setup/inc/hook_config.inc.php

Spacing +35 added lines, -35 removed lines

@@ -20,14 +20,14 @@ 
  */
 function vfs_storage_mode_options($config)
 {
-	if (!isset($config['vfs_fstab']) || $config['vfs_fstab'] == json_encode($default=array(
+	if (!isset($config['vfs_fstab']) || $config['vfs_fstab'] == json_encode($default = array(
 		'/' => 'sqlfs://$host/',
 		'/apps' => 'links://$host/apps',
 	)) || $config['vfs_fstab'] == serialize($default))	// detect old serialized value too
 	{
 		$config['vfs_storage_mode'] = 'fs';
 	}
-	elseif($config['vfs_fstab'] == json_encode($default_db=array(
+	elseif ($config['vfs_fstab'] == json_encode($default_db = array(
 		'/' => 'sqlfs://$host/?storage=db',
 		'/apps' => 'links://$host/apps?storage=db',
 	)) || $config['vfs_fstab'] == serialize($default_db))	// detect old serialized value too
@@ -39,10 +39,10 @@ 
 		$config['vfs_storage_mode'] = 'custom';
 	}
 	//_debug_array(array_intersect_key($config,array('vfs_fstab'=>1,'vfs_storage_mode'=>1)));
-	foreach(array(
+	foreach (array(
 		'fs' => lang('Filesystem (default)'),
 		'db' => lang('Database').' (problems with files > 1MB)',
-		'custom' => lang('Custom set via %1','filemanager/cli.php mount'),
+		'custom' => lang('Custom set via %1', 'filemanager/cli.php mount'),
 	) as $name => $label)
 	{
 		if ($name != 'custom' || $name === $config['vfs_storage_mode'])	// dont show custom, if not custom
@@ -57,24 +57,24 @@ 
 
 function encryptalgo($config)
 {
-	if(@function_exists('mcrypt_list_algorithms'))
+	if (@function_exists('mcrypt_list_algorithms'))
 	{
 		$listed = array();
-		if(!isset($config['mcrypt_algo']))
+		if (!isset($config['mcrypt_algo']))
 		{
-			$config['mcrypt_algo'] = 'tripledes';  /* MCRYPT_TRIPLEDES */
+			$config['mcrypt_algo'] = 'tripledes'; /* MCRYPT_TRIPLEDES */
 		}
 		$algos = @mcrypt_list_algorithms();
 		$found = False;
 
 		$out = '';
-		while(list($key,$value) = each($algos))
+		while (list($key, $value) = each($algos))
 		{
 			$found = True;
 			/* Only show each once - seems this is a problem in some installs */
-			if(!in_array($value,$listed))
+			if (!in_array($value, $listed))
 			{
-				if($config['mcrypt_algo'] == $value)
+				if ($config['mcrypt_algo'] == $value)
 				{
 					$selected = ' selected="selected"';
 				}
@@ -84,29 +84,29 @@ 
 				}
 				$descr = strtoupper($value);
 
-				$out .= '<option value="' . $value . '"' . $selected . '>' . $descr . '</option>' . "\n";
+				$out .= '<option value="'.$value.'"'.$selected.'>'.$descr.'</option>'."\n";
 				$listed[] = $value;
 			}
 		}
-		if(!$found)
+		if (!$found)
 		{
 			/* Something is wrong with their mcrypt install or php.ini */
-			$out = '<option value="">' . lang('no algorithms available') . '</option>' . "\n";
+			$out = '<option value="">'.lang('no algorithms available').'</option>'."\n";
 		}
 	}
 	else
 	{
-		$out = '<option value="tripledes">TRIPLEDES</option>' . "\n";
+		$out = '<option value="tripledes">TRIPLEDES</option>'."\n";
 	}
 	return $out;
 }
 
 function encryptmode($config)
 {
-	if(@function_exists('mcrypt_list_modes'))
+	if (@function_exists('mcrypt_list_modes'))
 	{
 		$listed = array();
-		if(!isset($config['mcrypt_mode']))
+		if (!isset($config['mcrypt_mode']))
 		{
 			$config['mcrypt_mode'] = 'cbc'; /* MCRYPT_MODE_CBC */
 		}
@@ -114,13 +114,13 @@ 
 		$found = False;
 
 		$out = '';
-		while(list($key,$value) = each($modes))
+		while (list($key, $value) = each($modes))
 		{
 			$found = True;
 			/* Only show each once - seems this is a problem in some installs */
-			if(!in_array($value,$listed))
+			if (!in_array($value, $listed))
 			{
-				if($config['mcrypt_mode'] == $value)
+				if ($config['mcrypt_mode'] == $value)
 				{
 					$selected = ' selected="selected"';
 				}
@@ -130,34 +130,34 @@ 
 				}
 				$descr = strtoupper($value);
 
-				$out .= '<option value="' . $value . '"' . $selected . '>' . $descr . '</option>' . "\n";
+				$out .= '<option value="'.$value.'"'.$selected.'>'.$descr.'</option>'."\n";
 				$listed[] = $value;
 			}
 		}
-		if(!$found)
+		if (!$found)
 		{
 			/* Something is wrong with their mcrypt install or php.ini */
-			$out = '<option value="" selected="selected">' . lang('no modes available') . '</option>' . "\n";
+			$out = '<option value="" selected="selected">'.lang('no modes available').'</option>'."\n";
 		}
 	}
 	else
 	{
-		$out = '<option value="cbc" selected="selected">CBC</option>' . "\n";
+		$out = '<option value="cbc" selected="selected">CBC</option>'."\n";
 	}
 	return $out;
 }
 
-function passwdhashes($config,$return_hashes=false)
+function passwdhashes($config, $return_hashes = false)
 {
-	$hashes = sql_passwdhashes($config,true);
+	$hashes = sql_passwdhashes($config, true);
 	if (isset($hashes['crypt']))
 	{
-		$hashes['des'] = 'des (=crypt)';	// old LDAP name for crypt
+		$hashes['des'] = 'des (=crypt)'; // old LDAP name for crypt
 	}
 	return $return_hashes ? $hashes : _options_from($hashes, $config['ldap_encryption_type'] ? $config['ldap_encryption_type'] : 'des');
 }
 
-function sql_passwdhashes($config, $return_hashes=false, &$securest=null)
+function sql_passwdhashes($config, $return_hashes = false, &$securest = null)
 {
 	$hashes = Api\Auth::passwdhashes($securest);
 
@@ -172,19 +172,19 @@ 
  */
 function auth_types($config)
 {
-	return _options_from(setup_cmd_config::auth_types(),$config['auth_type']);
+	return _options_from(setup_cmd_config::auth_types(), $config['auth_type']);
 }
 function auth_type_syncml($config)
 {
-	return _options_from(setup_cmd_config::auth_types(),$config['auth_type_syncml']);
+	return _options_from(setup_cmd_config::auth_types(), $config['auth_type_syncml']);
 }
 function auth_type_groupdav($config)
 {
-	return _options_from(setup_cmd_config::auth_types(),$config['auth_type_groupdav']);
+	return _options_from(setup_cmd_config::auth_types(), $config['auth_type_groupdav']);
 }
 function auth_type_activesync($config)
 {
-	return _options_from(setup_cmd_config::auth_types(),$config['auth_type_activesync']);
+	return _options_from(setup_cmd_config::auth_types(), $config['auth_type_activesync']);
 }
 
 /**
@@ -205,12 +205,12 @@ 
  * @param string $selected value of selected optino
  * @return string
  */
-function _options_from(array $options,$selected)
+function _options_from(array $options, $selected)
 {
-	foreach($options as $value => $label)
+	foreach ($options as $value => $label)
 	{
-		$out .= '<option value="' . htmlspecialchars($value) . '"' .
-			($selected == $value ? ' selected="selected"' : '') . '>' . $label . '</option>' . "\n";
+		$out .= '<option value="'.htmlspecialchars($value).'"'.
+			($selected == $value ? ' selected="selected"' : '').'>'.$label.'</option>'."\n";
 	}
 	return $out;
 }

setup/inc/class.setup_cmd_update.inc.php

Spacing +12 added lines, -12 removed lines

@@ -30,7 +30,7 @@ 
 	 * @param boolean $verbose =false if true, echos out some status information during the run
 	 * @param string $app =null single application to update or install
 	 */
-	function __construct($domain,$config_user=null,$config_passwd=null,$backup=null,$verbose=false,$app=null)
+	function __construct($domain, $config_user = null, $config_passwd = null, $backup = null, $verbose = false, $app = null)
 	{
 		if (!is_array($domain))
 		{
@@ -55,32 +55,32 @@ 
 	 * @throws Exception(lang('Wrong credentials to access the header.inc.php file!'),2);
 	 * @throws Exception('header.inc.php not found!');
 	 */
-	protected function exec($check_only=false)
+	protected function exec($check_only = false)
 	{
 		global $setup_info;
 
 		// instanciate setup object and check authorisation
-		$this->check_setup_auth($this->config_user,$this->config_passwd,$this->domain);
+		$this->check_setup_auth($this->config_user, $this->config_passwd, $this->domain);
 
-		$this->check_installed($this->domain,array(14),$this->verbose);
+		$this->check_installed($this->domain, array(14), $this->verbose);
 
 		if ($GLOBALS['egw_info']['setup']['stage']['db'] != 4 &&
 			(!$this->app || !in_array($this->app, self::$apps_to_install) && !in_array($this->app, self::$apps_to_upgrade)) &&
 			!self::check_autoinstall())
 		{
-			return lang('No update necessary, domain %1(%2) is up to date.',$this->domain,$GLOBALS['egw_domain'][$this->domain]['db_type']);
+			return lang('No update necessary, domain %1(%2) is up to date.', $this->domain, $GLOBALS['egw_domain'][$this->domain]['db_type']);
 		}
 		if ($check_only) return lang('Update necessary.');
 
 		$setup_info = self::$egw_setup->detection->upgrade_exclude($setup_info);
 
-		self::$egw_setup->process->init_process();	// we need a new schema-proc instance for each new domain
+		self::$egw_setup->process->init_process(); // we need a new schema-proc instance for each new domain
 
 		// request to install a single app
 		if ($this->app && in_array($this->app, self::$apps_to_install))
 		{
 			$app_title = $setup_info[$this->app]['title'] ? $setup_info[$this->app]['title'] : $setup_info[$this->app]['name'];
-			self::_echo_message($this->verbose,lang('Start installing application %1 ...',$app_title));
+			self::_echo_message($this->verbose, lang('Start installing application %1 ...', $app_title));
 			ob_start();
 			$terror = array($this->app => $setup_info[$this->app]);
 
@@ -88,7 +88,7 @@ 
 			{
 				$errors = self::$egw_setup->process->current($terror, $this->verbose);
 				$terror = self::$egw_setup->process->default_records($errors, $this->verbose);
-				echo $app_title . ' ' . lang('tables installed, unless there are errors printed above') . '.';
+				echo $app_title.' '.lang('tables installed, unless there are errors printed above').'.';
 			}
 			else
 			{
@@ -102,20 +102,20 @@ 
 				{
 					self::$egw_setup->register_app($setup_info[$this->app]['name']);
 				}
-				echo $app_title . ' ' . lang('registered') . '.';
+				echo $app_title.' '.lang('registered').'.';
 
 				if ($setup_info[$this->app]['hooks'])
 				{
 					self::$egw_setup->register_hooks($setup_info[$this->app]['name']);
-					echo "\n".$app_title . ' ' . lang('hooks registered') . '.';
+					echo "\n".$app_title.' '.lang('hooks registered').'.';
 				}
 			}
 		}
 		else
 		{
-			self::_echo_message($this->verbose,lang('Start updating the database ...'));
+			self::_echo_message($this->verbose, lang('Start updating the database ...'));
 			ob_start();
-			self::$egw_setup->process->pass($setup_info,'upgrade',false);
+			self::$egw_setup->process->pass($setup_info, 'upgrade', false);
 		}
 		$messages = ob_get_contents();
 		ob_end_clean();

setup/doc/chown.php

Spacing +6 added lines, -6 removed lines

@@ -11,7 +11,7 @@ 
  * @version $Id$
  */
 
-chdir(dirname(__FILE__));	// to enable our relative pathes to work
+chdir(dirname(__FILE__)); // to enable our relative pathes to work
 
 if (php_sapi_name() !== 'cli')	// security precaution: forbit calling as web-page
 {
@@ -39,7 +39,7 @@ 
 }
 $ids = explode(',', $_SERVER['argv'][0]);
 $change = array();
-while($ids)
+while ($ids)
 {
 	$from = (int)array_shift($ids);
 	$to = (int)array_shift($ids);
@@ -66,24 +66,24 @@ 
 
 chown_grp($path, null, $recursive);
 
-function chown_grp($path, array $stat=null, $recursive=false)
+function chown_grp($path, array $stat = null, $recursive = false)
 {
 	global $change;
 
 	if (is_null($stat) && !($stat = stat($path))) return false;
 
-	if (isset($change[$stat['uid']]) && !chown($path, $uid=$change[$stat['uid']]))
+	if (isset($change[$stat['uid']]) && !chown($path, $uid = $change[$stat['uid']]))
 	{
 		echo "Faild to set new owner #$uid for $path\n";
 	}
-	if (isset($change[-$stat['gid']]) && !chgrp($path, $gid=-$change[-$stat['gid']]))
+	if (isset($change[-$stat['gid']]) && !chgrp($path, $gid = -$change[-$stat['gid']]))
 	{
 		echo "Faild to set new group #$gid for $path\n";
 	}
 
 	if ($recursive && is_dir($path))
 	{
-		foreach(new DirectoryIterator($path) as $child)
+		foreach (new DirectoryIterator($path) as $child)
 		{
 			if (!$child->isDot())
 				chown_grp($child->getPathname(), array(

importexport/setup/setup.inc.php

Spacing +2 added lines, -2 removed lines

@@ -20,9 +20,9 @@
 	'name'  => 'eGroupware core team',
 	'email' => 'egroupware-developers@lists.sf.net'
 );
-$setup_info['importexport']['autoinstall'] = true;	// install automatically on update
+$setup_info['importexport']['autoinstall'] = true; // install automatically on update
 
-$setup_info['importexport']['license']  = 'GPL';
+$setup_info['importexport']['license'] = 'GPL';
 $setup_info['importexport']['description'] =
 '';
 $setup_info['importexport']['note'] =

importexport/setup/tables_current.inc.php

Spacing +8 added lines, -8 removed lines

@@ -12,15 +12,15 @@
 $phpgw_baseline = array(
 	'egw_importexport_definitions' => array(
 		'fd' => array(
-			'definition_id' => array('type' => 'auto','nullable' => False),
-			'name' => array('type' => 'varchar','precision' => '255'),
-			'application' => array('type' => 'varchar','precision' => '50'),
-			'plugin' => array('type' => 'varchar','precision' => '100'),
-			'type' => array('type' => 'varchar','precision' => '20'),
-			'allowed_users' => array('type' => 'varchar','meta' => 'account-commasep','precision' => '255'),
+			'definition_id' => array('type' => 'auto', 'nullable' => False),
+			'name' => array('type' => 'varchar', 'precision' => '255'),
+			'application' => array('type' => 'varchar', 'precision' => '50'),
+			'plugin' => array('type' => 'varchar', 'precision' => '100'),
+			'type' => array('type' => 'varchar', 'precision' => '20'),
+			'allowed_users' => array('type' => 'varchar', 'meta' => 'account-commasep', 'precision' => '255'),
 			'plugin_options' => array('type' => 'longtext'),
-			'owner' => array('type' => 'int','meta' => 'account','precision' => '4'),
-			'description' => array('type' => 'varchar','precision' => '255'),
+			'owner' => array('type' => 'int', 'meta' => 'account', 'precision' => '4'),
+			'description' => array('type' => 'varchar', 'precision' => '255'),
 			'modified' => array('type' => 'timestamp'),
 			'filter' => array('type' => 'longtext')
 		),