- support maxlength and src attributes in html_inputfield (#1486421), wrapp...

alecpl

2010-01-12 8780304bc834df704adf710200e6741d095616fd

- support maxlength and src attributes in html_inputfield (#1486421), wrapped some long lines

 program/include/html.php

@@ -32,9 +32,10 @@
    protected $allowed = array();
    protected $content;

    public static $common_attrib = array('id','class','style','title','align');
    public static $containers = array('iframe','div','span','p','h1','h2','h3','form','textarea','table','tr','th','td','style','script');
    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','tr','th','td','style','script');

    /**
     * Constructor
@@ -129,7 +130,8 @@
        if (is_string($attr)) {
            $attr = array('src' => $attr);
        }
        return self::tag('img', $attr + array('alt' => ''), null, array_merge(self::$common_attrib, array('src','alt','width','height','border','usemap')));
        return self::tag('img', $attr + array('alt' => ''), null, array_merge(self::$common_attrib,
        array('src','alt','width','height','border','usemap')));
    }

    /**
@@ -145,7 +147,8 @@
        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','onmousedown','onmouseup')));
        return self::tag('a', $attr, $cont, array_merge(self::$common_attrib,
        array('href','target','name','onclick','onmouseover','onmouseout','onmousedown','onmouseup')));
    }

    /**
@@ -192,7 +195,8 @@
        if (is_string($attr)) {
            $attr = array('src' => $attr);
        }
        return self::tag('iframe', $attr, $cont, array_merge(self::$common_attrib, array('src','name','width','height','border','frameborder')));
        return self::tag('iframe', $attr, $cont, array_merge(self::$common_attrib,
        array('src','name','width','height','border','frameborder')));
    }

    /**
@@ -263,7 +267,9 @@
{
    protected $tagname = 'input';
    protected $type = 'text';
    protected $allowed = array('type','name','value','size','tabindex','autocomplete','checked','onchange','onclick','disabled','readonly','spellcheck','results');
    protected $allowed = array('type','name','value','size','tabindex',
    'autocomplete','checked','onchange','onclick','disabled','readonly',
    'spellcheck','results','maxlength','src');

    public function __construct($attrib = array())
    {
@@ -431,7 +437,8 @@
class html_textarea extends html
{
    protected $tagname = 'textarea';
    protected $allowed = array('name','rows','cols','wrap','tabindex','onchange','disabled','readonly','spellcheck');
    protected $allowed = array('name','rows','cols','wrap','tabindex',
    'onchange','disabled','readonly','spellcheck');

    /**
     * Get HTML code for this object
@@ -461,7 +468,8 @@
            $value = Q($value, 'strict', false);
        }

        return self::tag($this->tagname, $this->attrib, $value, array_merge(self::$common_attrib, $this->allowed));
        return self::tag($this->tagname, $this->attrib, $value,
        array_merge(self::$common_attrib, $this->allowed));
    }
}

@@ -488,7 +496,8 @@
{
    protected $tagname = 'select';
    protected $options = array();
    protected $allowed = array('name','size','tabindex','autocomplete','multiple','onchange','disabled');
    protected $allowed = array('name','size','tabindex','autocomplete',
    'multiple','onchange','disabled');
    
    /**
     * Add a new option to this drop-down
@@ -546,7 +555,9 @@
class html_table extends html
{
    protected $tagname = 'table';
    protected $allowed = array('id','class','style','width','summary','cellpadding','cellspacing','border');
    protected $allowed = array('id','class','style','width','summary',
    'cellpadding','cellspacing','border');

    private $header = array();
    private $rows = array();
    private $rowindex = 0;