From 2caf204e2ba9a21a5ef7d87b855457e50aba1d0c Mon Sep 17 00:00:00 2001 From: thomasb Date: Fri, 2 Dec 2011 16:47:40 +0000 Subject: New template object to control HTML doctype git-svn-id: https://svn.roundcube.net/trunk@5532 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/include/html.php | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'roundcubemail/program/include/html.php') diff --git a/roundcubemail/program/include/html.php b/roundcubemail/program/include/html.php index 27eeebb2d..c225f7d56 100644 --- a/roundcubemail/program/include/html.php +++ b/roundcubemail/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); } /** -- cgit v1.2.3