Fixes for fixme comments on my r59655
[lhc/web/wiklou.git] / includes / HTMLForm.php
index ca5121e..10ac65d 100644 (file)
@@ -1,18 +1,57 @@
 <?php
 
+/**
+ * Object handling generic submission, CSRF protection, layout and 
+ * other logic for UI forms. in a reusable manner. 
+ *
+ * In order to generate the form, the HTMLForm object takes an array 
+ * structure detailing the form fields available. Each element of the 
+ * array is a basic property-list, including the type of field, the 
+ * label it is to be given in the form, callbacks for validation and
+ * 'filtering', and other pertinent information. 
+ *
+ * Field types are implemented as subclasses of the generic HTMLFormField
+ * object, and typically implement at least getInputHTML, which generates 
+ * the HTML for the input field to be placed in the table.
+ * 
+ * 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()
+ *                                
+ * TODO: Document 'section' / 'subsection' stuff
+ */
 class HTMLForm {
        static $jsAdded = false;
 
-       /* The descriptor is an array of arrays.
-               i.e. array(
-                       'fieldname' => array( 'section' => 'section/subsection',
-                                                               properties... ),
-                       ...
-               )
-        */
-
+       # A mapping of 'type' inputs onto standard HTMLFormField subclasses
        static $typeMappings = array(
                'text' => 'HTMLTextField',
+               'textarea' => 'HTMLTextAreaField',
                'select' => 'HTMLSelectField',
                'radio' => 'HTMLRadioField',
                'multiselect' => 'HTMLMultiSelectField',
@@ -22,14 +61,49 @@ 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
                # we don't use those at the moment, so no point in adding all of them.
                'email' => 'HTMLTextField',
                'password' => 'HTMLTextField',
        );
+       
+       protected $mMessagePrefix;
+       protected $mFlatFields;
+       protected $mFieldTree;
+       protected $mShowReset = false;
+       public $mFieldData;
+       
+       protected $mSubmitCallback;
+       protected $mValidationErrorMessage;
+       
+       protected $mPre = '';
+       protected $mHeader = '';
+       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;
 
-       function __construct( $descriptor, $messagePrefix ) {
+       /**
+        * Build a new HTMLForm from an array of field attributes
+        * @param $descriptor Array of Field constructs, as described above
+        * @param $messagePrefix String a prefix to go in front of default messages
+        */
+       public function __construct( $descriptor, $messagePrefix='' ) {
                $this->mMessagePrefix = $messagePrefix;
 
                // Expand out into a tree.
@@ -43,7 +117,10 @@ class HTMLForm {
 
                        $info['name'] = $fieldname;
 
-                       $field = $this->loadInputFromParameters( $info );
+                       if ( isset( $info['type'] ) && $info['type'] == 'file' )
+                               $this->mUseMultipart = true;
+
+                       $field = self::loadInputFromParameters( $info );
                        $field->mParent = $this;
 
                        $setSection =& $loadedDescriptor;
@@ -66,18 +143,25 @@ class HTMLForm {
                }
 
                $this->mFieldTree = $loadedDescriptor;
-
-               $this->mShowReset = true;
        }
 
+       /**
+        * Add the HTMLForm-specific JavaScript, if it hasn't been 
+        * done already.
+        */
        static function addJS() {
                if( self::$jsAdded ) return;
 
-               global $wgOut;
+               global $wgOut, $wgStylePath;
 
-               $wgOut->addScriptClass( 'htmlform' );
+               $wgOut->addScriptFile( "$wgStylePath/common/htmlform.js" );
        }
 
+       /**
+        * Initialise a new Object for the field
+        * @param $descriptor input Descriptor, as described above
+        * @return HTMLFormField subclass
+        */
        static function loadInputFromParameters( $descriptor ) {
                if ( isset( $descriptor['class'] ) ) {
                        $class = $descriptor['class'];
@@ -95,15 +179,21 @@ class HTMLForm {
                return $obj;
        }
 
+       /**
+        * The here's-one-I-made-earlier option: do the submission if 
+        * posted, or display the form with or without funky valiation 
+        * errors
+        * @return Bool whether submission was successful.
+        */
        function show() {
                $html = '';
 
                self::addJS();
 
-               // Load data from the request.
+               # Load data from the request.
                $this->loadData();
 
-               // Try a submission
+               # Try a submission
                global $wgUser, $wgRequest;
                $editToken = $wgRequest->getVal( 'wpEditToken' );
 
@@ -114,23 +204,31 @@ class HTMLForm {
                if( $result === true )
                        return $result;
 
-               // Display form.
+               # Display form.
                $this->displayForm( $result );
+               return false;
        }
 
-       /** Return values:
-         * TRUE == Successful submission
-         * FALSE == No submission attempted
-         * Anything else == Error to display.
-         */
+       /**
+        * 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.
+        */
        function trySubmit() {
-               // Check for validation
+               # Check for validation
                foreach( $this->mFlatFields as $fieldname => $field ) {
-                       if ( !empty( $field->mParams['nodata'] ) ) continue;
-                       if ( $field->validate( $this->mFieldData[$fieldname],
-                                       $this->mFieldData ) !== true ) {
-                               return isset( $this->mValidationErrorMessage ) ?
-                                               $this->mValidationErrorMessage : array( 'htmlform-invalid-input' );
+                       if ( !empty( $field->mParams['nodata'] ) )
+                               continue;
+                       if ( $field->validate( 
+                                       $this->mFieldData[$fieldname],
+                                       $this->mFieldData ) 
+                               !== true )
+                       {
+                               return isset( $this->mValidationErrorMessage )
+                                       ? $this->mValidationErrorMessage
+                                       : array( 'htmlform-invalid-input' );
                        }
                }
 
@@ -143,18 +241,69 @@ class HTMLForm {
                return $res;
        }
 
+       /**
+        * 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.
+        */
        function setSubmitCallback( $cb ) {
                $this->mSubmitCallback = $cb;
        }
 
+       /**
+        * 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)
+        */
        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; }
 
-       function setIntro( $msg ) {
-               $this->mIntro = $msg;
+       /**
+        * 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 addHeaderText( $msg ) { $this->mHeader .= $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
+        */
+       public function addHiddenField( $name, $value ){
+               $this->mHiddenFields[ $name ] = $value;
+       }
+       
+       public function addButton( $name, $value, $id=null, $attribs=null ){
+               $this->mButtons[] = compact( 'name', 'value', 'id', 'attribs' );
        }
 
+       /**
+        * Display the form (sending to wgOut), with an appropriate error 
+        * message or stack of messages, and any validation errors, etc.
+        * @param $submitResult Mixed output from HTMLForm::trySubmit()
+        */
        function displayForm( $submitResult ) {
                global $wgOut;
 
@@ -162,44 +311,72 @@ class HTMLForm {
                        $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->mHeader
+                       . $this->getBody()
+                       . $this->getHiddenFields()
+                       . $this->getButtons()
+               ;
 
                $html = $this->wrapForm( $html );
 
-               $wgOut->addHTML( $html );
+               $wgOut->addHTML( ''
+                       . $this->mPre
+                       . $html
+                       . $this->mPost
+               );
        }
 
+       /**
+        * Wrap the form innards in an actual <form> element
+        * @param $html String HTML contents to wrap.
+        * @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 );
        }
 
+       /**
+        * Get the hidden fields that should go inside the form.
+        * @return String HTML.
+        */
        function getHiddenFields() {
                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 ){
+                       $html .= Html::hidden( $name, $value ) . "\n";
+               }
 
                return $html;
        }
 
+       /**
+        * Get the submit and (potentially) reset buttons.
+        * @return String HTML.
+        */
        function getButtons() {
                $html = '';
 
@@ -207,6 +384,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';
 
@@ -222,13 +405,33 @@ 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;
        }
 
+       /**
+        * Get the whole body of the form.
+        */
        function getBody() {
                return $this->displaySection( $this->mFieldTree );
        }
 
+       /**
+        * Format and display an error message stack.
+        * @param $errors Mixed String or Array of message keys
+        */
        function displayErrors( $errors ) {
                if ( is_array( $errors ) ) {
                        $errorstr = $this->formatErrors( $errors );
@@ -242,6 +445,11 @@ class HTMLForm {
                $wgOut->addHTML( $errorstr );
        }
 
+       /**
+        * Format a stack of error messages into a single HTML string
+        * @param $errors Array of message keys/values
+        * @return String HTML, a <ul> list of errors
+        */
        static function formatErrors( $errors ) {
                $errorstr = '';
                foreach ( $errors as $error ) {
@@ -263,31 +471,83 @@ class HTMLForm {
                return $errorstr;
        }
 
+       /**
+        * Set the text for the submit button
+        * @param $t String plaintext.
+        */
        function setSubmitText( $t ) {
                $this->mSubmitText = $t;
        }
 
+       /**
+        * Get the text for the submit button, either customised or a default.
+        * @return unknown_type
+        */
        function getSubmitText() {
-               return isset( $this->mSubmitText ) ? $this->mSubmitText : wfMsg( 'htmlform-submit' );
+               return $this->mSubmitText
+                       ? $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. 
+        * @param $t String.  FIXME: Integrity is *not* validated
+        */
        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
+        * TODO: currently only used for the <fieldset> legend on forms 
+        * with multiple sections; should be used elsewhre?
+        * @param $p String
+        */
        function setMessagePrefix( $p ) {
                $this->mMessagePrefix = $p;
        }
 
+       /**
+        * Set the title for form submission
+        * @param $t Title of page the form is on/should be posted to
+        */
        function setTitle( $t ) {
                $this->mTitle = $t;
        }
 
+       /**
+        * Get the title
+        * @return Title
+        */
        function getTitle() {
                return $this->mTitle;
        }
 
-       function displaySection( $fields ) {
+       /**
+        * TODO: Document
+        * @param $fields
+        */
+       function displaySection( $fields, $sectionName = '' ) {
                $tableHtml = '';
                $subsectionHtml = '';
                $hasLeftColumn = false;
@@ -295,14 +555,14 @@ class HTMLForm {
                foreach( $fields as $key => $value ) {
                        if ( is_object( $value ) ) {
                                $v = empty( $value->mParams['nodata'] )
-                                                       ? $this->mFieldData[$key]
-                                                       : $value->getDefault();
+                                       ? $this->mFieldData[$key]
+                                       : $value->getDefault();
                                $tableHtml .= $value->getTableRow( $v );
 
                                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";
                        }
@@ -311,14 +571,21 @@ class HTMLForm {
                $classes = array();
                if( !$hasLeftColumn ) // Avoid strange spacing when no labels exist
                        $classes[] = 'mw-htmlform-nolabel';
-               $classes = implode( ' ', $classes );
+               $attribs = array(
+                       'classes' => 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;
        }
 
+       /**
+        * Construct the form fields from the Descriptor array
+        */
        function loadData() {
                global $wgRequest;
 
@@ -333,7 +600,7 @@ class HTMLForm {
                        }
                }
 
-               // Filter data.
+               # Filter data.
                foreach( $fieldData as $name => &$value ) {
                        $field = $this->mFlatFields[$name];
                        $value = $field->filter( $value, $this->mFlatFields );
@@ -342,33 +609,60 @@ class HTMLForm {
                $this->mFieldData = $fieldData;
        }
 
-       function importData( $fieldData ) {
-               // Filter data.
-               foreach( $fieldData as $name => &$value ) {
-                       $field = $this->mFlatFields[$name];
-                       $value = $field->filter( $value, $this->mFlatFields );
-               }
-
-               foreach( $this->mFlatFields as $fieldname => $field ) {
-                       if ( !isset( $fieldData[$fieldname] ) )
-                               $fieldData[$fieldname] = $field->getDefault();
-               }
-
-               $this->mFieldData = $fieldData;
-       }
-
+       /**
+        * Stop a reset button being shown for this form
+        * @param $suppressReset Bool set to false to re-enable the 
+        *       button again
+        */
        function suppressReset( $suppressReset = true ) {
                $this->mShowReset = !$suppressReset;
        }
 
+       /**
+        * Overload this if you want to apply special filtration routines
+        * to the form as a whole, after it's submitted but before it's 
+        * processed.
+        * @param $data 
+        * @return unknown_type
+        */
        function filterDataForSubmit( $data ) {
                return $data;
        }
 }
 
+/**
+ * The parent class to generate form fields.  Any field type should 
+ * be a subclass of this.
+ */
 abstract class HTMLFormField {
+       
+       protected $mValidationCallback;
+       protected $mFilterCallback;
+       protected $mName;
+       public $mParams;
+       protected $mLabel;      # String label.  Set on construction
+       protected $mID;
+       protected $mDefault;
+       public $mParent;
+       
+       /**
+        * This function must be implemented to return the HTML to generate
+        * 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. 
+        * @return String valid HTML.
+        */
        abstract function getInputHTML( $value );
 
+       /**
+        * Override this function to add specific validation checks on the 
+        * 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 Mixed Bool true on success, or String error to display.
+        */
        function validate( $value, $alldata ) {
                if ( isset( $this->mValidationCallback ) ) {
                        return call_user_func( $this->mValidationCallback, $value, $alldata );
@@ -395,6 +689,12 @@ abstract class HTMLFormField {
                return true;
        }
 
+       /**
+        * Get the value that this input has been set to from a posted form,
+        * or the input's default value if it has not been set.
+        * @param $request WebRequest
+        * @return String the value
+        */
        function loadDataFromRequest( $request ) {
                if( $request->getCheck( $this->mName ) ) {
                        return $request->getText( $this->mName );
@@ -403,9 +703,14 @@ abstract class HTMLFormField {
                }
        }
 
+       /**
+        * Initialise the object
+        * @param $params Associative Array. See HTMLForm doc for syntax.
+        */
        function __construct( $params ) {
                $this->mParams = $params;
 
+               # Generate the label from a message, if possible
                if( isset( $params['label-message'] ) ) {
                        $msgInfo = $params['label-message'];
 
@@ -453,8 +758,14 @@ abstract class HTMLFormField {
                }
        }
 
+       /**
+        * Get the complete table row for the input, including help text,
+        * labels, and whatever.
+        * @param $value String the value to set the input to.
+        * @return String complete HTML table row.
+        */
        function getTableRow( $value ) {
-               // Check for invalid data.
+               # Check for invalid data.
                global $wgRequest;
 
                $errors = $this->validate( $value, $this->mParent->mFieldData );
@@ -464,17 +775,7 @@ 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 = $this->getLabelHtml();
                $html .= Html::rawElement( 'td', array( 'class' => 'mw-input' ),
                                                        $this->getInputHTML( $value ) ."\n$errors" );
 
@@ -508,6 +809,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 ) ) {
@@ -516,8 +828,28 @@ 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();
+       }
 
-       static function flattenOptions( $options ) {
+       /**
+        * 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
+        * @return Array flattened input
+        */
+       public static function flattenOptions( $options ) {
                $flatOpts = array();
 
                foreach( $options as $key => $value ) {
@@ -530,24 +862,24 @@ abstract class HTMLFormField {
 
                return $flatOpts;
        }
+       
 }
 
 class HTMLTextField extends HTMLFormField {
-       # Override in derived classes to use other Xml::... functions
-       protected $mFunction = 'input';
        
        function getSize() {
-               return isset( $this->mParams['size'] ) ? $this->mParams['size'] : 45;
+               return isset( $this->mParams['size'] ) 
+                       ? $this->mParams['size'] 
+                       : 45;
        }
 
        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'];
@@ -557,23 +889,26 @@ 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] = '';
                        }
-                       if ( isset( $this->mParams['type'] ) ) {
-                               switch ( $this->mParams['type'] ) {
+               }
+                       
+               # 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;
@@ -584,20 +919,65 @@ class HTMLTextField extends HTMLFormField {
                                        $attribs['type'] = 'number';
                                        $attribs['step'] = 'any';
                                        break;
+                               # Pass through
                                case 'password':
-                                       $attribs['type'] = 'password';
+                               case 'file':
+                                       $attribs['type'] = $this->mParams['type'];
                                        break;
-                               }
                        }
                }
 
                return Html::element( 'input', $attribs );
        }
 }
+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 );
+       }
+}
 
+/**
+ * A field that will contain a numeric value
+ */
 class HTMLFloatField extends HTMLTextField {
+       
        function getSize() {
-               return isset( $this->mParams['size'] ) ? $this->mParams['size'] : 20;
+               return isset( $this->mParams['size'] ) 
+                       ? $this->mParams['size'] 
+                       : 20;
        }
 
        function validate( $value, $alldata ) {
@@ -611,8 +991,8 @@ class HTMLFloatField extends HTMLTextField {
 
                $in_range = true;
 
-               # The "int" part of these message names is rather confusing.  They make
-               # equal sense for all numbers.
+               # The "int" part of these message names is rather confusing. 
+               # They make equal sense for all numbers.
                if ( isset( $this->mParams['min'] ) ) {
                        $min = $this->mParams['min'];
                        if ( $min > $value )
@@ -629,6 +1009,9 @@ class HTMLFloatField extends HTMLTextField {
        }
 }
 
+/**
+ * A field that must contain a number
+ */
 class HTMLIntField extends HTMLFloatField {
        function validate( $value, $alldata ) {
                $p = parent::validate( $value, $alldata );
@@ -643,12 +1026,16 @@ class HTMLIntField extends HTMLFloatField {
        }
 }
 
+/**
+ * A checkbox field
+ */
 class HTMLCheckField extends HTMLFormField {
        function getInputHTML( $value ) {
                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';
                }
@@ -657,8 +1044,12 @@ class HTMLCheckField extends HTMLFormField {
                                Html::rawElement( 'label', array( 'for' => $this->mID ), $this->mLabel );
        }
 
+       /**
+        * For a checkbox, the label goes on the right hand side, and is
+        * added in getInputHTML(), rather than HTMLFormField::getRow()
+        */
        function getLabel() {
-               return '&nbsp;'; // In the right-hand column.
+               return '&nbsp;';
        }
 
        function loadDataFromRequest( $request ) {
@@ -682,6 +1073,9 @@ class HTMLCheckField extends HTMLFormField {
        }
 }
 
+/**
+ * A select dropdown field.  Basically a wrapper for Xmlselect class
+ */
 class HTMLSelectField extends HTMLFormField {
 
        function validate( $value, $alldata ) {
@@ -698,9 +1092,9 @@ class HTMLSelectField extends HTMLFormField {
        function getInputHTML( $value ) {
                $select = new XmlSelect( $this->mName, $this->mID, strval( $value ) );
 
-               // If one of the options' 'name' is int(0), it is automatically selected.
-               //  because PHP sucks and things int(0) == 'some string'.
-               //  Working around this by forcing all of them to strings.
+               # If one of the options' 'name' is int(0), it is automatically selected.
+               # because PHP sucks and things int(0) == 'some string'.
+               # Working around this by forcing all of them to strings.
                $options = array_map( 'strval', $this->mParams['options'] );
 
                if( !empty( $this->mParams['disabled'] ) ) {
@@ -713,6 +1107,9 @@ class HTMLSelectField extends HTMLFormField {
        }
 }
 
+/**
+ * Select dropdown field, with an additional "other" textbox.
+ */
 class HTMLSelectOrOtherField extends HTMLTextField {
        static $jsAdded = false;
 
@@ -765,7 +1162,7 @@ class HTMLSelectOrOtherField extends HTMLTextField {
                                                        'text',
                                                        $tbAttribs );
 
-               return "$select<br/>\n$textbox";
+               return "$select<br />\n$textbox";
        }
 
        function loadDataFromRequest( $request ) {
@@ -783,15 +1180,19 @@ class HTMLSelectOrOtherField extends HTMLTextField {
        }
 }
 
+/**
+ * Multi-select field
+ */
 class HTMLMultiSelectField extends HTMLFormField {
+       
        function validate( $value, $alldata ) {
                $p = parent::validate( $value, $alldata );
                if( $p !== true ) return $p;
 
                if( !is_array( $value ) ) return false;
 
-               // If all options are valid, array_intersect of the valid options and the provided
-               //  options will return the provided options.
+               # If all options are valid, array_intersect of the valid options 
+               # and the provided options will return the provided options.
                $validOptions = HTMLFormField::flattenOptions( $this->mParams['options'] );
 
                $validValues = array_intersect( $value, $validOptions );
@@ -834,7 +1235,7 @@ class HTMLMultiSelectField extends HTMLFormField {
        }
 
        function loadDataFromRequest( $request ) {
-               // won't work with getCheck
+               # won't work with getCheck
                if( $request->getCheck( 'wpEditToken' ) ) {
                        $arr = $request->getArray( $this->mName );
 
@@ -860,6 +1261,9 @@ class HTMLMultiSelectField extends HTMLFormField {
        }
 }
 
+/**
+ * Radio checkbox fields.
+ */
 class HTMLRadioField extends HTMLFormField {
        function validate( $value, $alldata ) {
                $p = parent::validate( $value, $alldata );
@@ -876,6 +1280,10 @@ class HTMLRadioField extends HTMLFormField {
                        return wfMsgExt( 'htmlform-select-badoption', 'parseinline' );
        }
 
+       /**
+        * This returns a block of all the radio options, in one cell.
+        * @see includes/HTMLFormField#getInputHTML()
+        */
        function getInputHTML( $value ) {
                $html = $this->formatOptions( $this->mParams['options'], $value );
 
@@ -890,6 +1298,7 @@ class HTMLRadioField extends HTMLFormField {
                        $attribs['disabled'] = 'disabled';
                }
 
+               # TODO: should this produce an unordered list perhaps?
                foreach( $options as $label => $info ) {
                        if( is_array( $info ) ) {
                                $html .= Html::rawElement( 'h1', array(), $label ) . "\n";
@@ -901,7 +1310,7 @@ class HTMLRadioField extends HTMLFormField {
                                $html .= '&nbsp;' .
                                                Html::rawElement( 'label', array( 'for' => $id ), $label );
 
-                               $html .= "<br/>\n";
+                               $html .= "<br />\n";
                        }
                }
 
@@ -913,6 +1322,9 @@ class HTMLRadioField extends HTMLFormField {
        }
 }
 
+/**
+ * An information field (text blob), not a proper input.
+ */
 class HTMLInfoField extends HTMLFormField {
        function __construct( $info ) {
                $info['nodata'] = true;
@@ -936,3 +1348,44 @@ class HTMLInfoField extends HTMLFormField {
                return false;
        }
 }
+
+class HTMLHiddenField extends HTMLFormField {
+       
+       public function getTableRow( $value ){
+               $this->mParent->addHiddenField( 
+                       $this->mParams['name'],
+                       $this->mParams['default']
+               );
+               return '';
+       }
+
+       public function getInputHTML( $value ){ return ''; }
+}
+
+class HTMLSubmitField extends HTMLFormField {
+       
+       public function getTableRow( $value ){
+               $this->mParent->addButton(
+                       $this->mParams['name'],
+                       $this->mParams['default'],
+                       isset($this->mParams['id']) ? $this->mParams['id'] : null,
+                       $this->getTooltipAndAccessKey()
+               );
+       }
+       
+       public function getInputHTML( $value ){ return ''; }
+}
+
+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";
+       }
+}