reverting to the old installer, according to the commit policy for 4.2
authorIngo Renner <ingo.renner@typo3.org>
Tue, 5 Feb 2008 21:12:10 +0000 (21:12 +0000)
committerIngo Renner <ingo.renner@typo3.org>
Tue, 5 Feb 2008 21:12:10 +0000 (21:12 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@3092 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/init.php
typo3/sysext/install/ext_tables.php
typo3/sysext/install/mod/class.tx_install.php

index 205de72..92ded26 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@
        * moved t3skin arrow icons to main typo3/gfx folder
        * added feature #7334: Feature: New Pagetree Styling, credits Steffen Kamper
        * removed <beta-code> tags from the cleaner backend project
+       * reverted to the old installer, according to the commit policy for 4.2
 
 2008-02-05  Oliver Hader  <oh@inpublica.de>
 
 2008-01-23  Thomas Hempel  <thomas@typo3-unleashed.net>
 
        * Bugfix: removed a needless comma in sysext/cms/ext_tables.sql (line 160)
-       * Installer: Improved the installer module.
-               - The result of the previous steps is now displayed
-               - Fixed some issues with "previous" button
-       * Installer: Improved database and table creation
-       * Installer: added new option BE/RTE_imageStorageDir. related to issue #7185
-       * Installer: Added some styles for deliverable lists
-
-2008-01-22  Thomas Hempel  <thomas@typo3-unleashed.net>
-
-       * Installer: Added a "hide" button to hide the results of executed methods
-       * Installer: Added skeletons for gfx check methods
-       * Installer: improved the look of the login screen
-       * Installer: Smaller bugfixes and enhancements in error handling
 
 2008-01-22  Ingo Renner  <ingo@typo3.org>
 
        * fixed tab borders in TCEforms
        * now the module menu in backend.php is as wide as in alt_main.php
 
-2008-01-20  Thomas Hempel  <thomas@typo3-unleashed.net>
-
-       * Installer: Renamed the tab back from "Setup" to "Installer" to avoid problems in translation tool
-       * Installer: reorganized installer module (rewrite)
-       * Installer: implemeted some features for setup module to make it usable for most cases
-       * Installer: added database checks (big thanks to Francois Suter!!!)
-       * Installer: started implementation of image checks
-       * Installer: prepared codebase for third party patches
-
 2008-01-20  Ingo Renner  <ingo@typo3.org>
 
        * fixed bug #7211: "Start in Module" does not work anymore
        * Added ability to send forms via AJAX
        * improved DB compare code (Thanks to Francois Suter)
 
-2007-12-11  Thomas Hempel  <thomas@typo3-unleashed.net>
-
-       * Added support for listing and calling methods in new installer
-
 2007-12-10  Ingmar Schlecht  <ingmar@typo3.org>
 
        * (security) Fixed a low-severity SQL injection in the modfunc2 of indexed_search (only exploitable by BE users, and severity limited because addslashes() was already applied to the value - yet not within a quoted string) (Thanks to Henning Pingel for findind the issue and Andreas Otto for the fix)
        * Set left-padding of options in selectorboxes to 22 if an icon is displayed that has a width between 14 and 20 pixels. This was necessary for a good visual impression even if page and content type icon sizes vary.
        * Made Clear Cache buttons of backend.php AJAX based, showing a nice spinner image during cache clearing
 
-2007-11-15  Thomas Hempel <thomas@typo3-unleashed.net>
-
-       * added new installer (ALPHA) code in typo3/sysext/install
-       * moved typo3/sysext/install to typo3/sysext/install_old
-       * added side-by-side patch to prepare core for new installer code (makes it possible to run old and new installer side by side)
-
 2007-11-15  Jeff Segars  <jeff@webempoweredchurch.org>
 
        * Feature #6672: Add tab filtering and file type filtering to TCA-defined link wizard
index 888490c..3447f09 100755 (executable)
@@ -269,78 +269,15 @@ if (!get_magic_quotes_gpc())      {
 // Check if the install script should be run:
 // ********************************************
 if (defined('TYPO3_enterInstallScript') && TYPO3_enterInstallScript)   {
-       if (!t3lib_extMgm::isLoaded('install') && !t3lib_extMgm::isLoaded('install_old'))       die('Install Tool is not loaded as an extension.<br/>You must add the key "install" to the list of installed extensions in typo3conf/localconf.php, $TYPO3_CONF_VARS["EXT"]["extList"].');
-
-
-
-       /* <beta-code TYPO3 4.2-dev> */
-
-       session_start();
-
-       if($setInstallToolVersion = t3lib_div::_GP('installToolVersion')) {
-               if ($setInstallToolVersion === 'new') {
-                       $lcBackupFileName =  PATH_typo3conf.'localconf-'.date('ymd').'.php';
-                       if (!file_exists($lcBackupFileName))    {
-                               if (!copy(PATH_typo3conf.'localconf.php', $lcBackupFileName)) {
-                                       echo 'Backup of localconf.php failed! Will not start the new install tool.';
-                                       exit;
-                               }
-                       }
-               }
-               $_SESSION['installToolVersion'] = $setInstallToolVersion==='new'?'new':'old';
-       }
-
-       if(!$_SESSION['installToolVersion']) {
-
-               $oldInstallToolLoaded = t3lib_extMgm::isLoaded('install_old');
-               $newInstallToolLoaded = t3lib_extMgm::isLoaded('install');
-
-               echo '
-                       <link rel="stylesheet" href="../stylesheet.css" />
-                       <p style="margin: 20px;">Please select the install tool version to use for this browser session:</p>
-                       <ul>
-                               <li>
-                                       '.($oldInstallToolLoaded?'<a href="index.php?installToolVersion=old&'.htmlspecialchars(t3lib_div::getIndpEnv('QUERY_STRING')).'">':'').'
-                                               Traditional Install Tool
-                                       '.($oldInstallToolLoaded?'</a>':' (The extension "install_old" must be installed for this to work.)').'
-                               </li>
-                               <li>
-                                       '.($newInstallToolLoaded?'<a href="index.php?installToolVersion=new&'.htmlspecialchars(t3lib_div::getIndpEnv('QUERY_STRING')).'">':'').'
-                                               New Install Tool for TYPO3 4.2
-                                       '.($newInstallToolLoaded?'</a>':' (The extension "install" must be installed for this to work.)').'<br /><b>If you choose this option, a backup of the localconf file which is named localconf-YYMMDD.php is automatically created.</b>
-                               </li>
-                       </ul>
-               ';
-               exit();
+       if(!t3lib_extMgm::isLoaded('install')) {
+               die('Install Tool is not loaded as an extension.<br/>You must add the key "install" to the list of installed extensions in typo3conf/localconf.php, $TYPO3_CONF_VARS["EXT"]["extList"].');
        }
 
-       if($_SESSION['installToolVersion'] === 'old') {
-               require_once(t3lib_extMgm::extPath('install_old').'mod/class.tx_install.php');
-               $install_check = t3lib_div::makeInstance('tx_install');
-               $install_check->allowUpdateLocalConf = 1;
-               $install_check->init();
-               exit;
-       } else {
-               require_once(t3lib_extMgm::extPath('install').'mod/class.tx_install.php');
-               $install_check = t3lib_div::makeInstance('tx_install');
-               $install_check->allowUpdateLocalConf = 1;
-               $install_check->init();
-               exit;           
-       }
-
-       /* </beta-code> */
-
-       /*
-       <original-code>
-
        require_once(t3lib_extMgm::extPath('install').'mod/class.tx_install.php');
        $install_check = t3lib_div::makeInstance('tx_install');
        $install_check->allowUpdateLocalConf = 1;
        $install_check->init();
        exit;
-
-       </original-code> 
-       */
 }
 
 
index c985143..7e6d23c 100755 (executable)
@@ -1,5 +1,5 @@
 <?php
 if (!defined ('TYPO3_MODE'))   die ('Access denied.');
 
-if (TYPO3_MODE=='BE')  t3lib_extMgm::addModule('tools','install_old','',t3lib_extMgm::extPath($_EXTKEY).'mod/');
+if (TYPO3_MODE=='BE')  t3lib_extMgm::addModule('tools','install','',t3lib_extMgm::extPath($_EXTKEY).'mod/');
 ?>
\ No newline at end of file
index 9d4ad6f..b38a487 100755 (executable)
@@ -152,11 +152,11 @@ require_once (PATH_t3lib.'class.t3lib_install.php');
 require_once (PATH_t3lib.'class.t3lib_stdgraphic.php');
 
 // include update classes
-require_once(t3lib_extMgm::extPath('install_old').'updates/class.tx_coreupdates_compatversion.php');
-require_once(t3lib_extMgm::extPath('install_old').'updates/class.tx_coreupdates_notinmenu.php');
-require_once(t3lib_extMgm::extPath('install_old').'updates/class.tx_coreupdates_mergeadvanced.php');
+require_once(t3lib_extMgm::extPath('install').'updates/class.tx_coreupdates_compatversion.php');
+require_once(t3lib_extMgm::extPath('install').'updates/class.tx_coreupdates_notinmenu.php');
+require_once(t3lib_extMgm::extPath('install').'updates/class.tx_coreupdates_mergeadvanced.php');
+
 
-    
 /**
  * Install Tool module
  *
@@ -2493,7 +2493,7 @@ From sub-directory:
         */
        function isGIF()        {
                if (function_exists('imagecreatefromgif') && function_exists('imagegif') && ($this->ImageTypes() & IMG_GIF))    {       // If GIF-functions exists, also do a real test of them:
-                       $im = @imagecreatefromgif(t3lib_extMgm::extPath('install_old').'imgs/jesus.gif');
+                       $im = @imagecreatefromgif(t3lib_extMgm::extPath('install').'imgs/jesus.gif');
                        return $im?1:0;
                }
        }
@@ -2516,7 +2516,7 @@ From sub-directory:
         */
        function isPNG()        {
                if (function_exists('imagecreatefrompng') && function_exists('imagepng') && ($this->ImageTypes() & IMG_PNG))    {
-                       $im = imagecreatefrompng(t3lib_extMgm::extPath('install_old').'imgs/jesus.png');
+                       $im = imagecreatefrompng(t3lib_extMgm::extPath('install').'imgs/jesus.png');
                        return $im?1:0;
                }
        }
@@ -2755,7 +2755,7 @@ From sub-directory:
                                        while(list(,$ext)=each($extArr))        {
                                                if ($this->isExtensionEnabled($ext, $headCode, "Read ".strtoupper($ext)))       {
                                                        $imageProc->IM_commands=array();
-                                                       $theFile = t3lib_extMgm::extPath('install_old').'imgs/jesus.'.$ext;
+                                                       $theFile = t3lib_extMgm::extPath('install').'imgs/jesus.'.$ext;
                                                        if (!@is_file($theFile))        die('Error: '.$theFile.' was not a file');
 
                                                        $imageProc->imageMagickConvert_forceFileNameBody='read_'.$ext;
@@ -2767,7 +2767,7 @@ From sub-directory:
 
                                        if ($this->isExtensionEnabled('pdf', $headCode, 'Read PDF'))    {
                                                $imageProc->IM_commands=array();
-                                               $theFile = t3lib_extMgm::extPath('install_old').'imgs/pdf_from_imagemagick.pdf';
+                                               $theFile = t3lib_extMgm::extPath('install').'imgs/pdf_from_imagemagick.pdf';
                                                if (!@is_file($theFile))        die('Error: '.$theFile.' was not a file');
 
                                                $imageProc->imageMagickConvert_forceFileNameBody='read_pdf';
@@ -2777,7 +2777,7 @@ From sub-directory:
                                        }
                                        if ($this->isExtensionEnabled('ai', $headCode, 'Read AI'))      {
                                                $imageProc->IM_commands=array();
-                                               $theFile = t3lib_extMgm::extPath('install_old').'imgs/typo3logotype.ai';
+                                               $theFile = t3lib_extMgm::extPath('install').'imgs/typo3logotype.ai';
                                                if (!@is_file($theFile))        die('Error: '.$theFile.' was not a file');
 
                                                $imageProc->imageMagickConvert_forceFileNameBody='read_ai';
@@ -2805,7 +2805,7 @@ From sub-directory:
                                if ($imActive)  {
                                                // Writing GIF
                                        $imageProc->IM_commands=array();
-                                       $theFile = t3lib_extMgm::extPath('install_old').'imgs/jesus.gif';
+                                       $theFile = t3lib_extMgm::extPath('install').'imgs/jesus.gif';
                                        if (!@is_file($theFile))        die('Error: '.$theFile.' was not a file');
 
                                        $imageProc->imageMagickConvert_forceFileNameBody='write_gif';
@@ -2824,7 +2824,7 @@ From sub-directory:
 
                                                // Writing PNG
                                        $imageProc->IM_commands=array();
-                                       $theFile = t3lib_extMgm::extPath('install_old').'imgs/jesus.gif';
+                                       $theFile = t3lib_extMgm::extPath('install').'imgs/jesus.gif';
 
                                        $imageProc->imageMagickConvert_forceFileNameBody='write_png';
                                        $fileInfo = $imageProc->imageMagickConvert($theFile,'png',"",'',"",'',"",1);
@@ -2849,7 +2849,7 @@ From sub-directory:
                                if ($imActive)  {
                                                // Scaling transparent image
                                        $imageProc->IM_commands=array();
-                                       $theFile = t3lib_extMgm::extPath('install_old').'imgs/jesus2_transp.gif';
+                                       $theFile = t3lib_extMgm::extPath('install').'imgs/jesus2_transp.gif';
                                        if (!@is_file($theFile))        die('Error: '.$theFile.' was not a file');
 
                                        $imageProc->imageMagickConvert_forceFileNameBody='scale_gif';
@@ -2866,7 +2866,7 @@ From sub-directory:
                                        $this->message($headCode,'GIF to GIF, 150 pixels wide',$result[0],$result[1]);
 
                                        $imageProc->IM_commands=array();
-                                       $theFile = t3lib_extMgm::extPath('install_old').'imgs/jesus2_transp.png';
+                                       $theFile = t3lib_extMgm::extPath('install').'imgs/jesus2_transp.png';
                                        if (!@is_file($theFile))        die('Error: '.$theFile.' was not a file');
 
                                        $imageProc->imageMagickConvert_forceFileNameBody='scale_png';
@@ -2875,7 +2875,7 @@ From sub-directory:
                                        $this->message($headCode,'PNG to PNG, 150 pixels wide',$result[0],$result[1]);
 
                                        $imageProc->IM_commands=array();
-                                       $theFile = t3lib_extMgm::extPath('install_old').'imgs/jesus2_transp.gif';
+                                       $theFile = t3lib_extMgm::extPath('install').'imgs/jesus2_transp.gif';
                                        if (!@is_file($theFile))        die('Error: '.$theFile.' was not a file');
                                        $imageProc->imageMagickConvert_forceFileNameBody='scale_jpg';
                                        $fileInfo = $imageProc->imageMagickConvert($theFile,'jpg',"150",'',"",'',"",1);
@@ -2900,9 +2900,9 @@ From sub-directory:
 
                                if ($imActive)  {
                                        $imageProc->IM_commands=array();
-                                       $input = t3lib_extMgm::extPath('install_old').'imgs/greenback.gif';
-                                       $overlay = t3lib_extMgm::extPath('install_old').'imgs/jesus.jpg';
-                                       $mask = t3lib_extMgm::extPath('install_old').'imgs/blackwhite_mask.gif';
+                                       $input = t3lib_extMgm::extPath('install').'imgs/greenback.gif';
+                                       $overlay = t3lib_extMgm::extPath('install').'imgs/jesus.jpg';
+                                       $mask = t3lib_extMgm::extPath('install').'imgs/blackwhite_mask.gif';
                                                if (!@is_file($input))  die('Error: '.$input.' was not a file');
                                                if (!@is_file($overlay))        die('Error: '.$overlay.' was not a file');
                                                if (!@is_file($mask))   die('Error: '.$mask.' was not a file');
@@ -2915,9 +2915,9 @@ From sub-directory:
 
                                        // Combine
                                        $imageProc->IM_commands=array();
-                                       $input = t3lib_extMgm::extPath('install_old').'imgs/combine_back.jpg';
-                                       $overlay = t3lib_extMgm::extPath('install_old').'imgs/jesus.jpg';
-                                       $mask = t3lib_extMgm::extPath('install_old').'imgs/combine_mask.jpg';
+                                       $input = t3lib_extMgm::extPath('install').'imgs/combine_back.jpg';
+                                       $overlay = t3lib_extMgm::extPath('install').'imgs/jesus.jpg';
+                                       $mask = t3lib_extMgm::extPath('install').'imgs/combine_mask.jpg';
                                                if (!@is_file($input))  die('Error: '.$input.' was not a file');
                                                if (!@is_file($overlay))        die('Error: '.$overlay.' was not a file');
                                                if (!@is_file($mask))   die('Error: '.$mask.' was not a file');
@@ -2966,7 +2966,7 @@ From sub-directory:
 
                                        // GD from image with box
                                        $imageProc->IM_commands=array();
-                                       $input = t3lib_extMgm::extPath('install_old').'imgs/jesus.'.$imageProc->gifExtension;
+                                       $input = t3lib_extMgm::extPath('install').'imgs/jesus.'.$imageProc->gifExtension;
                                                if (!@is_file($input))  die('Error: '.$input.' was not a file');
                                        $im = $imageProc->imageCreateFromFile($input);
                                        $workArea=array(0,0,170,136);
@@ -3133,12 +3133,12 @@ From sub-directory:
                $ex_rows='';
                $errorLevels=array(-1);
                if ($imageFile) {
-                       $verifyFile = t3lib_extMgm::extPath('install_old').'verify_imgs/'.basename($imageFile);
+                       $verifyFile = t3lib_extMgm::extPath('install').'verify_imgs/'.basename($imageFile);
 #debug(array($imageFile,$this->backPath.'../'.substr($imageFile,strlen(PATH_site))),1);
                        $destImg = @getImageSize($imageFile);
                        $destImgCode ='<img src="'.$this->backPath.'../'.substr($imageFile,strlen(PATH_site)).'" '.$destImg[3].'>';
                        $verifyImg = @getImageSize($verifyFile);
-                       $verifyImgCode = '<img src="'.$this->backPath.t3lib_extMgm::extRelPath('install_old').'verify_imgs/'.basename($verifyFile).'" '.$verifyImg[3].'>';
+                       $verifyImgCode = '<img src="'.$this->backPath.t3lib_extMgm::extRelPath('install').'verify_imgs/'.basename($verifyFile).'" '.$verifyImg[3].'>';
                        if (!$verifyImg)        {
                                $gifVersion=1;
                                $verifyFile_alt = substr($verifyFile,0,-3).'gif';