From e3e597e3b6c9ae10e5c7c1e5592726c71793cfe7 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Mon, 14 Jul 2008 17:56:22 +0000
Subject: Re-enable autocomplete attribute for login form (#1485211)

---
 program/include/html.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'program/include/html.php')

diff --git a/program/include/html.php b/program/include/html.php
index aa9d758f2..6a8892510 100644
--- a/program/include/html.php
+++ b/program/include/html.php
@@ -29,7 +29,7 @@ class html
 {
     protected $tagname;
     protected $attrib = array();
-    protected $allowed;
+    protected $allowed = array();
     protected $content;
 
     public static $common_attrib = array('id','class','style','title','align');
@@ -55,7 +55,7 @@ class html
      */
     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 *******/
@@ -248,6 +248,7 @@ class html_inputfield extends html
 {
     protected $tagname = 'input';
     protected $type = 'text';
+    protected $allowed = array('type','name','value','size','tabindex','autocomplete','checked');
 
     public function __construct($attrib = array())
     {
@@ -415,7 +416,7 @@ class html_checkbox extends html_inputfield
 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');
 
     /**
      * Get HTML code for this object
@@ -445,7 +446,7 @@ class html_textarea extends html
             $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));
     }
 }
 
-- 
cgit v1.2.3