Trivial white-space fixes
authorMichael Stucki <michael.stucki@typo3.org>
Wed, 29 Aug 2007 13:17:49 +0000 (13:17 +0000)
committerMichael Stucki <michael.stucki@typo3.org>
Wed, 29 Aug 2007 13:17:49 +0000 (13:17 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@2467 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
t3lib/class.t3lib_install.php
t3lib/class.t3lib_tcemain.php
typo3/mod/tools/em/class.em_index.php

index d88fb1d..0b8ba4a 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2007-08-28 Kasper Skaarhoj <kasper2007@typo3.com>
+2007-08-28  Kasper Skaarhoj  <kasper2007@typo3.com>
 
        * Improvements as announced in June on the core list (except workspace moving)
                - Dual-preview for workspaces are only used now if the checkbox "Frontend Preview" is not checked.
                - Change in t3lib_refindex so setReferenceValue() can be run without being admin (by special parameter)
                - Fixed bug in t3lib_BEfunc::selectVersionsOfRecord(): now offline versions are not only selected by their t3ver_oid but also pid=-1 which is the correct thing to do. This actually resulted in dataloss in some known cases with the lowlevel cleaner CLI script.
                - Added fields to indexes on pages, sys_template and pages_language_uid.
-               - RTEmagic images are now duplicated when records are copied/versioned in tcemain. This is a long awaited feature that solves the bug that RTE magic images shared between too records would result in both disappearing if the one was deleted. So its in fact a critical fix for workspaces.
+               - RTEmagic images are now duplicated when records are copied/versioned in tcemain. This is a long awaited feature that solves the bug that RTE magic images shared between two records would result in both disappearing if the one was deleted. So its in fact a critical fix for workspaces.
 
-2007-08-23 Dmitry Dulepov <dmitry@typo3.org>
+2007-08-23  Dmitry Dulepov  <dmitry@typo3.org>
 
        * Fixed: hanging recordset in t3lib_BEfunc
 
-2007-08-23 Andreas Otto <andreas.otto@dkd.de>
+2007-08-23  Andreas Otto  <andreas.otto@dkd.de>
 
-       * (trivial) Fixed bug #4888:  Invalid argument supplied for foreach().
+       * (trivial) Fixed bug #4888:  Invalid argument supplied for foreach()
 
-2007-08-21 Andreas Otto <andreas.otto@dkd.de>
+2007-08-21  Andreas Otto  <andreas.otto@dkd.de>
 
        * Feature request #5748: Introduced a new TS option that makes indexing of metatags configurable. Adapted code to make use of the new TS option.
 
 
 2007-04-04  Andreas Otto  <andreas.otto@dkd.de>
 
-       * Fix bug #5411: A directory handle was not correclty used.
+       * Fix bug #5411: A directory handle was not correctly used.
 
 2007-04-03  Andreas Otto  <andreas.otto@dkd.de>
 
index 3fa5b02..165f01f 100755 (executable)
@@ -390,7 +390,7 @@ class t3lib_install {
                                                                                )
                                                                        );
                                                                                // Change key definition if necessary (must use "prefix" on TEXT columns)
-                                                                       if ( is_array($cfg['keys']) ) {
+                                                                       if (is_array($cfg['keys'])) {
                                                                                foreach ($cfg['keys'] as $kN => $kType) {
                                                                                        $match = array();
                                                                                        preg_match('/^([^(]*)\(([^)]+)\)(.*)/', $kType, $match);
index 7a883e3..e1a3bdd 100755 (executable)
@@ -286,8 +286,8 @@ class t3lib_TCEmain {
        var $copyMappingArray_merged = Array();         // This array is the sum of all copying operations in this class. May be READ from outside, thus partly public.
        var $copiedFileMap = Array();                           // A map between input file name and final destination for files being attached to records.
        var $RTEmagic_copyIndex = Array();                      // Contains [table][id][field] of fiels where RTEmagic images was copied. Holds old filename as key and new filename as value.
-       var     $errorLog = Array();                                    // Errors are collected in this variable.
-       
+       var $errorLog = Array();                                        // Errors are collected in this variable.
+
 
 
                // *********************
@@ -1082,12 +1082,12 @@ class t3lib_TCEmain     {
                                                                                $diffStorageFlag = TRUE;
                                                                        }
                                                                }
-                                                               
+
 
                                                                        // If autoversioning is happening we need to perform a nasty hack. The case is parallel to a similar hack inside checkValue_group_select_file().
                                                                        // When a copy or version is made of a record, a search is made for any RTEmagic* images in fields having the "images" soft reference parser applied. That should be true for RTE fields. If any are found they are duplicated to new names and the file reference in the bodytext is updated accordingly.
                                                                        // However, with auto-versioning the submitted content of the field will just overwrite the corrected values. This leaves a) lost RTEmagic files and b) creates a double reference to the old files.
-                                                                       // The only solution I can come up with is detecting when auto versioning happens, then see if any RTEmagic images was copied and if so make a stupid string-replace of the content ! 
+                                                                       // The only solution I can come up with is detecting when auto versioning happens, then see if any RTEmagic images was copied and if so make a stupid string-replace of the content !
                                                                if ($this->autoVersioningUpdate===TRUE) {
                                                                        if (is_array($this->RTEmagic_copyIndex[$table][$id][$field]))   {
                                                                                foreach($this->RTEmagic_copyIndex[$table][$id][$field] as $oldRTEmagicName => $newRTEmagicName) {
@@ -1095,7 +1095,7 @@ class t3lib_TCEmain       {
                                                                                }
                                                                        }
                                                                }
-                                                               
+
                                                        } elseif ($TCA[$table]['ctrl']['origUid']===$field) {   // Allow value for original UID to pass by...
                                                                $fieldArray[$field] = $fieldValue;
                                                        }
@@ -1802,7 +1802,7 @@ class t3lib_TCEmain       {
 
                                // Only execute the first move command:
                        list ($key, $value) = each ($moveCMDS);
-                       
+
                        if (is_array($moveCMDS[$key]))  {
                                $this->_MOVE_FLEX_FORMdata($valueArrayToMoveIn[$key],$moveCMDS[$key], $direction);
                        } else {
@@ -3034,7 +3034,7 @@ class t3lib_TCEmain       {
         * Copies any "RTEmagic" image files found in record with table/id to new names.
         * Usage: After copying a record this function should be called to search for "RTEmagic"-images inside the record. If such are found they should be duplicated to new names so all records have a 1-1 relation to them.
         * Reason for copying RTEmagic files: a) if you remove an RTEmagic image from a record it will remove the file - any other record using it will have a lost reference! b) RTEmagic images keeps an original and a copy. The copy always is re-calculated to have the correct physical measures as the HTML tag inserting it defines. This is calculated from the original. Two records using the same image could have difference HTML-width/heights for the image and the copy could only comply with one of them. If you don't want a 1-1 relation you should NOT use RTEmagic files but just insert it as a normal file reference to a file inside fileadmin/ folder
-        * 
+        *
         * @param       string          Table name
         * @param       integer         Record UID
         * @return      void
@@ -3047,7 +3047,7 @@ class t3lib_TCEmain       {
                        $this->fileFunc = t3lib_div::makeInstance('t3lib_basicFileFunctions');
                        $this->include_filefunctions=1;
                }
-                               
+
                        // Select all RTEmagic files in the reference table from the table/ID
                $recs = $TYPO3_DB->exec_SELECTgetRows(
                        '*',
@@ -3059,8 +3059,8 @@ class t3lib_TCEmain       {
                                ' AND recuid='.intval($theNewSQLID),
                        '',
                        'sorting DESC'
-               );      
-               
+               );
+
 
                        // Traverse the files found and copy them:
                if (is_array($recs)) {
@@ -3084,9 +3084,9 @@ class t3lib_TCEmain       {
                                                        // If filename looks like an RTE file, and the directory is in "uploads/", then process as a RTE file!
                                                if ($rteOrigName && t3lib_div::isFirstPartOfStr($dirPrefix,'uploads/') && @is_dir(PATH_site.$dirPrefix))        {       // RTE:
 
-                                                               // From the "original" RTE filename, produce a new "original" destination filename which is unused. 
+                                                               // From the "original" RTE filename, produce a new "original" destination filename which is unused.
                                                        $origDestName = $this->fileFunc->getUniqueName($rteOrigName, PATH_site.$dirPrefix);
-                                                       
+
                                                                // Create copy file name:
                                                        $pI = pathinfo($rec['ref_string']);
                                                        $copyDestName = dirname($origDestName).'/RTEmagicC_'.substr(basename($origDestName),10).'.'.$pI['extension'];
@@ -3107,7 +3107,7 @@ class t3lib_TCEmain       {
                                                                        $error = $sysRefObj->setReferenceValue($rec['hash'],substr($copyDestName,strlen(PATH_site)),FALSE,TRUE);
                                                                        if ($error)     {
                                                                                echo $this->newlog('t3lib_refindex::setReferenceValue(): '.$error,1);
-                                                                       } 
+                                                                       }
                                                                } else $this->newlog('File "'.$copyDestName.'" was not created!',1);
                                                        } else $this->newlog('Could not construct new unique names for file!',1);
                                                } else $this->newlog('Maybe directory of file was not within "uploads/"?',1);
@@ -4545,7 +4545,7 @@ $this->log($table,$id,6,0,0,'Stage raised...',30,array('comment'=>$comment,'stag
                                        $dbAnalysis->writeForeignField($conf, $uid, $theUidToUpdate);
                                }
 
-                                       // Update child records if change to pid is required: 
+                                       // Update child records if change to pid is required:
                                if ($thePidToUpdate) {
                                        $updateValues = array('pid' => $thePidToUpdate);
                                        foreach ($dbAnalysis->itemArray as $v) {
@@ -4554,7 +4554,7 @@ $this->log($table,$id,6,0,0,'Stage raised...',30,array('comment'=>$comment,'stag
                                                }
                                        }
                                }
-                       }                       
+                       }
                }
        }
 
@@ -5347,7 +5347,7 @@ $this->log($table,$id,6,0,0,'Stage raised...',30,array('comment'=>$comment,'stag
         * @param       integer         Log entry ID, important for linking between log and history views
         * @return      void
         */
-       function setHistory($table,$id,$logId)          {
+       function setHistory($table,$id,$logId)  {
                if (isset($this->historyRecords[$table.':'.$id]))       {
 
                                // Initialize settings:
@@ -5361,17 +5361,17 @@ $this->log($table,$id,6,0,0,'Stage raised...',30,array('comment'=>$comment,'stag
                        $this->clearHistory($maxAgeSeconds, $table);
 
                                // Set history data:
-                               $fields_values = array();
-                               $fields_values['history_data'] = serialize($this->historyRecords[$table.':'.$id]);
-                               $fields_values['fieldlist'] = implode(',',array_keys($this->historyRecords[$table.':'.$id]['newRecord']));
-                               $fields_values['tstamp'] = time();
-                               $fields_values['tablename'] = $table;
-                               $fields_values['recuid'] = $id;
-                               $fields_values['sys_log_uid'] = $logId;
+                       $fields_values = array();
+                       $fields_values['history_data'] = serialize($this->historyRecords[$table.':'.$id]);
+                       $fields_values['fieldlist'] = implode(',',array_keys($this->historyRecords[$table.':'.$id]['newRecord']));
+                       $fields_values['tstamp'] = time();
+                       $fields_values['tablename'] = $table;
+                       $fields_values['recuid'] = $id;
+                       $fields_values['sys_log_uid'] = $logId;
 
-                               $GLOBALS['TYPO3_DB']->exec_INSERTquery('sys_history', $fields_values);
-                       }
+                       $GLOBALS['TYPO3_DB']->exec_INSERTquery('sys_history', $fields_values);
                }
+       }
 
        /**
         * Clearing sys_history table from older entries that are expired.
index d4d8c0b..e1994c4 100644 (file)
@@ -1962,7 +1962,7 @@ EXTENSION KEYS:
                                                        } else {
                                                                        // Determine if new modules were installed:
                                                                $techInfo = $this->makeDetailedExtensionAnalysis($extKey, $list[$extKey]);
-                                                               if (($this->CMD['load'] || $this->CMD['remove']) && is_array($techInfo['flags']) && in_array('Module', $techInfo['flags'], true)) {                                                                     
+                                                               if (($this->CMD['load'] || $this->CMD['remove']) && is_array($techInfo['flags']) && in_array('Module', $techInfo['flags'], true)) {
                                                                        $vA['CMD']['refreshMenu'] = 1;
                                                                }
                                                                header('Location: '.t3lib_div::linkThisScript($vA));