From e86a21bd83a0ae6cadfe9c919582951f306d3b64 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 06 Jan 2012 05:55:07 -0500
Subject: [PATCH] - Fix typo in timezone handling, more exception catching
---
program/include/rcube_html_page.php | 56 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 32 insertions(+), 24 deletions(-)
diff --git a/program/include/rcube_html_page.php b/program/include/rcube_html_page.php
index 21301e3..ac4fc0b 100644
--- a/program/include/rcube_html_page.php
+++ b/program/include/rcube_html_page.php
@@ -31,10 +31,6 @@
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>\n";
- 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 = '';
@@ -56,9 +52,13 @@
public function include_script($file, $position='head')
{
static $sa_files = array();
-
- if (!preg_match('|^https?://|i', $file) && $file[0] != '/')
- $file = $this->scripts_path . $file . (($fs = @filemtime($this->scripts_path . $file)) ? '?s='.$fs : '');
+
+ if (!preg_match('|^https?://|i', $file) && $file[0] != '/') {
+ $file = $this->scripts_path . $file;
+ if ($fs = @filemtime($file)) {
+ $file .= '?s=' . $fs;
+ }
+ }
if (in_array($file, $sa_files)) {
return;
@@ -69,6 +69,7 @@
if (!is_array($this->script_files[$position])) {
$this->script_files[$position] = array();
}
+
$this->script_files[$position][] = $file;
}
@@ -81,9 +82,10 @@
public function add_script($script, $position='head')
{
if (!isset($this->scripts[$position])) {
- $this->scripts[$position] = "\n".rtrim($script);
- } else {
- $this->scripts[$position] .= "\n".rtrim($script);
+ $this->scripts[$position] = "\n" . rtrim($script);
+ }
+ else {
+ $this->scripts[$position] .= "\n" . rtrim($script);
}
}
@@ -104,7 +106,7 @@
*/
public function add_header($str)
{
- $this->header .= "\n".$str;
+ $this->header .= "\n" . $str;
}
/**
@@ -115,7 +117,7 @@
*/
public function add_footer($str)
{
- $this->footer .= "\n".$str;
+ $this->footer .= "\n" . $str;
}
/**
@@ -195,13 +197,13 @@
// 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 .= html::script($file);
}
}
$head_script = $this->scripts['head_top'] . $this->scripts['head'];
if (!empty($head_script)) {
- $page_header .= sprintf($this->script_tag, $head_script);
+ $page_header .= html::script(array(), $head_script);
}
if (!empty($this->header)) {
@@ -215,7 +217,7 @@
if (is_array($this->script_files['foot'])) {
foreach ($this->script_files['foot'] as $file) {
- $page_footer .= sprintf($this->script_tag_file, $file);
+ $page_footer .= html::script($file);
}
}
@@ -224,7 +226,7 @@
}
if (!empty($this->scripts['foot'])) {
- $page_footer .= sprintf($this->script_tag, $this->scripts['foot']);
+ $page_footer .= html::script(array(), $this->scripts['foot']);
}
// find page header
@@ -266,7 +268,8 @@
) {
$css = '';
foreach ($this->css_files as $file) {
- $css .= sprintf($this->link_css_file, $file);
+ $css .= html::tag('link', array('rel' => 'stylesheet',
+ 'type' => 'text/css', 'href' => $file, 'nl' => true));
}
$output = substr_replace($output, $css, $pos, 0);
}
@@ -283,10 +286,12 @@
// trigger hook with final HTML content to be sent
$hook = rcmail::get_instance()->plugins->exec_hook("send_page", array('content' => $output));
if (!$hook['abort']) {
- if ($this->charset != RCMAIL_CHARSET)
+ if ($this->charset != RCMAIL_CHARSET) {
echo rcube_charset_convert($hook['content'], RCMAIL_CHARSET, $this->charset);
- else
+ }
+ else {
echo $hook['content'];
+ }
}
}
@@ -300,14 +305,17 @@
$file = $matches[3];
// correct absolute paths
- if ($file[0] == '/')
+ if ($file[0] == '/') {
$file = $this->base_path . $file;
+ }
// add file modification timestamp
- if (preg_match('/\.(js|css)$/', $file))
- $file .= '?s=' . @filemtime($file);
+ if (preg_match('/\.(js|css)$/', $file)) {
+ if ($fs = @filemtime($file)) {
+ $file .= '?s=' . $fs;
+ }
+ }
- return sprintf("%s=%s%s%s", $matches[1], $matches[2], $file, $matches[4]);
+ return $matches[1] . '=' . $matches[2] . $file . $matches[4];
}
}
-
--
Gitblit v1.9.1