githubFork/roundcubemail.git

			@@ -5,7 +5,7 @@
			\| program/include/html.php \|
			\| \|
			\| This file is part of the Roundcube Webmail client \|
			\| Copyright (C) 2005-2010, Roundcube Dev, - Switzerland \|
			\| Copyright (C) 2005-2010, The Roundcube Dev Team \|
			\| Licensed under the GNU GPL \|
			\| \|
			\| PURPOSE: \|
			@@ -32,6 +32,7 @@
			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');
			@@ -71,6 +72,9 @@
			*/
			public static function tag($tagname, $attrib = array(), $content = null, $allowed_attrib = null)
			{
			if (is_string($attrib))
			$attrib = array('class' => $attrib);

			$inline_tags = array('a','span','img');
			$suffix = $attrib['nl'] \|\| ($content && $attrib['nl'] !== false && !in_array($tagname, $inline_tags)) ? "\n" : '';

			@@ -83,6 +87,26 @@
			else {
			return sprintf("<%s%s />%s", $tagname, self::attrib_string($attrib, $allowed_attrib), $suffix);
			}
			}

			/**
			*
			*/
			public static function doctype($type)
			{
			$doctypes = array(
			'html5' => '<!DOCTYPE html>',
			'xhtml' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
			'xhtml-trans' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
			'xhtml-strict' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
			);

			if ($doctypes[$type]) {
			self::$doctype = preg_replace('/-\w+$/', '', $type);
			return $doctypes[$type];
			}

			return '';
			}

			/**
			@@ -147,7 +171,7 @@
			$attr = array('href' => $attr);
			}
			return self::tag('a', $attr, $cont, array_merge(self::$common_attrib,
			array('href','target','name','onclick','onmouseover','onmouseout','onmousedown','onmouseup')));
			array('href','target','name','rel','onclick','onmouseover','onmouseout','onmousedown','onmouseup')));
			}

			/**
			@@ -268,7 +292,7 @@
			protected $type = 'text';
			protected $allowed = array('type','name','value','size','tabindex',
			'autocomplete','checked','onchange','onclick','disabled','readonly',
			'spellcheck','results','maxlength','src');
			'spellcheck','results','maxlength','src','multiple');

			/**
			* Object constructor
			@@ -501,7 +525,7 @@
			protected $tagname = 'select';
			protected $options = array();
			protected $allowed = array('name','size','tabindex','autocomplete',
			'multiple','onchange','disabled');
			'multiple','onchange','disabled','rel');

			/**
			* Add a new option to this drop-down
			@@ -520,7 +544,6 @@
			$this->options[] = array('text' => $names, 'value' => $values);
			}
			}


			/**
			* Get HTML code for this object
			@@ -560,7 +583,7 @@
			{
			protected $tagname = 'table';
			protected $allowed = array('id','class','style','width','summary',
			'cellpadding','cellspacing','border');
			'cellpadding','cellspacing','border');

			private $header = array();
			private $rows = array();
			@@ -574,7 +597,8 @@
			*/
			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);
			}

			/**
			@@ -627,24 +651,23 @@
			public function remove_column($class)
			{
			// Remove the header
			foreach($this->header as $index=>$header){
			if($header->attrib['class'] == $class){
			foreach ($this->header as $index=>$header){
			if ($header->attrib['class'] == $class){
			unset($this->header[$index]);
			break;
			}
			}

			// Remove cells from rows
			foreach($this->rows as $i=>$row){
			foreach($row->cells as $j=>$cell){
			if($cell->attrib['class'] == $class){
			foreach ($this->rows as $i=>$row){
			foreach ($row->cells as $j=>$cell){
			if ($cell->attrib['class'] == $class){
			unset($this->rows[$i]->cells[$j]);
			break;
			}
			}
			}
			}


			/**
			* Jump to next row
			@@ -661,16 +684,35 @@
			}

			/**
			* Set current row attrib
			* Set row attributes
			*
			* @param array $attr Row attributes
			* @param array $attr Row attributes
			* @param int $index Optional row index (default current row index)
			*/
			public function set_row_attribs($attr = array())
			public function set_row_attribs($attr = array(), $index = null)
			{
			if (is_string($attr))
			$attr = array('class' => $attr);

			$this->rows[$this->rowindex]->attrib = $attr;
			if ($index === null)
			$index = $this->rowindex;

			$this->rows[$index]->attrib = $attr;
			}

			/**
			* Get row attributes
			*
			* @param int $index Row index
			*
			* @return array Row attributes
			*/
			public function get_row_attribs($index = null)
			{
			if ($index === null)
			$index = $this->rowindex;

			return $this->rows[$index] ? $this->rows[$index]->attrib : null;
			}

			/**
			@@ -683,7 +725,7 @@
			{
			if (is_array($attrib))
			$this->attrib = array_merge($this->attrib, $attrib);


			$thead = $tbody = "";

			// include <thead>
			@@ -692,7 +734,7 @@
			foreach ($this->header as $c => $col) {
			$rowcontent .= self::tag('td', $col->attrib, $col->content);
			}
			$thead = self::tag('thead', null, self::tag('tr', null, $rowcontent));
			$thead = self::tag('thead', null, self::tag('tr', null, $rowcontent, parent::$common_attrib));
			}

			foreach ($this->rows as $r => $row) {
			@@ -702,7 +744,7 @@
			}

			if ($r < $this->rowindex \|\| count($row->cells)) {
			$tbody .= self::tag('tr', $row->attrib, $rowcontent);
			$tbody .= self::tag('tr', $row->attrib, $rowcontent, parent::$common_attrib);
			}
			}

			@@ -716,7 +758,7 @@
			unset($this->attrib['cols'], $this->attrib['rowsonly']);
			return parent::show();
			}


			/**
			* Count number of rows
			*
			@@ -726,5 +768,15 @@
			{
			return count($this->rows);
			}

			/**
			* Remove table body (all rows)
			*/
			public function remove_body()
			{
			$this->rows = array();
			$this->rowindex = 0;
			}

			}