banananetwork
/
roundcubemail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simply use reset() to clear the state vars of rcube_html_page; reverted r1346

Browse Source
release-0.6
thomascube 16 years ago
parent 3510d7bf0a
commit 4c6b662feb
2 changed files with 19 additions and 59 deletions
Show Stats Download Patch File Download Diff File

75
program/include/rcube_html_page.php
Unescape Escape View File

@ -1,4 +1,5 @@
<?php <?php
/* /*
+-----------------------------------------------------------------------+ +-----------------------------------------------------------------------+
| program/include/rcube_html_page.php | | program/include/rcube_html_page.php |
@ -22,25 +23,26 @@
* Class for HTML page creation * Class for HTML page creation
* *
* @package HTML * @package HTML
*
* @author Thomas Bruederli <roundcube@gmail.com>
* @license http://gnu.org GPL
* @todo See about improving performance (__get, __set, sprintf)
*/ */
class rcube_html_page class rcube_html_page
{ {
protected $_store = array(); protected $scripts_path = '';
protected $script_files = array();
protected $scripts = array();
protected $charset = 'UTF-8';
/** protected $script_tag_file = "<script type=\"text/javascript\" src=\"%s%s\"></script>\n";
* Constructor protected $script_tag = "<script type=\"text/javascript\">\n<!--\n%s\n\n//-->\n</script>\n";
* protected $default_template = "<html>\n<head><title></title></head>\n<body></body>\n</html>";
* @return rcube_html_page
* @uses self::reset() protected $title = '';
*/ protected $header = '';
public function __construct() protected $footer = '';
{ protected $body = '';
$this->reset();
}
/** Constructor */
public function __construct() {}
/** /**
* Link an external script file * Link an external script file
@ -120,26 +122,11 @@ class rcube_html_page
/** /**
* Reset all saved properties * Reset all saved properties
*
* @return void
* @see self::__construct
* @uses self::$_store
*/ */
public function reset() public function reset()
{ {
$this->scripts_path = '';
$this->script_files = array(); $this->script_files = array();
$this->external_scripts = array();
$this->scripts = array(); $this->scripts = array();
$this->charset = 'UTF-8';
// templates
$this->script_tag_file = "<script type=\"text/javascript\" src=\"%s%s\"></script>\n";
$this->script_tag = "<script type=\"text/javascript\">\n<!--\n%s\n\n//-->\n</script>\n";
$this->default_template = "<html>\n<head><title></title></head>\n<body></body>\n</html>";
$this->tag_format_external_script = "<script type=\"text/javascript\" src=\"%s\"></script>\n";
// page stuff
$this->title = ''; $this->title = '';
$this->header = ''; $this->header = '';
$this->footer = ''; $this->footer = '';
@ -264,31 +251,5 @@ class rcube_html_page
echo rcube_charset_convert($output, 'UTF-8', $this->charset); echo rcube_charset_convert($output, 'UTF-8', $this->charset);
} }
/**
* __get
*
* @param string $var A variable name.
*
* @return mixed
* @uses self::$_store
*/
public function __get($var)
{
return $this->_store[$var];
}
/**
* __set
*
* @param string $var A variable name.
* @param mixed $value The value of the variable.
*
* @return mixed
* @uses self::$_store
*/
public function __set($var, $value)
{
return $this->_store[$var] = $value;
}
} }

3
program/steps/error.inc
Unescape Escape View File

@ -99,8 +99,7 @@ EOF;
if (template_exists('error')) if (template_exists('error'))
{ {
$OUTPUT->scripts = array(); $OUTPUT->reset();
$OUTPUT->script_files = array();
$OUTPUT->send('error'); $OUTPUT->send('error');
} }

Write Preview
Loading…
Cancel
Save