From 42e328a85f5880e3e767eebaaa88b55a2b49d2ff Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 19 Sep 2008 15:42:11 -0400
Subject: [PATCH] Indent with spaces not tabs. Please respect our code-style when creating patches!

---
 program/include/html.php |   26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/program/include/html.php b/program/include/html.php
index aa9d758..50689f2 100644
--- a/program/include/html.php
+++ b/program/include/html.php
@@ -29,11 +29,11 @@
 {
     protected $tagname;
     protected $attrib = array();
-    protected $allowed;
+    protected $allowed = array();
     protected $content;
 
     public static $common_attrib = array('id','class','style','title','align');
-    public static $containers = array('div','span','p','h1','h2','h3','form','textarea');
+    public static $containers = array('div','span','p','h1','h2','h3','form','textarea','table','tr','th','td','style');
     public static $lc_tags = true;
 
     /**
@@ -55,7 +55,7 @@
      */
     public function show()
     {
-        return self::tag($this->tagname, $this->attrib, $this->content, $this->allowed);
+        return self::tag($this->tagname, $this->attrib, $this->content, array_merge(self::$common_attrib, $this->allowed));
     }
 
     /****** STATIC METHODS *******/
@@ -98,7 +98,7 @@
         if (is_string($attr)) {
             $attr = array('class' => $attr);
         }
-        return self::tag('div', $attr, $cont, self::$common_attrib);
+        return self::tag('div', $attr, $cont, array_merge(self::$common_attrib, array('onclick')));
     }
 
     /**
@@ -145,7 +145,7 @@
         if (is_string($attr)) {
             $attr = array('href' => $attr);
         }
-        return self::tag('a', $attr, $cont, array_merge(self::$common_attrib, array('href','target','name','onclick','onmouseover','onmouseout')));
+        return self::tag('a', $attr, $cont, array_merge(self::$common_attrib, array('href','target','name','onclick','onmouseover','onmouseout','onmousedown','onmouseup')));
     }
 
     /**
@@ -248,6 +248,7 @@
 {
     protected $tagname = 'input';
     protected $type = 'text';
+    protected $allowed = array('type','name','value','size','tabindex','autocomplete','checked','onchange','onclick','disabled','readonly','spellcheck','results');
 
     public function __construct($attrib = array())
     {
@@ -415,7 +416,7 @@
 class html_textarea extends html
 {
     protected $tagname = 'textarea';
-    protected $allowed_attrib = array('name','rows','cols','wrap','tabindex');
+    protected $allowed = array('name','rows','cols','wrap','tabindex','onchange','disabled','readonly','spellcheck');
 
     /**
      * Get HTML code for this object
@@ -445,7 +446,7 @@
             $value = Q($value, 'strict', false);
         }
 
-        return self::tag($this->tagname, $this->attrib, $value, array_merge(self::$common_attrib, $this->allowed_attrib));
+        return self::tag($this->tagname, $this->attrib, $value, array_merge(self::$common_attrib, $this->allowed));
     }
 }
 
@@ -472,6 +473,7 @@
 {
     protected $tagname = 'select';
     protected $options = array();
+    protected $allowed = array('name','size','tabindex','autocomplete','multiple','onchange','disabled');
     
     /**
      * Add a new option to this drop-down
@@ -512,7 +514,7 @@
             $attr = array(
                 'value' => $option['value'],
                 'selected' => (in_array($option['value'], $select, true) ||
-            in_array($option['text'], $select, true)) ? 1 : null);
+                  in_array($option['text'], $select, true)) ? 1 : null);
 
             $this->content .= self::tag('option', $attr, Q($option['text']));
         }
@@ -605,10 +607,10 @@
      */
     public function show($attrib = null)
     {
-	if (is_array($attrib))
-    	    $this->attrib = array_merge($this->attrib, $attrib);
+        if (is_array($attrib))
+            $this->attrib = array_merge($this->attrib, $attrib);
         
-	$thead = $tbody = "";
+        $thead = $tbody = "";
 
         // include <thead>
         if (!empty($this->header)) {
@@ -642,4 +644,4 @@
     }
 }
 
-?>
\ No newline at end of file
+?>

--
Gitblit v1.9.1