From c1f9b1f7b1b77776192048005dcc66dcf3df2bfb Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sat, 27 Dec 2014 15:41:37 +0100
Subject: Update to MediaWiki 1.24.1

---
 includes/htmlform/HTMLSelectAndOtherField.php | 126 ++++++++++++++++++++++++++
 1 file changed, 126 insertions(+)
 create mode 100644 includes/htmlform/HTMLSelectAndOtherField.php

(limited to 'includes/htmlform/HTMLSelectAndOtherField.php')

diff --git a/includes/htmlform/HTMLSelectAndOtherField.php b/includes/htmlform/HTMLSelectAndOtherField.php
new file mode 100644
index 00000000..65176dd7
--- /dev/null
+++ b/includes/htmlform/HTMLSelectAndOtherField.php
@@ -0,0 +1,126 @@
+<?php
+
+/**
+ * Double field with a dropdown list constructed from a system message in the format
+ *     * Optgroup header
+ *     ** <option value>
+ *     * New Optgroup header
+ * Plus a text field underneath for an additional reason.  The 'value' of the field is
+ * "<select>: <extra reason>", or "<extra reason>" if nothing has been selected in the
+ * select dropdown.
+ * @todo FIXME: If made 'required', only the text field should be compulsory.
+ */
+class HTMLSelectAndOtherField extends HTMLSelectField {
+	function __construct( $params ) {
+		if ( array_key_exists( 'other', $params ) ) {
+		} elseif ( array_key_exists( 'other-message', $params ) ) {
+			$params['other'] = wfMessage( $params['other-message'] )->plain();
+		} else {
+			$params['other'] = wfMessage( 'htmlform-selectorother-other' )->plain();
+		}
+
+		parent::__construct( $params );
+
+		if ( $this->getOptions() === null ) {
+			# Sulk
+			throw new MWException( 'HTMLSelectAndOtherField called without any options' );
+		}
+		if ( !in_array( 'other', $this->mOptions, true ) ) {
+			// Have 'other' always as first element
+			$this->mOptions = array( $params['other'] => 'other' ) + $this->mOptions;
+		}
+		$this->mFlatOptions = self::flattenOptions( $this->getOptions() );
+
+	}
+
+	function getInputHTML( $value ) {
+		$select = parent::getInputHTML( $value[1] );
+
+		$textAttribs = array(
+			'id' => $this->mID . '-other',
+			'size' => $this->getSize(),
+		);
+
+		if ( $this->mClass !== '' ) {
+			$textAttribs['class'] = $this->mClass;
+		}
+
+		$allowedParams = array(
+			'required',
+			'autofocus',
+			'multiple',
+			'disabled',
+			'tabindex'
+		);
+
+		$textAttribs += $this->getAttributes( $allowedParams );
+
+		$textbox = Html::input( $this->mName . '-other', $value[2], 'text', $textAttribs );
+
+		return "$select<br />\n$textbox";
+	}
+
+	/**
+	 * @param WebRequest $request
+	 *
+	 * @return array("<overall message>","<select value>","<text field value>")
+	 */
+	function loadDataFromRequest( $request ) {
+		if ( $request->getCheck( $this->mName ) ) {
+
+			$list = $request->getText( $this->mName );
+			$text = $request->getText( $this->mName . '-other' );
+
+			if ( $list == 'other' ) {
+				$final = $text;
+			} elseif ( !in_array( $list, $this->mFlatOptions, true ) ) {
+				# User has spoofed the select form to give an option which wasn't
+				# in the original offer.  Sulk...
+				$final = $text;
+			} elseif ( $text == '' ) {
+				$final = $list;
+			} else {
+				$final = $list . $this->msg( 'colon-separator' )->inContentLanguage()->text() . $text;
+			}
+		} else {
+			$final = $this->getDefault();
+
+			$list = 'other';
+			$text = $final;
+			foreach ( $this->mFlatOptions as $option ) {
+				$match = $option . $this->msg( 'colon-separator' )->inContentLanguage()->text();
+				if ( strpos( $text, $match ) === 0 ) {
+					$list = $option;
+					$text = substr( $text, strlen( $match ) );
+					break;
+				}
+			}
+		}
+
+		return array( $final, $list, $text );
+	}
+
+	function getSize() {
+		return isset( $this->mParams['size'] ) ? $this->mParams['size'] : 45;
+	}
+
+	function validate( $value, $alldata ) {
+		# HTMLSelectField forces $value to be one of the options in the select
+		# field, which is not useful here.  But we do want the validation further up
+		# the chain
+		$p = parent::validate( $value[1], $alldata );
+
+		if ( $p !== true ) {
+			return $p;
+		}
+
+		if ( isset( $this->mParams['required'] )
+			&& $this->mParams['required'] !== false
+			&& $value[1] === ''
+		) {
+			return $this->msg( 'htmlform-required' )->parse();
+		}
+
+		return true;
+	}
+}
-- 
cgit v1.2.3-54-g00ecf