nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #4646 from Andi-K/3.6-rc

Browse source 
vier: replace hard coded style paths
This commit is contained in:
Hypolite Petovan 2018-03-21 21:12:04 -04:00 committed by GitHub
parent f3358b7af4 97840abdd6
commit 0d60f1a7d3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
view/theme/vier/style.php
View file

@ -18,32 +18,22 @@ if (empty($style)) {
$style = "plus"; $style = "plus";
} }
if ($style == "flat") { $stylecss = '';
$stylecssfile = 'view/theme/vier/flat.css'; $modified = '';
} else if ($style == "netcolour") {
$stylecssfile = 'view/theme/vier/netcolour.css'; foreach (['style', $style] as $file) {
} else if ($style == "breathe") { $stylecssfile = $THEMEPATH . DIRECTORY_SEPARATOR . $file .'.css';
$stylecssfile = 'view/theme/vier/breathe.css'; if (file_exists($stylecssfile)) {
} else if ($style == "plus") { $stylecss .= file_get_contents($stylecssfile);
$stylecssfile = 'view/theme/vier/plus.css'; $stylemodified = filemtime($stylecssfile);
} else if ($style == "dark") { if ($stylemodified > $modified) {
$stylecssfile = 'view/theme/vier/dark.css'; $modified = $stylemodified;
} else if ($style == "plusminus") { }
$stylecssfile = 'view/theme/vier/plusminus.css'; } else {
//TODO: use LOGGER_ERROR?
logger('Error: missing file: "' . $stylecssfile .'" (userid: '. $uid .')');
}
} }
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); $modified = gmdate('r', $modified);
$etag = md5($stylecss); $etag = md5($stylecss);
@ -54,7 +44,6 @@ header('ETag: "'.$etag.'"');
header('Last-Modified: '.$modified); header('Last-Modified: '.$modified);
if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) || isset($_SERVER['HTTP_IF_NONE_MATCH'])) { if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) || isset($_SERVER['HTTP_IF_NONE_MATCH'])) {
$cached_modified = gmdate('r', strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE'])); $cached_modified = gmdate('r', strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']));
$cached_etag = str_replace(['"', "-gzip"], ['', ''], $cached_etag = str_replace(['"', "-gzip"], ['', ''],
stripslashes($_SERVER['HTTP_IF_NONE_MATCH'])); stripslashes($_SERVER['HTTP_IF_NONE_MATCH']));