Fixed bug #9748: Some extensions do not work anymore in the frontend
[Packages/TYPO3.CMS.git] / typo3 / file_newfolder.php
index a557fce..4a63921 100755 (executable)
@@ -2,7 +2,7 @@
 /***************************************************************
 *  Copyright notice
 *
 /***************************************************************
 *  Copyright notice
 *
-*  (c) 1999-2004 Kasper Skaarhoj (kasper@typo3.com)
+*  (c) 1999-2008 Kasper Skaarhoj (kasperYYYY@typo3.com)
 *  All rights reserved
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
 *  All rights reserved
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
  * $Id$
  * Revised for TYPO3 3.6 November/2003 by Kasper Skaarhoj
  *
  * $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]
  *
  *
  *
  */
 /**
  * [CLASS/FUNCTION INDEX of SCRIPT]
  *
  *
  *
- *   76: class SC_file_newfolder
- *  102:     function init()
+ *   74: class SC_file_newfolder
+ *  101:     function init()
  *  161:     function main()
  *  161:     function main()
- *  248:     function printContent()
+ *  255:     function printContent()
  *
  * TOTAL FUNCTIONS: 3
  * (This index is automatically created/updated by the extension "extdeveval")
  *
  * TOTAL FUNCTIONS: 3
  * (This index is automatically created/updated by the extension "extdeveval")
 
 
 
 
 
 
-$BACK_PATH='';
-require ('init.php');
-require ('template.php');
-require_once (PATH_t3lib.'class.t3lib_basicfilefunc.php');
-
-
-
+$BACK_PATH = '';
+require('init.php');
+require('template.php');
+require_once(PATH_t3lib.'class.t3lib_basicfilefunc.php');
+require_once(PATH_t3lib.'class.t3lib_parsehtml.php');
 
 
 
 
 
 
@@ -69,7 +67,7 @@ require_once (PATH_t3lib.'class.t3lib_basicfilefunc.php');
 /**
  * Script Class for the create-new script; Displays a form for creating up to 10 folders or one new text file
  *
 /**
  * Script Class for the create-new script; Displays a form for creating up to 10 folders or one new text file
  *
- * @author     Kasper Skaarhoj <kasper@typo3.com>
+ * @author     Kasper Skaarhoj <kasperYYYY@typo3.com>
  * @package TYPO3
  * @subpackage core
  */
  * @package TYPO3
  * @subpackage core
  */
@@ -79,15 +77,34 @@ class SC_file_newfolder {
        var $folderNumber=10;
 
                // Internal, static:
        var $folderNumber=10;
 
                // Internal, static:
-       var $doc;                       // Template object.
-       var $basicff;           // Instance of "t3lib_basicFileFunctions"
+       /**
+        * document template object
+        *
+        * @var smallDoc
+        */
+       var $doc;
+
+       /**
+        * File processing object
+        *
+        * @var t3lib_basicFileFunctions
+        */
+       var $basicff;
        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
 
        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
 
+       /**
+        * Charset processing object
+        *
+        * @var t3lib_cs
+        */
+       protected $charsetConversion;
+
                // Internal, static (GPVar):
        var $number;
        var $target;            // Set with the target path inputted in &target
                // 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
 
                // Internal, dynamic:
        var $content;           // Accumulating content
@@ -105,13 +122,18 @@ class SC_file_newfolder {
                        // Initialize GPvars:
                $this->number = t3lib_div::_GP('number');
                $this->target = t3lib_div::_GP('target');
                        // 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']);
 
 
                        // Init basic-file-functions object:
                $this->basicff = t3lib_div::makeInstance('t3lib_basicFileFunctions');
                $this->basicff->init($GLOBALS['FILEMOUNTS'],$TYPO3_CONF_VARS['BE']['fileExtensions']);
 
+                       // Init basic-charset-functions object:
+               $this->charsetConversion = t3lib_div::makeInstance('t3lib_cs');
+
                        // Cleaning and checking target
                        // Cleaning and checking target
-               $this->target=$this->basicff->is_directory($this->target);
+               $this->target = $this->charsetConversion->conv($this->target, 'utf-8', $GLOBALS['LANG']->charSet);
+               $this->target = $this->basicff->is_directory($this->target);
                $key=$this->basicff->checkPathAgainstMounts($this->target.'/');
                if (!$this->target || !$key)    {
                        t3lib_BEfunc::typo3PrintError ('Parameter Error','Target was not a directory!','');
                $key=$this->basicff->checkPathAgainstMounts($this->target.'/');
                if (!$this->target || !$key)    {
                        t3lib_BEfunc::typo3PrintError ('Parameter Error','Target was not a directory!','');
@@ -125,24 +147,27 @@ class SC_file_newfolder {
                        default:                $this->icon = 'gfx/i/_icon_ftp.gif';    break;
                }
 
                        default:                $this->icon = 'gfx/i/_icon_ftp.gif';    break;
                }
 
+               $this->icon = '<img'.t3lib_iconWorks::skinImg($this->backPath,$this->icon,'width="18" height="16"').' title="" alt="" />';
+
                        // Relative path to filemount, $key:
                $this->shortPath = substr($this->target,strlen($GLOBALS['FILEMOUNTS'][$key]['path']));
 
                        // Setting title:
                        // 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;
+               $this->title = $this->icon.$GLOBALS['FILEMOUNTS'][$key]['name'].': '.$this->shortPath;
 
                        // Setting template object
 
                        // Setting template object
-               $this->doc = t3lib_div::makeInstance('smallDoc');
-               $this->doc->docType = 'xhtml_trans';
+               $this->doc = t3lib_div::makeInstance('template');
+               $this->doc->setModuleTemplate('templates/file_newfolder.html');
                $this->doc->backPath = $BACK_PATH;
                $this->doc->backPath = $BACK_PATH;
-               $this->doc->form='<form action="tce_file.php" method="post" name="editform">';
                $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')).')))  {
                $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;
-                                       document.location = "file_newfolder.php?"+params;
+                                       var params = "&target="+encodeURIComponent(path)+"&number="+a+"&returnUrl='
+                                                       . urlencode($this->charsetConversion->conv($this->returnUrl, $GLOBALS['LANG']->charSet, 'utf-8'))
+                                                       . '";
+                                       window.location.href = "file_newfolder.php?"+params;
                                }
                        }
                        function backToList()   {       //
                                }
                        }
                        function backToList()   {       //
@@ -161,18 +186,21 @@ class SC_file_newfolder {
        function main() {
                global $LANG;
 
        function main() {
                global $LANG;
 
-                       // Make page header:
-               $this->content='';
+                       // start content compilation
                $this->content.=$this->doc->startPage($LANG->sL('LLL:EXT:lang/locallang_core.php:file_newfolder.php.pagetitle'));
                $this->content.=$this->doc->startPage($LANG->sL('LLL:EXT:lang/locallang_core.php:file_newfolder.php.pagetitle'));
-               $this->content.=$this->doc->header($LANG->sL('LLL:EXT:lang/locallang_core.php:file_newfolder.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);
 
 
 
 
+                       // Make page header:
+               $pageContent='';
+               $pageContent.=$this->doc->header($LANG->sL('LLL:EXT:lang/locallang_core.php:file_newfolder.php.pagetitle'));
+               $pageContent.=$this->doc->spacer(5);
+               $pageContent.=$this->doc->divider(5);
+
+
+               $code = '<form action="tce_file.php" method="post" name="editform">';
                        // Making the selector box for the number of concurrent folder-creations
                $this->number = t3lib_div::intInRange($this->number,1,10);
                        // Making the selector box for the number of concurrent folder-creations
                $this->number = t3lib_div::intInRange($this->number,1,10);
-               $code='
+               $code .= '
                        <div id="c-select">
                                <select name="number" onchange="reload(this.options[this.selectedIndex].value);">';
                for ($a=1;$a<=$this->folderNumber;$a++) {
                        <div id="c-select">
                                <select name="number" onchange="reload(this.options[this.selectedIndex].value);">';
                for ($a=1;$a<=$this->folderNumber;$a++) {
@@ -203,18 +231,23 @@ class SC_file_newfolder {
                        <div id="c-submitFolders">
                                <input type="submit" value="'.$LANG->sL('LLL:EXT:lang/locallang_core.php:file_newfolder.php.submit',1).'" />
                                <input type="submit" value="'.$LANG->sL('LLL:EXT:lang/locallang_core.php:labels.cancel',1).'" onclick="backToList(); return false;" />
                        <div id="c-submitFolders">
                                <input type="submit" value="'.$LANG->sL('LLL:EXT:lang/locallang_core.php:file_newfolder.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>
                        ';
                        </div>
                        ';
-               $this->content.= $this->doc->section('',$code);
+
+                       // CSH:
+               $code.= t3lib_BEfunc::cshItem('xMOD_csh_corebe', 'file_newfolder', $GLOBALS['BACK_PATH'],'<br/>');
+
+               $pageContent.= $code;
 
 
 
                        // Add spacer:
 
 
 
                        // Add spacer:
-               $this->content.= $this->doc->spacer(10);
+               $pageContent.= $this->doc->spacer(10);
 
                        // Switching form tags:
 
                        // Switching form tags:
-               $this->content.= $this->doc->sectionEnd();
-               $this->content.= '</form><form action="tce_file.php" method="post" name="editform2">';
+               $pageContent.= $this->doc->sectionEnd();
+               $pageContent.= '</form><form action="tce_file.php" method="post" name="editform2">';
 
                        // Add form fields for creation of a new, blank text file:
                $code='
 
                        // Add form fields for creation of a new, blank text file:
                $code='
@@ -230,14 +263,28 @@ class SC_file_newfolder {
                        <div id="c-submitFiles">
                                <input type="submit" value="'.$LANG->sL('LLL:EXT:lang/locallang_core.php:file_newfolder.php.newfile_submit',1).'" />
                                <input type="submit" value="'.$LANG->sL('LLL:EXT:lang/locallang_core.php:labels.cancel',1).'" onclick="backToList(); return false;" />
                        <div id="c-submitFiles">
                                <input type="submit" value="'.$LANG->sL('LLL:EXT:lang/locallang_core.php:file_newfolder.php.newfile_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>
                        ';
 
                        </div>
                        ';
 
-                       // Add the HTML as a section:
-               $this->content.= $this->doc->section($LANG->sL('LLL:EXT:lang/locallang_core.php:file_newfolder.php.newfile'),$code);
+                       // CSH:
+               $code.= t3lib_BEfunc::cshItem('xMOD_csh_corebe', 'file_newfile', $GLOBALS['BACK_PATH'],'<br/>');
+               $pageContent.= $this->doc->section($LANG->sL('LLL:EXT:lang/locallang_core.php:file_newfolder.php.newfile'),$code);
+
+               $docHeaderButtons = array();
 
 
-                       // Ending page
+                       // Add the HTML as a section:
+               $markerArray = array(
+                       'CSH' => $docHeaderButtons['csh'],
+                       'FUNC_MENU' => t3lib_BEfunc::getFuncMenu($this->id, 'SET[function]', $this->MOD_SETTINGS['function'], $this->MOD_MENU['function']),
+                       'CONTENT' => $pageContent,
+                       'PATH' => $this->title,
+               );
+
+               $this->content.= $this->doc->moduleBody(array(), $docHeaderButtons, $markerArray);
                $this->content.= $this->doc->endPage();
                $this->content.= $this->doc->endPage();
+
+               $this->content = $this->doc->insertStylesAndJS($this->content);
        }
 
        /**
        }
 
        /**
@@ -246,30 +293,21 @@ class SC_file_newfolder {
         * @return      void
         */
        function printContent() {
         * @return      void
         */
        function printContent() {
-
                echo $this->content;
        }
 }
 
                echo $this->content;
        }
 }
 
-// Include extension?
+
 if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/file_newfolder.php'])       {
        include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/file_newfolder.php']);
 }
 
 
 
 if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/file_newfolder.php'])       {
        include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/file_newfolder.php']);
 }
 
 
 
-
-
-
-
-
-
-
-
-
 // Make instance:
 $SOBE = t3lib_div::makeInstance('SC_file_newfolder');
 $SOBE->init();
 $SOBE->main();
 $SOBE->printContent();
 // Make instance:
 $SOBE = t3lib_div::makeInstance('SC_file_newfolder');
 $SOBE->init();
 $SOBE->main();
 $SOBE->printContent();
+
 ?>
\ No newline at end of file
 ?>
\ No newline at end of file