Fixed bug #12355: Remove WIN-check in tsconfig_help::rebuild
authorSteffen Kamper <info@sk-typo3.de>
Wed, 28 Oct 2009 09:38:54 +0000 (09:38 +0000)
committerSteffen Kamper <info@sk-typo3.de>
Wed, 28 Oct 2009 09:38:54 +0000 (09:38 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@6290 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/tsconfig_help/mod1/index.php

index f21130e..ab9ccf3 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 009-10-27  Steffen Kamper  <info@sk-typo3.de>
 
+       * Fixed bug #12355: Remove WIN-check in tsconfig_help::rebuild
        * Fixed bug #12364: Icon for content element 'Media'
 
 2009-10-27  Christian Kuhn  <lolli@schwarzbu.ch>
index 0bad04f..9535c43 100644 (file)
@@ -192,79 +192,75 @@ class tx_tsconfighelp_module1 extends t3lib_SCbase {
 
                        case 2:
                                if ($GLOBALS['BE_USER']->user['admin']) {
-                                       if ($GLOBALS['TYPO3_OS'] === 'WIN') {
-                                               $this->content .= '<p>'.$LANG->getLL('noRebuildOnWindows').'</p><br />';
-                                       } else {
-                                               if (t3lib_div::_GP('_rebuild')) {
-                                                               // remove all data from the database
-                                                       $this->purgeSQLContents();
-
-                                                               // get all loaded extension keys
-                                                       $extArray = $TYPO3_LOADED_EXT;
-
-                                                       $content = '<div align="left"><strong>'.$LANG->getLL('loadedTSfrom').'</strong></div><br />';
-
-                                                               // parse the extension names only (no need for all details from the TYPO3_LOADED_EXT table
-                                                       foreach ($extArray as $extName => $dummy)       {
-                                                                       // check that the extension is really loaded (which should always be the case)
-                                                               if (t3lib_extMgm::isLoaded($extName))   {
-                                                                               // extract the content.xml from the manual.sxw ZIP file
-                                                                       $manual = $this->getZIPFileContents(t3lib_extMgm::extPath($extName).'doc/manual.sxw', 'content.xml');
-
-                                                                               // check if the manual file actually exists and if the content.xml could be loaded
-                                                                       if ($manual != '')      {
-                                                                                       // if the manual file exists, proceed with the load into the SQL database
-                                                                               $content .= '<p>Extension '.$extName.'...';
-
-                                                                                       // run the extraction processing and import the data into SQL. Return the number of TS tables found in the open office document
-                                                                               $number = $this->loadExtensionManual($extName, $manual);
-
-                                                                                       // print a status message with a link to the openoffice manual
-                                                                               $content .= $number.' '.$LANG->getLL('sections').' (<a href="'.t3lib_div::getIndpEnv('TYPO3_SITE_URL').TYPO3_mainDir.t3lib_extMgm::extRelPath($extName).'doc/manual.sxw">manual</a>)</p>';
-                                                                       }
-                                                               } else  {
-                                                                               // this should never happen!
-                                                                       die ("Fatal error : loaded extension not actually loaded? Please file a bug report at http://bugs.typo3.org!");
+                                       if (t3lib_div::_GP('_rebuild')) {
+                                                       // remove all data from the database
+                                               $this->purgeSQLContents();
+
+                                                       // get all loaded extension keys
+                                               $extArray = $TYPO3_LOADED_EXT;
+
+                                               $content = '<div align="left"><strong>'.$LANG->getLL('loadedTSfrom').'</strong></div><br />';
+
+                                                       // parse the extension names only (no need for all details from the TYPO3_LOADED_EXT table
+                                               foreach ($extArray as $extName => $dummy)       {
+                                                               // check that the extension is really loaded (which should always be the case)
+                                                       if (t3lib_extMgm::isLoaded($extName))   {
+                                                                       // extract the content.xml from the manual.sxw ZIP file
+                                                               $manual = $this->getZIPFileContents(t3lib_extMgm::extPath($extName).'doc/manual.sxw', 'content.xml');
+
+                                                                       // check if the manual file actually exists and if the content.xml could be loaded
+                                                               if ($manual != '')      {
+                                                                               // if the manual file exists, proceed with the load into the SQL database
+                                                                       $content .= '<p>Extension '.$extName.'...';
+
+                                                                               // run the extraction processing and import the data into SQL. Return the number of TS tables found in the open office document
+                                                                       $number = $this->loadExtensionManual($extName, $manual);
+
+                                                                               // print a status message with a link to the openoffice manual
+                                                                       $content .= $number.' '.$LANG->getLL('sections').' (<a href="'.t3lib_div::getIndpEnv('TYPO3_SITE_URL').TYPO3_mainDir.t3lib_extMgm::extRelPath($extName).'doc/manual.sxw">manual</a>)</p>';
                                                                }
+                                                       } else  {
+                                                                       // this should never happen!
+                                                               die ("Fatal error : loaded extension not actually loaded? Please file a bug report at http://bugs.typo3.org!");
                                                        }
+                                               }
 
-                                                       $this->content .= $this->doc->section($LANG->getLL('rebuildTS'),$content.'<br />',0,1);
-
-                                                               // Issue warnings about duplicate or empty obj_strings, if any
-                                                               // An obj_string should be unique. It should appear in only one extension manual and then only once
-                                                               // If the sum of all occurrences of a given obj_string is more than one, issue a list of duplicate entries as a warning
-                                                       $duplicateWarnings = '';
-                                                       $emptyWarnings = '';
-                                                       foreach ($this->objStringsPerExtension as $obj_string => $extensions)   {
-                                                               if (empty($obj_string)) {
-                                                                       $emptyWarnings = '<p class="typo3-red">'.$LANG->getLL('warning_manualsWithoutMarkers');
+                                               $this->content .= $this->doc->section($LANG->getLL('rebuildTS'),$content.'<br />',0,1);
+
+                                                       // Issue warnings about duplicate or empty obj_strings, if any
+                                                       // An obj_string should be unique. It should appear in only one extension manual and then only once
+                                                       // If the sum of all occurrences of a given obj_string is more than one, issue a list of duplicate entries as a warning
+                                               $duplicateWarnings = '';
+                                               $emptyWarnings = '';
+                                               foreach ($this->objStringsPerExtension as $obj_string => $extensions)   {
+                                                       if (empty($obj_string)) {
+                                                               $emptyWarnings = '<p class="typo3-red">'.$LANG->getLL('warning_manualsWithoutMarkers');
+                                                               foreach ($extensions as $extensionKey => $counter)      {
+                                                                       $emptyWarnings .= ' '.$extensionKey.' ('.$counter.')<br />';
+                                                               }
+                                                               $emptyWarnings .= '</p><br />';
+                                                       } else {
+                                                               if (array_sum($extensions) > 1) {
+                                                                       $duplicateWarnings .= $obj_string.':';
                                                                        foreach ($extensions as $extensionKey => $counter)      {
-                                                                               $emptyWarnings .= ' '.$extensionKey.' ('.$counter.')<br />';
-                                                                       }
-                                                                       $emptyWarnings .= '</p><br />';
-                                                               } else {
-                                                                       if (array_sum($extensions) > 1) {
-                                                                               $duplicateWarnings .= $obj_string.':';
-                                                                               foreach ($extensions as $extensionKey => $counter)      {
-                                                                                       $duplicateWarnings .= ' '.$extensionKey.' ('.$counter.')';
-                                                                               }
-                                                                               $duplicateWarnings .= '<br />';
+                                                                               $duplicateWarnings .= ' '.$extensionKey.' ('.$counter.')';
                                                                        }
+                                                                       $duplicateWarnings .= '<br />';
                                                                }
                                                        }
-                                                       $warnings = $emptyWarnings;
-                                                       if (!empty($duplicateWarnings)) {
-                                                               $warnings .= '<p class="typo3-red">'.$LANG->getLL('warning_duplicateMarkers').'<br />'.$duplicateWarnings.'</p>';
-                                                       }
-                                                       if (!empty($warnings))  {
-                                                               $this->content .= $this->doc->section($LANG->getLL('updateWarnings'),'<div>'.$warnings.'</div>',0,1);
-                                                       }
                                                }
-
-                                               $content = '<p>'.$LANG->getLL('rebuildExplanation').'</p><br />';
-                                               $content .= $LANG->getLL('rebuild').' <input type="submit" name="_rebuild" value="Rebuild" /><br />';
-                                               $this->content .= $this->doc->section($LANG->getLL('rebuildTS'),$content,0,1);
+                                               $warnings = $emptyWarnings;
+                                               if (!empty($duplicateWarnings)) {
+                                                       $warnings .= '<p class="typo3-red">'.$LANG->getLL('warning_duplicateMarkers').'<br />'.$duplicateWarnings.'</p>';
+                                               }
+                                               if (!empty($warnings))  {
+                                                       $this->content .= $this->doc->section($LANG->getLL('updateWarnings'),'<div>'.$warnings.'</div>',0,1);
+                                               }
                                        }
+
+                                       $content = '<p>'.$LANG->getLL('rebuildExplanation').'</p><br />';
+                                       $content .= $LANG->getLL('rebuild').' <input type="submit" name="_rebuild" value="Rebuild" /><br />';
+                                       $this->content .= $this->doc->section($LANG->getLL('rebuildTS'),$content,0,1);
                                } else {
                                        $this->content .= '<p>'.$LANG->getLL('adminAccessOnly').'</p><br />';
                                }