summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--program/include/rcube_html_page.php34
1 files changed, 23 insertions, 11 deletions
diff --git a/program/include/rcube_html_page.php b/program/include/rcube_html_page.php
index 36b56e076..628104324 100644
--- a/program/include/rcube_html_page.php
+++ b/program/include/rcube_html_page.php
@@ -39,6 +39,7 @@ class rcube_html_page
protected $header = '';
protected $footer = '';
protected $body = '';
+ protected $base_path = '';
/** Constructor */
@@ -196,14 +197,14 @@ class rcube_html_page
}
// find page header
- if ($hpos = strpos(strtolower($output), '</head>')) {
+ if ($hpos = stripos($output, '</head>')) {
$__page_header .= "\n";
}
else {
if (!is_numeric($hpos)) {
- $hpos = strpos(strtolower($output), '<body');
+ $hpos = stripos($output, '<body');
}
- if (!is_numeric($hpos) && ($hpos = strpos(strtolower($output), '<html'))) {
+ if (!is_numeric($hpos) && ($hpos = stripos($output, '<html'))) {
while ($output[$hpos] != '>') {
$hpos++;
}
@@ -221,14 +222,14 @@ class rcube_html_page
}
// find page body
- if ($bpos = strpos(strtolower($output), '<body')) {
+ if ($bpos = stripos($output, '<body')) {
while ($output[$bpos] != '>') {
$bpos++;
}
$bpos++;
}
else {
- $bpos = strpos(strtolower($output), '</head>')+7;
+ $bpos = stripos($output, '</head>')+7;
}
// add page body
@@ -237,8 +238,7 @@ class rcube_html_page
}
// find and add page footer
- $output_lc = strtolower($output);
- if (($fpos = strrpos($output_lc, '</body>')) || ($fpos = strrpos($output_lc, '</html>'))) {
+ if (($fpos = strripos($output, '</body>')) || ($fpos = strripos($output, '</html>'))) {
$output = substr($output, 0, $fpos) . "$__page_footer\n" . substr($output, $fpos);
}
else {
@@ -248,9 +248,11 @@ class rcube_html_page
// reset those global vars
$__page_header = $__page_footer = '';
+ $this->base_path = $base_path;
// correct absolute paths in images and other tags
- $output = preg_replace('!(src|href|background)=(["\']?)(/[a-z0-9_-]+)!i', "\\1=\\2$base_path\\3", $output);
- $output = preg_replace_callback('!(src|href)=(["\']?)([a-z0-9/_.-]+.(css|js))(["\'\s>])!i', array($this, 'add_filemtime'), $output);
+ // add timestamp to .js and .css filename
+ $output = preg_replace_callback('!(src|href|background)=(["\']?)([a-z0-9/_.-]+)(["\'\s>])!i',
+ array($this, 'file_callback'), $output);
$output = str_replace('$__skin_path', $base_path, $output);
if ($this->charset != RCMAIL_CHARSET)
@@ -262,9 +264,19 @@ class rcube_html_page
/**
* Callback function for preg_replace_callback in write()
*/
- public function add_filemtime($matches)
+ private function file_callback($matches)
{
- return sprintf("%s=%s%s?s=%d%s", $matches[1], $matches[2], $matches[3], @filemtime($matches[3]), $matches[5]);
+ $file = $matches[3];
+
+ // correct absolute paths
+ if ($file[0] == '/')
+ $file = $this->base_path . $file;
+
+ // add file modification timestamp
+ if (preg_match('/\.(js|css)$/', $file))
+ $file .= '?s=' . @filemtime($file);
+
+ return sprintf("%s=%s%s%s", $matches[1], $matches[2], $file, $matches[4]);
}
}