From 011e8055fe52fa267dc4227861539a2d6d297b6a Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Mon, 26 Dec 2011 10:40:37 -0500
Subject: [PATCH] Get rid of sprintf() calls for html output generation
---
program/include/rcube_html_page.php | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/program/include/rcube_html_page.php b/program/include/rcube_html_page.php
index 21301e3..7d48168 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 = '';
@@ -195,13 +191,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 +211,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 +220,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 +262,7 @@
) {
$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);
}
--
Gitblit v1.9.1