Fixed bug #14214: Install tool hooks are not complete and could be better
authorPatrick Broens <patrick@netcreators.com>
Tue, 27 Apr 2010 06:51:09 +0000 (06:51 +0000)
committerPatrick Broens <patrick@netcreators.com>
Tue, 27 Apr 2010 06:51:09 +0000 (06:51 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@7434 709f56b5-9817-0410-a4d7-c38de5d9e867

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

index bd5c790..cecd5be 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-27  Patrick Broens  <patrick@patrickbroens.nl>
+
+       * Fixed bug #14214: Install tool hooks are not complete and could be better 
+
 2010-04-26  Susanne Moog  <typo3@susanne-moog.de>
 
        * Follow-up to bug #12908: reverted changes in CSC 4.3 folder due to new rules, added comment to IE hacks (thanks to Helmut Hummel)
index 163880c..1de7bee 100755 (executable)
@@ -294,7 +294,7 @@ class tx_install extends t3lib_install {
                if (is_array ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install/mod/class.tx_install.php']['additionalSteps'])) {
                        foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install/mod/class.tx_install.php']['additionalSteps'] as $classData) {
                                $hookObject = t3lib_div::getUserObj($classData);
-                               $this->totalSteps += (integer) $hookObject->execute();
+                               $this->totalSteps += (integer) $hookObject->executeAdditionalSteps($this);
                        }
                }
 
@@ -959,7 +959,7 @@ REMOTE_ADDR was '".t3lib_div::getIndpEnv('REMOTE_ADDR')."' (".t3lib_div::getIndp
                if (is_array ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install/mod/class.tx_install.php']['stepOutput'])) {
                        foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install/mod/class.tx_install.php']['stepOutput'] as $classData) {
                                $hookObject = t3lib_div::getUserObj($classData);
-                               $hookObject->execute($markers, $this->step, $this);
+                               $hookObject->executeStepOutput($markers, $this->step, $this);
                        }
                }
                        // Use the default steps when there is no override
@@ -3865,10 +3865,15 @@ REMOTE_ADDR was '".t3lib_div::getIndpEnv('REMOTE_ADDR')."' (".t3lib_div::getIndp
                                                                if (strcmp($GLOBALS['TYPO3_CONF_VARS']['GFX']['TTFdpi'],$value))        $this->setValueInLocalconfFile($lines, '$TYPO3_CONF_VARS[\'GFX\'][\'TTFdpi\']', $value);
                                                        break;
                                                }
-
-
                                        }
 
+                                               // Hook to modify localconf.php lines in the 1-2-3 installer
+                                       if (is_array ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install/mod/class.tx_install.php']['writeLocalconf'])) {
+                                               foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install/mod/class.tx_install.php']['writeLocalconf'] as $classData) {
+                                                       $hookObject = t3lib_div::getUserObj($classData);
+                                                       $hookObject->executeWriteLocalconf($lines, $this->step, $this);
+                                               }
+                                       }
                                        $this->writeToLocalconf_control($lines);
                                }
                        break;