badmanners/shimmie2
badmanners/shimmie2
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove duplicate code

Browse source
This commit is contained in:
Shish 2012-02-22 10:18:07 +00:00
parent 0e6b20f286
commit cf621c066c
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ext/handle_404/main.php
View file

@ -17,17 +17,17 @@ class Handle404 extends Extension {
$f_pagename = preg_replace("/[^a-z\.]+/", "_", $h_pagename); $f_pagename = preg_replace("/[^a-z\.]+/", "_", $h_pagename);
$theme_name = $config->get_string("theme", "default"); $theme_name = $config->get_string("theme", "default");
if(file_exists("themes/$theme_name/$f_pagename")) { if(file_exists("themes/$theme_name/$f_pagename") || file_exists("lib/static/$f_pagename")) {
$filename = file_exists("themes/$theme_name/$f_pagename") ?
"themes/$theme_name/$f_pagename" : "lib/static/$f_pagename";
header("Cache-control: public, max-age=600"); header("Cache-control: public, max-age=600");
header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 600) . ' GMT'); header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 600) . ' GMT');
$page->set_mode("data"); $page->set_mode("data");
$page->set_data(file_get_contents("themes/$theme_name/$f_pagename")); $page->set_data(file_get_contents($filename));
} if(endsWith($filename, ".ico")) $page->set_type("image/x-icon");
else if(file_exists("lib/static/$f_pagename")) { if(endsWith($filename, ".png")) $page->set_type("image/png");
header("Cache-control: public, max-age=600"); if(endsWith($filename, ".txt")) $page->set_type("text/plain");
header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 600) . ' GMT');
$page->set_mode("data");
$page->set_data(file_get_contents("lib/static/$f_pagename"));
} }
else { else {
log_debug("handle_404", "Hit 404: $h_pagename"); log_debug("handle_404", "Hit 404: $h_pagename");