X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftheme%2Fvier%2Fstyle.php;h=4dfbe4e268f1a837c1b1f2adc15c4ee09c454fcd;hb=34bc0b0c97b7ba4a29d217c33227906e2ced6a73;hp=0c6667423b68ad05b436025218e81b97c8f671d6;hpb=30c1cc0e8cec5438fd8fe36bd4ea00991dc01934;p=friendica.git

diff --git a/view/theme/vier/style.php b/view/theme/vier/style.php
index 0c6667423b..4dfbe4e268 100644
--- a/view/theme/vier/style.php
+++ b/view/theme/vier/style.php
@@ -2,11 +2,12 @@
 /**
  * @file view/theme/vier/style.php
  */
+use Friendica\Core\Logger;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Model\Profile;
 
-$uid = Profile::getThemeUid();
+$uid = defaults($_REQUEST, 'puid', 0);
 
 $style = PConfig::get($uid, 'vier', 'style');
 
@@ -18,32 +19,22 @@ 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 = '';
+
+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,7 +45,6 @@ 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']));