X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftheme%2Fvier%2Fstyle.php;h=d777864825a11cf98b2aeb1d692ab1567b44d7b4;hb=f97636193552ffeed8b531139d9fe632e4f8ae7d;hp=72731a9bebc9843d3c7949c7a53e7a9abfe16593;hpb=649578ae333e70280f8100b36f7d9e95cf27b64a;p=friendica.git

diff --git a/view/theme/vier/style.php b/view/theme/vier/style.php
index 72731a9beb..d777864825 100644
--- a/view/theme/vier/style.php
+++ b/view/theme/vier/style.php
@@ -1,28 +1,56 @@
 <?php
+/**
+ * @file view/theme/vier/style.php
+ */
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
+use Friendica\Model\Profile;
 
-if (file_exists("$THEMEPATH//style.css")){
-	echo file_get_contents("$THEMEPATH//style.css");
+$uid = Profile::getThemeUid();
+
+$style = PConfig::get($uid, 'vier', 'style');
+
+if (empty($style)) {
+	$style = Config::get('vier', 'style');
+}
+
+if (empty($style)) {
+	$style = "plus";
 }
 
-$uid = get_theme_uid();
+$stylecss = '';
+$modified = '';
 
-$style = get_pconfig( $uid, 'vier', '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('Error: missing file: "' . $stylecssfile .'" (userid: '. $uid .')');
+	}
+}
+$modified = gmdate('r', $modified);
 
-if ($style == "")
-	$style = get_config('vier', 'style');
+$etag = md5($stylecss);
 
-if ($style == "")
-	$style = "plus";
+// Only send the CSS file if it was changed
+header('Cache-Control: public');
+header('ETag: "'.$etag.'"');
+header('Last-Modified: '.$modified);
 
-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');
+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;