Merge pull request #9757 from MrPetovan/bug/9716-show-edited-date-non-frio

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

diff --git a/view/theme/vier/style.php b/view/theme/vier/style.php
index e118d1ef0905cf77b11001f65156a11732c5fba0..8cd0d7a32aae8921ab67db53ee12faf928a96bb9 100644 (file)
--- a/view/theme/vier/style.php
+++ b/view/theme/vier/style.php
@@ -1,30 +1,74 @@
 <?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
-if (file_exists("$THEMEPATH//style.css")){
-       echo file_get_contents("$THEMEPATH//style.css");
-}
+use Friendica\Core\Logger;
+use Friendica\DI;
 
-$uid = get_theme_uid();
+$uid = $_REQUEST['puid'] ?? 0;
 
-$style = get_pconfig( $uid, 'vier', 'style');
+$style = DI::pConfig()->get($uid, 'vier', 'style');
 
-if ($style == "")
-       $style = get_config('vier', 'style');
+if (empty($style)) {
+       $style = DI::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 = '';
 
-echo $stylecss;
+$style = \Friendica\Util\Strings::sanitizeFilePathItem($style);
+
+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::log('Error: missing file: "' . $stylecssfile .'" (userid: '. $uid .')');
+       }
+}
+$modified = gmdate('r', $modified);
+
+$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;