[frio] Fix wrongly removed content wrapper and fix CSS instead. (#5496) (#5505)

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

diff --git a/view/theme/vier/style.php b/view/theme/vier/style.php
index e118d1ef0905cf77b11001f65156a11732c5fba0..d777864825a11cf98b2aeb1d692ab1567b44d7b4 100644 (file)
--- a/view/theme/vier/style.php
+++ b/view/theme/vier/style.php
@@ -1,30 +1,56 @@
 <?php
+/**
+ * @file view/theme/vier/style.php
+ */
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
+use Friendica\Model\Profile;
 
-if (file_exists("$THEMEPATH//style.css")){
-       echo file_get_contents("$THEMEPATH//style.css");
-}
-
-$uid = get_theme_uid();
+$uid = Profile::getThemeUid();
 
-$style = get_pconfig( $uid, 'vier', 'style');
+$style = PConfig::get($uid, 'vier', 'style');
 
-if ($style == "")
-       $style = get_config('vier', 'style');
+if (empty($style)) {
+       $style = Config::get('vier', 'style');
+}
 
-if ($style == "")
+if (empty($style)) {
        $style = "plus";
+}
 
-if ($style == "flat")
-       $stylecss = file_get_contents('view/theme/vier/flat.css');
-else if ($style == "netcolour")
-       $stylecss = file_get_contents('view/theme/vier/netcolour.css');
-else if ($style == "breathe")
-       $stylecss = file_get_contents('view/theme/vier/breathe.css');
-else if ($style == "plus")
-       $stylecss = file_get_contents('view/theme/vier/plus.css');
-else if ($style == "dark")
-       $stylecss = file_get_contents('view/theme/vier/dark.css');
+$stylecss = '';
+$modified = '';
+
+foreach (['style', $style] as $file) {
+       $stylecssfile = $THEMEPATH . DIRECTORY_SEPARATOR . $file .'.css';
+       if (file_exists($stylecssfile)) {
+               $stylecss .= file_get_contents($stylecssfile);
+               $stylemodified = filemtime($stylecssfile);
+               if ($stylemodified > $modified) {
+                       $modified = $stylemodified;
+               }
+       } else {
+               //TODO: use LOGGER_ERROR?
+               logger('Error: missing file: "' . $stylecssfile .'" (userid: '. $uid .')');
+       }
+}
+$modified = gmdate('r', $modified);
 
-echo $stylecss;
+$etag = md5($stylecss);
+
+// Only send the CSS file if it was changed
+header('Cache-Control: public');
+header('ETag: "'.$etag.'"');
+header('Last-Modified: '.$modified);
 
+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();
+       }
+}
+echo $stylecss;