From 0ff554d1654cecc15472de186bdcd30fb1dffc77 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 10 Jan 2011 08:22:45 -0500
Subject: [PATCH] - Fix handling square brackets in links (#1487672)
---
program/include/rcube_html_page.php | 50 +++++++++++++++++++++++++++++++-------------------
1 files changed, 31 insertions(+), 19 deletions(-)
diff --git a/program/include/rcube_html_page.php b/program/include/rcube_html_page.php
index 6281043..06cb5cb 100644
--- a/program/include/rcube_html_page.php
+++ b/program/include/rcube_html_page.php
@@ -4,8 +4,8 @@
+-----------------------------------------------------------------------+
| program/include/rcube_html_page.php |
| |
- | This file is part of the RoundCube PHP suite |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland |
+ | This file is part of the Roundcube PHP suite |
+ | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland |
| Licensed under the GNU GPL |
| |
| CONTENTS: |
@@ -56,7 +56,7 @@
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 : '');
+ $file = $this->scripts_path . $file . (($fs = @filemtime($this->scripts_path . $file)) ? '?s='.$fs : '');
if (in_array($file, $sa_files)) {
return;
@@ -84,6 +84,8 @@
/**
* Add HTML code to the page header
+ *
+ * @param string $str HTML code
*/
public function add_header($str)
{
@@ -93,6 +95,8 @@
/**
* Add HTML code to the page footer
* To be added right befor </body>
+ *
+ * @param string $str HTML code
*/
public function add_footer($str)
{
@@ -101,6 +105,8 @@
/**
* Setter for page title
+ *
+ * @param string $t Page title
*/
public function set_title($t)
{
@@ -110,6 +116,8 @@
/**
* Setter for output charset.
* To be specified in a meta tag and sent as http-header
+ *
+ * @param string $charset Charset
*/
public function set_charset($charset)
{
@@ -118,6 +126,8 @@
/**
* Getter for output charset
+ *
+ * @return string Output charset
*/
public function get_charset()
{
@@ -130,11 +140,11 @@
public function reset()
{
$this->script_files = array();
- $this->scripts = array();
- $this->title = '';
- $this->header = '';
- $this->footer = '';
- $this->body = '';
+ $this->scripts = array();
+ $this->title = '';
+ $this->header = '';
+ $this->footer = '';
+ $this->body = '';
}
/**
@@ -149,7 +159,7 @@
// set default page title
if (empty($this->title)) {
- $this->title = 'RoundCube Mail';
+ $this->title = 'Roundcube Mail';
}
// replace specialchars in content
@@ -248,35 +258,37 @@
// reset those global vars
$__page_header = $__page_footer = '';
- $this->base_path = $base_path;
+ $this->base_path = $base_path;
// correct absolute paths in images and other tags
- // add timestamp to .js and .css filename
+ // 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)
- echo rcube_charset_convert($output, RCMAIL_CHARSET, $this->charset);
- else
- echo $output;
+ echo rcube_charset_convert($output, RCMAIL_CHARSET, $this->charset);
+ else
+ echo $output;
}
/**
* Callback function for preg_replace_callback in write()
+ *
+ * @return string Parsed string
*/
private function file_callback($matches)
{
- $file = $matches[3];
+ $file = $matches[3];
// correct absolute paths
- if ($file[0] == '/')
- $file = $this->base_path . $file;
+ if ($file[0] == '/')
+ $file = $this->base_path . $file;
// add file modification timestamp
- if (preg_match('/\.(js|css)$/', $file))
+ if (preg_match('/\.(js|css)$/', $file))
$file .= '?s=' . @filemtime($file);
- return sprintf("%s=%s%s%s", $matches[1], $matches[2], $file, $matches[4]);
+ return sprintf("%s=%s%s%s", $matches[1], $matches[2], $file, $matches[4]);
}
}
--
Gitblit v1.9.1