X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=view%2Ftheme%2Fvier%2Fstyle.php;h=b1386ad7076dbebf7c48631b553251086a21fe00;hb=0dce57d4007d7e3cff578825f212a7c0a6cb8800;hp=72731a9bebc9843d3c7949c7a53e7a9abfe16593;hpb=f8eca3da91adf28b46083eb704d91edc0be5ee81;p=friendica.git

diff --git a/view/theme/vier/style.php b/view/theme/vier/style.php
index 72731a9beb..b1386ad707 100644
--- a/view/theme/vier/style.php
+++ b/view/theme/vier/style.php
@@ -1,28 +1,60 @@
 <?php
 
-if (file_exists("$THEMEPATH//style.css")){
-	echo file_get_contents("$THEMEPATH//style.css");
-}
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
 
 $uid = get_theme_uid();
 
-$style = get_pconfig( $uid, 'vier', 'style');
+$style = PConfig::get($uid, 'vier', 'style');
 
 if ($style == "")
-	$style = get_config('vier', 'style');
+	$style = Config::get('vier', 'style');
 
 if ($style == "")
 	$style = "plus";
 
 if ($style == "flat")
-	$stylecss = file_get_contents('view/theme/vier/flat.css');
+	$stylecssfile = 'view/theme/vier/flat.css';
 else if ($style == "netcolour")
-	$stylecss = file_get_contents('view/theme/vier/netcolour.css');
+	$stylecssfile = 'view/theme/vier/netcolour.css';
 else if ($style == "breathe")
-	$stylecss = file_get_contents('view/theme/vier/breathe.css');
+	$stylecssfile = 'view/theme/vier/breathe.css';
 else if ($style == "plus")
-	$stylecss = file_get_contents('view/theme/vier/plus.css');
+	$stylecssfile = 'view/theme/vier/plus.css';
 else if ($style == "dark")
-	$stylecss = file_get_contents('view/theme/vier/dark.css');
+	$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;
+
+$modified = gmdate('r', $modified);
 
+$etag = md5($stylecss);
+
+// Only send the CSS file if it was changed
+header('Cache-Control: public');
+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('', ''),
+				stripslashes($_SERVER['HTTP_IF_NONE_MATCH']));
+
+	if (($cached_modified == $modified) && ($cached_etag == $etag)) {
+		header('HTTP/1.1 304 Not Modified');
+		exit();
+	}
+}
 echo $stylecss;