From: Rotem Liss <rotem@users.mediawiki.org>
Date: Thu, 31 Aug 2006 11:20:43 +0000 (+0000)
Subject: EOL fixes.
X-Git-Tag: 1.31.0-rc.0~55868
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=679f587f2454c1a352bda4f10a80927508606d3b;p=lhc%2Fweb%2Fwiklou.git

EOL fixes.
---

diff --git a/includes/ImageFunctions.php b/includes/ImageFunctions.php
index a66b4d79a3..38887bbf74 100644
--- a/includes/ImageFunctions.php
+++ b/includes/ImageFunctions.php
@@ -1,223 +1,223 @@
-<?php
-
-/**
- * Returns the image directory of an image
- * The result is an absolute path.
- *
- * This function is called from thumb.php before Setup.php is included
- *
- * @param $fname String: file name of the image file.
- * @public
- */
-function wfImageDir( $fname ) {
-	global $wgUploadDirectory, $wgHashedUploadDirectory;
-
-	if (!$wgHashedUploadDirectory) { return $wgUploadDirectory; }
-
-	$hash = md5( $fname );
-	$dest = $wgUploadDirectory . '/' . $hash{0} . '/' . substr( $hash, 0, 2 );
-
-	return $dest;
-}
-
-/**
- * Returns the image directory of an image's thubnail
- * The result is an absolute path.
- *
- * This function is called from thumb.php before Setup.php is included
- *
- * @param $fname String: file name of the original image file
- * @param $shared Boolean: (optional) use the shared upload directory (default: 'false').
- * @public
- */
-function wfImageThumbDir( $fname, $shared = false ) {
-	$base = wfImageArchiveDir( $fname, 'thumb', $shared );
-	if ( Image::isHashed( $shared ) ) {
-		$dir =  "$base/$fname";
-	} else {
-		$dir = $base;
-	}
-
-	return $dir;
-}
-
-/**
- * Old thumbnail directory, kept for conversion
- */
-function wfDeprecatedThumbDir( $thumbName , $subdir='thumb', $shared=false) {
-	return wfImageArchiveDir( $thumbName, $subdir, $shared );
-}
-
-/**
- * Returns the image directory of an image's old version
- * The result is an absolute path.
- *
- * This function is called from thumb.php before Setup.php is included
- *
- * @param $fname String: file name of the thumbnail file, including file size prefix.
- * @param $subdir String: subdirectory of the image upload directory that should be used for storing the old version. Default is 'archive'.
- * @param $shared Boolean use the shared upload directory (only relevant for other functions which call this one). Default is 'false'.
- * @public
- */
-function wfImageArchiveDir( $fname , $subdir='archive', $shared=false ) {
-	global $wgUploadDirectory, $wgHashedUploadDirectory;
-	global $wgSharedUploadDirectory, $wgHashedSharedUploadDirectory;
-	$dir = $shared ? $wgSharedUploadDirectory : $wgUploadDirectory;
-	$hashdir = $shared ? $wgHashedSharedUploadDirectory : $wgHashedUploadDirectory;
-	if (!$hashdir) { return $dir.'/'.$subdir; }
-	$hash = md5( $fname );
-
-	return $dir.'/'.$subdir.'/'.$hash[0].'/'.substr( $hash, 0, 2 );
-}
-
-
-/*
- * Return the hash path component of an image path (URL or filesystem),
- * e.g. "/3/3c/", or just "/" if hashing is not used.
- *
- * @param $dbkey The filesystem / database name of the file
- * @param $fromSharedDirectory Use the shared file repository? It may
- *   use different hash settings from the local one.
- */
-function wfGetHashPath ( $dbkey, $fromSharedDirectory = false ) {
-	if( Image::isHashed( $fromSharedDirectory ) ) {
-		$hash = md5($dbkey);
-		return '/' . $hash{0} . '/' . substr( $hash, 0, 2 ) . '/';
-	} else {
-		return '/';
-	}
-}
-
-/**
- * Returns the image URL of an image's old version
- *
- * @param $name String: file name of the image file
- * @param $subdir String: (optional) subdirectory of the image upload directory that is used by the old version. Default is 'archive'
- * @public
- */
-function wfImageArchiveUrl( $name, $subdir='archive' ) {
-	global $wgUploadPath, $wgHashedUploadDirectory;
-
-	if ($wgHashedUploadDirectory) {
-		$hash = md5( substr( $name, 15) );
-		$url = $wgUploadPath.'/'.$subdir.'/' . $hash{0} . '/' .
-		  substr( $hash, 0, 2 ) . '/'.$name;
-	} else {
-		$url = $wgUploadPath.'/'.$subdir.'/'.$name;
-	}
-	return wfUrlencode($url);
-}
-
-/**
- * Return a rounded pixel equivalent for a labeled CSS/SVG length.
- * http://www.w3.org/TR/SVG11/coords.html#UnitIdentifiers
- *
- * @param $length String: CSS/SVG length.
- * @return Integer: length in pixels
- */
-function wfScaleSVGUnit( $length ) {
-	static $unitLength = array(
-		'px' => 1.0,
-		'pt' => 1.25,
-		'pc' => 15.0,
-		'mm' => 3.543307,
-		'cm' => 35.43307,
-		'in' => 90.0,
-		''   => 1.0, // "User units" pixels by default
-		'%'  => 2.0, // Fake it!
-		);
-	if( preg_match( '/^(\d+(?:\.\d+)?)(em|ex|px|pt|pc|cm|mm|in|%|)$/', $length, $matches ) ) {
-		$length = floatval( $matches[1] );
-		$unit = $matches[2];
-		return round( $length * $unitLength[$unit] );
-	} else {
-		// Assume pixels
-		return round( floatval( $length ) );
-	}
-}
-
-/**
- * Compatible with PHP getimagesize()
- * @todo support gzipped SVGZ
- * @todo check XML more carefully
- * @todo sensible defaults
- *
- * @param $filename String: full name of the file (passed to php fopen()).
- * @return array
- */
-function wfGetSVGsize( $filename ) {
-	$width = 256;
-	$height = 256;
-
-	// Read a chunk of the file
-	$f = fopen( $filename, "rt" );
-	if( !$f ) return false;
-	$chunk = fread( $f, 4096 );
-	fclose( $f );
-
-	// Uber-crappy hack! Run through a real XML parser.
-	if( !preg_match( '/<svg\s*([^>]*)\s*>/s', $chunk, $matches ) ) {
-		return false;
-	}
-	$tag = $matches[1];
-	if( preg_match( '/\bwidth\s*=\s*("[^"]+"|\'[^\']+\')/s', $tag, $matches ) ) {
-		$width = wfScaleSVGUnit( trim( substr( $matches[1], 1, -1 ) ) );
-	}
-	if( preg_match( '/\bheight\s*=\s*("[^"]+"|\'[^\']+\')/s', $tag, $matches ) ) {
-		$height = wfScaleSVGUnit( trim( substr( $matches[1], 1, -1 ) ) );
-	}
-
-	return array( $width, $height, 'SVG',
-		"width=\"$width\" height=\"$height\"" );
-}
-
-/**
- * Determine if an image exists on the 'bad image list'.
- *
- * @param $name String: the image name to check
- * @return bool
- */
-function wfIsBadImage( $name ) {
-	static $titleList = false;
-	wfProfileIn( __METHOD__ );
-	$bad = false;
-	if( wfRunHooks( 'BadImage', array( $name, &$bad ) ) ) {
-		if( !$titleList ) {
-			# Build the list now
-			$titleList = array();
-			$lines = explode( "\n", wfMsgForContent( 'bad_image_list' ) );
-			foreach( $lines as $line ) {
-				if( preg_match( '/^\*\s*\[\[:?(.*?)\]\]/i', $line, $matches ) ) {
-					$title = Title::newFromText( $matches[1] );
-					if( is_object( $title ) && $title->getNamespace() == NS_IMAGE )
-						$titleList[ $title->getDBkey() ] = true;
-				}
-			}
-		}
-		wfProfileOut( __METHOD__ );
-		return array_key_exists( $name, $titleList );
-	} else {
-		wfProfileOut( __METHOD__ );
-		return $bad;
-	}
-}
-
-/**
- * Calculate the largest thumbnail width for a given original file size
- * such that the thumbnail's height is at most $maxHeight.
- * @param $boxWidth Integer Width of the thumbnail box.
- * @param $boxHeight Integer Height of the thumbnail box.
- * @param $maxHeight Integer Maximum height expected for the thumbnail.
- * @return Integer.
- */
-function wfFitBoxWidth( $boxWidth, $boxHeight, $maxHeight ) {
-	$idealWidth = $boxWidth * $maxHeight / $boxHeight;
-	$roundedUp = ceil( $idealWidth );
-	if( round( $roundedUp * $boxHeight / $boxWidth ) > $maxHeight )
-		return floor( $idealWidth );
-	else
-		return $roundedUp;
-}
-
-
-?>
+<?php
+
+/**
+ * Returns the image directory of an image
+ * The result is an absolute path.
+ *
+ * This function is called from thumb.php before Setup.php is included
+ *
+ * @param $fname String: file name of the image file.
+ * @public
+ */
+function wfImageDir( $fname ) {
+	global $wgUploadDirectory, $wgHashedUploadDirectory;
+
+	if (!$wgHashedUploadDirectory) { return $wgUploadDirectory; }
+
+	$hash = md5( $fname );
+	$dest = $wgUploadDirectory . '/' . $hash{0} . '/' . substr( $hash, 0, 2 );
+
+	return $dest;
+}
+
+/**
+ * Returns the image directory of an image's thubnail
+ * The result is an absolute path.
+ *
+ * This function is called from thumb.php before Setup.php is included
+ *
+ * @param $fname String: file name of the original image file
+ * @param $shared Boolean: (optional) use the shared upload directory (default: 'false').
+ * @public
+ */
+function wfImageThumbDir( $fname, $shared = false ) {
+	$base = wfImageArchiveDir( $fname, 'thumb', $shared );
+	if ( Image::isHashed( $shared ) ) {
+		$dir =  "$base/$fname";
+	} else {
+		$dir = $base;
+	}
+
+	return $dir;
+}
+
+/**
+ * Old thumbnail directory, kept for conversion
+ */
+function wfDeprecatedThumbDir( $thumbName , $subdir='thumb', $shared=false) {
+	return wfImageArchiveDir( $thumbName, $subdir, $shared );
+}
+
+/**
+ * Returns the image directory of an image's old version
+ * The result is an absolute path.
+ *
+ * This function is called from thumb.php before Setup.php is included
+ *
+ * @param $fname String: file name of the thumbnail file, including file size prefix.
+ * @param $subdir String: subdirectory of the image upload directory that should be used for storing the old version. Default is 'archive'.
+ * @param $shared Boolean use the shared upload directory (only relevant for other functions which call this one). Default is 'false'.
+ * @public
+ */
+function wfImageArchiveDir( $fname , $subdir='archive', $shared=false ) {
+	global $wgUploadDirectory, $wgHashedUploadDirectory;
+	global $wgSharedUploadDirectory, $wgHashedSharedUploadDirectory;
+	$dir = $shared ? $wgSharedUploadDirectory : $wgUploadDirectory;
+	$hashdir = $shared ? $wgHashedSharedUploadDirectory : $wgHashedUploadDirectory;
+	if (!$hashdir) { return $dir.'/'.$subdir; }
+	$hash = md5( $fname );
+
+	return $dir.'/'.$subdir.'/'.$hash[0].'/'.substr( $hash, 0, 2 );
+}
+
+
+/*
+ * Return the hash path component of an image path (URL or filesystem),
+ * e.g. "/3/3c/", or just "/" if hashing is not used.
+ *
+ * @param $dbkey The filesystem / database name of the file
+ * @param $fromSharedDirectory Use the shared file repository? It may
+ *   use different hash settings from the local one.
+ */
+function wfGetHashPath ( $dbkey, $fromSharedDirectory = false ) {
+	if( Image::isHashed( $fromSharedDirectory ) ) {
+		$hash = md5($dbkey);
+		return '/' . $hash{0} . '/' . substr( $hash, 0, 2 ) . '/';
+	} else {
+		return '/';
+	}
+}
+
+/**
+ * Returns the image URL of an image's old version
+ *
+ * @param $name String: file name of the image file
+ * @param $subdir String: (optional) subdirectory of the image upload directory that is used by the old version. Default is 'archive'
+ * @public
+ */
+function wfImageArchiveUrl( $name, $subdir='archive' ) {
+	global $wgUploadPath, $wgHashedUploadDirectory;
+
+	if ($wgHashedUploadDirectory) {
+		$hash = md5( substr( $name, 15) );
+		$url = $wgUploadPath.'/'.$subdir.'/' . $hash{0} . '/' .
+		  substr( $hash, 0, 2 ) . '/'.$name;
+	} else {
+		$url = $wgUploadPath.'/'.$subdir.'/'.$name;
+	}
+	return wfUrlencode($url);
+}
+
+/**
+ * Return a rounded pixel equivalent for a labeled CSS/SVG length.
+ * http://www.w3.org/TR/SVG11/coords.html#UnitIdentifiers
+ *
+ * @param $length String: CSS/SVG length.
+ * @return Integer: length in pixels
+ */
+function wfScaleSVGUnit( $length ) {
+	static $unitLength = array(
+		'px' => 1.0,
+		'pt' => 1.25,
+		'pc' => 15.0,
+		'mm' => 3.543307,
+		'cm' => 35.43307,
+		'in' => 90.0,
+		''   => 1.0, // "User units" pixels by default
+		'%'  => 2.0, // Fake it!
+		);
+	if( preg_match( '/^(\d+(?:\.\d+)?)(em|ex|px|pt|pc|cm|mm|in|%|)$/', $length, $matches ) ) {
+		$length = floatval( $matches[1] );
+		$unit = $matches[2];
+		return round( $length * $unitLength[$unit] );
+	} else {
+		// Assume pixels
+		return round( floatval( $length ) );
+	}
+}
+
+/**
+ * Compatible with PHP getimagesize()
+ * @todo support gzipped SVGZ
+ * @todo check XML more carefully
+ * @todo sensible defaults
+ *
+ * @param $filename String: full name of the file (passed to php fopen()).
+ * @return array
+ */
+function wfGetSVGsize( $filename ) {
+	$width = 256;
+	$height = 256;
+
+	// Read a chunk of the file
+	$f = fopen( $filename, "rt" );
+	if( !$f ) return false;
+	$chunk = fread( $f, 4096 );
+	fclose( $f );
+
+	// Uber-crappy hack! Run through a real XML parser.
+	if( !preg_match( '/<svg\s*([^>]*)\s*>/s', $chunk, $matches ) ) {
+		return false;
+	}
+	$tag = $matches[1];
+	if( preg_match( '/\bwidth\s*=\s*("[^"]+"|\'[^\']+\')/s', $tag, $matches ) ) {
+		$width = wfScaleSVGUnit( trim( substr( $matches[1], 1, -1 ) ) );
+	}
+	if( preg_match( '/\bheight\s*=\s*("[^"]+"|\'[^\']+\')/s', $tag, $matches ) ) {
+		$height = wfScaleSVGUnit( trim( substr( $matches[1], 1, -1 ) ) );
+	}
+
+	return array( $width, $height, 'SVG',
+		"width=\"$width\" height=\"$height\"" );
+}
+
+/**
+ * Determine if an image exists on the 'bad image list'.
+ *
+ * @param $name String: the image name to check
+ * @return bool
+ */
+function wfIsBadImage( $name ) {
+	static $titleList = false;
+	wfProfileIn( __METHOD__ );
+	$bad = false;
+	if( wfRunHooks( 'BadImage', array( $name, &$bad ) ) ) {
+		if( !$titleList ) {
+			# Build the list now
+			$titleList = array();
+			$lines = explode( "\n", wfMsgForContent( 'bad_image_list' ) );
+			foreach( $lines as $line ) {
+				if( preg_match( '/^\*\s*\[\[:?(.*?)\]\]/i', $line, $matches ) ) {
+					$title = Title::newFromText( $matches[1] );
+					if( is_object( $title ) && $title->getNamespace() == NS_IMAGE )
+						$titleList[ $title->getDBkey() ] = true;
+				}
+			}
+		}
+		wfProfileOut( __METHOD__ );
+		return array_key_exists( $name, $titleList );
+	} else {
+		wfProfileOut( __METHOD__ );
+		return $bad;
+	}
+}
+
+/**
+ * Calculate the largest thumbnail width for a given original file size
+ * such that the thumbnail's height is at most $maxHeight.
+ * @param $boxWidth Integer Width of the thumbnail box.
+ * @param $boxHeight Integer Height of the thumbnail box.
+ * @param $maxHeight Integer Maximum height expected for the thumbnail.
+ * @return Integer.
+ */
+function wfFitBoxWidth( $boxWidth, $boxHeight, $maxHeight ) {
+	$idealWidth = $boxWidth * $maxHeight / $boxHeight;
+	$roundedUp = ceil( $idealWidth );
+	if( round( $roundedUp * $boxHeight / $boxWidth ) > $maxHeight )
+		return floor( $idealWidth );
+	else
+		return $roundedUp;
+}
+
+
+?>
diff --git a/includes/Xml.php b/includes/Xml.php
index 3026242f7c..dc91fa519b 100644
--- a/includes/Xml.php
+++ b/includes/Xml.php
@@ -1,282 +1,282 @@
-<?php
-
-/**
- * Module of static functions for generating XML
- */
-
-class Xml {
-	/**
-	 * Format an XML element with given attributes and, optionally, text content.
-	 * Element and attribute names are assumed to be ready for literal inclusion.
-	 * Strings are assumed to not contain XML-illegal characters; special
-	 * characters (<, >, &) are escaped but illegals are not touched.
-	 *
-	 * @param $element String:
-	 * @param $attribs Array: Name=>value pairs. Values will be escaped.
-	 * @param $contents String: NULL to make an open tag only; '' for a contentless closed tag (default)
-	 * @return string
-	 */
-	public static function element( $element, $attribs = null, $contents = '') {
-		$out = '<' . $element;
-		if( !is_null( $attribs ) ) {
-			foreach( $attribs as $name => $val ) {
-				$out .= ' ' . $name . '="' . Sanitizer::encodeAttribute( $val ) . '"';
-			}
-		}
-		if( is_null( $contents ) ) {
-			$out .= '>';
-		} else {
-			if( $contents === '' ) {
-				$out .= ' />';
-			} else {
-				$out .= '>' . htmlspecialchars( $contents ) . "</$element>";
-			}
-		}
-		return $out;
-	}
-
-	/**
-	 * Format an XML element as with self::element(), but run text through the
-	 * UtfNormal::cleanUp() validator first to ensure that no invalid UTF-8
-	 * is passed.
-	 *
-	 * @param $element String:
-	 * @param $attribs Array: Name=>value pairs. Values will be escaped.
-	 * @param $contents String: NULL to make an open tag only; '' for a contentless closed tag (default)
-	 * @return string
-	 */
-	public static function elementClean( $element, $attribs = array(), $contents = '') {
-		if( $attribs ) {
-			$attribs = array_map( array( 'UtfNormal', 'cleanUp' ), $attribs );
-		}
-		if( $contents ) {
-			$contents = UtfNormal::cleanUp( $contents );
-		}
-		return self::element( $element, $attribs, $contents );
-	}
-
-	// Shortcuts
-	public static function openElement( $element, $attribs = null ) { return self::element( $element, $attribs, null ); }
-	public static function closeElement( $element ) { return "</$element>"; }
-
-	/**
-	 * Create a namespace selector
-	 *
-	 * @param $selected Mixed: the namespace which should be selected, default ''
-	 * @param $allnamespaces String: value of a special item denoting all namespaces. Null to not include (default)
-	 * @param $includehidden Bool: include hidden namespaces?
-	 * @return String: Html string containing the namespace selector
-	 */
-	public static function &namespaceSelector($selected = '', $allnamespaces = null, $includehidden=false) {
-		global $wgContLang;
-		if( $selected !== '' ) {
-			if( is_null( $selected ) ) {
-				// No namespace selected; let exact match work without hitting Main
-				$selected = '';
-			} else {
-				// Let input be numeric strings without breaking the empty match.
-				$selected = intval( $selected );
-			}
-		}
-		$s = "\n<select id='namespace' name='namespace' class='namespaceselector'>\n";
-		$arr = $wgContLang->getFormattedNamespaces();
-		if( !is_null($allnamespaces) ) {
-			$arr = array($allnamespaces => wfMsg('namespacesall')) + $arr;
-		}
-		foreach ($arr as $index => $name) {
-			if ($index < NS_MAIN) continue;
-
-			$name = $index !== 0 ? $name : wfMsg('blanknamespace');
-
-			if ($index === $selected) {
-				$s .= "\t" . self::element("option",
-						array("value" => $index, "selected" => "selected"),
-						$name) . "\n";
-			} else {
-				$s .= "\t" . self::element("option", array("value" => $index), $name) . "\n";
-			}
-		}
-		$s .= "</select>\n";
-		return $s;
-	}
-
-	public static function span( $text, $class, $attribs=array() ) {
-		return self::element( 'span', array( 'class' => $class ) + $attribs, $text );
-	}
-
-	/**
-	 * Convenience function to build an HTML text input field
-	 * @return string HTML
-	 */
-	public static function input( $name, $size=false, $value=false, $attribs=array() ) {
-		return self::element( 'input', array(
-			'name' => $name,
-			'size' => $size,
-			'value' => $value ) + $attribs );
-	}
-
-	/**
-	 * Internal function for use in checkboxes and radio buttons and such.
-	 * @return array
-	 */
-	public static function attrib( $name, $present = true ) {
-		return $present ? array( $name => $name ) : array();
-	}
-
-	/**
-	 * Convenience function to build an HTML checkbox
-	 * @return string HTML
-	 */
-	public static function check( $name, $checked=false, $attribs=array() ) {
-		return self::element( 'input', array(
-			'name' => $name,
-			'type' => 'checkbox',
-			'value' => 1 ) + self::attrib( 'checked', $checked ) +  $attribs );
-	}
-
-	/**
-	 * Convenience function to build an HTML radio button
-	 * @return string HTML
-	 */
-	public static function radio( $name, $value, $checked=false, $attribs=array() ) {
-		return self::element( 'input', array(
-			'name' => $name,
-			'type' => 'radio',
-			'value' => $value ) + self::attrib( 'checked', $checked ) + $attribs );
-	}
-
-	/**
-	 * Convenience function to build an HTML form label
-	 * @return string HTML
-	 */
-	public static function label( $label, $id ) {
-		return self::element( 'label', array( 'for' => $id ), $label );
-	}
-
-	/**
-	 * Convenience function to build an HTML text input field with a label
-	 * @return string HTML
-	 */
-	public static function inputLabel( $label, $name, $id, $size=false, $value=false, $attribs=array() ) {
-		return Xml::label( $label, $id ) .
-			'&nbsp;' .
-			self::input( $name, $size, $value, array( 'id' => $id ) + $attribs );
-	}
-
-	/**
-	 * Convenience function to build an HTML checkbox with a label
-	 * @return string HTML
-	 */
-	public static function checkLabel( $label, $name, $id, $checked=false, $attribs=array() ) {
-		return self::check( $name, $checked, array( 'id' => $id ) + $attribs ) .
-			'&nbsp;' .
-			self::label( $label, $id );
-	}
-
-	/**
-	 * Convenience function to build an HTML radio button with a label
-	 * @return string HTML
-	 */
-	public static function radioLabel( $label, $name, $value, $id, $checked=false, $attribs=array() ) {
-		return self::radio( $name, $value, $checked, array( 'id' => $id ) + $attribs ) .
-			'&nbsp;' .
-			self::label( $label, $id );
-	}
-
-	/**
-	 * Convenience function to build an HTML submit button
-	 * @param $value String: label text for the button
-	 * @param $attribs Array: optional custom attributes
-	 * @return string HTML
-	 */
-	public static function submitButton( $value, $attribs=array() ) {
-		return self::element( 'input', array( 'type' => 'submit', 'value' => $value ) + $attribs );
-	}
-
-	/**
-	 * Convenience function to build an HTML hidden form field.
-	 * @todo Document $name parameter.
-	 * @param $name FIXME
-	 * @param $value String: label text for the button
-	 * @param $attribs Array: optional custom attributes
-	 * @return string HTML
-	 */
-	public static function hidden( $name, $value, $attribs=array() ) {
-		return self::element( 'input', array(
-			'name' => $name,
-			'type' => 'hidden',
-			'value' => $value ) + $attribs );
-	}
-
-	/**
-	 * Returns an escaped string suitable for inclusion in a string literal
-	 * for JavaScript source code.
-	 * Illegal control characters are assumed not to be present.
-	 *
-	 * @param string $string
-	 * @return string
-	 */
-	public static function escapeJsString( $string ) {
-		// See ECMA 262 section 7.8.4 for string literal format
-		$pairs = array(
-			"\\" => "\\\\",
-			"\"" => "\\\"",
-			'\'' => '\\\'',
-			"\n" => "\\n",
-			"\r" => "\\r",
-
-			# To avoid closing the element or CDATA section
-			"<" => "\\x3c",
-			">" => "\\x3e",
-
-			# To avoid any complaints about bad entity refs                        
-			"&" => "\\x26",
-		);
-		return strtr( $string, $pairs );
-	}
-
-	/**
-	 * Check if a string is well-formed XML.
-	 * Must include the surrounding tag.
-	 *
-	 * @param $text String: string to test.
-	 * @return bool
-	 *
-	 * @todo Error position reporting return
-	 */
-	public static function isWellFormed( $text ) {
-		$parser = xml_parser_create( "UTF-8" );
-
-		# case folding violates XML standard, turn it off
-		xml_parser_set_option( $parser, XML_OPTION_CASE_FOLDING, false );
-
-		if( !xml_parse( $parser, $text, true ) ) {
-			$err = xml_error_string( xml_get_error_code( $parser ) );
-			$position = xml_get_current_byte_index( $parser );
-			//$fragment = $this->extractFragment( $html, $position );
-			//$this->mXmlError = "$err at byte $position:\n$fragment";
-			xml_parser_free( $parser );
-			return false;
-		}
-		xml_parser_free( $parser );
-		return true;
-	}
-
-	/**
-	 * Check if a string is a well-formed XML fragment.
-	 * Wraps fragment in an \<html\> bit and doctype, so it can be a fragment
-	 * and can use HTML named entities.
-	 *
-	 * @param $text String:
-	 * @return bool
-	 */
-	public static function isWellFormedXmlFragment( $text ) {
-		$html =
-			Sanitizer::hackDocType() .
-			'<html>' .
-			$text .
-			'</html>';
-		return Xml::isWellFormed( $html );
-	}
-}
-?>
+<?php
+
+/**
+ * Module of static functions for generating XML
+ */
+
+class Xml {
+	/**
+	 * Format an XML element with given attributes and, optionally, text content.
+	 * Element and attribute names are assumed to be ready for literal inclusion.
+	 * Strings are assumed to not contain XML-illegal characters; special
+	 * characters (<, >, &) are escaped but illegals are not touched.
+	 *
+	 * @param $element String:
+	 * @param $attribs Array: Name=>value pairs. Values will be escaped.
+	 * @param $contents String: NULL to make an open tag only; '' for a contentless closed tag (default)
+	 * @return string
+	 */
+	public static function element( $element, $attribs = null, $contents = '') {
+		$out = '<' . $element;
+		if( !is_null( $attribs ) ) {
+			foreach( $attribs as $name => $val ) {
+				$out .= ' ' . $name . '="' . Sanitizer::encodeAttribute( $val ) . '"';
+			}
+		}
+		if( is_null( $contents ) ) {
+			$out .= '>';
+		} else {
+			if( $contents === '' ) {
+				$out .= ' />';
+			} else {
+				$out .= '>' . htmlspecialchars( $contents ) . "</$element>";
+			}
+		}
+		return $out;
+	}
+
+	/**
+	 * Format an XML element as with self::element(), but run text through the
+	 * UtfNormal::cleanUp() validator first to ensure that no invalid UTF-8
+	 * is passed.
+	 *
+	 * @param $element String:
+	 * @param $attribs Array: Name=>value pairs. Values will be escaped.
+	 * @param $contents String: NULL to make an open tag only; '' for a contentless closed tag (default)
+	 * @return string
+	 */
+	public static function elementClean( $element, $attribs = array(), $contents = '') {
+		if( $attribs ) {
+			$attribs = array_map( array( 'UtfNormal', 'cleanUp' ), $attribs );
+		}
+		if( $contents ) {
+			$contents = UtfNormal::cleanUp( $contents );
+		}
+		return self::element( $element, $attribs, $contents );
+	}
+
+	// Shortcuts
+	public static function openElement( $element, $attribs = null ) { return self::element( $element, $attribs, null ); }
+	public static function closeElement( $element ) { return "</$element>"; }
+
+	/**
+	 * Create a namespace selector
+	 *
+	 * @param $selected Mixed: the namespace which should be selected, default ''
+	 * @param $allnamespaces String: value of a special item denoting all namespaces. Null to not include (default)
+	 * @param $includehidden Bool: include hidden namespaces?
+	 * @return String: Html string containing the namespace selector
+	 */
+	public static function &namespaceSelector($selected = '', $allnamespaces = null, $includehidden=false) {
+		global $wgContLang;
+		if( $selected !== '' ) {
+			if( is_null( $selected ) ) {
+				// No namespace selected; let exact match work without hitting Main
+				$selected = '';
+			} else {
+				// Let input be numeric strings without breaking the empty match.
+				$selected = intval( $selected );
+			}
+		}
+		$s = "\n<select id='namespace' name='namespace' class='namespaceselector'>\n";
+		$arr = $wgContLang->getFormattedNamespaces();
+		if( !is_null($allnamespaces) ) {
+			$arr = array($allnamespaces => wfMsg('namespacesall')) + $arr;
+		}
+		foreach ($arr as $index => $name) {
+			if ($index < NS_MAIN) continue;
+
+			$name = $index !== 0 ? $name : wfMsg('blanknamespace');
+
+			if ($index === $selected) {
+				$s .= "\t" . self::element("option",
+						array("value" => $index, "selected" => "selected"),
+						$name) . "\n";
+			} else {
+				$s .= "\t" . self::element("option", array("value" => $index), $name) . "\n";
+			}
+		}
+		$s .= "</select>\n";
+		return $s;
+	}
+
+	public static function span( $text, $class, $attribs=array() ) {
+		return self::element( 'span', array( 'class' => $class ) + $attribs, $text );
+	}
+
+	/**
+	 * Convenience function to build an HTML text input field
+	 * @return string HTML
+	 */
+	public static function input( $name, $size=false, $value=false, $attribs=array() ) {
+		return self::element( 'input', array(
+			'name' => $name,
+			'size' => $size,
+			'value' => $value ) + $attribs );
+	}
+
+	/**
+	 * Internal function for use in checkboxes and radio buttons and such.
+	 * @return array
+	 */
+	public static function attrib( $name, $present = true ) {
+		return $present ? array( $name => $name ) : array();
+	}
+
+	/**
+	 * Convenience function to build an HTML checkbox
+	 * @return string HTML
+	 */
+	public static function check( $name, $checked=false, $attribs=array() ) {
+		return self::element( 'input', array(
+			'name' => $name,
+			'type' => 'checkbox',
+			'value' => 1 ) + self::attrib( 'checked', $checked ) +  $attribs );
+	}
+
+	/**
+	 * Convenience function to build an HTML radio button
+	 * @return string HTML
+	 */
+	public static function radio( $name, $value, $checked=false, $attribs=array() ) {
+		return self::element( 'input', array(
+			'name' => $name,
+			'type' => 'radio',
+			'value' => $value ) + self::attrib( 'checked', $checked ) + $attribs );
+	}
+
+	/**
+	 * Convenience function to build an HTML form label
+	 * @return string HTML
+	 */
+	public static function label( $label, $id ) {
+		return self::element( 'label', array( 'for' => $id ), $label );
+	}
+
+	/**
+	 * Convenience function to build an HTML text input field with a label
+	 * @return string HTML
+	 */
+	public static function inputLabel( $label, $name, $id, $size=false, $value=false, $attribs=array() ) {
+		return Xml::label( $label, $id ) .
+			'&nbsp;' .
+			self::input( $name, $size, $value, array( 'id' => $id ) + $attribs );
+	}
+
+	/**
+	 * Convenience function to build an HTML checkbox with a label
+	 * @return string HTML
+	 */
+	public static function checkLabel( $label, $name, $id, $checked=false, $attribs=array() ) {
+		return self::check( $name, $checked, array( 'id' => $id ) + $attribs ) .
+			'&nbsp;' .
+			self::label( $label, $id );
+	}
+
+	/**
+	 * Convenience function to build an HTML radio button with a label
+	 * @return string HTML
+	 */
+	public static function radioLabel( $label, $name, $value, $id, $checked=false, $attribs=array() ) {
+		return self::radio( $name, $value, $checked, array( 'id' => $id ) + $attribs ) .
+			'&nbsp;' .
+			self::label( $label, $id );
+	}
+
+	/**
+	 * Convenience function to build an HTML submit button
+	 * @param $value String: label text for the button
+	 * @param $attribs Array: optional custom attributes
+	 * @return string HTML
+	 */
+	public static function submitButton( $value, $attribs=array() ) {
+		return self::element( 'input', array( 'type' => 'submit', 'value' => $value ) + $attribs );
+	}
+
+	/**
+	 * Convenience function to build an HTML hidden form field.
+	 * @todo Document $name parameter.
+	 * @param $name FIXME
+	 * @param $value String: label text for the button
+	 * @param $attribs Array: optional custom attributes
+	 * @return string HTML
+	 */
+	public static function hidden( $name, $value, $attribs=array() ) {
+		return self::element( 'input', array(
+			'name' => $name,
+			'type' => 'hidden',
+			'value' => $value ) + $attribs );
+	}
+
+	/**
+	 * Returns an escaped string suitable for inclusion in a string literal
+	 * for JavaScript source code.
+	 * Illegal control characters are assumed not to be present.
+	 *
+	 * @param string $string
+	 * @return string
+	 */
+	public static function escapeJsString( $string ) {
+		// See ECMA 262 section 7.8.4 for string literal format
+		$pairs = array(
+			"\\" => "\\\\",
+			"\"" => "\\\"",
+			'\'' => '\\\'',
+			"\n" => "\\n",
+			"\r" => "\\r",
+
+			# To avoid closing the element or CDATA section
+			"<" => "\\x3c",
+			">" => "\\x3e",
+
+			# To avoid any complaints about bad entity refs                        
+			"&" => "\\x26",
+		);
+		return strtr( $string, $pairs );
+	}
+
+	/**
+	 * Check if a string is well-formed XML.
+	 * Must include the surrounding tag.
+	 *
+	 * @param $text String: string to test.
+	 * @return bool
+	 *
+	 * @todo Error position reporting return
+	 */
+	public static function isWellFormed( $text ) {
+		$parser = xml_parser_create( "UTF-8" );
+
+		# case folding violates XML standard, turn it off
+		xml_parser_set_option( $parser, XML_OPTION_CASE_FOLDING, false );
+
+		if( !xml_parse( $parser, $text, true ) ) {
+			$err = xml_error_string( xml_get_error_code( $parser ) );
+			$position = xml_get_current_byte_index( $parser );
+			//$fragment = $this->extractFragment( $html, $position );
+			//$this->mXmlError = "$err at byte $position:\n$fragment";
+			xml_parser_free( $parser );
+			return false;
+		}
+		xml_parser_free( $parser );
+		return true;
+	}
+
+	/**
+	 * Check if a string is a well-formed XML fragment.
+	 * Wraps fragment in an \<html\> bit and doctype, so it can be a fragment
+	 * and can use HTML named entities.
+	 *
+	 * @param $text String:
+	 * @return bool
+	 */
+	public static function isWellFormedXmlFragment( $text ) {
+		$html =
+			Sanitizer::hackDocType() .
+			'<html>' .
+			$text .
+			'</html>';
+		return Xml::isWellFormed( $html );
+	}
+}
+?>