X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FXmlSelect.php;h=45002e82f66ee39becf44f0233fef6181b6d26c1;hb=e3c9107089c261d538d2fe161e2ec2446379c6f6;hp=1cd04ae10e27e30f4feb0c0782bf18bf65046045;hpb=b305d72af57101d580783d639e0cd88f2a049dae;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/XmlSelect.php b/includes/XmlSelect.php
index 1cd04ae10e..45002e82f6 100644
--- a/includes/XmlSelect.php
+++ b/includes/XmlSelect.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Class to generate XML <select>.
+ * Class for generating HTML <select> elements.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,12 +21,13 @@
  */
 
 /**
- * Module of static functions for generating XML <select> elements
+ * Class for generating HTML <select> or <datalist> elements.
  */
 class XmlSelect {
-	protected $options = array();
+	protected $options = [];
 	protected $default = false;
-	protected $attributes = array();
+	protected $tagName = 'select';
+	protected $attributes = [];
 
 	public function __construct( $name = false, $id = false, $default = false ) {
 		if ( $name ) {
@@ -43,15 +44,22 @@ class XmlSelect {
 	}
 
 	/**
-	 * @param string $default
+	 * @param string|array $default
 	 */
 	public function setDefault( $default ) {
 		$this->default = $default;
 	}
 
+	/**
+	 * @param string|array $tagName
+	 */
+	public function setTagName( $tagName ) {
+		$this->tagName = $tagName;
+	}
+
 	/**
 	 * @param string $name
-	 * @param array $value
+	 * @param string $value
 	 */
 	public function setAttribute( $name, $value ) {
 		$this->attributes[$name] = $value;
@@ -59,25 +67,19 @@ class XmlSelect {
 
 	/**
 	 * @param string $name
-	 * @return array|null
+	 * @return string|null
 	 */
 	public function getAttribute( $name ) {
-		if ( isset( $this->attributes[$name] ) ) {
-			return $this->attributes[$name];
-		} else {
-			return null;
-		}
+		return $this->attributes[$name] ?? null;
 	}
 
 	/**
-	 * @param string $name
-	 * @param bool $value
+	 * @param string $label
+	 * @param string|false $value If not given, assumed equal to $label
 	 */
-	public function addOption( $name, $value = false ) {
-		// Stab stab stab
-		$value = $value !== false ? $value : $name;
-
-		$this->options[] = array( $name => $value );
+	public function addOption( $label, $value = false ) {
+		$value = $value !== false ? $value : $label;
+		$this->options[] = [ $label => $value ];
 	}
 
 	/**
@@ -92,12 +94,12 @@ class XmlSelect {
 	}
 
 	/**
-	 * This accepts an array of form
+	 * This accepts an array of form:
 	 * label => value
 	 * label => ( label => value, label => value )
 	 *
 	 * @param array $options
-	 * @param bool $default
+	 * @param string|array|false $default
 	 * @return string
 	 */
 	static function formatOptions( $options, $default = false ) {
@@ -106,9 +108,13 @@ class XmlSelect {
 		foreach ( $options as $label => $value ) {
 			if ( is_array( $value ) ) {
 				$contents = self::formatOptions( $value, $default );
-				$data .= Html::rawElement( 'optgroup', array( 'label' => $label ), $contents ) . "\n";
+				$data .= Html::rawElement( 'optgroup', [ 'label' => $label ], $contents ) . "\n";
 			} else {
-				$data .= Xml::option( $label, $value, $value === $default ) . "\n";
+				// If $default is an array, then the <select> probably has the multiple attribute,
+				// so we should check if each $value is in $default, rather than checking if
+				// $value is equal to $default.
+				$selected = is_array( $default ) ? in_array( $value, $default ) : $value === $default;
+				$data .= Xml::option( $label, $value, $selected ) . "\n";
 			}
 		}
 
@@ -125,6 +131,6 @@ class XmlSelect {
 			$contents .= self::formatOptions( $options, $this->default );
 		}
 
-		return Html::rawElement( 'select', $this->attributes, rtrim( $contents ) );
+		return Html::rawElement( $this->tagName, $this->attributes, rtrim( $contents ) );
 	}
 }