From ba3377fb4aaad4ab77967920275fb78b3516d35e Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 12 Jan 2011 15:56:31 -0500
Subject: [PATCH] - include css files before scripts for speedup (with parallel downloads) + some code cleanups
---
program/include/rcube_plugin_api.php | 3 -
program/include/rcube_html_page.php | 86 ++++++++++++++++++++++++-------------------
2 files changed, 49 insertions(+), 40 deletions(-)
diff --git a/program/include/rcube_html_page.php b/program/include/rcube_html_page.php
index ce35088..ab226bc 100644
--- a/program/include/rcube_html_page.php
+++ b/program/include/rcube_html_page.php
@@ -28,11 +28,13 @@
{
protected $scripts_path = '';
protected $script_files = array();
+ protected $css_files = array();
protected $scripts = array();
protected $charset = RCMAIL_CHARSET;
protected $script_tag_file = "<script type=\"text/javascript\" src=\"%s\"></script>\n";
protected $script_tag = "<script type=\"text/javascript\">\n/* <![CDATA[ */\n%s\n/* ]]> */\n</script>";
+ protected $link_css_file = "<link rel=\"stylesheet\" type=\"text/css\" href=\"%s\" />\n";
protected $default_template = "<html>\n<head><title></title></head>\n<body></body>\n</html>";
protected $title = '';
@@ -61,6 +63,9 @@
if (in_array($file, $sa_files)) {
return;
}
+
+ $sa_files[] = $file;
+
if (!is_array($this->script_files[$position])) {
$this->script_files[$position] = array();
}
@@ -80,6 +85,16 @@
} else {
$this->scripts[$position] .= "\n".rtrim($script);
}
+ }
+
+ /**
+ * Link an external css file
+ *
+ * @param string File URL
+ */
+ public function include_css($file)
+ {
+ $this->css_files[] = $file;
}
/**
@@ -163,52 +178,53 @@
}
// replace specialchars in content
- $__page_title = Q($this->title, 'show', FALSE);
- $__page_header = $__page_body = $__page_footer = '';
+ $page_title = Q($this->title, 'show', FALSE);
+ $page_header = '';
+ $page_footer = '';
// include meta tag with charset
if (!empty($this->charset)) {
if (!headers_sent()) {
header('Content-Type: text/html; charset=' . $this->charset);
}
- $__page_header = '<meta http-equiv="content-type"';
- $__page_header.= ' content="text/html; charset=';
- $__page_header.= $this->charset . '" />'."\n";
+ $page_header = '<meta http-equiv="content-type"';
+ $page_header.= ' content="text/html; charset=';
+ $page_header.= $this->charset . '" />'."\n";
}
// definition of the code to be placed in the document header and footer
if (is_array($this->script_files['head'])) {
foreach ($this->script_files['head'] as $file) {
- $__page_header .= sprintf($this->script_tag_file, $file);
+ $page_header .= sprintf($this->script_tag_file, $file);
}
}
$head_script = $this->scripts['head_top'] . $this->scripts['head'];
if (!empty($head_script)) {
- $__page_header .= sprintf($this->script_tag, $head_script);
+ $page_header .= sprintf($this->script_tag, $head_script);
}
if (!empty($this->header)) {
- $__page_header .= $this->header;
+ $page_header .= $this->header;
}
if (is_array($this->script_files['foot'])) {
foreach ($this->script_files['foot'] as $file) {
- $__page_footer .= sprintf($this->script_tag_file, $file);
+ $page_footer .= sprintf($this->script_tag_file, $file);
}
}
if (!empty($this->scripts['foot'])) {
- $__page_footer .= sprintf($this->script_tag, $this->scripts['foot']);
+ $page_footer .= sprintf($this->script_tag, $this->scripts['foot']);
}
if (!empty($this->footer)) {
- $__page_footer .= $this->footer;
+ $page_footer .= $this->footer;
}
// find page header
if ($hpos = stripos($output, '</head>')) {
- $__page_header .= "\n";
+ $page_header .= "\n";
}
else {
if (!is_numeric($hpos)) {
@@ -220,49 +236,43 @@
}
$hpos++;
}
- $__page_header = "<head>\n<title>$__page_title</title>\n$__page_header\n</head>\n";
+ $page_header = "<head>\n<title>$page_title</title>\n$page_header\n</head>\n";
}
// add page hader
if ($hpos) {
- $output = substr($output,0,$hpos) . $__page_header . substr($output,$hpos,strlen($output));
+ $output = substr($output,0,$hpos) . $page_header . substr($output,$hpos,strlen($output));
}
else {
- $output = $__page_header . $output;
+ $output = $page_header . $output;
}
- // find page body
- if ($bpos = stripos($output, '<body')) {
- while ($output[$bpos] != '>') {
- $bpos++;
- }
- $bpos++;
- }
- else {
- $bpos = stripos($output, '</head>')+7;
- }
-
- // add page body
- if ($bpos && $__page_body) {
- $output = substr($output,0,$bpos) . "\n$__page_body\n" . substr($output,$bpos,strlen($output));
- }
-
- // find and add page footer
+ // add page footer
if (($fpos = strripos($output, '</body>')) || ($fpos = strripos($output, '</html>'))) {
- $output = substr($output, 0, $fpos) . "$__page_footer\n" . substr($output, $fpos);
+ $output = substr($output, 0, $fpos) . "$page_footer\n" . substr($output, $fpos);
}
else {
- $output .= "\n".$__page_footer;
+ $output .= "\n".$page_footer;
}
- // reset those global vars
- $__page_header = $__page_footer = '';
+ // add css files in head, before scripts, for speed up with parallel downloads
+ if (!empty($this->css_files) &&
+ (($pos = stripos($output, '<script ')) || ($pos = stripos($output, '</head>')))
+ ) {
+ $css = '';
+ foreach ($this->css_files as $file) {
+ $css .= sprintf($this->link_css_file, $file);
+ }
+ $output = substr($output, 0, $pos) . $css . substr($output, $pos);
+ }
$this->base_path = $base_path;
+
// correct absolute paths in images and other tags
// 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 = 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)
diff --git a/program/include/rcube_plugin_api.php b/program/include/rcube_plugin_api.php
index dd6d0aa..0f7ab3f 100644
--- a/program/include/rcube_plugin_api.php
+++ b/program/include/rcube_plugin_api.php
@@ -395,7 +395,7 @@
{
if ($this->output->type == 'html') {
$src = $this->resource_url($fn);
- $this->output->add_header(html::tag('link', array('rel' => "stylesheet", 'type' => "text/css", 'href' => $src)));
+ $this->output->include_css($src);
}
}
@@ -437,4 +437,3 @@
}
}
-
--
Gitblit v1.9.1