projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ff39344)
Embed the assets as data URIs in rescueMode.tpl
authorTim Düsterhus <duesterhus@woltlab.com>
Wed, 13 Apr 2022 08:06:35 +0000 (10:06 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Wed, 13 Apr 2022 08:26:02 +0000 (10:26 +0200)
The same reasoning as for the change to WCFSetup in
600940bc4fe0cbc219ba6fd9a89444aefa07dda5 applies:

With this change the rescue mode is fully self-contained and does not rely on
external requests that need to be served using PHP, making it more resilient.

It also avoids the expensive rebuild of the compiled ACP CSS, because it now
uses the prebuilt WCFSetup.css which can be used as-is for this purpose.

wcfsetup/install/files/acp/templates/rescueMode.tpl patch | blob | blame | history
wcfsetup/install/files/lib/acp/form/RescueModeForm.class.php patch | blob | blame | history

diff --git a/wcfsetup/install/files/acp/templates/rescueMode.tpl b/wcfsetup/install/files/acp/templates/rescueMode.tpl
index 1b53b97d36c5dc7c83d8fe0131d11141eeeb2cfb..6408a4c8c634a99e99db75b3e99d3ac686f1d5c9 100644 (file)
--- a/wcfsetup/install/files/acp/templates/rescueMode.tpl
+++ b/wcfsetup/install/files/acp/templates/rescueMode.tpl
@@ -5,7 +5,7 @@
        <meta name="robots" content="noindex">
        <title>{lang}wcf.acp.rescueMode{/lang} - {lang}wcf.global.acp{/lang}{if PACKAGE_ID} - {PAGE_TITLE|phrase}{/if}</title>
        
-       <link rel="stylesheet" href="{$pageURL}&amp;proxy=css">
+       <link rel="stylesheet" href="{$assets['WCFSetup.css']}">
 </head>
 
 <body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}" class="wcfAcp">
@@ -17,7 +17,7 @@
                        <div class="layoutBoundary">
                                <div id="pageHeaderLogo" class="pageHeaderLogo">
                                        <a href="{$pageURL}">
-                                               <img src="{$pageURL}&amp;proxy=logo" alt="" class="pageHeaderLogoLarge" style="width: 281px;height: 40px;display: inline !important;">
+                                               <img src="{$assets['woltlabSuite.png']}" alt="" class="pageHeaderLogoLarge" style="width: 281px;height: 40px;display: inline !important;">
                                        </a>
                                </div>
                        </div>
diff --git a/wcfsetup/install/files/lib/acp/form/RescueModeForm.class.php b/wcfsetup/install/files/lib/acp/form/RescueModeForm.class.php
index e0209b3470d2d60526ad706038f4c30908fa98e4..5a84fb29136db1f5338b119745e3e57e5c440d5e 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/RescueModeForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/RescueModeForm.class.php
@@ -12,10 +12,8 @@ use wcf\data\user\authentication\failure\UserAuthenticationFailureAction;
 use wcf\data\user\User;
 use wcf\form\AbstractCaptchaForm;
 use wcf\system\application\ApplicationHandler;
-use wcf\system\exception\IllegalLinkException;
 use wcf\system\exception\NamedUserException;
 use wcf\system\exception\UserInputException;
-use wcf\system\style\StyleHandler;
 use wcf\system\user\authentication\EmailUserAuthentication;
 use wcf\system\user\authentication\UserAuthenticationFactory;
 use wcf\system\WCF;
@@ -89,37 +87,6 @@ class RescueModeForm extends AbstractCaptchaForm
     {
         parent::readParameters();
 
-        // request style generation to prevent issues when using the proxy parameter
-        StyleHandler::getInstance()->getStylesheet(true);
-
-        if (isset($_GET['proxy'])) {
-            switch ($_GET['proxy']) {
-                case 'css':
-                    $file = WCF_DIR . 'acp/style/style.css';
-
-                    \header('Content-Type: text/css; charset=UTF-8');
-                    break;
-
-                case 'logo':
-                    $file = WCF_DIR . 'images/default-logo.png';
-
-                    \header('Content-Type: image/png');
-                    break;
-
-                default:
-                    throw new IllegalLinkException();
-                    break;
-            }
-
-            \header('Expires: ' . \gmdate('D, d M Y H:i:s', \time() + 3600) . ' GMT');
-            \header('Last-Modified: Mon, 26 Jul 1997 05:00:00 GMT');
-            \header('Cache-Control: public, max-age=3600');
-
-            \readfile($file);
-
-            exit;
-        }
-
         // check authentication failures
         if (ENABLE_USER_AUTHENTICATION_FAILURE) {
             $failures = UserAuthenticationFailure::countIPFailures(UserUtil::getIpAddress());
@@ -358,6 +325,16 @@ class RescueModeForm extends AbstractCaptchaForm
             'pageURL' => WCFACP::getRescueModePageURL() . 'acp/index.php?rescue-mode/',
             'password' => $this->password,
             'username' => $this->username,
+            'assets' => [
+                'woltlabSuite.png' => \sprintf(
+                    'data:image/png;base64,%s',
+                    \base64_encode(\file_get_contents(WCF_DIR . 'acp/images/woltlabSuite.png'))
+                ),
+                'WCFSetup.css' => \sprintf(
+                    'data:text/css;base64,%s',
+                    \base64_encode(\file_get_contents(WCF_DIR . 'acp/style/setup/WCFSetup.css'))
+                ),
+            ],
         ]);
     }
 }
WoltLab Suite Core (previously WoltLab Community Framework)