Fix some typos in ChangeLog and other files (non-functional)

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

diff --git a/typo3/file_rename.php b/typo3/file_rename.php
old mode 100755 (executable)
new mode 100644 (file)
index af399dc..a54284d
--- a/typo3/file_rename.php
+++ b/typo3/file_rename.php
@@ -2,7 +2,7 @@
 /***************************************************************
 *  Copyright notice
 *
-*  (c) 1999-2005 Kasper Skaarhoj (kasperYYYY@typo3.com)
+*  (c) 1999-2009 Kasper Skaarhoj (kasperYYYY@typo3.com)
 *  All rights reserved
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
@@ -53,7 +53,7 @@ $BACK_PATH = '';
 require('init.php');
 require('template.php');
 require_once(PATH_t3lib.'class.t3lib_basicfilefunc.php');
-
+require_once(PATH_t3lib.'class.t3lib_parsehtml.php');
 
 
 
@@ -105,6 +105,7 @@ class SC_file_rename {
         * @return      void
         */
        function init() {
+               //TODO remove global
                global $LANG,$BACK_PATH,$TYPO3_CONF_VARS;
 
                        // Initialize GPvars:
@@ -116,14 +117,14 @@ class SC_file_rename {
                $this->basicff->init($GLOBALS['FILEMOUNTS'],$TYPO3_CONF_VARS['BE']['fileExtensions']);
 
                        // Cleaning and checking target
-               if (@file_exists($this->target))        {
+               if (file_exists($this->target)) {
                        $this->target=$this->basicff->cleanDirectoryName($this->target);                // Cleaning and checking target (file or dir)
                } else {
                        $this->target='';
                }
                $key=$this->basicff->checkPathAgainstMounts($this->target.'/');
                if (!$this->target || !$key)    {
-                       t3lib_BEfunc::typo3PrintError ('Parameter Error','Target was not a directory!','');
+                       t3lib_BEfunc::typo3PrintError ($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_file_list.xml:paramError', true), $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_file_list.xml:targetNoDir', true), '');
                        exit;
                }
 
@@ -134,17 +135,18 @@ class SC_file_rename {
                        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:
-               $this->title = $GLOBALS['FILEMOUNTS'][$key]['name'].': '.$this->shortPath;
+               $this->title = $this->icon.$GLOBALS['FILEMOUNTS'][$key]['name'].': '.$this->shortPath;
 
                        // 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_rename.html');
                $this->doc->backPath = $BACK_PATH;
-               $this->doc->form='<form action="tce_file.php" method="post" name="editform">';
                $this->doc->JScode=$this->doc->wrapScriptTags('
                        function backToList()   {       //
                                top.goToModule("file_list");
@@ -158,19 +160,21 @@ class SC_file_rename {
         * @return      void
         */
        function main() {
+               //TODO remove global, change $LANG into $GLOBALS['LANG'], change locallang*.php to locallang*.xml
+
                global $LANG;
 
                        // Make page header:
-               $this->content='';
-               $this->content.=$this->doc->startPage($LANG->sL('LLL:EXT:lang/locallang_core.php:file_rename.php.pagetitle'));
-               $this->content.=$this->doc->header($LANG->sL('LLL:EXT:lang/locallang_core.php:file_rename.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->startPage($LANG->sL('LLL:EXT:lang/locallang_core.php:file_rename.php.pagetitle'));
 
+               $pageContent = $this->doc->header($LANG->sL('LLL:EXT:lang/locallang_core.php:file_rename.php.pagetitle'));
+               $pageContent .= $this->doc->spacer(5);
+               $pageContent .= $this->doc->divider(5);
 
+
+               $code = '<form action="tce_file.php" method="post" name="editform">';
                        // Making the formfields for renaming:
-               $code='
+               $code .= '
 
                        <div id="c-rename">
                                <input type="text" name="file[rename][0][data]" value="'.htmlspecialchars(basename($this->shortPath)).'"'.$GLOBALS['TBE_TEMPLATE']->formWidth(20).' />
@@ -187,12 +191,24 @@ class SC_file_rename {
                        </div>
                ';
 
-                       // CSH:
-               $code.= t3lib_BEfunc::cshItem('xMOD_csh_corebe', 'file_rename', $GLOBALS['BACK_PATH'],'<br/>');
 
                        // Add the HTML as a section:
-               $this->content.= $this->doc->section('',$code);
+               $pageContent .= $code;
+
+               $docHeaderButtons = array();
+               $docHeaderButtons['csh'] = t3lib_BEfunc::cshItem('xMOD_csh_corebe', 'file_rename', $GLOBALS['BACK_PATH']);
 
+                       // 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->insertStylesAndJS($this->content);
        }
 
        /**
@@ -201,31 +217,21 @@ class SC_file_rename {
         * @return      void
         */
        function printContent() {
-               $this->content.= $this->doc->endPage();
-               $this->content = $this->doc->insertStylesAndJS($this->content);
                echo $this->content;
        }
 }
 
-// Include extension?
+
 if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/file_rename.php'])  {
        include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/file_rename.php']);
 }
 
 
 
-
-
-
-
-
-
-
-
-
 // Make instance:
 $SOBE = t3lib_div::makeInstance('SC_file_rename');
 $SOBE->init();
 $SOBE->main();
 $SOBE->printContent();
+
 ?>
\ No newline at end of file