Merge pull request #12501 from MarekBenjamin/improve-registraiton-text-input

[friendica.git] / view / theme / vier / style.php

diff --git a/view/theme/vier/style.php b/view/theme/vier/style.php
index ac5cd08efb3b0bd13bea1bdb0def39f949209d74..74975893ce8ac6d17a288a2562d94ee58f6cfdad 100644 (file)
--- a/view/theme/vier/style.php
+++ b/view/theme/vier/style.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,17 +21,18 @@
 
 use Friendica\Core\Logger;
 use Friendica\DI;
+use Friendica\Network\HTTPException\NotModifiedException;
 
-$uid = $_REQUEST['puid'] ?? 0;
-
-$style = DI::pConfig()->get($uid, 'vier', 'style');
+/*
+ * This script can be included when the maintenance mode is on, which requires us to avoid any config call and
+ * use the following hardcoded default
+ */
+$style = 'plus';
 
-if (empty($style)) {
-       $style = DI::config()->get('vier', 'style');
-}
+if (DI::mode()->has(\Friendica\App\Mode::MAINTENANCEDISABLED)) {
+       $uid = $_REQUEST['puid'] ?? 0;
 
-if (empty($style)) {
-       $style = "plus";
+       $style = DI::pConfig()->get($uid, 'vier', 'style', DI::config()->get('vier', 'style', $style));
 }
 
 $stylecss = '';
@@ -48,8 +49,7 @@ foreach (['style', $style] as $file) {
                        $modified = $stylemodified;
                }
        } else {
-               //TODO: use Logger::ERROR?
-               Logger::log('Error: missing file: "' . $stylecssfile .'" (userid: '. $uid .')');
+               Logger::warning('Missing CSS file', ['file' => $stylecssfile, 'uid' => $uid]);
        }
 }
 $modified = gmdate('r', $modified);
@@ -61,14 +61,13 @@ header('Cache-Control: public');
 header('ETag: "'.$etag.'"');
 header('Last-Modified: '.$modified);
 
-if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) || isset($_SERVER['HTTP_IF_NONE_MATCH'])) {
+if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && isset($_SERVER['HTTP_IF_NONE_MATCH'])) {
        $cached_modified = gmdate('r', strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']));
        $cached_etag = str_replace(['"', "-gzip"], ['', ''],
                                stripslashes($_SERVER['HTTP_IF_NONE_MATCH']));
 
        if (($cached_modified == $modified) && ($cached_etag == $etag)) {
-               header('HTTP/1.1 304 Not Modified');
-               exit();
+               throw new NotModifiedException();
        }
 }
 echo $stylecss;