Add cache-buster to scripts and linked files in skin templates

release-0.6
thomascube 16 years ago
parent 384d83adb9
commit 533e8602c0

@ -1023,17 +1023,16 @@ function write_log($name, $line)
* @access private
*/
function rcube_timer()
{
list($usec, $sec) = explode(" ", microtime());
return ((float)$usec + (float)$sec);
}
{
return microtime(true);
}
/**
* @access private
*/
function rcube_print_time($timer, $label='Timer')
{
{
static $print_count = 0;
$print_count++;
@ -1044,7 +1043,7 @@ function rcube_print_time($timer, $label='Timer')
$label = 'Timer '.$print_count;
console(sprintf("%s: %0.4f sec", $label, $diff));
}
}
/**

@ -55,7 +55,7 @@ class rcube_html_page
static $sa_files = array();
if (!preg_match('|^https?://|i', $file) && $file[0] != '/')
$file = $this->scripts_path . $file;
$file = $this->scripts_path . $file . (($fs = @filesize($this->scripts_path . $file)) ? '?s='.$fs : '');
if (in_array($file, $sa_files)) {
return;
@ -249,10 +249,19 @@ class rcube_html_page
$__page_header = $__page_footer = '';
// correct absolute paths in images and other tags
$output = preg_replace('/(src|href|background)=(["\']?)(\/[a-z0-9_\-]+)/Ui', "\\1=\\2$base_path\\3", $output);
$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_filesize'), $output);
$output = str_replace('$__skin_path', $base_path, $output);
echo rcube_charset_convert($output, 'UTF-8', $this->charset);
}
/**
* Callback function for preg_replace_callback in write()
*/
public function add_filesize($matches)
{
return sprintf("%s=%s%s?s=%d%s", $matches[1], $matches[2], $matches[3], @filesize($matches[3]), $matches[5]);
}
}

@ -435,6 +435,7 @@ class rcube_template extends rcube_html_page
*/
private function parse_with_globals($input)
{
$GLOBALS['__version'] = Q(RCMAIL_VERSION);
$GLOBALS['__comm_path'] = Q($this->app->comm_path);
return preg_replace('/\$(__[a-z0-9_\-]+)/e', '$GLOBALS["\\1"]', $input);
}

Loading…
Cancel
Save