Merge branch 'archwiki'

# Conflicts:
#	skins/ArchLinux.php
#	skins/ArchLinux/archlogo.gif

1 files changed, 46 insertions, 0 deletions

diff --git a/includes/htmlform/HTMLFloatField.php b/includes/htmlform/HTMLFloatField.php
new file mode 100644
index 00000000..3b38fbe8
--- /dev/null
+++ b/includes/htmlform/HTMLFloatField.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * A field that will contain a numeric value
+ */
+class HTMLFloatField extends HTMLTextField {
+	function getSize() {
+		return isset( $this->mParams['size'] ) ? $this->mParams['size'] : 20;
+	}
+
+	function validate( $value, $alldata ) {
+		$p = parent::validate( $value, $alldata );
+
+		if ( $p !== true ) {
+			return $p;
+		}
+
+		$value = trim( $value );
+
+		# http://dev.w3.org/html5/spec/common-microsyntaxes.html#real-numbers
+		# with the addition that a leading '+' sign is ok.
+		if ( !preg_match( '/^((\+|\-)?\d+(\.\d+)?(E(\+|\-)?\d+)?)?$/i', $value ) ) {
+			return $this->msg( 'htmlform-float-invalid' )->parseAsBlock();
+		}
+
+		# 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 ) {
+				return $this->msg( 'htmlform-int-toolow', $min )->parseAsBlock();
+			}
+		}
+
+		if ( isset( $this->mParams['max'] ) ) {
+			$max = $this->mParams['max'];
+
+			if ( $max < $value ) {
+				return $this->msg( 'htmlform-int-toohigh', $max )->parseAsBlock();
+			}
+		}
+
+		return true;
+	}
+}