Follow up r64936. Even better, provide the bug number and imagemagick doc page.
[lhc/web/wiklou.git] / includes / HTMLForm.php
index 1764f6e..e798611 100644 (file)
  * The constructor input is an associative array of $fieldname => $info,
  * where $info is an Associative Array with any of the following:
  * 
- *     'class'    -- the subclass of HTMLFormField that will be used
- *                   to create the object.  *NOT* the CSS class!
- *     'type'     -- roughly translates into the <select> type attribute.
- *                   if 'class' is not specified, this is used as a map
- *                   through HTMLForm::$typeMappings to get the class name.
- *     'default'  -- default value when the form is displayed
- *     'id'       -- HTML id attribute
- *     'options'  -- varies according to the specific object.
- *     'label-message' -- message key for a message to use as the label.
- *                   can be an array of msg key and then parameters to 
- *                   the message.
- *     'label'    -- alternatively, a raw text message. Overridden by
- *                   label-message
- *     'help-message'  -- message key for a message to use as a help text.
- *                   can be an array of msg key and then parameters to 
- *                   the message.
- *     'required' -- passed through to the object, indicating that it
- *                   is a required field.
- *     'size'     -- the length of text fields
- *     'filter-callback -- a function name to give you the chance to 
- *                   massage the inputted value before it's processed.
- *                   @see HTMLForm::filter()
- *     'validation-callback' -- a function name to give you the chance
- *                   to impose extra validation on the field input.
- *                   @see HTMLForm::validate()
- *                   
+ *      'class'        -- the subclass of HTMLFormField that will be used
+ *                                to create the object.  *NOT* the CSS class!
+ *      'type'     -- roughly translates into the <select> type attribute.
+ *                                if 'class' is not specified, this is used as a map
+ *                                through HTMLForm::$typeMappings to get the class name.
+ *      'default'  -- default value when the form is displayed
+ *      'id'       -- HTML id attribute
+ *   'cssclass' -- CSS class
+ *      'options'  -- varies according to the specific object.
+ *      'label-message' -- message key for a message to use as the label.
+ *                                can be an array of msg key and then parameters to 
+ *                                the message.
+ *      'label'        -- alternatively, a raw text message. Overridden by
+ *                                label-message
+ *      'help-message'  -- message key for a message to use as a help text.
+ *                                can be an array of msg key and then parameters to 
+ *                                the message.
+ *      'required' -- passed through to the object, indicating that it
+ *                                is a required field.
+ *      'size'     -- the length of text fields
+ *      'filter-callback -- a function name to give you the chance to 
+ *                                massage the inputted value before it's processed.
+ *                                @see HTMLForm::filter()
+ *      'validation-callback' -- a function name to give you the chance
+ *                                to impose extra validation on the field input.
+ *                                @see HTMLForm::validate()
+ *                                
  * TODO: Document 'section' / 'subsection' stuff
  */
 class HTMLForm {
@@ -51,6 +52,7 @@ class HTMLForm {
        # A mapping of 'type' inputs onto standard HTMLFormField subclasses
        static $typeMappings = array(
                'text' => 'HTMLTextField',
+               'textarea' => 'HTMLTextAreaField',
                'select' => 'HTMLSelectField',
                'radio' => 'HTMLRadioField',
                'multiselect' => 'HTMLMultiSelectField',
@@ -60,8 +62,12 @@ class HTMLForm {
                'float' => 'HTMLFloatField',
                'info' => 'HTMLInfoField',
                'selectorother' => 'HTMLSelectOrOtherField',
+               'submit' => 'HTMLSubmitField',
+               'hidden' => 'HTMLHiddenField',
+               'edittools' => 'HTMLEditTools',
+       
                # HTMLTextField will output the correct type="" attribute automagically.
-               # There are about four zillion other HTML 5 input types, like url, but
+               # There are about four zillion other HTML5 input types, like url, but
                # we don't use those at the moment, so no point in adding all of them.
                'email' => 'HTMLTextField',
                'password' => 'HTMLTextField',
@@ -70,14 +76,29 @@ class HTMLForm {
        protected $mMessagePrefix;
        protected $mFlatFields;
        protected $mFieldTree;
-       protected $mShowReset;
+       protected $mShowReset = false;
        public $mFieldData;
+       
        protected $mSubmitCallback;
        protected $mValidationErrorMessage;
-       protected $mIntro;
+       
+       protected $mPre = '';
+       protected $mHeader = '';
+       protected $mFooter = '';
+       protected $mPost = '';
+       protected $mId;
+       
        protected $mSubmitID;
+       protected $mSubmitName;
        protected $mSubmitText;
+       protected $mSubmitTooltip;
        protected $mTitle;
+       
+       protected $mUseMultipart = false;
+       protected $mHiddenFields = array();
+       protected $mButtons = array();
+       
+       protected $mWrapperLegend = false;
 
        /**
         * Build a new HTMLForm from an array of field attributes
@@ -92,11 +113,17 @@ class HTMLForm {
                $this->mFlatFields = array();
 
                foreach( $descriptor as $fieldname => $info ) {
-                       $section = '';
-                       if ( isset( $info['section'] ) )
-                               $section = $info['section'];
+                       $section = isset( $info['section'] ) 
+                               ? $info['section']
+                               : '';
 
-                       $info['name'] = $fieldname;
+                       $info['name'] = isset( $info['name'] )
+                               ? $info['name']
+                               : $fieldname;
+
+                       if ( isset( $info['type'] ) && $info['type'] == 'file' ){
+                               $this->mUseMultipart = true;
+                       }
 
                        $field = self::loadInputFromParameters( $info );
                        $field->mParent = $this;
@@ -121,8 +148,6 @@ class HTMLForm {
                }
 
                $this->mFieldTree = $loadedDescriptor;
-
-               $this->mShowReset = true;
        }
 
        /**
@@ -132,9 +157,9 @@ class HTMLForm {
        static function addJS() {
                if( self::$jsAdded ) return;
 
-               global $wgOut;
+               global $wgOut, $wgStylePath;
 
-               $wgOut->addScriptClass( 'htmlform' );
+               $wgOut->addScriptFile( "$wgStylePath/common/htmlform.js" );
        }
 
        /**
@@ -193,14 +218,15 @@ class HTMLForm {
         * Validate all the fields, and call the submision callback
         * function if everything is kosher.
         * @return Mixed Bool true == Successful submission, Bool false
-        *     == No submission attempted, anything else == Error to 
-        *     display.
+        *       == No submission attempted, anything else == Error to 
+        *       display.
         */
        function trySubmit() {
                # Check for validation
                foreach( $this->mFlatFields as $fieldname => $field ) {
-                       if ( !empty( $field->mParams['nodata'] ) )
+                       if ( !empty( $field->mParams['nodata'] ) ){
                                continue;
+                       }
                        if ( $field->validate( 
                                        $this->mFieldData[$fieldname],
                                        $this->mFieldData ) 
@@ -225,9 +251,9 @@ class HTMLForm {
         * Set a callback to a function to do something with the form
         * once it's been successfully validated.
         * @param $cb String function name.  The function will be passed
-        *     the output from HTMLForm::filterDataForSubmit, and must
-        *     return Bool true on success, Bool false if no submission
-        *     was attempted, or String HTML output to display on error.
+        *       the output from HTMLForm::filterDataForSubmit, and must
+        *       return Bool true on success, Bool false if no submission
+        *       was attempted, or String HTML output to display on error.
         */
        function setSubmitCallback( $cb ) {
                $this->mSubmitCallback = $cb;
@@ -236,18 +262,54 @@ class HTMLForm {
        /**
         * Set a message to display on a validation error.  
         * @param $msg Mixed String or Array of valid inputs to wfMsgExt()
-        *     (so each entry can be either a String or Array)
+        *       (so each entry can be either a String or Array)
         */
        function setValidationErrorMessage( $msg ) {
                $this->mValidationErrorMessage = $msg;
        }
+       
+       /**
+        * Set the introductory message, overwriting any existing message.
+        * @param $msg String complete text of message to display
+        */
+       function setIntro( $msg ) { $this->mPre = $msg; }
 
        /**
-        * Set the introductory message
+        * Add introductory text.
+        * @param $msg String complete text of message to display
+        */
+       function addPreText( $msg ) { $this->mPre .= $msg; }
+       
+       /**
+        * Add header text, inside the form.
         * @param $msg String complete text of message to display
         */
-       function setIntro( $msg ) {
-               $this->mIntro = $msg;
+       function addHeaderText( $msg ) { $this->mHeader .= $msg; }
+       
+       /**
+        * Add footer text, inside the form.
+        * @param $msg String complete text of message to display
+        */
+       function addFooterText( $msg ) { $this->mFooter .= $msg; }
+       
+       /**
+        * Add text to the end of the display.
+        * @param $msg String complete text of message to display
+        */
+       function addPostText( $msg ) { $this->mPost .= $msg; }
+       
+       /**
+        * Add a hidden field to the output
+        * @param $name String field name
+        * @param $value String field value
+        * @param $attribs Array
+        */
+       public function addHiddenField( $name, $value, $attribs=array() ){
+               $this->mHiddenFields[ $name ] = array( $value, $attribs );
+       }
+       
+       public function addButton( $name, $value, $id=null, $attribs=null ){
+               $this->mButtons[] = compact( 'name', 'value', 'id', 'attribs' );
        }
 
        /**
@@ -258,25 +320,22 @@ class HTMLForm {
        function displayForm( $submitResult ) {
                global $wgOut;
 
-               if ( $submitResult !== false ) {
-                       $this->displayErrors( $submitResult );
-               }
-
-               if ( isset( $this->mIntro ) ) {
-                       $wgOut->addHTML( $this->mIntro );
-               }
-
-               $html = $this->getBody();
-
-               // Hidden fields
-               $html .= $this->getHiddenFields();
-
-               // Buttons
-               $html .= $this->getButtons();
+               $html = ''
+                       . $this->getErrors( $submitResult )
+                       . $this->mHeader
+                       . $this->getBody()
+                       . $this->getHiddenFields()
+                       . $this->getButtons()
+                       . $this->mFooter
+               ;
 
                $html = $this->wrapForm( $html );
 
-               $wgOut->addHTML( $html );
+               $wgOut->addHTML( ''
+                       . $this->mPre
+                       . $html
+                       . $this->mPost
+               );
        }
 
        /**
@@ -285,14 +344,26 @@ class HTMLForm {
         * @return String wrapped HTML.
         */
        function wrapForm( $html ) {
-               return Html::rawElement(
-                       'form',
-                       array(
-                               'action' => $this->getTitle()->getFullURL(),
-                               'method' => 'post',
-                       ),
-                       $html
+               
+               # Include a <fieldset> wrapper for style, if requested.
+               if ( $this->mWrapperLegend !== false ){
+                       $html = Xml::fieldset( $this->mWrapperLegend, $html );
+               }
+               # Use multipart/form-data
+               $encType = $this->mUseMultipart 
+                       ? 'multipart/form-data'
+                       : 'application/x-www-form-urlencoded';
+               # Attributes
+               $attribs = array(
+                       'action'  => $this->getTitle()->getFullURL(),
+                       'method'  => 'post',
+                       'class'   => 'visualClear',
+                       'enctype' => $encType, 
                );
+               if ( !empty( $this->mId ) )
+                       $attribs['id'] = $this->mId;
+                               
+               return Html::rawElement( 'form', $attribs, $html );
        }
 
        /**
@@ -303,8 +374,13 @@ class HTMLForm {
                global $wgUser;
                $html = '';
 
-               $html .= Html::hidden( 'wpEditToken', $wgUser->editToken() ) . "\n";
-               $html .= Html::hidden( 'title', $this->getTitle() ) . "\n";
+               $html .= Html::hidden( 'wpEditToken', $wgUser->editToken(), array( 'id' => 'wpEditToken' ) ) . "\n";
+               $html .= Html::hidden( 'title', $this->getTitle()->getPrefixedText() ) . "\n";
+               
+               foreach( $this->mHiddenFields as $name => $value ){
+                       list( $value, $attribs ) = $value;
+                       $html .= Html::hidden( $name, $value, $attribs ) . "\n";
+               }
 
                return $html;
        }
@@ -320,6 +396,12 @@ class HTMLForm {
 
                if ( isset( $this->mSubmitID ) )
                        $attribs['id'] = $this->mSubmitID;
+               if ( isset( $this->mSubmitName ) ) 
+                       $attribs['name'] = $this->mSubmitName;
+               if ( isset( $this->mSubmitTooltip ) ) {
+                       global $wgUser;
+                       $attribs += $wgUser->getSkin()->tooltipAndAccessKeyAttribs( $this->mSubmitTooltip );
+               }
 
                $attribs['class'] = 'mw-htmlform-submit';
 
@@ -335,6 +417,19 @@ class HTMLForm {
                        ) . "\n";
                }
                
+               foreach( $this->mButtons as $button ){
+                       $attrs = array(
+                               'type'  => 'submit',
+                               'name'  => $button['name'],
+                               'value' => $button['value']
+                       );
+                       if ( $button['attribs'] )
+                               $attrs += $button['attribs'];
+                       if( isset( $button['id'] ) )
+                               $attrs['id'] = $button['id'];
+                       $html .= Html::element( 'input', $attrs );
+               }
+               
                return $html;
        }
 
@@ -348,18 +443,18 @@ class HTMLForm {
        /**
         * Format and display an error message stack.
         * @param $errors Mixed String or Array of message keys
+        * @return String
         */
-       function displayErrors( $errors ) {
+       function getErrors( $errors ) {
                if ( is_array( $errors ) ) {
                        $errorstr = $this->formatErrors( $errors );
                } else {
                        $errorstr = $errors;
                }
                
-               $errorstr = Html::rawElement( 'div', array( 'class' => 'error' ), $errorstr );
-
-               global $wgOut;
-               $wgOut->addHTML( $errorstr );
+               return $errorstr
+                       ? Html::rawElement( 'div', array( 'class' => 'error' ), $errorstr )
+                       : '';
        }
 
        /**
@@ -405,6 +500,15 @@ class HTMLForm {
                        ? $this->mSubmitText 
                        : wfMsg( 'htmlform-submit' );
        }
+       
+       public function setSubmitName( $name ) {
+               $this->mSubmitName = $name;
+       }
+       
+       public function setSubmitTooltip( $name ) {
+               $this->mSubmitTooltip = $name;
+       }
+
 
        /**
         * Set the id for the submit button. 
@@ -413,6 +517,17 @@ class HTMLForm {
        function setSubmitID( $t ) {
                $this->mSubmitID = $t;
        }
+       
+       public function setId( $id ) {
+               $this->mId = $id;
+       }
+       /**
+        * Prompt the whole form to be wrapped in a <fieldset>, with
+        * this text as its <legend> element.
+        * @param $legend String HTML to go inside the <legend> element.
+        *       Will be escaped
+        */
+       public function setWrapperLegend( $legend ){ $this->mWrapperLegend = $legend; }
 
        /**
         * Set the prefix for various default messages
@@ -444,7 +559,7 @@ class HTMLForm {
         * TODO: Document
         * @param $fields
         */
-       function displaySection( $fields ) {
+       function displaySection( $fields, $sectionName = '' ) {
                $tableHtml = '';
                $subsectionHtml = '';
                $hasLeftColumn = false;
@@ -459,7 +574,7 @@ class HTMLForm {
                                if( $value->getLabel() != '&nbsp;' )
                                        $hasLeftColumn = true;
                        } elseif ( is_array( $value ) ) {
-                               $section = $this->displaySection( $value );
+                               $section = $this->displaySection( $value, $key );
                                $legend = wfMsg( "{$this->mMessagePrefix}-$key" );
                                $subsectionHtml .= Xml::fieldset( $legend, $section ) . "\n";
                        }
@@ -468,9 +583,13 @@ class HTMLForm {
                $classes = array();
                if( !$hasLeftColumn ) // Avoid strange spacing when no labels exist
                        $classes[] = 'mw-htmlform-nolabel';
-               $classes = implode( ' ', $classes );
+               $attribs = array(
+                       'class' => implode( ' ', $classes ), 
+               );
+               if ( $sectionName ) 
+                       $attribs['id'] = Sanitizer::escapeId( "mw-htmlform-$sectionName" );
 
-               $tableHtml = Html::rawElement( 'table', array( 'class' => $classes ),
+               $tableHtml = Html::rawElement( 'table', $attribs,
                        Html::rawElement( 'tbody', array(), "\n$tableHtml\n" ) ) . "\n";
 
                return $subsectionHtml . "\n" . $tableHtml;
@@ -485,8 +604,9 @@ class HTMLForm {
                $fieldData = array();
 
                foreach( $this->mFlatFields as $fieldname => $field ) {
-                       if ( !empty( $field->mParams['nodata'] ) ) continue;
-                       if ( !empty( $field->mParams['disabled'] ) ) {
+                       if ( !empty( $field->mParams['nodata'] ) ){
+                               continue;
+                       } elseif ( !empty( $field->mParams['disabled'] ) ) {
                                $fieldData[$fieldname] = $field->getDefault();
                        } else {
                                $fieldData[$fieldname] = $field->loadDataFromRequest( $wgRequest );
@@ -498,14 +618,14 @@ class HTMLForm {
                        $field = $this->mFlatFields[$name];
                        $value = $field->filter( $value, $this->mFlatFields );
                }
-
+               
                $this->mFieldData = $fieldData;
        }
 
        /**
         * Stop a reset button being shown for this form
         * @param $suppressReset Bool set to false to re-enable the 
-        *     button again
+        *       button again
         */
        function suppressReset( $suppressReset = true ) {
                $this->mShowReset = !$suppressReset;
@@ -533,8 +653,9 @@ abstract class HTMLFormField {
        protected $mFilterCallback;
        protected $mName;
        public $mParams;
-       protected $mLabel;    # String label.  Set on construction
+       protected $mLabel;      # String label.  Set on construction
        protected $mID;
+       protected $mClass = '';
        protected $mDefault;
        public $mParent;
        
@@ -543,7 +664,7 @@ abstract class HTMLFormField {
         * the input object itself.  It should not implement the surrounding
         * table cells/rows, or labels/help messages.
         * @param $value String the value to set the input to; eg a default
-        *     text for a text input. 
+        *       text for a text input. 
         * @return String valid HTML.
         */
        abstract function getInputHTML( $value );
@@ -553,8 +674,8 @@ abstract class HTMLFormField {
         * field input.  Don't forget to call parent::validate() to ensure
         * that the user-defined callback mValidationCallback is still run
         * @param $value String the value the field was submitted with
-        * @param $alldata $all the data collected from the form
-        * @return Bool is the input valid
+        * @param $alldata Array the data collected from the form
+        * @return Mixed Bool true on success, or String error to display.
         */
        function validate( $value, $alldata ) {
                if ( isset( $this->mValidationCallback ) ) {
@@ -642,6 +763,10 @@ abstract class HTMLFormField {
                        $this->mID = $id;
                }
 
+               if ( isset( $params['cssclass'] ) ) {
+                       $this->mClass = $params['cssclass'];
+               }
+
                if ( isset( $params['validation-callback'] ) ) {
                        $this->mValidationCallback = $params['validation-callback'];
                }
@@ -668,24 +793,20 @@ abstract class HTMLFormField {
                        $errors = Html::rawElement( 'span', array( 'class' => 'error' ), $errors );
                }
 
-               $html = '';
-
-               # Don't output a for= attribute for labels with no associated input.
-               # Kind of hacky here, possibly we don't want these to be <label>s at all.
-               $for = array();
-               if ( $this->needsLabel() ) {
-                       $for['for'] = $this->mID;
-               }
-               $html .= Html::rawElement( 'td', array( 'class' => 'mw-label' ),
-                                       Html::rawElement( 'label', $for, $this->getLabel() )
-                               );
-               $html .= Html::rawElement( 'td', array( 'class' => 'mw-input' ),
-                                                       $this->getInputHTML( $value ) ."\n$errors" );
+               $html = $this->getLabelHtml();
+               $html .= Html::rawElement( 
+                       'td', 
+                       array( 'class' => 'mw-input' ),
+                       $this->getInputHTML( $value ) ."\n$errors"
+               );
 
                $fieldType = get_class( $this );
 
-               $html = Html::rawElement( 'tr', array( 'class' => "mw-htmlform-field-$fieldType" ),
-                                                       $html ) . "\n";
+               $html = Html::rawElement( 
+                       'tr',
+                       array( 'class' => "mw-htmlform-field-$fieldType {$this->mClass}" ),
+                       $html 
+               ) . "\n";
 
                $helptext = null;
                if ( isset( $this->mParams['help-message'] ) ) {
@@ -712,6 +833,17 @@ abstract class HTMLFormField {
        function getLabel() {
                return $this->mLabel;
        }
+       function getLabelHtml() {
+               # Don't output a for= attribute for labels with no associated input.
+               # Kind of hacky here, possibly we don't want these to be <label>s at all.
+               $for = array();
+               if ( $this->needsLabel() ) {
+                       $for['for'] = $this->mID;
+               }
+               return Html::rawElement( 'td', array( 'class' => 'mw-label' ),
+                                       Html::rawElement( 'label', $for, $this->getLabel() )
+                               );              
+       }
 
        function getDefault() {
                if ( isset( $this->mDefault ) ) {
@@ -720,12 +852,25 @@ abstract class HTMLFormField {
                        return null;
                }
        }
+       
+       /**
+        * Returns the attributes required for the tooltip and accesskey.
+        * 
+        * @return array Attributes
+        */
+       public function getTooltipAndAccessKey() {
+               if ( empty( $this->mParams['tooltip'] ) )
+                       return array();
+
+               global $wgUser;
+               return $wgUser->getSkin()->tooltipAndAccessKeyAttribs();
+       }
 
        /**
         * flatten an array of options to a single array, for instance,
         * a set of <options> inside <optgroups>.  
         * @param $options Associative Array with values either Strings
-        *     or Arrays
+        *       or Arrays
         * @return Array flattened input
         */
        public static function flattenOptions( $options ) {
@@ -741,6 +886,7 @@ abstract class HTMLFormField {
 
                return $flatOpts;
        }
+       
 }
 
 class HTMLTextField extends HTMLFormField {
@@ -752,13 +898,12 @@ class HTMLTextField extends HTMLFormField {
        }
 
        function getInputHTML( $value ) {
-               global $wgHtml5;
                $attribs = array(
                        'id' => $this->mID,
                        'name' => $this->mName,
                        'size' => $this->getSize(),
                        'value' => $value,
-               );
+               ) + $this->getTooltipAndAccessKey();
 
                if ( isset( $this->mParams['maxlength'] ) ) {
                        $attribs['maxlength'] = $this->mParams['maxlength'];
@@ -768,46 +913,104 @@ class HTMLTextField extends HTMLFormField {
                        $attribs['disabled'] = 'disabled';
                }
 
-               if ( $wgHtml5 ) {
-                       # TODO: Enforce pattern, step, required, readonly on the server
-                       # side as well
-                       foreach ( array( 'min', 'max', 'pattern', 'title', 'step',
-                       'placeholder' ) as $param ) {
-                               if ( isset( $this->mParams[$param] ) ) {
-                                       $attribs[$param] = $this->mParams[$param];
-                               }
+               # TODO: Enforce pattern, step, required, readonly on the server side as
+               # well
+               foreach ( array( 'min', 'max', 'pattern', 'title', 'step',
+               'placeholder' ) as $param ) {
+                       if ( isset( $this->mParams[$param] ) ) {
+                               $attribs[$param] = $this->mParams[$param];
                        }
-                       foreach ( array( 'required', 'autofocus', 'multiple', 'readonly' )
-                       as $param ) {
-                               if ( isset( $this->mParams[$param] ) ) {
-                                       $attribs[$param] = '';
-                               }
+               }
+               foreach ( array( 'required', 'autofocus', 'multiple', 'readonly' ) as
+               $param ) {
+                       if ( isset( $this->mParams[$param] ) ) {
+                               $attribs[$param] = '';
                        }
+               }
                        
-                       # Implement tiny differences between some field variants
-                       # here, rather than creating a new class for each one which
-                       # is essentially just a clone of this one.
-                       if ( isset( $this->mParams['type'] ) ) {
-                               switch ( $this->mParams['type'] ) {
-                                       case 'email':
-                                               $attribs['type'] = 'email';
-                                               break;
-                                       case 'int':
-                                               $attribs['type'] = 'number';
-                                               break;
-                                       case 'float':
-                                               $attribs['type'] = 'number';
-                                               $attribs['step'] = 'any';
-                                               break;
-                                       case 'password':
-                                               $attribs['type'] = 'password';
-                                               break;
-                               }
+               # Implement tiny differences between some field variants
+               # here, rather than creating a new class for each one which
+               # is essentially just a clone of this one.
+               if ( isset( $this->mParams['type'] ) ) {
+                       switch ( $this->mParams['type'] ) {
+                               case 'email':
+                                       $attribs['type'] = 'email';
+                                       break;
+                               case 'int':
+                                       $attribs['type'] = 'number';
+                                       break;
+                               case 'float':
+                                       $attribs['type'] = 'number';
+                                       $attribs['step'] = 'any';
+                                       break;
+                               # Pass through
+                               case 'password':
+                               case 'file':
+                                       $attribs['type'] = $this->mParams['type'];
+                                       break;
                        }
                }
 
                return Html::element( 'input', $attribs );
        }
+       
+       public function validate( $value, $alldata ){
+               $p = parent::validate( $value, $alldata );
+               if( $p !== true ) return $p;
+               
+               if( isset( $this->mParams['required'] ) && $value === '' ){
+                       return wfMsgExt( 'htmlform-required', 'parseinline' );
+               }
+               return true;
+       }
+}
+class HTMLTextAreaField extends HTMLFormField {
+       
+       function getCols() {
+               return isset( $this->mParams['cols'] ) 
+                       ? $this->mParams['cols'] 
+                       : 80;
+       }
+       function getRows() {
+               return isset( $this->mParams['rows'] ) 
+                       ? $this->mParams['rows'] 
+                       : 25;
+       }
+       
+       function getInputHTML( $value ) {
+               $attribs = array(
+                       'id' => $this->mID,
+                       'name' => $this->mName,
+                       'cols' => $this->getCols(),
+                       'rows' => $this->getRows(),
+               ) + $this->getTooltipAndAccessKey();
+
+
+               if ( !empty( $this->mParams['disabled'] ) ) {
+                       $attribs['disabled'] = 'disabled';
+               }
+               if ( !empty( $this->mParams['readonly'] ) ) {
+                       $attribs['readonly'] = 'readonly';
+               }
+               
+               foreach ( array( 'required', 'autofocus' ) as $param ) {
+                       if ( isset( $this->mParams[$param] ) ) {
+                               $attribs[$param] = '';
+                       }
+               }
+
+               return Html::element( 'textarea', $attribs, $value );
+       }
+       
+       public function validate( $value, $alldata ){
+               $p = parent::validate( $value, $alldata );
+               if( $p !== true ) return $p;
+               
+               if( isset( $this->mParams['required'] ) && $value === '' ){
+                       return wfMsgExt( 'htmlform-required', 'parseinline' );
+               }
+               return true;
+       }
 }
 
 /**
@@ -859,7 +1062,9 @@ class HTMLIntField extends HTMLFloatField {
 
                if ( $p !== true ) return $p;
 
-               if ( intval( $value ) != $value ) {
+               if ( $value !== '' 
+                       && ( !is_numeric( $value ) || round( $value ) != $value ) ) 
+               {
                        return wfMsgExt( 'htmlform-int-invalid', 'parse' );
                }
 
@@ -875,7 +1080,8 @@ class HTMLCheckField extends HTMLFormField {
                if ( !empty( $this->mParams['invert'] ) )
                        $value = !$value;
 
-               $attr = array( 'id' => $this->mID );
+               $attr = $this->getTooltipAndAccessKey(); 
+               $attr['id'] = $this->mID;
                if( !empty( $this->mParams['disabled'] ) ) {
                        $attr['disabled'] = 'disabled';
                }
@@ -1002,7 +1208,7 @@ class HTMLSelectOrOtherField extends HTMLTextField {
                                                        'text',
                                                        $tbAttribs );
 
-               return "$select<br/>\n$textbox";
+               return "$select<br />\n$textbox";
        }
 
        function loadDataFromRequest( $request ) {
@@ -1063,7 +1269,7 @@ class HTMLMultiSelectField extends HTMLFormField {
                        } else {
                                $thisAttribs = array( 'id' => $this->mID . "-$info", 'value' => $info );
                                
-                               $checkbox = Xml::check( $this->mName . '[]', in_array( $info, $value ),
+                               $checkbox = Xml::check( $this->mName . '[]', $info === $value,
                                                                $attribs + $thisAttribs );
                                $checkbox .= '&nbsp;' . Html::rawElement( 'label', array( 'for' => $this->mID . "-$info" ), $label );
 
@@ -1150,7 +1356,7 @@ class HTMLRadioField extends HTMLFormField {
                                $html .= '&nbsp;' .
                                                Html::rawElement( 'label', array( 'for' => $id ), $label );
 
-                               $html .= "<br/>\n";
+                               $html .= "<br />\n";
                        }
                }
 
@@ -1188,3 +1394,62 @@ class HTMLInfoField extends HTMLFormField {
                return false;
        }
 }
+
+class HTMLHiddenField extends HTMLFormField {
+       
+       public function getTableRow( $value ){
+               $params = array();
+               if( $this->mID ){
+                       $params['id'] = $this->mID;
+               }
+               $this->mParent->addHiddenField( 
+                       $this->mName,
+                       $this->mDefault,
+                       $params
+               );
+               return '';
+       }
+
+       public function getInputHTML( $value ){ return ''; }
+}
+
+/**
+ * Add a submit button inline in the form (as opposed to 
+ * HTMLForm::addButton(), which will add it at the end).
+ */
+class HTMLSubmitField extends HTMLFormField {
+       
+       function __construct( $info ) {
+               $info['nodata'] = true;
+               parent::__construct( $info );
+       }
+
+       function getInputHTML( $value ) {
+               return Xml::submitButton( 
+                       $value, 
+                       array( 
+                               'class' => 'mw-htmlform-submit',
+                               'name' => $this->mName,
+                               'id' => $this->mID,
+                       ) 
+               );
+       }
+
+       protected function needsLabel() {
+               return false;
+       }
+}
+
+class HTMLEditTools extends HTMLFormField {
+       public function getInputHTML( $value ) {
+               return '';
+       }
+       public function getTableRow( $value ) {
+               return "<tr><td></td><td class=\"mw-input\">" 
+                       . '<div class="mw-editTools">' 
+                       . wfMsgExt( empty( $this->mParams['message'] ) 
+                               ? 'edittools' : $this->mParams['message'], 
+                               array( 'parse', 'content' ) )
+                       . "</div></td></tr>\n";
+       }
+}