14050_cleaning_t3lib_arraybrowser
[Packages/TYPO3.CMS.git] / t3lib / class.t3lib_extfilefunc.php
index aadd08b..838d256 100644 (file)
@@ -2,7 +2,7 @@
 /***************************************************************
 *  Copyright notice
 *
-*  (c) 1999-2009 Kasper Skaarhoj (kasperYYYY@typo3.com)
+*  (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
@@ -28,9 +28,9 @@
  * extending class to class t3lib_basicFileFunctions
  *
  * $Id$
- * Revised for TYPO3 3.6 May/2004 by Kasper Skaarhoj
+ * Revised for TYPO3 3.6 May/2004 by Kasper Skårhøj
  *
- * @author     Kasper Skaarhoj <kasperYYYY@typo3.com>
+ * @author     Kasper Skårhøj <kasperYYYY@typo3.com>
  */
 /**
  * [CLASS/FUNCTION INDEX of SCRIPT]
@@ -98,7 +98,7 @@
  * You should never mount a ftp_space 'below' the webspace so that it reaches into the webspace. This is because if somebody unzips a zip-file in the ftp-space so that it reaches out into the webspace this will be a violation of the safety
  * For example this is a bad idea: you have an ftp-space that is '/www/' and a web-space that is '/www/htdocs/'
  *
- * @author     Kasper Skaarhoj <kasperYYYY@typo3.com>
+ * @author     Kasper Skårhøj <kasperYYYY@typo3.com>
  * @package TYPO3
  * @subpackage t3lib
  */
@@ -240,7 +240,7 @@ class t3lib_extFileFunctions extends t3lib_basicFileFunctions       {
 
                                        // Traverse all action data. More than one file might be affected at the same time.
                                if (is_array($actionData)) {
-                                   $result[$action] = array();
+                                       $result[$action] = array();
                                        foreach ($actionData as $cmdArr) {
 
                                                        // Clear file stats
@@ -276,6 +276,19 @@ class t3lib_extFileFunctions extends t3lib_basicFileFunctions      {
                                                                $result[$action][] = $this->func_unzip($cmdArr);
                                                        break;
                                                }
+
+                                                       // Hook for post-processing the action
+                                               if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_extfilefunc.php']['processData'])) {
+                                                       foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_extfilefunc.php']['processData'] as $classRef) {
+                                                               $hookObject = t3lib_div::getUserObj($classRef);
+                               
+                                                               if (!($hookObject instanceof t3lib_extFileFunctions_processDataHook)) {
+                                                                       throw new UnexpectedValueException('$hookObject must implement interface t3lib_extFileFunctions_processDataHook', 1279719168);
+                                                               }
+                               
+                                                               $hookObject->processData_postProcessAction($action, $cmdArr, $result[$action], $this);
+                                                       }
+                                               }
                                        }
                                }
                        }
@@ -284,61 +297,23 @@ class t3lib_extFileFunctions extends t3lib_basicFileFunctions     {
        }
 
        /**
-        * Print log error messages from the operations of this script instance
+        * Adds log error messages from the operations of this script instance to the FlashMessageQueue
         *
         * @param       string          Redirect URL (for creating link in message)
-        * @return      void            (Will exit on error)
+        * @return      void
         */
        function printLogErrorMessages($redirect = '') {
-                       // fetch the error messages from the DB
-               $errorMessages = $this->getErrorMessages();
-
-                       // only print error messages if there is an error
-               if (count($errorMessages)) {
-                       $errorDoc = t3lib_div::makeInstance('template');
-                       $errorDoc->backPath = '';
-
-                       $content = $errorDoc->startPage('tce_db.php Error output');
-
-                       $lines[] = '
-                                       <tr class="bgColor5">
-                                               <td colspan="2" align="center"><strong>Errors:</strong></td>
-                                       </tr>';
-
-                       foreach ($errorMessages as $line) {
-                               $lines[] = '
-                                       <tr class="bgColor4">
-                                               <td valign="top"><img' . t3lib_iconWorks::skinImg('', 'gfx/icon_fatalerror.gif', 'width="18" height="16"') . ' alt="" /></td>
-                                               <td>' . htmlspecialchars($line) . '</td>
-                                       </tr>';
-                       }
-
-                       $lines[] = '
-                                       <tr>
-                                               <td colspan="2" align="center"><br />'.
-                                               '<form action=""><input type="submit" value="Continue" onclick="'.htmlspecialchars('window.location.href=\'' . $redirect . '\';return false;').'" /></form>'.
-                                               '</td>
-                                       </tr>';
-
-                       $content .= '
-                               <br /><br />
-                               <table border="0" cellpadding="1" cellspacing="1" width="300" align="center">
-                                       ' . implode('', $lines) . '
-                               </table>';
-
-                       $content .= $errorDoc->endPage();
-                       die($content);
-               }
+               $this->getErrorMessages();
        }
 
 
        /**
-        * Returns log error messages from the previous file operations of this script instance
+        * Adds log error messages from the previous file operations of this script instance
+        * to the FlashMessageQueue
         *
-        * @return      array   all errorMessages as a numerical array
+        * @return      void
         */
        function getErrorMessages() {
-               $errorMessages = array();
                $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                                '*',
                                'sys_log',
@@ -348,10 +323,17 @@ class t3lib_extFileFunctions extends t3lib_basicFileFunctions     {
                );
                while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
                        $logData = unserialize($row['log_data']);
-                       $errorMessages[] = $row['error'] . ': ' . sprintf($row['details'], $logData[0], $logData[1], $logData[2], $logData[3], $logData[4]);
+                       $msg = $row['error'] . ': ' . sprintf($row['details'], $logData[0], $logData[1], $logData[2], $logData[3], $logData[4]);
+                       $flashMessage = t3lib_div::makeInstance(
+                                       't3lib_FlashMessage',
+                                       $msg,
+                                       '',
+                                       t3lib_FlashMessage::ERROR,
+                                       TRUE
+                       );
+                       t3lib_FlashMessageQueue::addMessage($flashMessage);
                }
                $GLOBALS['TYPO3_DB']->sql_free_result($res);
-               return $errorMessages;
        }
 
 
@@ -605,7 +587,7 @@ class t3lib_extFileFunctions extends t3lib_basicFileFunctions       {
                                                if ($this->checkIfAllowed($fI['fileext'], $theDest, $fI['file'])) {
                                                        if ($this->checkPathAgainstMounts($theDestFile) && $this->checkPathAgainstMounts($theFile))     {
                                                                if ($this->PHPFileFunctions)    {
-                                                                       rename($theFile, $theDestFile);
+                                                                       @rename($theFile, $theDestFile);
                                                                } else {
                                                                        $cmd = 'mv "'.$theFile.'" "'.$theDestFile.'"';
                                                                        exec($cmd);
@@ -638,7 +620,7 @@ class t3lib_extFileFunctions extends t3lib_basicFileFunctions       {
                                                        if ($this->checkIfFullAccess($theDest) || $this->is_webPath($theDestFile)==$this->is_webPath($theFile)) {       // // no moving of folders between spaces
                                                                if ($this->checkPathAgainstMounts($theDestFile) && $this->checkPathAgainstMounts($theFile))     {
                                                                        if ($this->PHPFileFunctions)    {
-                                                                               rename($theFile, $theDestFile);
+                                                                               @rename($theFile, $theDestFile);
                                                                        } else {
                                                                                $cmd = 'mv "'.$theFile.'" "'.$theDestFile.'"';
                                                                                $errArr = array();
@@ -719,7 +701,7 @@ class t3lib_extFileFunctions extends t3lib_basicFileFunctions       {
                if (!$this->isInit) return FALSE;
 
                $theFolder = $this->cleanFileName($cmds['data']);
-               if (isset($theFolder) {
+               if (isset($theFolder) && trim($theFolder) != '') {
                        if ($this->checkFileNameLen($theFolder))        {
                                $theTarget = $this->is_directory($cmds['target']);      // Check the target dir
                                if ($theTarget) {
@@ -766,7 +748,7 @@ class t3lib_extFileFunctions extends t3lib_basicFileFunctions       {
                                                                                        $this->writelog(8,0,1,'File created: "%s"',Array($fI['file']));
                                                                                        return $theNewFile;
                                                                                } else $this->writelog(8,1,100,'File "%s" was not created! Write-permission problem in "%s"?',Array($fI['file'], $theTarget));
-                                                                       } else $this->writelog(8,1,107,'Fileextension "%s" is not a textfile format! (%s)',Array($fI['fileext'], $extList));
+                                                                       } else $this->writelog(8,1,107,'File extension "%s" is not a textfile format! (%s)',Array($fI['fileext'], $extList));
                                                                } else $this->writelog(8,1,106,'Extension of file name "%s" was not allowed!',Array($fI['file']));
                                                        } else $this->writelog(8,1,101,'File "%s" existed already!',Array($theNewFile));
                                                } else $this->writelog(8,1,102,'Destination path "%s" was not within your mountpoints!',Array($theTarget.'/'));
@@ -801,7 +783,7 @@ class t3lib_extFileFunctions extends t3lib_basicFileFunctions       {
                                                                $this->writelog(9,0,1,'File saved to "%s", bytes: %s, MD5: %s ',Array($fileInfo['file'],@filesize($theTarget),md5($content)));
                                                                return TRUE;
                                                        } else $this->writelog(9,1,100,'File "%s" was not saved! Write-permission problem in "%s"?',Array($theTarget,$fileInfo['path']));
-                                               } else $this->writelog(9,1,102,'Fileextension "%s" is not a textfile format! (%s)',Array($fI['fileext'], $extList));
+                                               } else $this->writelog(9,1,102,'File extension "%s" is not a textfile format! (%s)',Array($fI['fileext'], $extList));
                                        } else $this->writelog(9,1,103,'Extension of file name "%s" was not allowed!',Array($fI['file']));
                                } else $this->writelog(9,1,104,'You are not allowed to edit files!','');
                        } else $this->writelog(9,1,121,'Destination path "%s" was not within your mountpoints!',Array($fileInfo['path']));
@@ -875,7 +857,7 @@ class t3lib_extFileFunctions extends t3lib_basicFileFunctions       {
                                                                return TRUE;
                                                        } else $this->writelog(7,1,100,'File "%s" or destination "%s" was not within your mountpoints!',Array($theFile,$theDest));
                                                } else $this->writelog(7,1,101,'You don\'t have full access to the destination directory "%s"!',Array($theDest));
-                                       } else $this->writelog(7,1,102,'Fileextension is not "zip"','');
+                                       } else $this->writelog(7,1,102,'File extension is not "zip"','');
                                } else $this->writelog(7,1,103,'You are not allowed to unzip files','');
                        } else $this->writelog(7,2,104,'Destination "%s" was not a directory',Array($cmds['target']));
                } else $this->writelog(7,2,105,'The file "%s" did not exist!',Array($theFile));
@@ -886,4 +868,4 @@ if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class
        include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_extfilefunc.php']);
 }
 
-?>
+?>
\ No newline at end of file