summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--modules/gallery/controllers/combined.php41
-rw-r--r--modules/gallery/helpers/gallery_theme.php18
-rw-r--r--modules/gallery/libraries/Admin_View.php1
-rw-r--r--modules/gallery/libraries/Gallery_View.php94
-rw-r--r--modules/gallery/libraries/Theme_View.php3
-rw-r--r--modules/organize/helpers/organize_theme.php3
-rw-r--r--modules/server_add/helpers/server_add_theme.php3
-rw-r--r--themes/admin_default/views/admin.html.php19
-rw-r--r--themes/default/views/page.html.php15
9 files changed, 157 insertions, 40 deletions
diff --git a/modules/gallery/controllers/combined.php b/modules/gallery/controllers/combined.php
index 510482db..399a60f4 100644
--- a/modules/gallery/controllers/combined.php
+++ b/modules/gallery/controllers/combined.php
@@ -58,5 +58,46 @@ class Combined_Controller extends Controller {
Kohana::close_buffers(false);
print $content;
}
+
+ public function css($key) {
+ if (preg_match('/[^0-9a-f]/', $key)) {
+ // The key can't contain non-hex, so just terminate early
+ Kohana::show_404();
+ }
+
+ // We don't need to save the session for this request
+ Session::abort_save();
+
+ // Our data is immutable, so if they already have a copy then it needs no updating.
+ if (!empty($_SERVER["HTTP_IF_MODIFIED_SINCE"])) {
+ header('HTTP/1.0 304 Not Modified');
+ return;
+ }
+
+ $cache = Cache::instance();
+ if (strpos($_SERVER["HTTP_ACCEPT_ENCODING"], "gzip") !== false ) {
+ $content = $cache->get("{$key}_gz");
+ }
+
+ if (empty($content)) {
+ $content = $cache->get($key);
+ }
+
+ if (empty($content)) {
+ Kohana::show_404();
+ }
+
+ if (strpos($_SERVER["HTTP_ACCEPT_ENCODING"], "gzip") !== false) {
+ header("Content-Encoding: gzip");
+ header("Cache-Control: public");
+ }
+
+ header("Content-Type: text/css; charset=UTF-8");
+ header("Expires: Tue, 19 Jan 2038 00:00:00 GMT");
+ header("Last-Modified: " . gmdate("D, d M Y H:i:s T", time()));
+
+ Kohana::close_buffers(false);
+ print $content;
+ }
}
diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php
index cffecb12..0e3150bc 100644
--- a/modules/gallery/helpers/gallery_theme.php
+++ b/modules/gallery/helpers/gallery_theme.php
@@ -22,13 +22,11 @@ class gallery_theme_Core {
$session = Session::instance();
$buf = "";
if ($session->get("debug")) {
- $buf .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
- url::file("modules/gallery/css/debug.css") . "\" />";
+ $theme->css("modules/gallery/css/debug.css");
}
if (($theme->page_type == "album" || $theme->page_type == "photo")
&& access::can("edit", $theme->item())) {
- $buf .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
- url::file("modules/gallery/css/quick.css") . "\" />";
+ $theme->css("modules/gallery/css/quick.css");
$theme->script("modules/gallery/js/quick.js");
}
@@ -41,8 +39,7 @@ class gallery_theme_Core {
}
if ($session->get("l10n_mode", false)) {
- $buf .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
- url::file("modules/gallery/css/l10n_client.css") . "\" />";
+ $theme->css("modules/gallery/css/l10n_client.css");
$theme->script("lib/jquery.cookie.js");
$theme->script("modules/gallery/js/l10n_client.js");
}
@@ -78,20 +75,15 @@ class gallery_theme_Core {
static function admin_head($theme) {
$session = Session::instance();
- $buf = "";
if ($session->get("debug")) {
- $buf .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
- url::file("modules/gallery/css/debug.css") . "\" />";
+ $theme->css("modules/gallery/css/debug.css");
}
if ($session->get("l10n_mode", false)) {
- $buf .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
- url::file("modules/gallery/css/l10n_client.css") . "\" />";
+ $theme->css("modules/gallery/css/l10n_client.css");
$theme->script("lib/jquery.cookie.js");
$theme->script("modules/gallery/js/l10n_client.js");
}
-
- return $buf;
}
static function page_bottom($theme) {
diff --git a/modules/gallery/libraries/Admin_View.php b/modules/gallery/libraries/Admin_View.php
index 01496c0d..5e0d5feb 100644
--- a/modules/gallery/libraries/Admin_View.php
+++ b/modules/gallery/libraries/Admin_View.php
@@ -99,6 +99,7 @@ class Admin_View_Core extends Gallery_View {
}
if ($function == "admin_head") {
+ array_unshift($blocks, $this->combine_css());
array_unshift($blocks, $this->combine_script());
}
diff --git a/modules/gallery/libraries/Gallery_View.php b/modules/gallery/libraries/Gallery_View.php
index 659b24dc..9d4fe5c0 100644
--- a/modules/gallery/libraries/Gallery_View.php
+++ b/modules/gallery/libraries/Gallery_View.php
@@ -20,6 +20,7 @@
class Gallery_View_Core extends View {
protected $theme_name = null;
protected $scripts = array();
+ protected $css = array();
/**
* Add a script to the combined scripts list.
@@ -86,4 +87,97 @@ class Gallery_View_Core extends View {
return "<script type=\"text/javascript\" src=\"" . url::site("combined/javascript/$key") .
"\"></script>";
}
+
+ /**
+ * Add a css file to the combined css list.
+ * @param $file the relative path to a script from the gallery3 directory
+ */
+ public function css($file, $theme_relative=false) {
+ $this->css[$file] = 1;
+ }
+
+ /**
+ * Add a css file to the combined css list.
+ * @param $file the relative path to a script from the base of the active theme
+ * @param
+ */
+ public function theme_css($file) {
+ $file = "themes/{$this->theme_name}/$file";
+ $this->css[$file] = 1;
+ }
+
+ /**
+ * Combine a series of Javascript files into a single one and cache it in the database, then
+ * return a single <script> element to refer to it.
+ */
+ protected function combine_css() {
+ $links = array();
+ $key = "";
+
+ foreach (array_keys($this->css) as $file) {
+ $path = DOCROOT . $file;
+ if (file_exists($path)) {
+ $stats = stat($path);
+ $links[] = $path;
+ // 7 == size, 9 == mtime, see http://php.net/stat
+ $key = "{$key}$file $stats[7] $stats[9],";
+ } else {
+ Kohana::log("alert", "CSS file missing: " . $file);
+ }
+ }
+
+ $key = md5($key);
+ $cache = Cache::instance();
+ $contents = $cache->get($key);
+
+ $contents = "";
+ if (empty($contents)) {
+ $contents = "";
+ foreach ($links as $link) {
+ $contents .= $this->process_css($link);
+ }
+ $cache->set($key, $contents, array("css"), 30 * 84600);
+ if (function_exists("gzencode")) {
+ $cache->set("{$key}_gz", gzencode($contents, 9, FORCE_GZIP),
+ array("css", "gzip"), 30 * 84600);
+ }
+ }
+ return "<link media=\"screen, projection\" rel=\"stylesheet\" type=\"text/css\" href=\"" .
+ url::site("combined/css/$key") . "\" />";
+ }
+
+ private function process_css($css_file) {
+ static $PATTERN = "#url\(\s*['|\"]{0,1}(.*?)['|\"]{0,1}\s*\)#";
+ $docroot_length = strlen(DOCROOT);
+
+ $css = file_get_contents($css_file);
+ if (preg_match_all($PATTERN, $css, $matches, PREG_SET_ORDER)) {
+ $search = $replace = array();
+ foreach ($matches as $match) {
+ $relative = substr(realpath(dirname($css_file) . "/$match[1]"), $docroot_length);
+ if (!empty($relative)) {
+ $search[] = $match[0];
+ $replace[] = "url('" . url::abs_file($relative) . "')";
+ } else {
+ Kohana::log("alert", sprintf("Missing URL reference '%s' in CSS file '%s' ",
+ $match[1], $css_file));
+ }
+ }
+ $css = str_replace($search, $replace, $css);
+ }
+ $imports = preg_match_all("#@import\s*['|\"]{0,1}(.*?)['|\"]{0,1};#",
+ $css, $matches, PREG_SET_ORDER);
+
+ if ($imports) {
+ $search = $replace = array();
+ foreach ($matches as $match) {
+ Kohana::log("error", dirname($css_file) . "/$match[1]");
+ $search[] = $match[0];
+ $replace[] = $this->process_css(dirname($css_file) . "/$match[1]");
+ }
+ $css = str_replace($search, $replace, $css);
+ }
+
+ return $css;
+ }
} \ No newline at end of file
diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index 8e320f44..bc8e540a 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -201,8 +201,8 @@ class Theme_View_Core extends Gallery_View {
array("gallery_theme", $function),
array_merge(array($this), $args));
}
-
}
+
foreach (module::active() as $module) {
if ($module->name == "gallery") {
continue;
@@ -216,6 +216,7 @@ class Theme_View_Core extends Gallery_View {
}
if ($function == "head") {
+ array_unshift($blocks, $this->combine_css());
array_unshift($blocks, $this->combine_script());
}
diff --git a/modules/organize/helpers/organize_theme.php b/modules/organize/helpers/organize_theme.php
index cddc48b6..02f1f589 100644
--- a/modules/organize/helpers/organize_theme.php
+++ b/modules/organize/helpers/organize_theme.php
@@ -22,7 +22,6 @@ class organize_theme {
// @tdo remove the addition css and organize.js (just here to test)
$theme->script("modules/organize/js/organize_init.js");
$theme->script("modules/organize/js/organize.js");
- return "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
- url::file("modules/organize/css/organize.css") . "\" />";
+ $theme->css("modules/organize/css/organize.css");
}
}
diff --git a/modules/server_add/helpers/server_add_theme.php b/modules/server_add/helpers/server_add_theme.php
index 3df57ee4..02f99690 100644
--- a/modules/server_add/helpers/server_add_theme.php
+++ b/modules/server_add/helpers/server_add_theme.php
@@ -27,8 +27,7 @@ class server_add_theme_Core {
static function admin_head($theme) {
$head = array();
if (strpos(Router::$current_uri, "admin/server_add") !== false) {
- $head[] = "<link media=\"screen, projection\" rel=\"stylesheet\" type=\"text/css\" href=\"" .
- url::file("lib/jquery.autocomplete.css") . "\" />";
+ $theme->css("lib/jquery.autocomplete.css");
$base = url::site("__ARGS__");
$csrf = access::csrf_token();
$head[] = "<script> var base_url = \"$base\"; var csrf = \"$csrf\";</script>";
diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php
index 62f9761f..2a231057 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_default/views/admin.html.php
@@ -6,19 +6,14 @@
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<title><?= t("Admin Dashboard") ?></title>
<link rel="shortcut icon" href="<?= url::file("themes/default/images/favicon.ico") ?>" type="image/x-icon" />
- <link rel="stylesheet" type="text/css" href="<?= url::file("lib/yui/reset-fonts-grids.css") ?>"
- media="screen,projection" />
- <link rel="stylesheet" type="text/css" type="text/css" href="<?= url::file("lib/themeroller/ui.base.css") ?>"
- media="screen,projection" />
- <link rel="stylesheet" type="text/css" href="<?= url::file("lib/superfish/css/superfish.css") ?>"
- media="screen,projection" />
- <link rel="stylesheet" type="text/css" href="<?= url::file("themes/default/css/screen.css") ?>"
- media="screen,projection" />
- <link rel="stylesheet" type="text/css" href="<?= $theme->theme_url("css/screen.css") ?>"
- media="screen,projection" />
+
+ <?= $theme->css("lib/yui/reset-fonts-grids.css") ?>
+ <?= $theme->css("lib/themeroller/ui.base.css") ?>
+ <?= $theme->css("lib/superfish/css/superfish.css") ?>
+ <?= $theme->css("themes/default/css/screen.css") ?>
+ <?= $theme->theme_css("css/screen.css") ?>
<!--[if IE]>
- <link rel="stylesheet" type="text/css" href="<?= $theme->theme_url("css/fix-ie.css") ?>"
- media="screen,print,projection" />
+ <?= $theme->theme_css("css/fix-ie.css") ?>
<![endif]-->
<?= $theme->script("lib/jquery.js") ?>
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index 3ae3e155..2e68f571 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -24,17 +24,12 @@
<? endif ?>
</title>
<link rel="shortcut icon" href="<?= $theme->theme_url("images/favicon.ico") ?>" type="image/x-icon" />
- <link rel="stylesheet" type="text/css" href="<?= url::file("lib/yui/reset-fonts-grids.css") ?>"
- media="screen,print,projection" />
- <link rel="stylesheet" type="text/css" href="<?= url::file("lib/superfish/css/superfish.css") ?>"
- media="screen" />
- <link rel="stylesheet" type="text/css" href="<?= url::file("lib/themeroller/ui.base.css") ?>"
- media="screen,print,projection" />
- <link rel="stylesheet" type="text/css" href="<?= $theme->theme_url("css/screen.css") ?>"
- media="screen,print,projection" />
+ <?= $theme->css("lib/yui/reset-fonts-grids.css") ?>
+ <?= $theme->css("lib/superfish/css/superfish.css") ?>
+ <?= $theme->css("lib/themeroller/ui.base.css") ?>
+ <?= $theme->theme_css("css/screen.css") ?>
<!--[if lt IE 8]>
- <link rel="stylesheet" type="text/css" href="<?= $theme->theme_url("css/fix-ie.css") ?>"
- media="screen,print,projection" />
+ <?= $theme->theme_css("css/fix-ie.css") ?>
<![endif]-->
<? if ($theme->page_type == 'album'): ?>
<? if ($thumb_proportion != 1): ?>
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 14:11:36 +0000