X-Git-Url: http://git.typo3.org/Packages/TYPO3.CMS.git/blobdiff_plain/7ec36e3378e071797bcc91062dcd67f82c41e240..42387f9aeeac45843ac2766f2cb0293bbbc0fc86:/typo3/file_upload.php

diff --git a/typo3/file_upload.php b/typo3/file_upload.php
index bf66d931d6d..d2a243fac4c 100755
--- a/typo3/file_upload.php
+++ b/typo3/file_upload.php
@@ -1,22 +1,22 @@
 <?php
 /***************************************************************
 *  Copyright notice
-*  
-*  (c) 1999-2004 Kasper Skaarhoj (kasper@typo3.com)
+*
+*  (c) 1999-2005 Kasper Skaarhoj (kasperYYYY@typo3.com)
 *  All rights reserved
 *
-*  This script is part of the TYPO3 project. The TYPO3 project is 
+*  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 
+*  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
@@ -24,37 +24,36 @@
 *
 *  This copyright notice MUST APPEAR in all copies of the script!
 ***************************************************************/
-/** 
+/**
  * Web>File: Upload of files
  *
  * $Id$
  * Revised for TYPO3 3.6 November/2003 by Kasper Skaarhoj
  *
- * @author	Kasper Skaarhoj <kasper@typo3.com>
+ * @author	Kasper Skaarhoj <kasperYYYY@typo3.com>
  */
 /**
  * [CLASS/FUNCTION INDEX of SCRIPT]
  *
  *
  *
- *   78: class SC_file_upload 
- *  103:     function init()	
- *  161:     function main()	
- *  229:     function printContent()	
+ *   77: class SC_file_upload
+ *  103:     function init()
+ *  162:     function main()
+ *  235:     function printContent()
  *
  * TOTAL FUNCTIONS: 3
  * (This index is automatically created/updated by the extension "extdeveval")
  *
  */
- 
 
 
-$BACK_PATH='';
-require ('init.php');
-require ('template.php');
-include ('sysext/lang/locallang_misc.php');
-require_once (PATH_t3lib.'class.t3lib_basicfilefunc.php');
 
+$BACK_PATH = '';
+require('init.php');
+require('template.php');
+$LANG->includeLLFile('EXT:lang/locallang_misc.xml');
+require_once(PATH_t3lib.'class.t3lib_basicfilefunc.php');
 
 
 
@@ -70,13 +69,13 @@ require_once (PATH_t3lib.'class.t3lib_basicfilefunc.php');
 
 /**
  * Script Class for display up to 10 upload fields
- * 
- * @author	Kasper Skaarhoj <kasper@typo3.com>
+ *
+ * @author	Kasper Skaarhoj <kasperYYYY@typo3.com>
  * @package TYPO3
  * @subpackage core
  */
 class SC_file_upload {
-	
+
 		// External, static:
 	var $uploadNumber=10;
 
@@ -88,29 +87,31 @@ class SC_file_upload {
 	var $title;			// Name of the filemount
 
 		// Internal, static (GPVar):
-	var $number;		
+	var $number;
 	var $target;		// Set with the target path inputted in &target
+	var $returnUrl;		// Return URL of list module.
 
-		// Internal, dynamic:	
+		// Internal, dynamic:
 	var $content;		// Accumulating content
-	
-		
+
+
 	/**
 	 * Constructor for initializing the class
-	 * 
-	 * @return	void		
+	 *
+	 * @return	void
 	 */
 	function init()	{
 		global $LANG,$BACK_PATH,$TYPO3_CONF_VARS;
 
 			// Initialize GPvars:
-		$this->number = t3lib_div::GPvar('number');
-		$this->target = t3lib_div::GPvar('target');
+		$this->number = t3lib_div::_GP('number');
+		$this->target = t3lib_div::_GP('target');
+		$this->returnUrl = t3lib_div::_GP('returnUrl');
 
 			// Init basic-file-functions object:
 		$this->basicff = t3lib_div::makeInstance('t3lib_basicFileFunctions');
 		$this->basicff->init($GLOBALS['FILEMOUNTS'],$TYPO3_CONF_VARS['BE']['fileExtensions']);
-		
+
 			// Cleaning and checking target
 		$this->target=$this->basicff->is_directory($this->target);		// Cleaning and checking target
 		$key=$this->basicff->checkPathAgainstMounts($this->target.'/');
@@ -125,13 +126,13 @@ class SC_file_upload {
 			case 'group':	$this->icon = 'gfx/i/_icon_ftp_group.gif';	break;
 			default:		$this->icon = 'gfx/i/_icon_ftp.gif';	break;
 		}
-		
+
 			// Relative path to filemount, $key:
 		$this->shortPath = substr($this->target,strlen($GLOBALS['FILEMOUNTS'][$key]['path']));
-		
+
 			// Setting title:
 		$this->title = $GLOBALS['FILEMOUNTS'][$key]['name'].': '.$this->shortPath;
-		
+
 			// Setting template object
 		$this->doc = t3lib_div::makeInstance('smallDoc');
 		$this->doc->docType = 'xhtml_trans';
@@ -139,10 +140,10 @@ class SC_file_upload {
 		$this->doc->form='<form action="tce_file.php" method="post" name="editform" enctype="'.$GLOBALS['TYPO3_CONF_VARS']['SYS']['form_enctype'].'">';
 		$this->doc->JScode=$this->doc->wrapScriptTags('
 			var path = "'.$this->target.'";
-		
+
 			function reload(a)	{	//
 				if (!changed || (changed && confirm('.$LANG->JScharCode($LANG->sL('LLL:EXT:lang/locallang_core.php:mess.redraw')).')))	{
-					var params = "&target="+escape(path)+"&number="+a; 
+					var params = "&target="+escape(path)+"&number="+a+"&returnUrl='.htmlspecialchars($this->returnUrl).'";
 					document.location = "file_upload.php?"+params;
 				}
 			}
@@ -155,8 +156,8 @@ class SC_file_upload {
 
 	/**
 	 * Main function, rendering the upload file form fields
-	 * 
-	 * @return	void		
+	 *
+	 * @return	void
 	 */
 	function main()	{
 		global $LANG;
@@ -168,7 +169,7 @@ class SC_file_upload {
 		$this->content.=$this->doc->spacer(5);
 		$this->content.=$this->doc->section('',$this->doc->getFileheader($this->title,$this->shortPath,$this->icon));
 		$this->content.=$this->doc->divider(5);
-		
+
 
 			// Making the selector box for the number of concurrent uploads
 		$this->number = t3lib_div::intInRange($this->number,1,10);
@@ -183,14 +184,14 @@ class SC_file_upload {
 				</select>
 			</div>
 			';
-		
+
 			// Make checkbox for "overwrite"
 		$code.='
 			<div id="c-override">
 				<input type="checkbox" name="overwriteExistingFiles" value="1" /> '.$LANG->getLL('overwriteExistingFiles',1).'
 			</div>
 			';
-		
+
 			// Produce the number of upload-fields needed:
 		$code.='
 			<div id="c-upload">
@@ -206,15 +207,19 @@ class SC_file_upload {
 		$code.='
 			</div>
 		';
-		
+
 			// Submit button:
 		$code.='
 			<div id="c-submit">
 				<input type="submit" value="'.$LANG->sL('LLL:EXT:lang/locallang_core.php:file_upload.php.submit',1).'" />
 				<input type="submit" value="'.$LANG->sL('LLL:EXT:lang/locallang_core.php:labels.cancel',1).'" onclick="backToList(); return false;" />
+				<input type="hidden" name="redirect" value="'.htmlspecialchars($this->returnUrl).'" />
 			</div>
 		';
-	
+
+			// CSH:
+		$code.= t3lib_BEfunc::cshItem('xMOD_csh_corebe', 'file_upload', $GLOBALS['BACK_PATH'],'<br/>');
+
 			// Add the HTML as a section:
 		$this->content.= $this->doc->section('',$code);
 
@@ -224,8 +229,8 @@ class SC_file_upload {
 
 	/**
 	 * Outputting the accumulated content to screen
-	 * 
-	 * @return	void		
+	 *
+	 * @return	void
 	 */
 	function printContent()	{