[TASK] Move configuration code from bootstrap to ext:install
[Packages/TYPO3.CMS.git] / typo3 / sysext / core / Classes / Core / Bootstrap.php
index cf14469..2c7f231 100644 (file)
@@ -188,10 +188,8 @@ class Bootstrap {
                        ->checkUtf8DatabaseSettingsOrDie()
                        ->transferDeprecatedCurlSettings()
                        ->setCacheHashOptions()
                        ->checkUtf8DatabaseSettingsOrDie()
                        ->transferDeprecatedCurlSettings()
                        ->setCacheHashOptions()
-                       ->enforceCorrectProxyAuthScheme()
                        ->setDefaultTimezone()
                        ->initializeL10nLocales()
                        ->setDefaultTimezone()
                        ->initializeL10nLocales()
-                       ->configureImageProcessingOptions()
                        ->convertPageNotFoundHandlingToBoolean()
                        ->registerGlobalDebugFunctions()
                        // SwiftMailerAdapter is
                        ->convertPageNotFoundHandlingToBoolean()
                        ->registerGlobalDebugFunctions()
                        // SwiftMailerAdapter is
@@ -427,17 +425,6 @@ class Bootstrap {
                return $this;
        }
 
                return $this;
        }
 
-       /**
-        * $GLOBALS['TYPO3_CONF_VARS']['HTTP']['proxy_auth_scheme'] must be either
-        * 'digest' or 'basic' with fallback to 'basic'
-        *
-        * @return \TYPO3\CMS\Core\Core\Bootstrap
-        */
-       protected function enforceCorrectProxyAuthScheme() {
-               $GLOBALS['TYPO3_CONF_VARS']['HTTP']['proxy_auth_scheme'] === 'digest' ?: ($GLOBALS['TYPO3_CONF_VARS']['HTTP']['proxy_auth_scheme'] = 'basic');
-               return $this;
-       }
-
        /**
         * Set default timezone
         *
        /**
         * Set default timezone
         *
@@ -469,32 +456,6 @@ class Bootstrap {
                return $this;
        }
 
                return $this;
        }
 
-       /**
-        * Based on the configuration of the image processing some options are forced
-        * to simplify configuration settings and combinations
-        *
-        * @return \TYPO3\CMS\Core\Core\Bootstrap
-        */
-       protected function configureImageProcessingOptions() {
-               if (!$GLOBALS['TYPO3_CONF_VARS']['GFX']['image_processing']) {
-                       $GLOBALS['TYPO3_CONF_VARS']['GFX']['im'] = 0;
-                       $GLOBALS['TYPO3_CONF_VARS']['GFX']['gdlib'] = 0;
-               }
-               if (!$GLOBALS['TYPO3_CONF_VARS']['GFX']['im']) {
-                       $GLOBALS['TYPO3_CONF_VARS']['GFX']['im_path'] = '';
-                       $GLOBALS['TYPO3_CONF_VARS']['GFX']['im_path_lzw'] = '';
-                       $GLOBALS['TYPO3_CONF_VARS']['GFX']['imagefile_ext'] = 'gif,jpg,jpeg,png';
-                       $GLOBALS['TYPO3_CONF_VARS']['GFX']['thumbnails'] = 0;
-               }
-               if ($GLOBALS['TYPO3_CONF_VARS']['GFX']['im_version_5']) {
-                       $GLOBALS['TYPO3_CONF_VARS']['GFX']['im_mask_temp_ext_gif'] = 1;
-                       if ($GLOBALS['TYPO3_CONF_VARS']['GFX']['im_version_5'] === 'gm') {
-                               $GLOBALS['TYPO3_CONF_VARS']['GFX']['im_v5effects'] = -1;
-                       }
-               }
-               return $this;
-       }
-
        /**
         * Convert type of "pageNotFound_handling" setting in case it was written as a
         * string (e.g. if edited in Install Tool)
        /**
         * Convert type of "pageNotFound_handling" setting in case it was written as a
         * string (e.g. if edited in Install Tool)
@@ -1060,8 +1021,5 @@ class Bootstrap {
                $GLOBALS['TBE_TEMPLATE'] = Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Template\\DocumentTemplate');
                return $this;
        }
                $GLOBALS['TBE_TEMPLATE'] = Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Template\\DocumentTemplate');
                return $this;
        }
-
 }
 }
-
-
-?>
\ No newline at end of file
+?>