X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftheme%2Fvier%2Fstyle.php;h=d777864825a11cf98b2aeb1d692ab1567b44d7b4;hb=2022d0e812d191acd47b8408f933dfb726a21b92;hp=dba758ca24eb374fd7e661761789fd481ca3df0d;hpb=06815f1a38409e45b0c5e5184c081f964ec89e47;p=friendica.git

diff --git a/view/theme/vier/style.php b/view/theme/vier/style.php
index dba758ca24..d777864825 100644
--- a/view/theme/vier/style.php
+++ b/view/theme/vier/style.php
@@ -1,36 +1,39 @@
 <?php
-$uid = get_theme_uid();
+/**
+ * @file view/theme/vier/style.php
+ */
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
+use Friendica\Model\Profile;
 
-$style = get_pconfig($uid, 'vier', 'style');
+$uid = Profile::getThemeUid();
 
-if ($style == "")
-	$style = get_config('vier', 'style');
+$style = PConfig::get($uid, 'vier', 'style');
 
-if ($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';
-
-if (file_exists($THEMEPATH."//style.css")) {
-	$stylecss = file_get_contents($THEMEPATH."//style.css")."\n";
-	$modified = filemtime($THEMEPATH."//style.css");
+if (empty($style)) {
+	$style = Config::get('vier', 'style');
 }
 
-$stylemodified = filemtime($stylecssfile);
-$stylecss .= file_get_contents($stylecssfile);
-
-if ($stylemodified > $modified)
-	$modified = $stylemodified;
+if (empty($style)) {
+	$style = "plus";
+}
 
+$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);
 
 $etag = md5($stylecss);
@@ -41,9 +44,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)) {