diff --git a/program/include/html.php b/program/include/html.php
index 27eeebb2d..c225f7d56 100644
--- a/program/include/html.php
+++ b/program/include/html.php
@@ -32,6 +32,7 @@ class html
protected $allowed = array();
protected $content;
+ public static $doctype = 'xhtml';
public static $lc_tags = true;
public static $common_attrib = array('id','class','style','title','align');
public static $containers = array('iframe','div','span','p','h1','h2','h3','form','textarea','table','thead','tbody','tr','th','td','style','script');
@@ -88,6 +89,26 @@ class html
}
}
+ /**
+ *
+ */
+ public static function doctype($type)
+ {
+ $doctypes = array(
+ 'html5' => '',
+ 'xhtml' => '',
+ 'xhtml-trans' => '',
+ 'xhtml-strict' => '',
+ );
+
+ if ($doctypes[$type]) {
+ self::$doctype = preg_replace('/-\w+$/', '', $type);
+ return $doctypes[$type];
+ }
+
+ return '';
+ }
+
/**
* Derrived method for
containers
*
@@ -576,7 +597,8 @@ class html_table extends html
*/
public function __construct($attrib = array())
{
- $this->attrib = array_merge($attrib, array('summary' => '', 'border' => 0));
+ $default_attrib = self::$doctype == 'xhtml' ? array('summary' => '', 'border' => 0) : array();
+ $this->attrib = array_merge($attrib, $default_attrib);
}
/**
diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php
index 8c6c5fbd8..433b22ac7 100755
--- a/program/include/rcube_template.php
+++ b/program/include/rcube_template.php
@@ -449,7 +449,7 @@ class rcube_template extends rcube_html_page
if ($realname != 'error' && ($this->config['debug_level'] & 8)) {
$this->add_footer('
'
+
'
);
$this->add_script(
"if (!window.console || !window.console.log) {\n".
@@ -747,6 +747,9 @@ class rcube_template extends rcube_html_page
else if (function_exists($handler)) {
$content = call_user_func($handler, $attrib);
}
+ else if ($object == 'doctype') {
+ $content = html::doctype($attrib['value']);
+ }
else if ($object == 'logo') {
$attrib += array('alt' => $this->xml_command(array('', 'object', 'name="productname"')));
if ($this->config['skin_logo'])