Index: t3lib/class.t3lib_basicfilefunc.php
===================================================================
--- t3lib/class.t3lib_basicfilefunc.php	(revision 9324)
+++ t3lib/class.t3lib_basicfilefunc.php	(revision )
@@ -1,29 +1,29 @@
 <?php
 /***************************************************************
-*  Copyright notice
-*
-*  (c) 1999-2010 Kasper Skårhøj (kasperYYYY@typo3.com)
-*  All rights reserved
-*
-*  This script is part of the TYPO3 project. The TYPO3 project is
-*  free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2 of the License, or
-*  (at your option) any later version.
-*
-*  The GNU General Public License can be found at
-*  http://www.gnu.org/copyleft/gpl.html.
-*  A copy is found in the textfile GPL.txt and important notices to the license
-*  from the author is found in LICENSE.txt distributed with these scripts.
-*
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
+ *  Copyright notice
+ *
+ *  (c) 1999-2010 Kasper Skårhøj (kasperYYYY@typo3.com)
+ *  All rights reserved
+ *
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *  A copy is found in the textfile GPL.txt and important notices to the license
+ *  from the author is found in LICENSE.txt distributed with these scripts.
+ *
+ *
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ ***************************************************************/
 /**
  * Contains class with basic file management functions
  *
@@ -39,28 +39,28 @@
  *
  *   81: class t3lib_basicFileFunctions
  *
- *              SECTION: Checking functions
+ *			  SECTION: Checking functions
- *  133:     function init($mounts, $f_ext)
+ *  133:	 function init($mounts, $f_ext)
- *  152:     function getTotalFileInfo($wholePath)
+ *  152:	 function getTotalFileInfo($wholePath)
- *  172:     function is_allowed($iconkey,$type)
+ *  172:	 function is_allowed($iconkey,$type)
- *  197:     function checkIfFullAccess($theDest)
+ *  197:	 function checkIfFullAccess($theDest)
- *  211:     function is_webpath($path)
+ *  211:	 function is_webpath($path)
- *  231:     function checkIfAllowed($ext, $theDest, $filename='')
+ *  231:	 function checkIfAllowed($ext, $theDest, $filename='')
- *  241:     function checkFileNameLen($fileName)
+ *  241:	 function checkFileNameLen($fileName)
- *  251:     function is_directory($theDir)
+ *  251:	 function is_directory($theDir)
- *  268:     function isPathValid($theFile)
+ *  268:	 function isPathValid($theFile)
- *  283:     function getUniqueName($theFile, $theDest, $dontCheckForUnique=0)
+ *  283:	 function getUniqueName($theFile, $theDest, $dontCheckForUnique=0)
- *  326:     function checkPathAgainstMounts($thePath)
+ *  326:	 function checkPathAgainstMounts($thePath)
- *  342:     function findFirstWebFolder()
+ *  342:	 function findFirstWebFolder()
- *  362:     function blindPath($thePath)
+ *  362:	 function blindPath($thePath)
- *  378:     function findTempFolder()
+ *  378:	 function findTempFolder()
  *
- *              SECTION: Cleaning functions
+ *			  SECTION: Cleaning functions
- *  412:     function cleanDirectoryName($theDir)
+ *  412:	 function cleanDirectoryName($theDir)
- *  422:     function rmDoubleSlash($string)
+ *  422:	 function rmDoubleSlash($string)
- *  432:     function slashPath($path)
+ *  432:	 function slashPath($path)
- *  446:     function cleanFileName($fileName,$charset='')
+ *  446:	 function cleanFileName($fileName,$charset='')
- *  480:     function formatSize($sizeInBytes)
+ *  480:	 function formatSize($sizeInBytes)
  *
  * TOTAL FUNCTIONS: 19
  * (This index is automatically created/updated by the extension "extdeveval")
@@ -68,7 +68,6 @@
  */
 
 
-
 /**
  * Contains functions for management, validation etc of files in TYPO3, using the concepts of web- and ftp-space. Please see the comment for the init() function
  *
@@ -77,21 +76,20 @@
  * @subpackage t3lib
  * @see t3lib_basicFileFunctions::init()
  */
-class t3lib_basicFileFunctions	{
+class t3lib_basicFileFunctions {
-	var $getUniqueNamePrefix = '';	// Prefix which will be prepended the file when using the getUniqueName-function
+	var $getUniqueNamePrefix = ''; // Prefix which will be prepended the file when using the getUniqueName-function
-	var $maxNumber = 99;			// This number decides the highest allowed appended number used on a filename before we use naming with unique strings
+	var $maxNumber = 99; // This number decides the highest allowed appended number used on a filename before we use naming with unique strings
-	var $uniquePrecision = 6;		// This number decides how many characters out of a unique MD5-hash that is appended to a filename if getUniqueName is asked to find an available filename.
+	var $uniquePrecision = 6; // This number decides how many characters out of a unique MD5-hash that is appended to a filename if getUniqueName is asked to find an available filename.
-	var $maxInputNameLen = 60;		// This is the maximum length of names treated by cleanFileName()
+	var $maxInputNameLen = 60; // This is the maximum length of names treated by cleanFileName()
-	var $tempFN = '_temp_';			// Temp-foldername. A folder in the root of one of the mounts with this name is regarded a TEMP-folder (used for upload from clipboard)
+	var $tempFN = '_temp_'; // Temp-foldername. A folder in the root of one of the mounts with this name is regarded a TEMP-folder (used for upload from clipboard)
 
-		// internal
+	// internal
-	var $f_ext = Array();			// See comment in header
+	var $f_ext = Array(); // See comment in header
-	var $mounts = Array();			// See comment in header
+	var $mounts = Array(); // See comment in header
-	var $webPath ='';				// Set to DOCUMENT_ROOT.
+	var $webPath = ''; // Set to DOCUMENT_ROOT.
-	var $isInit = 0;				// Set to true after init()/start();
+	var $isInit = 0; // Set to true after init()/start();
 
 
-
 	/**********************************
 	 *
 	 * Checking functions
@@ -103,33 +101,33 @@
 	 * This function should be called to initialise the internal arrays $this->mounts and $this->f_ext
 	 *
 	 *  A typical example of the array $mounts is this:
-	 * 		$mounts[xx][path] = (..a mounted path..)
+	 *		 $mounts[xx][path] = (..a mounted path..)
-	 * 	the 'xx'-keys is just numerical from zero. There are also a [name] and [type] value that just denotes the mountname and type. Not used for athentication here.
+	 *	 the 'xx'-keys is just numerical from zero. There are also a [name] and [type] value that just denotes the mountname and type. Not used for athentication here.
-	 * 	$this->mounts is traversed in the function checkPathAgainstMounts($thePath), and it is checked that $thePath is actually below one of the mount-paths
+	 *	 $this->mounts is traversed in the function checkPathAgainstMounts($thePath), and it is checked that $thePath is actually below one of the mount-paths
-	 * 	The mountpaths are with a trailing '/'. $thePath must be with a trailing '/' also!
+	 *	 The mountpaths are with a trailing '/'. $thePath must be with a trailing '/' also!
-	 * 	As you can see, $this->mounts is very critical! This is the array that decides where the user will be allowed to copy files!!
+	 *	 As you can see, $this->mounts is very critical! This is the array that decides where the user will be allowed to copy files!!
 	 *  Typically the global var $WEBMOUNTS would be passed along as $mounts
 	 *
-	 * 	A typical example of the array $f_ext is this:
+	 *	 A typical example of the array $f_ext is this:
-	 * 		$f_ext['webspace']['allow']='';
+	 *		 $f_ext['webspace']['allow']='';
-	 * 		$f_ext['webspace']['deny']= PHP_EXTENSIONS_DEFAULT;
+	 *		 $f_ext['webspace']['deny']= PHP_EXTENSIONS_DEFAULT;
-	 * 		$f_ext['ftpspace']['allow']='*';
+	 *		 $f_ext['ftpspace']['allow']='*';
-	 * 		$f_ext['ftpspace']['deny']='';
+	 *		 $f_ext['ftpspace']['deny']='';
-	 * 	The control of fileextensions goes in two catagories. Webspace and Ftpspace. Webspace is folders accessible from a webbrowser (below TYPO3_DOCUMENT_ROOT) and ftpspace is everything else.
+	 *	 The control of fileextensions goes in two catagories. Webspace and Ftpspace. Webspace is folders accessible from a webbrowser (below TYPO3_DOCUMENT_ROOT) and ftpspace is everything else.
-	 * 	The control is done like this: If an extension matches 'allow' then the check returns true. If not and an extension matches 'deny' then the check return false. If no match at all, returns true.
+	 *	 The control is done like this: If an extension matches 'allow' then the check returns true. If not and an extension matches 'deny' then the check return false. If no match at all, returns true.
-	 * 	You list extensions comma-separated. If the value is a '*' every extension is allowed
+	 *	 You list extensions comma-separated. If the value is a '*' every extension is allowed
-	 * 	The list is case-insensitive when used in this class (see init())
+	 *	 The list is case-insensitive when used in this class (see init())
 	 *  Typically TYPO3_CONF_VARS['BE']['fileExtensions'] would be passed along as $f_ext.
 	 *
 	 *  Example:
-	 * 	$basicff->init($GLOBALS['FILEMOUNTS'],$TYPO3_CONF_VARS['BE']['fileExtensions']);
+	 *	 $basicff->init($GLOBALS['FILEMOUNTS'],$TYPO3_CONF_VARS['BE']['fileExtensions']);
 	 *
 	 * @param	array		Contains the paths of the file mounts for the current BE user. Normally $GLOBALS['FILEMOUNTS'] is passed. This variable is set during backend user initialization; $FILEMOUNTS = $BE_USER->returnFilemounts(); (see typo3/init.php)
 	 * @param	array		Array with information about allowed and denied file extensions. Typically passed: $TYPO3_CONF_VARS['BE']['fileExtensions']
 	 * @return	void
 	 * @see typo3/init.php, t3lib_userAuthGroup::returnFilemounts()
 	 */
-	function init($mounts, $f_ext)	{
+	function init($mounts, $f_ext) {
 		$this->f_ext['webspace']['allow'] = t3lib_div::uniqueList(strtolower($f_ext['webspace']['allow']));
 		$this->f_ext['webspace']['deny'] = t3lib_div::uniqueList(strtolower($f_ext['webspace']['deny']));
 		$this->f_ext['ftpspace']['allow'] = t3lib_div::uniqueList(strtolower($f_ext['ftpspace']['allow']));
@@ -163,7 +161,7 @@
 	 * @param	string		Filepath to existing file. Should probably be absolute. Filefunctions are performed on this value.
 	 * @return	array		Information about the file in the filepath
 	 */
-	function getTotalFileInfo($wholePath)	{
+	function getTotalFileInfo($wholePath) {
 		$theuser = getmyuid();
 		$info = t3lib_div::split_fileref($wholePath);
 		$info['tstamp'] = @filemtime($wholePath);
@@ -183,24 +181,32 @@
 	 * @param	string		Either "webspage" or "ftpspace" - points to a key in $this->f_ext
 	 * @return	boolean		True if file extension is allowed.
 	 */
-	function is_allowed($iconkey,$type)	{
+	function is_allowed($iconkey, $type) {
-		if (isset($this->f_ext[$type]))	{
+		if (isset($this->f_ext[$type])) {
 			$ik = strtolower($iconkey);
-			if ($ik)	{
+			if ($ik) {
 					// If the extension is found amongst the allowed types, we return true immediately
-				if ($this->f_ext[$type]['allow']=='*' || t3lib_div::inList($this->f_ext[$type]['allow'],$ik))	return true;
+				if ($this->f_ext[$type]['allow'] == '*' || t3lib_div::inList($this->f_ext[$type]['allow'], $ik)) {
+					return TRUE;
+				}
 					// If the extension is found amongst the denied types, we return false immediately
-				if ($this->f_ext[$type]['deny']=='*' || t3lib_div::inList($this->f_ext[$type]['deny'],$ik))	return false;
+				if ($this->f_ext[$type]['deny'] == '*' || t3lib_div::inList($this->f_ext[$type]['deny'], $ik)) {
+					return FALSE;
+				}
 					// If no match we return true
-				return true;
+				return TRUE;
-			} else {	// If no extension:
+			} else { // If no extension:
-				if ($this->f_ext[$type]['allow']=='*')	return true;
-				if ($this->f_ext[$type]['deny']=='*')	return false;
-				return true;
+				if ($this->f_ext[$type]['allow'] == '*') {
+					return TRUE;
-			}
+				}
+				if ($this->f_ext[$type]['deny'] == '*') {
+					return FALSE;
-		}
+				}
-		return false;
+				return TRUE;
-	}
+			}
+		}
+		return FALSE;
+	}
 
 	/**
 	 * Returns true if you can operate of ANY file ('*') in the space $theDest is in ('webspace' / 'ftpspace')
@@ -208,12 +214,14 @@
 	 * @param	string		Absolute path
 	 * @return	boolean
 	 */
-	function checkIfFullAccess($theDest)	{
+	function checkIfFullAccess($theDest) {
-		$type = $this->is_webpath($theDest)?'webspace':'ftpspace';
+		$type = $this->is_webpath($theDest) ? 'webspace' : 'ftpspace';
-		if (isset($this->f_ext[$type]))	{
+		if (isset($this->f_ext[$type])) {
-			if ((string)$this->f_ext[$type]['deny']=='' || $this->f_ext[$type]['allow']=='*')	return true;
+			if ((string) $this->f_ext[$type]['deny'] == '' || $this->f_ext[$type]['allow'] == '*') {
+				return TRUE;
-		}
-	}
+			}
+		}
+	}
 
 	/**
 	 * Checks if $this->webPath (should be TYPO3_DOCUMENT_ROOT) is in the first part of $path
@@ -222,15 +230,15 @@
 	 * @param	string		Absolute path to check
 	 * @return	boolean
 	 */
-	function is_webpath($path)	{
+	function is_webpath($path) {
-		if ($this->isInit)	{
+		if ($this->isInit) {
 			$testPath = $this->slashPath($path);
 			$testPathWeb = $this->slashPath($this->webPath);
-			if ($testPathWeb && $testPath)	{
+			if ($testPathWeb && $testPath) {
-				return t3lib_div::isFirstPartOfStr($testPath,$testPathWeb);
+				return t3lib_div::isFirstPartOfStr($testPath, $testPathWeb);
 			}
 		}
-		return true;	// Its more safe to return true (as the webpath is more restricted) if something went wrong...
+		return TRUE; // Its more safe to return true (as the webpath is more restricted) if something went wrong...
 	}
 
 	/**
@@ -242,8 +250,8 @@
 	 * @param	string		Filename to check against TYPO3_CONF_VARS[BE][fileDenyPattern]
 	 * @return	boolean		True if extension/filename is allowed
 	 */
-	function checkIfAllowed($ext, $theDest, $filename='')	{
+	function checkIfAllowed($ext, $theDest, $filename = '') {
-		return t3lib_div::verifyFilenameAgainstDenyPattern($filename) && $this->is_allowed($ext,($this->is_webpath($theDest)?'webspace':'ftpspace'));
+		return t3lib_div::verifyFilenameAgainstDenyPattern($filename) && $this->is_allowed($ext, ($this->is_webpath($theDest) ? 'webspace' : 'ftpspace'));
 	}
 
 	/**
@@ -252,7 +260,7 @@
 	 * @param	string		Filename, eg "somefile.html"
 	 * @return	boolean
 	 */
-	function checkFileNameLen($fileName)	{
+	function checkFileNameLen($fileName) {
 		return strlen($fileName) <= $this->maxInputNameLen;
 	}
 
@@ -262,14 +270,14 @@
 	 * @param	string		Directory path to check
 	 * @return	string		Returns the cleaned up directory name if OK, otherwise false.
 	 */
-	function is_directory($theDir)	{
+	function is_directory($theDir) {
-		if ($this->isPathValid($theDir))	{
+		if ($this->isPathValid($theDir)) {
-			$theDir=$this->cleanDirectoryName($theDir);
+			$theDir = $this->cleanDirectoryName($theDir);
-			if (@is_dir($theDir))	{
+			if (@is_dir($theDir)) {
 				return $theDir;
 			}
 		}
-		return false;
+		return FALSE;
 	}
 
 	/**
@@ -279,7 +287,7 @@
 	 * @return	boolean		True, if no '//', '..' or '\' is in the $theFile
 	 * @see	t3lib_div::validPathStr()
 	 */
-	function isPathValid($theFile)	{
+	function isPathValid($theFile) {
 		return t3lib_div::validPathStr($theFile);
 	}
 
@@ -294,35 +302,35 @@
 	 * @return	string		The destination absolute filepath (not just the name!) of a unique filename/foldername in that path.
 	 * @see t3lib_TCEmain::checkValue()
 	 */
-	function getUniqueName($theFile, $theDest, $dontCheckForUnique=0)	{
+	function getUniqueName($theFile, $theDest, $dontCheckForUnique = 0) {
-		$theDest = $this->is_directory($theDest);	// $theDest is cleaned up
+		$theDest = $this->is_directory($theDest); // $theDest is cleaned up
-		$origFileInfo = t3lib_div::split_fileref($theFile);		// Fetches info about path, name, extention of $theFile
+		$origFileInfo = t3lib_div::split_fileref($theFile); // Fetches info about path, name, extention of $theFile
-		if ($theDest)	{
+		if ($theDest) {
-			if ($this->getUniqueNamePrefix)	{		// Adds prefix
+			if ($this->getUniqueNamePrefix) { // Adds prefix
-				$origFileInfo['file']     = $this->getUniqueNamePrefix.$origFileInfo['file'];
+				$origFileInfo['file'] = $this->getUniqueNamePrefix . $origFileInfo['file'];
-				$origFileInfo['filebody'] = $this->getUniqueNamePrefix.$origFileInfo['filebody'];
+				$origFileInfo['filebody'] = $this->getUniqueNamePrefix . $origFileInfo['filebody'];
 			}
 
 				// Check if the file exists and if not - return the filename...
 			$fileInfo = $origFileInfo;
-			$theDestFile = $theDest.'/'.$fileInfo['file'];		// The destinations file
+			$theDestFile = $theDest . '/' . $fileInfo['file']; // The destinations file
-			if (!file_exists($theDestFile) || $dontCheckForUnique)		{	// If the file does NOT exist we return this filename
+			if (!file_exists($theDestFile) || $dontCheckForUnique) { // If the file does NOT exist we return this filename
 				return $theDestFile;
 			}
 
 				// Well the filename in its pure form existed. Now we try to append numbers / unique-strings and see if we can find an available filename...
-			$theTempFileBody = preg_replace('/_[0-9][0-9]$/','',$origFileInfo['filebody']);		// This removes _xx if appended to the file
+			$theTempFileBody = preg_replace('/_[0-9][0-9]$/', '', $origFileInfo['filebody']); // This removes _xx if appended to the file
-			$theOrigExt = $origFileInfo['realFileext'] ? '.'.$origFileInfo['realFileext'] : '';
+			$theOrigExt = $origFileInfo['realFileext'] ? '.' . $origFileInfo['realFileext'] : '';
 
-			for ($a=1; $a<=($this->maxNumber+1); $a++)	{
+			for ($a = 1; $a <= ($this->maxNumber + 1); $a++) {
-				if ($a<=$this->maxNumber)	{	// First we try to append numbers
+				if ($a <= $this->maxNumber) { // First we try to append numbers
-					$insert = '_'.sprintf('%02d', $a);
+					$insert = '_' . sprintf('%02d', $a);
-				} else {		// .. then we try unique-strings...
+				} else { // .. then we try unique-strings...
-					$insert = '_'.substr(md5(uniqId('')),0,$this->uniquePrecision);
+					$insert = '_' . substr(md5(uniqId('')), 0, $this->uniquePrecision);
 				}
-				$theTestFile = $theTempFileBody.$insert.$theOrigExt;
+				$theTestFile = $theTempFileBody . $insert . $theOrigExt;
-				$theDestFile = $theDest.'/'.$theTestFile;		// The destinations file
+				$theDestFile = $theDest . '/' . $theTestFile; // The destinations file
-				if (!file_exists($theDestFile))		{	// If the file does NOT exist we return this filename
+				if (!file_exists($theDestFile)) { // If the file does NOT exist we return this filename
 					return $theDestFile;
 				}
 			}
@@ -337,10 +345,10 @@
 	 * @return	string		The key to the first mount found, otherwise nothing is returned.
 	 * @see init()
 	 */
-	function checkPathAgainstMounts($thePath)	{
+	function checkPathAgainstMounts($thePath) {
-		if ($thePath && $this->isPathValid($thePath) && is_array($this->mounts))	{
+		if ($thePath && $this->isPathValid($thePath) && is_array($this->mounts)) {
 			foreach ($this->mounts as $k => $val) {
-				if (t3lib_div::isFirstPartOfStr($thePath,$val['path']))	{
+				if (t3lib_div::isFirstPartOfStr($thePath, $val['path'])) {
 					return $k;
 				}
 			}
@@ -352,12 +360,12 @@
 	 *
 	 * @return	string		The key to the first mount inside PATH_site."fileadmin" found, otherwise nothing is returned.
 	 */
-	function findFirstWebFolder()	{
+	function findFirstWebFolder() {
 		global $TYPO3_CONF_VARS;
 
-		if (is_array($this->mounts))	{
+		if (is_array($this->mounts)) {
 			foreach ($this->mounts as $k => $val) {
-				if (t3lib_div::isFirstPartOfStr($val['path'], PATH_site.$TYPO3_CONF_VARS['BE']['fileadminDir']))	{
+				if (t3lib_div::isFirstPartOfStr($val['path'], PATH_site . $TYPO3_CONF_VARS['BE']['fileadminDir'])) {
 					return $k;
 				}
 			}
@@ -371,12 +379,12 @@
 	 * @param	string		$thePath is a path which MUST be found within one of the internally set filemounts, $this->mounts
 	 * @return	string		The processed input path
 	 */
-	function blindPath($thePath)	{
+	function blindPath($thePath) {
-		$k=$this->checkPathAgainstMounts($thePath);
+		$k = $this->checkPathAgainstMounts($thePath);
-		if ($k)	{
+		if ($k) {
-			$name='';
+			$name = '';
-			$name.='['.$this->mounts[$k]['name'].']: ';
+			$name .= '[' . $this->mounts[$k]['name'] . ']: ';
-			$name.=substr($thePath,strlen($this->mounts[$k]['path']));
+			$name .= substr($thePath, strlen($this->mounts[$k]['path']));
 			return $name;
 		}
 	}
@@ -387,11 +395,11 @@
 	 *
 	 * @return	string		Returns the path if found, otherwise nothing if error.
 	 */
-	function findTempFolder()	{
+	function findTempFolder() {
-		if ($this->tempFN && is_array($this->mounts))	{
+		if ($this->tempFN && is_array($this->mounts)) {
 			foreach ($this->mounts as $k => $val) {
-				$tDir = $val['path'].$this->tempFN;
+				$tDir = $val['path'] . $this->tempFN;
-				if (@is_dir($tDir))	{
+				if (@is_dir($tDir)) {
 					return $tDir;
 				}
 			}
@@ -399,15 +407,6 @@
 	}
 
 
-
-
-
-
-
-
-
-
-
 	/*********************
 	 *
 	 * Cleaning functions
@@ -420,8 +419,8 @@
 	 * @param	string		Input string
 	 * @return	string		Output string
 	 */
-	function cleanDirectoryName($theDir)	{
+	function cleanDirectoryName($theDir) {
-		return preg_replace('/[\/\. ]*$/','',$this->rmDoubleSlash($theDir));
+		return preg_replace('/[\/\. ]*$/', '', $this->rmDoubleSlash($theDir));
 	}
 
 	/**
@@ -430,8 +429,8 @@
 	 * @param	string		Input value
 	 * @return	string		Returns the converted string
 	 */
-	function rmDoubleSlash($string)	{
+	function rmDoubleSlash($string) {
-		return str_replace('//','/',$string);
+		return str_replace('//', '/', $string);
 	}
 
 	/**
@@ -440,9 +439,9 @@
 	 * @param	string		Input string
 	 * @return	string		Output string with a slash in the end (if not already there)
 	 */
-	function slashPath($path)	{
+	function slashPath($path) {
-		if (substr($path,-1)!='/')	{
+		if (substr($path, -1) != '/') {
-			return $path.'/';
+			return $path . '/';
 		}
 		return $path;
 	}
@@ -465,22 +464,22 @@
 		} else {
 				// Get conversion object or initialize if needed
 			if (!is_object($this->csConvObj)) {
-				if (TYPO3_MODE=='FE') {
+				if (TYPO3_MODE == 'FE') {
 					$this->csConvObj = $GLOBALS['TSFE']->csConvObj;
-				} elseif (is_object($GLOBALS['LANG'])) {	// BE assumed:
+				} elseif (is_object($GLOBALS['LANG'])) { // BE assumed:
 					$this->csConvObj = $GLOBALS['LANG']->csConvObj;
-				} else {	// The object may not exist yet, so we need to create it now. Happens in the Install Tool for example.
+				} else { // The object may not exist yet, so we need to create it now. Happens in the Install Tool for example.
 					$this->csConvObj = t3lib_div::makeInstance('t3lib_cs');
 				}
 			}
 
 				// Define character set
-			if (!$charset)	{
+			if (!$charset) {
 				if (TYPO3_MODE == 'FE') {
 					$charset = $GLOBALS['TSFE']->renderCharset;
-				} elseif (is_object($GLOBALS['LANG'])) {	// BE assumed:
+				} elseif (is_object($GLOBALS['LANG'])) { // BE assumed:
 					$charset = $GLOBALS['LANG']->charSet;
-				} else {	// best guess
+				} else { // best guess
 					$charset = $GLOBALS['TYPO3_CONF_VARS']['BE']['forceCharset'];
 				}
 			}
@@ -504,26 +503,25 @@
 	 * @return	string		Formatted with M,K or &nbsp;&nbsp; appended.
 	 * @deprecated since at least TYPO3 4.2, will be removed in TYPO3 4.6 - Use t3lib_div::formatSize() instead
 	 */
-	function formatSize($sizeInBytes)	{
+	function formatSize($sizeInBytes) {
 		t3lib_div::logDeprecatedFunction();
 
-		if ($sizeInBytes>900)	{
+		if ($sizeInBytes > 900) {
-			if ($sizeInBytes>900000)	{	// MB
+			if ($sizeInBytes > 900000) { // MB
-				$val = $sizeInBytes/(1024*1024);
+				$val = $sizeInBytes / (1024 * 1024);
-				return number_format($val, (($val<20)?1:0), '.', '').' M';
+				return number_format($val, (($val < 20) ? 1 : 0), '.', '') . ' M';
-			} else {	// KB
+			} else { // KB
-				$val = $sizeInBytes/(1024);
+				$val = $sizeInBytes / (1024);
-				return number_format($val, (($val<20)?1:0), '.', '').' K';
+				return number_format($val, (($val < 20) ? 1 : 0), '.', '') . ' K';
 			}
-		} else {	// Bytes
+		} else { // Bytes
-			return $sizeInBytes.'&nbsp;&nbsp;';
+			return $sizeInBytes . '&nbsp;&nbsp;';
 		}
 	}
 }
 
 
-
-if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_basicfilefunc.php'])	{
+if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_basicfilefunc.php']) {
 	include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_basicfilefunc.php']);
 }
 
