Fixed bug #986, thanks to Sebastian Kurfuerst.

[Packages/TYPO3.CMS.git] / typo3 / file_upload.php

diff --git a/typo3/file_upload.php b/typo3/file_upload.php
index d7edd29..d2a243f 100755 (executable)
--- a/typo3/file_upload.php
+++ b/typo3/file_upload.php
@@ -1,22 +1,22 @@
 <?php
 /***************************************************************
 *  Copyright notice
 <?php
 /***************************************************************
 *  Copyright notice

-*  
-*  (c) 1999-2003 Kasper Skårhøj (kasper@typo3.com)
+*
+*  (c) 1999-2005 Kasper Skaarhoj (kasperYYYY@typo3.com)

 *  All rights reserved
 *
 *  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.
 *  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.
 *  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.
 *
 *  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
 *  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,133 +24,223 @@
 *
 *  This copyright notice MUST APPEAR in all copies of the script!
 ***************************************************************/
 *
 *  This copyright notice MUST APPEAR in all copies of the script!
 ***************************************************************/

-/** 
+/**

  * Web>File: Upload of files
  *
  * Web>File: Upload of files
  *

- * @author     Kasper Skårhøj <kasper@typo3.com>
- * @package TYPO3
- * @subpackage core
+ * $Id$
+ * Revised for TYPO3 3.6 November/2003 by Kasper Skaarhoj

  *
  *

+ * @author     Kasper Skaarhoj <kasperYYYY@typo3.com>

  */
  */

+/**
+ * [CLASS/FUNCTION INDEX of SCRIPT]
+ *
+ *
+ *
+ *   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');
+$LANG->includeLLFile('EXT:lang/locallang_misc.xml');
+require_once(PATH_t3lib.'class.t3lib_basicfilefunc.php');
+

 
 
 
 

-$BACK_PATH="";
-require ("init.php");
-require ("template.php");
-include ("sysext/lang/locallang_misc.php");
-require_once (PATH_t3lib."class.t3lib_basicfilefunc.php");

 
 
 
 

-// ***************************
-// Script Classes
-// ***************************
+
+
+
+
+
+
+
+
+/**
+ * Script Class for display up to 10 upload fields
+ *
+ * @author     Kasper Skaarhoj <kasperYYYY@typo3.com>
+ * @package TYPO3
+ * @subpackage core
+ */

 class SC_file_upload {
 class SC_file_upload {

-       var $content;
-       var $number;
+
+               // External, static:

        var $uploadNumber=10;
 
        var $uploadNumber=10;
 

-       var $basicff;
-       var $shortPath;
-       var $title;
-       var $icon;
-       var $target;
-       var $doc;       
-       
+               // Internal, static:
+       var $doc;                       // Template object.
+       var $basicff;           // Instance of "t3lib_basicFileFunctions"
+       var $icon;                      // Will be set to the proper icon for the $target value.
+       var $shortPath;         // Relative path to current found filemount
+       var $title;                     // Name of the filemount
+
+               // Internal, static (GPVar):
+       var $number;
+       var $target;            // Set with the target path inputted in &target
+       var $returnUrl;         // Return URL of list module.
+
+               // Internal, dynamic:
+       var $content;           // Accumulating content
+
+
+       /**
+        * Constructor for initializing the class
+        *
+        * @return      void
+        */

        function init() {
        function init() {

-               global $BE_USER,$LANG,$BACK_PATH,$TCA_DESCR,$TCA,$HTTP_GET_VARS,$HTTP_POST_VARS,$CLIENT,$TYPO3_CONF_VARS;
+               global $LANG,$BACK_PATH,$TYPO3_CONF_VARS;
+
+                       // Initialize GPvars:
+               $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']);

 
 

-               $this->number = t3lib_div::GPvar("number");
-               $this->target = t3lib_div::GPvar("target");
-               $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
                $this->target=$this->basicff->is_directory($this->target);              // Cleaning and checking target

-               $key=$this->basicff->checkPathAgainstMounts($this->target."/");
+               $key=$this->basicff->checkPathAgainstMounts($this->target.'/');

                if (!$this->target || !$key)    {
                if (!$this->target || !$key)    {

-                       t3lib_BEfunc::typo3PrintError ("Parameter Error","Target was not a directory!","");
+                       t3lib_BEfunc::typo3PrintError ('Parameter Error','Target was not a directory!','');

                        exit;
                }
                        exit;
                }

+

                        // Finding the icon
                        // Finding the icon

-               switch($GLOBALS["FILEMOUNTS"][$key]["type"])    {
-                       case "user":    $this->icon = "gfx/i/_icon_ftp_user.gif";       break;
-                       case "group":   $this->icon = "gfx/i/_icon_ftp_group.gif";      break;
-                       default:                $this->icon = "gfx/i/_icon_ftp.gif";    break;
+               switch($GLOBALS['FILEMOUNTS'][$key]['type'])    {
+                       case 'user':    $this->icon = 'gfx/i/_icon_ftp_user.gif';       break;
+                       case 'group':   $this->icon = 'gfx/i/_icon_ftp_group.gif';      break;
+                       default:                $this->icon = 'gfx/i/_icon_ftp.gif';    break;

                }
                }

-               $this->shortPath = substr($this->target,strlen($GLOBALS["FILEMOUNTS"][$key]["path"]));
-               $this->title = $GLOBALS["FILEMOUNTS"][$key]["name"].": ".$this->shortPath;
-               
-               
-               
-               
-               // ***************************
-               // Setting template object
-               // ***************************
-               $this->doc = t3lib_div::makeInstance("smallDoc");
+
+                       // 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';

                $this->doc->backPath = $BACK_PATH;
                $this->doc->backPath = $BACK_PATH;

-               
-               $this->doc->JScode='
-               <script language="javascript" type="text/javascript">
+               $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.'";
                        var path = "'.$this->target.'";

-               
-                       function reload(a)      {
-                               if (!changed || (changed && confirm("'.$LANG->sL("LLL:EXT:lang/locallang_core.php:mess.redraw").'")))   {
-                                       var params = "&target="+escape(path)+"&number="+a; 
+
+                       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+"&returnUrl='.htmlspecialchars($this->returnUrl).'";

                                        document.location = "file_upload.php?"+params;
                                }
                        }
                                        document.location = "file_upload.php?"+params;
                                }
                        }

-                       function backToList()   {
+                       function backToList()   {       //

                                top.goToModule("file_list");
                        }
                        var changed = 0;
                                top.goToModule("file_list");
                        }
                        var changed = 0;

-                       
-               </script>
-               ';
-               $this->doc->form='<form action="tce_file.php" method="POST" name="editform" enctype="'.$GLOBALS["TYPO3_CONF_VARS"]["SYS"]["form_enctype"].'">';
+               ');

        }
        }

+
+       /**
+        * Main function, rendering the upload file form fields
+        *
+        * @return      void
+        */

        function main() {
        function main() {

-               global $BE_USER,$LANG,$BACK_PATH,$TCA_DESCR,$TCA,$HTTP_GET_VARS,$HTTP_POST_VARS,$CLIENT,$TYPO3_CONF_VARS;
+               global $LANG;

 
 

-               $this->content="";
-               $this->content.=$this->doc->startPage($LANG->sL("LLL:EXT:lang/locallang_core.php:file_upload.php.pagetitle"));
-               $this->content.=$this->doc->header($LANG->sL("LLL:EXT:lang/locallang_core.php:file_upload.php.pagetitle"));
+                       // Make page header:
+               $this->content='';
+               $this->content.=$this->doc->startPage($LANG->sL('LLL:EXT:lang/locallang_core.php:file_upload.php.pagetitle'));
+               $this->content.=$this->doc->header($LANG->sL('LLL:EXT:lang/locallang_core.php:file_upload.php.pagetitle'));

                $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);
                $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
+
+
+                       // Making the selector box for the number of concurrent uploads

                $this->number = t3lib_div::intInRange($this->number,1,10);
                $this->number = t3lib_div::intInRange($this->number,1,10);

-               $code='<select name="number" onChange="reload(this.options[this.selectedIndex].value);">';
+               $code='
+                       <div id="c-select">
+                               <select name="number" onchange="reload(this.options[this.selectedIndex].value);">';

                for ($a=1;$a<=$this->uploadNumber;$a++) {
                for ($a=1;$a<=$this->uploadNumber;$a++) {

-                       $code.='<option value="'.$a.'"'.($this->number==$a?' selected':'').'>'.$a.' '.$LANG->sL("LLL:EXT:lang/locallang_core.php:file_upload.php.files").'</option>';
+                       $code.='
+                                       <option value="'.$a.'"'.($this->number==$a?' selected="selected"':'').'>'.$a.' '.$LANG->sL('LLL:EXT:lang/locallang_core.php:file_upload.php.files',1).'</option>';

                }
                }

-               $code.='</select><BR><BR>';
-               
-               $code.='<input type="checkbox" name="overwriteExistingFiles" value="1"> '.$LANG->getLL("overwriteExistingFiles")."<BR>";
-               
+               $code.='
+                               </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">
+               ';

                for ($a=0;$a<$this->number;$a++)        {
                for ($a=0;$a<$this->number;$a++)        {

-                       $code.='<input type="File" name="upload_'.$a.'"'.$GLOBALS["TBE_TEMPLATE"]->formWidth(35).' onClick="changed=1;"><input type="Hidden" name="file[upload]['.$a.'][target]" value="'.$this->target.'"><input type="Hidden" name="file[upload]['.$a.'][data]" value="'.$a.'"><BR>';
+                               // Adding 'size="50" ' for the sake of Mozilla!
+                       $code.='
+                               <input type="file" name="upload_'.$a.'"'.$this->doc->formWidth(35).' size="50" onclick="changed=1;" />
+                               <input type="hidden" name="file[upload]['.$a.'][target]" value="'.htmlspecialchars($this->target).'" />
+                               <input type="hidden" name="file[upload]['.$a.'][data]" value="'.$a.'" /><br />
+                       ';

                }
                }

-               $code.='<BR><input type="Submit" value="'.$LANG->sL("LLL:EXT:lang/locallang_core.php:file_upload.php.submit").'">&nbsp;&nbsp;<input type="Submit" value="'.$LANG->sL("LLL:EXT:lang/locallang_core.php:labels.cancel").'" onClick="backToList(); return false;">';
-               $this->content.= $this->doc->section("",$code);
+               $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);
+
+                       // Ending page
+               $this->content.= $this->doc->endPage();

        }
        }

+
+       /**
+        * Outputting the accumulated content to screen
+        *
+        * @return      void
+        */

        function printContent() {
        function printContent() {

-               global $SOBE;

 
 

-               $this->content.= $this->doc->spacer(10);
-               $this->content.= $this->doc->middle();
-               $this->content.= $this->doc->endPage();

                echo $this->content;
        }
                echo $this->content;
        }

-       
-       // ***************************
-       // OTHER FUNCTIONS:     
-       // ***************************

 }
 
 // Include extension?
 }
 
 // Include extension?

-if (defined("TYPO3_MODE") && $TYPO3_CONF_VARS[TYPO3_MODE]["XCLASS"]["typo3/file_upload.php"])  {
-       include_once($TYPO3_CONF_VARS[TYPO3_MODE]["XCLASS"]["typo3/file_upload.php"]);
+if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/file_upload.php'])  {
+       include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/file_upload.php']);

 }
 
 
 }
 
 


@@ -165,7 +255,7 @@ if (defined("TYPO3_MODE") && $TYPO3_CONF_VARS[TYPO3_MODE]["XCLASS"]["typo3/file_
 
 
 // Make instance:
 
 
 // Make instance:

-$SOBE = t3lib_div::makeInstance("SC_file_upload");
+$SOBE = t3lib_div::makeInstance('SC_file_upload');

 $SOBE->init();
 $SOBE->main();
 $SOBE->printContent();
 $SOBE->init();
 $SOBE->main();
 $SOBE->printContent();