From 40c45e9de99186eda203a925c09424a3a8ec103c Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 07 Dec 2011 03:44:48 -0500
Subject: [PATCH] - Fixed issues with big memory allocation of IMAP results, improved a lot of rcube_imap class
---
program/include/html.php | 71 ++++++++++++++++++++++++++++-------
1 files changed, 56 insertions(+), 15 deletions(-)
diff --git a/program/include/html.php b/program/include/html.php
index 8f932ce..c225f7d 100644
--- a/program/include/html.php
+++ b/program/include/html.php
@@ -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');
@@ -86,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 '';
}
/**
@@ -562,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();
@@ -576,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);
}
/**
@@ -629,17 +651,17 @@
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;
}
@@ -662,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;
}
/**
@@ -684,7 +725,7 @@
{
if (is_array($attrib))
$this->attrib = array_merge($this->attrib, $attrib);
-
+
$thead = $tbody = "";
// include <thead>
@@ -693,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) {
@@ -703,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);
}
}
@@ -717,7 +758,7 @@
unset($this->attrib['cols'], $this->attrib['rowsonly']);
return parent::show();
}
-
+
/**
* Count number of rows
*
--
Gitblit v1.9.1