@brief is removed completely

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

diff --git a/view/theme/vier/style.php b/view/theme/vier/style.php
index 407e080550e13d31a23b0e91f031c8aa6c6a0d32..f8068646ca58ec2001074d55eb69b25b67327dcf 100644 (file)
--- a/view/theme/vier/style.php
+++ b/view/theme/vier/style.php
@@ -2,48 +2,40 @@
 /**
  * @file view/theme/vier/style.php
  */
+use Friendica\Core\Logger;
 use Friendica\Core\Config;
-use Friendica\Core\PConfig;
-use Friendica\Model\Profile;
+use Friendica\DI;
 
-$uid = Profile::getThemeUid();
+$uid = $_REQUEST['puid'] ?? 0;
 
-$style = PConfig::get($uid, 'vier', 'style');
+$style = DI::pConfig()->get($uid, 'vier', 'style');
 
-if ($style == "") {
+if (empty($style)) {
        $style = Config::get('vier', 'style');
 }
 
-if ($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");
-}
-
-$stylemodified = filemtime($stylecssfile);
-$stylecss .= file_get_contents($stylecssfile);
-
-if ($stylemodified > $modified) {
-       $modified = $stylemodified;
+$stylecss = '';
+$modified = '';
+
+$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);
@@ -54,9 +46,8 @@ 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(array('"', "-gzip"), array('', ''),
+       $cached_etag = str_replace(['"', "-gzip"], ['', ''],
                                stripslashes($_SERVER['HTTP_IF_NONE_MATCH']));
 
        if (($cached_modified == $modified) && ($cached_etag == $etag)) {