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 0c6667423b68ad05b436025218e81b97c8f671d6..8cd0d7a32aae8921ab67db53ee12faf928a96bb9 100644 (file)
--- a/view/theme/vier/style.php
+++ b/view/theme/vier/style.php
@@ -1,49 +1,57 @@
 <?php
 /**
- * @file view/theme/vier/style.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/>.
+ *
  */
-use Friendica\Core\Config;
-use Friendica\Core\PConfig;
-use Friendica\Model\Profile;
 
-$uid = Profile::getThemeUid();
+use Friendica\Core\Logger;
+use Friendica\DI;
 
-$style = PConfig::get($uid, 'vier', 'style');
+$uid = $_REQUEST['puid'] ?? 0;
+
+$style = DI::pConfig()->get($uid, 'vier', 'style');
 
 if (empty($style)) {
-       $style = Config::get('vier', 'style');
+       $style = DI::config()->get('vier', 'style');
 }
 
 if (empty($style)) {
        $style = "plus";
 }
 
-if ($style == "flat") {
-       $stylecssfile = 'view/theme/vier/flat.css';
-} else if ($style == "netcolour") {
-       $stylecssfile = 'view/theme/vier/netcolour.css';
-} else if ($style == "breathe") {
-       $stylecssfile = 'view/theme/vier/breathe.css';
-} else if ($style == "plus") {
-       $stylecssfile = 'view/theme/vier/plus.css';
-} else if ($style == "dark") {
-       $stylecssfile = 'view/theme/vier/dark.css';
-} else if ($style == "plusminus") {
-       $stylecssfile = 'view/theme/vier/plusminus.css';
-}
-
-if (file_exists($THEMEPATH."//style.css")) {
-       $stylecss = file_get_contents($THEMEPATH."//style.css")."\n";
-       $modified = filemtime($THEMEPATH."//style.css");
-}
+$stylecss = '';
+$modified = '';
 
-$stylemodified = filemtime($stylecssfile);
-$stylecss .= file_get_contents($stylecssfile);
+$style = \Friendica\Util\Strings::sanitizeFilePathItem($style);
 
-if ($stylemodified > $modified) {
-       $modified = $stylemodified;
+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);
@@ -53,8 +61,7 @@ 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']));