From 99d9f50a0000447d0a752e6c43716237dc0da176 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Sun, 09 Sep 2012 14:23:56 -0400
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail

---
 program/include/html.php |   30 +++++++++++++++++-------------
 1 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/program/include/html.php b/program/include/html.php
index b42da1d..c6507f8 100644
--- a/program/include/html.php
+++ b/program/include/html.php
@@ -154,7 +154,7 @@
             $attr = array('src' => $attr);
         }
         return self::tag('img', $attr + array('alt' => ''), null, array_merge(self::$common_attrib,
-	        array('src','alt','width','height','border','usemap','onclick')));
+            array('src','alt','width','height','border','usemap','onclick')));
     }
 
     /**
@@ -171,7 +171,7 @@
             $attr = array('href' => $attr);
         }
         return self::tag('a', $attr, $cont, array_merge(self::$common_attrib,
-	    array('href','target','name','rel','onclick','onmouseover','onmouseout','onmousedown','onmouseup')));
+        array('href','target','name','rel','onclick','onmouseover','onmouseout','onmousedown','onmouseup')));
     }
 
     /**
@@ -358,7 +358,7 @@
     protected $tagname = 'input';
     protected $type = 'text';
     protected $allowed = array(
-        'type','name','value','size','tabindex',
+        'type','name','value','size','tabindex','autocapitalize',
         'autocomplete','checked','onchange','onclick','disabled','readonly',
         'spellcheck','results','maxlength','src','multiple','placeholder',
     );
@@ -532,7 +532,7 @@
 {
     protected $tagname = 'textarea';
     protected $allowed = array('name','rows','cols','wrap','tabindex',
-	'onchange','disabled','readonly','spellcheck');
+        'onchange','disabled','readonly','spellcheck');
 
     /**
      * Get HTML code for this object
@@ -563,7 +563,7 @@
         }
 
         return self::tag($this->tagname, $this->attrib, $value,
-	        array_merge(self::$common_attrib, $this->allowed));
+            array_merge(self::$common_attrib, $this->allowed));
     }
 }
 
@@ -591,7 +591,7 @@
     protected $tagname = 'select';
     protected $options = array();
     protected $allowed = array('name','size','tabindex','autocomplete',
-	'multiple','onchange','disabled','rel');
+        'multiple','onchange','disabled','rel');
 
     /**
      * Add a new option to this drop-down
@@ -655,7 +655,7 @@
 {
     protected $tagname = 'table';
     protected $allowed = array('id','class','style','width','summary',
-	    'cellpadding','cellspacing','border');
+        'cellpadding','cellspacing','border');
 
     private $header = array();
     private $rows = array();
@@ -705,8 +705,9 @@
      */
     public function add_header($attr, $cont)
     {
-        if (is_string($attr))
-    	    $attr = array('class' => $attr);
+        if (is_string($attr)) {
+            $attr = array('class' => $attr);
+        }
 
         $cell = new stdClass;
         $cell->attrib = $attr;
@@ -763,11 +764,13 @@
      */
     public function set_row_attribs($attr = array(), $index = null)
     {
-        if (is_string($attr))
-    	    $attr = array('class' => $attr);
+        if (is_string($attr)) {
+            $attr = array('class' => $attr);
+        }
 
-        if ($index === null)
+        if ($index === null) {
             $index = $this->rowindex;
+        }
 
         $this->rows[$index]->attrib = $attr;
     }
@@ -781,8 +784,9 @@
      */
     public function get_row_attribs($index = null)
     {
-        if ($index === null)
+        if ($index === null) {
             $index = $this->rowindex;
+        }
 
         return $this->rows[$index] ? $this->rows[$index]->attrib : null;
     }

--
Gitblit v1.9.1