From: Siebrand Mazeland <siebrand@users.mediawiki.org>
Date: Sun, 30 May 2010 12:44:17 +0000 (+0000)
Subject: Ran stylize.php, removed trailing whitespace, updated indentation and code formatting.
X-Git-Tag: 1.31.0-rc.0~36670
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=e0a4a54ca157789695e2bea9b365efedd80196a0;p=lhc%2Fweb%2Fwiklou.git

Ran stylize.php, removed trailing whitespace, updated indentation and code formatting.
---

diff --git a/includes/HTMLForm.php b/includes/HTMLForm.php
index 6046879622..78c37945e3 100644
--- a/includes/HTMLForm.php
+++ b/includes/HTMLForm.php
@@ -1,22 +1,21 @@
 <?php
-
 /**
- * Object handling generic submission, CSRF protection, layout and 
- * other logic for UI forms. in a reusable manner. 
+ * 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 
+ * 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. 
+ * 'filtering', and other pertinent information.
  *
  * Field types are implemented as subclasses of the generic HTMLFormField
- * object, and typically implement at least getInputHTML, which generates 
+ * 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.
@@ -27,23 +26,23 @@
  *   '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 
+ *				   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 
+ *				   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 
+ *	 '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 {
@@ -65,39 +64,39 @@ class HTMLForm {
 		'submit' => 'HTMLSubmitField',
 		'hidden' => 'HTMLHiddenField',
 		'edittools' => 'HTMLEditTools',
-	
+
 		# HTMLTextField will output the correct type="" attribute automagically.
 		# 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',
 	);
-	
+
 	protected $mMessagePrefix;
 	protected $mFlatFields;
 	protected $mFieldTree;
 	protected $mShowReset = false;
 	public $mFieldData;
-	
+
 	protected $mSubmitCallback;
 	protected $mValidationErrorMessage;
-	
+
 	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;
 
 	/**
@@ -105,15 +104,15 @@ class HTMLForm {
 	 * @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='' ) {
+	public function __construct( $descriptor, $messagePrefix = '' ) {
 		$this->mMessagePrefix = $messagePrefix;
 
 		// Expand out into a tree.
 		$loadedDescriptor = array();
 		$this->mFlatFields = array();
 
-		foreach( $descriptor as $fieldname => $info ) {
-			$section = isset( $info['section'] ) 
+		foreach ( $descriptor as $fieldname => $info ) {
+			$section = isset( $info['section'] )
 				? $info['section']
 				: '';
 
@@ -121,7 +120,7 @@ class HTMLForm {
 				? $info['name']
 				: $fieldname;
 
-			if ( isset( $info['type'] ) && $info['type'] == 'file' ){
+			if ( isset( $info['type'] ) && $info['type'] == 'file' ) {
 				$this->mUseMultipart = true;
 			}
 
@@ -129,10 +128,10 @@ class HTMLForm {
 			$field->mParent = $this;
 
 			$setSection =& $loadedDescriptor;
-			if( $section ) {
+			if ( $section ) {
 				$sectionParts = explode( '/', $section );
 
-				while( count( $sectionParts ) ) {
+				while ( count( $sectionParts ) ) {
 					$newName = array_shift( $sectionParts );
 
 					if ( !isset( $setSection[$newName] ) ) {
@@ -151,11 +150,11 @@ class HTMLForm {
 	}
 
 	/**
-	 * Add the HTMLForm-specific JavaScript, if it hasn't been 
+	 * Add the HTMLForm-specific JavaScript, if it hasn't been
 	 * done already.
 	 */
 	static function addJS() {
-		if( self::$jsAdded ) return;
+		if ( self::$jsAdded ) return;
 
 		global $wgOut, $wgStylePath;
 
@@ -175,7 +174,7 @@ class HTMLForm {
 			$descriptor['class'] = $class;
 		}
 
-		if( !$class ) {
+		if ( !$class ) {
 			throw new MWException( "Descriptor with no class: " . print_r( $descriptor, true ) );
 		}
 
@@ -185,8 +184,8 @@ class HTMLForm {
 	}
 
 	/**
-	 * The here's-one-I-made-earlier option: do the submission if 
-	 * posted, or display the form with or without funky valiation 
+	 * 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.
 	 */
@@ -206,11 +205,13 @@ class HTMLForm {
 		$editToken = $wgRequest->getVal( 'wpEditToken' );
 
 		$result = false;
-		if ( $wgUser->matchEditToken( $editToken ) )
+		if ( $wgUser->matchEditToken( $editToken ) ) {
 			$result = $this->trySubmit();
+		}
 
-		if( $result === true )
+		if ( $result === true ) {
 			return $result;
+		}
 
 		# Display form.
 		$this->displayForm( $result );
@@ -221,20 +222,20 @@ 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 
+	 *	 == No submission attempted, anything else == Error to
 	 *	 display.
 	 */
 	function trySubmit() {
 		# Check for validation
-		foreach( $this->mFlatFields as $fieldname => $field ) {
-			if ( !empty( $field->mParams['nodata'] ) ){
+		foreach ( $this->mFlatFields as $fieldname => $field ) {
+			if ( !empty( $field->mParams['nodata'] ) ) {
 				continue;
 			}
-			if ( $field->validate( 
+			if ( $field->validate(
 					$this->mFieldData[$fieldname],
-					$this->mFieldData ) 
-				!== true )
-			{
+					$this->mFieldData )
+				!== true
+			) {
 				return isset( $this->mValidationErrorMessage )
 					? $this->mValidationErrorMessage
 					: array( 'htmlform-invalid-input' );
@@ -263,14 +264,14 @@ class HTMLForm {
 	}
 
 	/**
-	 * Set a message to display on a validation error.  
+	 * 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
@@ -282,42 +283,42 @@ class HTMLForm {
 	 * @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 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() ){
+	public function addHiddenField( $name, $value, $attribs = array() ) {
 		$attribs += array( 'name' => $name );
 		$this->mHiddenFields[] = array( $value, $attribs );
 	}
-	
-	public function addButton( $name, $value, $id=null, $attribs=null ){
+
+	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 
+	 * 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()
 	 */
@@ -348,13 +349,13 @@ class HTMLForm {
 	 * @return String wrapped HTML.
 	 */
 	function wrapForm( $html ) {
-		
+
 		# Include a <fieldset> wrapper for style, if requested.
-		if ( $this->mWrapperLegend !== false ){
+		if ( $this->mWrapperLegend !== false ) {
 			$html = Xml::fieldset( $this->mWrapperLegend, $html );
 		}
 		# Use multipart/form-data
-		$encType = $this->mUseMultipart 
+		$encType = $this->mUseMultipart
 			? 'multipart/form-data'
 			: 'application/x-www-form-urlencoded';
 		# Attributes
@@ -362,11 +363,12 @@ class HTMLForm {
 			'action'  => $this->getTitle()->getFullURL(),
 			'method'  => 'post',
 			'class'   => 'visualClear',
-			'enctype' => $encType, 
+			'enctype' => $encType,
 		);
-		if ( !empty( $this->mId ) )
+		if ( !empty( $this->mId ) ) {
 			$attribs['id'] = $this->mId;
-				
+		}
+
 		return Html::rawElement( 'form', $attribs, $html );
 	}
 
@@ -376,12 +378,12 @@ class HTMLForm {
 	 */
 	function getHiddenFields() {
 		global $wgUser;
-		$html = '';
 
+		$html = '';
 		$html .= Html::hidden( 'wpEditToken', $wgUser->editToken(), array( 'id' => 'wpEditToken' ) ) . "\n";
 		$html .= Html::hidden( 'title', $this->getTitle()->getPrefixedText() ) . "\n";
-		
-		foreach( $this->mHiddenFields as $data ){
+
+		foreach ( $this->mHiddenFields as $data ) {
 			list( $value, $attribs ) = $data;
 			$html .= Html::hidden( $attribs['name'], $value, $attribs ) . "\n";
 		}
@@ -395,13 +397,16 @@ class HTMLForm {
 	 */
 	function getButtons() {
 		$html = '';
-
 		$attribs = array();
 
-		if ( isset( $this->mSubmitID ) )
+		if ( isset( $this->mSubmitID ) ) {
 			$attribs['id'] = $this->mSubmitID;
-		if ( isset( $this->mSubmitName ) ) 
+		}
+
+		if ( isset( $this->mSubmitName ) ) {
 			$attribs['name'] = $this->mSubmitName;
+		}
+
 		if ( isset( $this->mSubmitTooltip ) ) {
 			global $wgUser;
 			$attribs += $wgUser->getSkin()->tooltipAndAccessKeyAttribs( $this->mSubmitTooltip );
@@ -411,7 +416,7 @@ class HTMLForm {
 
 		$html .= Xml::submitButton( $this->getSubmitText(), $attribs ) . "\n";
 
-		if( $this->mShowReset ) {
+		if ( $this->mShowReset ) {
 			$html .= Html::element(
 				'input',
 				array(
@@ -420,20 +425,25 @@ class HTMLForm {
 				)
 			) . "\n";
 		}
-		
-		foreach( $this->mButtons as $button ){
+
+		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'] ) )
+
+			if ( $button['attribs'] ) {
+				$attrs += $button['attribs'];
+			}
+
+			if ( isset( $button['id'] ) ) {
 				$attrs['id'] = $button['id'];
+			}
+
 			$html .= Html::element( 'input', $attrs );
 		}
-		
+
 		return $html;
 	}
 
@@ -455,7 +465,7 @@ class HTMLForm {
 		} else {
 			$errorstr = $errors;
 		}
-		
+
 		return $errorstr
 			? Html::rawElement( 'div', array( 'class' => 'error' ), $errorstr )
 			: '';
@@ -468,13 +478,15 @@ class HTMLForm {
 	 */
 	static function formatErrors( $errors ) {
 		$errorstr = '';
+
 		foreach ( $errors as $error ) {
-			if( is_array( $error ) ) {
+			if ( is_array( $error ) ) {
 				$msg = array_shift( $error );
 			} else {
 				$msg = $error;
 				$error = array();
 			}
+
 			$errorstr .= Html::rawElement(
 				'li',
 				null,
@@ -501,27 +513,27 @@ class HTMLForm {
 	 */
 	function getSubmitText() {
 		return $this->mSubmitText
-			? $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. 
+	 * 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;
 	}
@@ -531,11 +543,11 @@ class HTMLForm {
 	 * @param $legend String HTML to go inside the <legend> element.
 	 *	 Will be escaped
 	 */
-	public function setWrapperLegend( $legend ){ $this->mWrapperLegend = $legend; }
+	public function setWrapperLegend( $legend ) { $this->mWrapperLegend = $legend; }
 
 	/**
 	 * Set the prefix for various default messages
-	 * TODO: currently only used for the <fieldset> legend on forms 
+	 * TODO: currently only used for the <fieldset> legend on forms
 	 * with multiple sections; should be used elsewhre?
 	 * @param $p String
 	 */
@@ -568,14 +580,14 @@ class HTMLForm {
 		$subsectionHtml = '';
 		$hasLeftColumn = false;
 
-		foreach( $fields as $key => $value ) {
+		foreach ( $fields as $key => $value ) {
 			if ( is_object( $value ) ) {
 				$v = empty( $value->mParams['nodata'] )
 					? $this->mFieldData[$key]
 					: $value->getDefault();
 				$tableHtml .= $value->getTableRow( $v );
 
-				if( $value->getLabel() != '&nbsp;' )
+				if ( $value->getLabel() != '&nbsp;' )
 					$hasLeftColumn = true;
 			} elseif ( is_array( $value ) ) {
 				$section = $this->displaySection( $value, $key );
@@ -585,13 +597,18 @@ class HTMLForm {
 		}
 
 		$classes = array();
-		if( !$hasLeftColumn ) // Avoid strange spacing when no labels exist
+
+		if ( !$hasLeftColumn ) { // Avoid strange spacing when no labels exist
 			$classes[] = 'mw-htmlform-nolabel';
+		}
+
 		$attribs = array(
-			'class' => implode( ' ', $classes ), 
+			'class' => implode( ' ', $classes ),
 		);
-		if ( $sectionName ) 
+
+		if ( $sectionName ) {
 			$attribs['id'] = Sanitizer::escapeId( "mw-htmlform-$sectionName" );
+		}
 
 		$tableHtml = Html::rawElement( 'table', $attribs,
 			Html::rawElement( 'tbody', array(), "\n$tableHtml\n" ) ) . "\n";
@@ -607,8 +624,8 @@ class HTMLForm {
 
 		$fieldData = array();
 
-		foreach( $this->mFlatFields as $fieldname => $field ) {
-			if ( !empty( $field->mParams['nodata'] ) ){
+		foreach ( $this->mFlatFields as $fieldname => $field ) {
+			if ( !empty( $field->mParams['nodata'] ) ) {
 				continue;
 			} elseif ( !empty( $field->mParams['disabled'] ) ) {
 				$fieldData[$fieldname] = $field->getDefault();
@@ -618,17 +635,17 @@ class HTMLForm {
 		}
 
 		# Filter data.
-		foreach( $fieldData as $name => &$value ) {
+		foreach ( $fieldData as $name => &$value ) {
 			$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 
+	 * @param $suppressReset Bool set to false to re-enable the
 	 *	 button again
 	 */
 	function suppressReset( $suppressReset = true ) {
@@ -637,9 +654,9 @@ class HTMLForm {
 
 	/**
 	 * Overload this if you want to apply special filtration routines
-	 * to the form as a whole, after it's submitted but before it's 
+	 * to the form as a whole, after it's submitted but before it's
 	 * processed.
-	 * @param $data 
+	 * @param $data
 	 * @return unknown_type
 	 */
 	function filterDataForSubmit( $data ) {
@@ -648,11 +665,11 @@ class HTMLForm {
 }
 
 /**
- * The parent class to generate form fields.  Any field type should 
+ * 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;
@@ -662,19 +679,19 @@ abstract class HTMLFormField {
 	protected $mClass = '';
 	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. 
+	 *	 text for a text input.
 	 * @return String valid HTML.
 	 */
 	abstract function getInputHTML( $value );
 
 	/**
-	 * Override this function to add specific validation checks on the 
+	 * 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
@@ -690,7 +707,7 @@ abstract class HTMLFormField {
 	}
 
 	function filter( $value, $alldata ) {
-		if( isset( $this->mFilterCallback ) ) {
+		if ( isset( $this->mFilterCallback ) ) {
 			$value = call_user_func( $this->mFilterCallback, $value, $alldata );
 		}
 
@@ -714,7 +731,7 @@ abstract class HTMLFormField {
 	 * @return String the value
 	 */
 	function loadDataFromRequest( $request ) {
-		if( $request->getCheck( $this->mName ) ) {
+		if ( $request->getCheck( $this->mName ) ) {
 			return $request->getText( $this->mName );
 		} else {
 			return $this->getDefault();
@@ -729,7 +746,7 @@ abstract class HTMLFormField {
 		$this->mParams = $params;
 
 		# Generate the label from a message, if possible
-		if( isset( $params['label-message'] ) ) {
+		if ( isset( $params['label-message'] ) ) {
 			$msgInfo = $params['label-message'];
 
 			if ( is_array( $msgInfo ) ) {
@@ -747,11 +764,13 @@ abstract class HTMLFormField {
 		if ( isset( $params['name'] ) ) {
 			$name = $params['name'];
 			$validName = Sanitizer::escapeId( $name );
-			if( $name != $validName ) {
-				throw new MWException("Invalid name '$name' passed to " . __METHOD__ );
+
+			if ( $name != $validName ) {
+				throw new MWException( "Invalid name '$name' passed to " . __METHOD__ );
 			}
-			$this->mName = 'wp'.$name;
-			$this->mID = 'mw-input-'.$name;
+
+			$this->mName = 'wp' . $name;
+			$this->mID = 'mw-input-' . $name;
 		}
 
 		if ( isset( $params['default'] ) ) {
@@ -761,9 +780,11 @@ abstract class HTMLFormField {
 		if ( isset( $params['id'] ) ) {
 			$id = $params['id'];
 			$validId = Sanitizer::escapeId( $id );
-			if( $id != $validId ) {
-				throw new MWException("Invalid id '$id' passed to " . __METHOD__ );
+
+			if ( $id != $validId ) {
+				throw new MWException( "Invalid id '$id' passed to " . __METHOD__ );
 			}
+
 			$this->mID = $id;
 		}
 
@@ -791,6 +812,7 @@ abstract class HTMLFormField {
 		global $wgRequest;
 
 		$errors = $this->validate( $value, $this->mParent->mFieldData );
+
 		if ( $errors === true || !$wgRequest->wasPosted() ) {
 			$errors = '';
 		} else {
@@ -798,21 +820,22 @@ abstract class HTMLFormField {
 		}
 
 		$html = $this->getLabelHtml();
-		$html .= Html::rawElement( 
-			'td', 
+		$html .= Html::rawElement(
+			'td',
 			array( 'class' => 'mw-input' ),
-			$this->getInputHTML( $value ) ."\n$errors"
+			$this->getInputHTML( $value ) . "\n$errors"
 		);
 
 		$fieldType = get_class( $this );
 
-		$html = Html::rawElement( 
+		$html = Html::rawElement(
 			'tr',
 			array( 'class' => "mw-htmlform-field-$fieldType {$this->mClass}" ),
-			$html 
+			$html
 		) . "\n";
 
 		$helptext = null;
+
 		if ( isset( $this->mParams['help-message'] ) ) {
 			$msg = $this->mParams['help-message'];
 			$helptext = wfMsgExt( $msg, 'parseinline' );
@@ -841,12 +864,14 @@ abstract class HTMLFormField {
 		# 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() )
-				);		
+			Html::rawElement( 'label', $for, $this->getLabel() )
+		);
 	}
 
 	function getDefault() {
@@ -856,23 +881,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'] ) )
+		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>.  
+	 * a set of <options> inside <optgroups>.
 	 * @param $options Associative Array with values either Strings
 	 *	 or Arrays
 	 * @return Array flattened input
@@ -880,7 +907,7 @@ abstract class HTMLFormField {
 	public static function flattenOptions( $options ) {
 		$flatOpts = array();
 
-		foreach( $options as $key => $value ) {
+		foreach ( $options as $key => $value ) {
 			if ( is_array( $value ) ) {
 				$flatOpts = array_merge( $flatOpts, self::flattenOptions( $value ) );
 			} else {
@@ -890,14 +917,12 @@ abstract class HTMLFormField {
 
 		return $flatOpts;
 	}
-	
 }
 
 class HTMLTextField extends HTMLFormField {
-	
 	function getSize() {
-		return isset( $this->mParams['size'] ) 
-			? $this->mParams['size'] 
+		return isset( $this->mParams['size'] )
+			? $this->mParams['size']
 			: 45;
 	}
 
@@ -912,7 +937,7 @@ class HTMLTextField extends HTMLFormField {
 		if ( isset( $this->mParams['maxlength'] ) ) {
 			$attribs['maxlength'] = $this->mParams['maxlength'];
 		}
-		
+
 		if ( !empty( $this->mParams['disabled'] ) ) {
 			$attribs['disabled'] = 'disabled';
 		}
@@ -925,13 +950,13 @@ class HTMLTextField extends HTMLFormField {
 				$attribs[$param] = $this->mParams[$param];
 			}
 		}
-		foreach ( array( 'required', 'autofocus', 'multiple', 'readonly' ) as
-		$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.
@@ -957,30 +982,34 @@ class HTMLTextField extends HTMLFormField {
 
 		return Html::element( 'input', $attribs );
 	}
-	
-	public function validate( $value, $alldata ){
+
+	public function validate( $value, $alldata ) {
 		$p = parent::validate( $value, $alldata );
-		if( $p !== true ) return $p;
-		
-		if( isset( $this->mParams['required'] ) && $value === '' ){
+
+		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'] 
+		return isset( $this->mParams['cols'] )
+			? $this->mParams['cols']
 			: 80;
 	}
+
 	function getRows() {
-		return isset( $this->mParams['rows'] ) 
-			? $this->mParams['rows'] 
+		return isset( $this->mParams['rows'] )
+			? $this->mParams['rows']
 			: 25;
 	}
-	
+
 	function getInputHTML( $value ) {
 		$attribs = array(
 			'id' => $this->mID,
@@ -993,10 +1022,11 @@ class HTMLTextAreaField extends HTMLFormField {
 		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] = '';
@@ -1005,14 +1035,18 @@ class HTMLTextAreaField extends HTMLFormField {
 
 		return Html::element( 'textarea', $attribs, $value );
 	}
-	
-	public function validate( $value, $alldata ){
+
+	public function validate( $value, $alldata ) {
 		$p = parent::validate( $value, $alldata );
-		if( $p !== true ) return $p;
-		
-		if( isset( $this->mParams['required'] ) && $value === '' ){
+
+		if ( $p !== true ) {
+			return $p;
+		}
+
+		if ( isset( $this->mParams['required'] ) && $value === '' ) {
 			return wfMsgExt( 'htmlform-required', 'parseinline' );
 		}
+
 		return true;
 	}
 }
@@ -1021,17 +1055,18 @@ class HTMLTextAreaField extends HTMLFormField {
  * A field that will contain a numeric value
  */
 class HTMLFloatField extends HTMLTextField {
-	
 	function getSize() {
-		return isset( $this->mParams['size'] ) 
-			? $this->mParams['size'] 
+		return isset( $this->mParams['size'] )
+			? $this->mParams['size']
 			: 20;
 	}
 
 	function validate( $value, $alldata ) {
 		$p = parent::validate( $value, $alldata );
 
-		if ( $p !== true ) return $p;
+		if ( $p !== true ) {
+			return $p;
+		}
 
 		if ( floatval( $value ) != $value ) {
 			return wfMsgExt( 'htmlform-float-invalid', 'parse' );
@@ -1039,18 +1074,22 @@ class HTMLFloatField extends HTMLTextField {
 
 		$in_range = true;
 
-		# The "int" part of these message names is rather confusing. 
+		# 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 )
+
+			if ( $min > $value ) {
 				return wfMsgExt( 'htmlform-int-toolow', 'parse', array( $min ) );
+			}
 		}
 
 		if ( isset( $this->mParams['max'] ) ) {
 			$max = $this->mParams['max'];
-			if( $max < $value )
+
+			if ( $max < $value ) {
 				return wfMsgExt( 'htmlform-int-toohigh', 'parse', array( $max ) );
+			}
 		}
 
 		return true;
@@ -1064,11 +1103,13 @@ class HTMLIntField extends HTMLFloatField {
 	function validate( $value, $alldata ) {
 		$p = parent::validate( $value, $alldata );
 
-		if ( $p !== true ) return $p;
+		if ( $p !== true ) {
+			return $p;
+		}
 
-		if ( $value !== '' 
-			&& ( !is_numeric( $value ) || round( $value ) != $value ) ) 
-		{
+		if ( $value !== ''
+			&& ( !is_numeric( $value ) || round( $value ) != $value )
+		) {
 			return wfMsgExt( 'htmlform-int-invalid', 'parse' );
 		}
 
@@ -1081,17 +1122,19 @@ class HTMLIntField extends HTMLFloatField {
  */
 class HTMLCheckField extends HTMLFormField {
 	function getInputHTML( $value ) {
-		if ( !empty( $this->mParams['invert'] ) )
+		if ( !empty( $this->mParams['invert'] ) ) {
 			$value = !$value;
+		}
 
-		$attr = $this->getTooltipAndAccessKey(); 
+		$attr = $this->getTooltipAndAccessKey();
 		$attr['id'] = $this->mID;
-		if( !empty( $this->mParams['disabled'] ) ) {
+
+		if ( !empty( $this->mParams['disabled'] ) ) {
 			$attr['disabled'] = 'disabled';
 		}
 
 		return Xml::check( $this->mName, $value, $attr ) . '&nbsp;' .
-				Html::rawElement( 'label', array( 'for' => $this->mID ), $this->mLabel );
+			Html::rawElement( 'label', array( 'for' => $this->mID ), $this->mLabel );
 	}
 
 	/**
@@ -1109,7 +1152,7 @@ class HTMLCheckField extends HTMLFormField {
 		}
 
 		// GetCheck won't work like we want for checks.
-		if( $request->getCheck( 'wpEditToken' ) ) {
+		if ( $request->getCheck( 'wpEditToken' ) ) {
 			// XOR has the following truth table, which is what we want
 			// INVERT VALUE | OUTPUT
 			// true   true  | false
@@ -1127,12 +1170,15 @@ class HTMLCheckField extends HTMLFormField {
  * A select dropdown field.  Basically a wrapper for Xmlselect class
  */
 class HTMLSelectField extends HTMLFormField {
-
 	function validate( $value, $alldata ) {
 		$p = parent::validate( $value, $alldata );
-		if( $p !== true ) return $p;
+
+		if ( $p !== true ) {
+			return $p;
+		}
 
 		$validOptions = HTMLFormField::flattenOptions( $this->mParams['options'] );
+
 		if ( in_array( $value, $validOptions ) )
 			return true;
 		else
@@ -1147,7 +1193,7 @@ class HTMLSelectField extends HTMLFormField {
 		# Working around this by forcing all of them to strings.
 		$options = array_map( 'strval', $this->mParams['options'] );
 
-		if( !empty( $this->mParams['disabled'] ) ) {
+		if ( !empty( $this->mParams['disabled'] ) ) {
 			$select->setAttribute( 'disabled', 'disabled' );
 		}
 
@@ -1164,30 +1210,33 @@ class HTMLSelectOrOtherField extends HTMLTextField {
 	static $jsAdded = false;
 
 	function __construct( $params ) {
-		if( !in_array( 'other', $params['options'], true ) ) {
+		if ( !in_array( 'other', $params['options'], true ) ) {
 			$params['options'][wfMsg( 'htmlform-selectorother-other' )] = 'other';
 		}
 
 		parent::__construct( $params );
 	}
-	
+
 	static function forceToStringRecursive( $array ) {
-		if ( is_array($array) ) {
-			return array_map( array( __CLASS__, 'forceToStringRecursive' ), $array);
+		if ( is_array( $array ) ) {
+			return array_map( array( __CLASS__, 'forceToStringRecursive' ), $array );
 		} else {
-			return strval($array);
+			return strval( $array );
 		}
 	}
 
 	function getInputHTML( $value ) {
 		$valInSelect = false;
 
-		if( $value !== false )
-			$valInSelect = in_array( $value,
-							HTMLFormField::flattenOptions( $this->mParams['options'] ) );
+		if ( $value !== false ) {
+			$valInSelect = in_array(
+				$value,
+				HTMLFormField::flattenOptions( $this->mParams['options'] )
+			);
+		}
 
 		$selected = $valInSelect ? $value : 'other';
-		
+
 		$opts = self::forceToStringRecursive( $this->mParams['options'] );
 
 		$select = new XmlSelect( $this->mName, $this->mID, $selected );
@@ -1196,7 +1245,8 @@ class HTMLSelectOrOtherField extends HTMLTextField {
 		$select->setAttribute( 'class', 'mw-htmlform-select-or-other' );
 
 		$tbAttribs = array( 'id' => $this->mID . '-other', 'size' => $this->getSize() );
-		if( !empty( $this->mParams['disabled'] ) ) {
+
+		if ( !empty( $this->mParams['disabled'] ) ) {
 			$select->setAttribute( 'disabled', 'disabled' );
 			$tbAttribs['disabled'] = 'disabled';
 		}
@@ -1207,19 +1257,21 @@ class HTMLSelectOrOtherField extends HTMLTextField {
 			$tbAttribs['maxlength'] = $this->mParams['maxlength'];
 		}
 
-		$textbox = Html::input( $this->mName . '-other',
-							$valInSelect ? '' : $value,
-							'text',
-							$tbAttribs );
+		$textbox = Html::input(
+			$this->mName . '-other',
+			$valInSelect ? '' : $value,
+			'text',
+			$tbAttribs
+		);
 
 		return "$select<br />\n$textbox";
 	}
 
 	function loadDataFromRequest( $request ) {
-		if( $request->getCheck( $this->mName ) ) {
+		if ( $request->getCheck( $this->mName ) ) {
 			$val = $request->getText( $this->mName );
 
-			if( $val == 'other' ) {
+			if ( $val == 'other' ) {
 				$val = $request->getText( $this->mName . '-other' );
 			}
 
@@ -1234,22 +1286,27 @@ 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 ( $p !== true ) {
+			return $p;
+		}
+
+		if ( !is_array( $value ) ) {
+			return false;
+		}
 
-		# If all options are valid, array_intersect of the valid 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 );
-		if ( count( $validValues ) == count( $value ) )
+		if ( count( $validValues ) == count( $value ) ) {
 			return true;
-		else
+		} else {
 			return wfMsgExt( 'htmlform-select-badoption', 'parseinline' );
+		}
 	}
 
 	function getInputHTML( $value ) {
@@ -1262,17 +1319,18 @@ class HTMLMultiSelectField extends HTMLFormField {
 		$html = '';
 
 		$attribs = array();
+
 		if ( !empty( $this->mParams['disabled'] ) ) {
 			$attribs['disabled'] = 'disabled';
 		}
 
-		foreach( $options as $label => $info ) {
-			if( is_array( $info ) ) {
+		foreach ( $options as $label => $info ) {
+			if ( is_array( $info ) ) {
 				$html .= Html::rawElement( 'h1', array(), $label ) . "\n";
 				$html .= $this->formatOptions( $info, $value );
 			} else {
 				$thisAttribs = array( 'id' => $this->mID . "-$info", 'value' => $info );
-				
+
 				$checkbox = Xml::check( $this->mName . '[]', in_array( $info, $value, true ),
 								$attribs + $thisAttribs );
 				$checkbox .= '&nbsp;' . Html::rawElement( 'label', array( 'for' => $this->mID . "-$info" ), $label );
@@ -1286,11 +1344,12 @@ class HTMLMultiSelectField extends HTMLFormField {
 
 	function loadDataFromRequest( $request ) {
 		# won't work with getCheck
-		if( $request->getCheck( 'wpEditToken' ) ) {
+		if ( $request->getCheck( 'wpEditToken' ) ) {
 			$arr = $request->getArray( $this->mName );
 
-			if( !$arr )
+			if ( !$arr ) {
 				$arr = array();
+			}
 
 			return $arr;
 		} else {
@@ -1317,17 +1376,22 @@ class HTMLMultiSelectField extends HTMLFormField {
 class HTMLRadioField extends HTMLFormField {
 	function validate( $value, $alldata ) {
 		$p = parent::validate( $value, $alldata );
-		if( $p !== true ) return $p;
 
-		if( !is_string( $value ) && !is_int( $value ) )
+		if ( $p !== true ) {
+			return $p;
+		}
+
+		if ( !is_string( $value ) && !is_int( $value ) ) {
 			return false;
+		}
 
 		$validOptions = HTMLFormField::flattenOptions( $this->mParams['options'] );
 
-		if ( in_array( $value, $validOptions ) )
+		if ( in_array( $value, $validOptions ) ) {
 			return true;
-		else
+		} else {
 			return wfMsgExt( 'htmlform-select-badoption', 'parseinline' );
+		}
 	}
 
 	/**
@@ -1339,7 +1403,7 @@ class HTMLRadioField extends HTMLFormField {
 
 		return $html;
 	}
-	
+
 	function formatOptions( $options, $value ) {
 		$html = '';
 
@@ -1349,14 +1413,18 @@ class HTMLRadioField extends HTMLFormField {
 		}
 
 		# TODO: should this produce an unordered list perhaps?
-		foreach( $options as $label => $info ) {
-			if( is_array( $info ) ) {
+		foreach ( $options as $label => $info ) {
+			if ( is_array( $info ) ) {
 				$html .= Html::rawElement( 'h1', array(), $label ) . "\n";
 				$html .= $this->formatOptions( $info, $value );
 			} else {
 				$id = Sanitizer::escapeId( $this->mID . "-$info" );
-				$html .= Xml::radio( $this->mName, $info, $info == $value,
-										$attribs + array( 'id' => $id ) );
+				$html .= Xml::radio(
+					$this->mName,
+					$info,
+					$info == $value,
+					$attribs + array( 'id' => $id )
+				);
 				$html .= '&nbsp;' .
 						Html::rawElement( 'label', array( 'for' => $id ), $label );
 
@@ -1400,49 +1468,50 @@ class HTMLInfoField extends HTMLFormField {
 }
 
 class HTMLHiddenField extends HTMLFormField {
-	
-	public function __construct( $params ){
+	public function __construct( $params ) {
 		parent::__construct( $params );
 		# forcing the 'wp' prefix on hidden field names
 		# is undesirable
 		$this->mName = substr( $this->mName, 2 );
 	}
-	
-	public function getTableRow( $value ){
+
+	public function getTableRow( $value ) {
 		$params = array();
-		if( $this->mID ){
+		if ( $this->mID ) {
 			$params['id'] = $this->mID;
 		}
-		$this->mParent->addHiddenField( 
+
+		$this->mParent->addHiddenField(
 			$this->mName,
 			$this->mDefault,
 			$params
 		);
+
 		return '';
 	}
 
-	public function getInputHTML( $value ){ return ''; }
+	public function getInputHTML( $value ) { return ''; }
 }
 
 /**
- * Add a submit button inline in the form (as opposed to 
+ * 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( 
+		return Xml::submitButton(
+			$value,
+			array(
 				'class' => 'mw-htmlform-submit',
 				'name' => $this->mName,
 				'id' => $this->mID,
-			) 
+			)
 		);
 	}
 
@@ -1455,11 +1524,12 @@ 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'], 
+		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";
 	}