From 396b28f3d881f5debd888ba9bb9b47c2d478a76f Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Mon, 15 Dec 2008 18:02:47 +0100
Subject: update to Mediawiki 1.13.3; some cleanups

---
 includes/XmlTypeCheck.php | 74 +++++++++++++++++++----------------------------
 1 file changed, 30 insertions(+), 44 deletions(-)

(limited to 'includes/XmlTypeCheck.php')

diff --git a/includes/XmlTypeCheck.php b/includes/XmlTypeCheck.php
index 09b8c20a..8ee211e1 100644
--- a/includes/XmlTypeCheck.php
+++ b/includes/XmlTypeCheck.php
@@ -6,6 +6,12 @@ class XmlTypeCheck {
 	 * well-formed XML. Note that this doesn't check schema validity.
 	 */
 	public $wellFormed = false;
+	
+	/**
+	 * Will be set to true if the optional element filter returned
+	 * a match at some point.
+	 */
+	public $filterMatch = false;
 
 	/**
 	 * Name of the document's root element, including any namespace
@@ -13,33 +19,26 @@ class XmlTypeCheck {
 	 */
 	public $rootElement = '';
 
-	private $softNamespaces;
-	private $namespaces = array();
-
 	/**
 	 * @param $file string filename
-	 * @param $softNamespaces bool
-	 *        If set to true, use of undeclared XML namespaces will be ignored.
-	 *        This matches the behavior of rsvg, but more compliant consumers
-	 *        such as Firefox will reject such files.
-	 *        Leave off for the default, stricter checks.
+	 * @param $filterCallback callable (optional)
+	 *        Function to call to do additional custom validity checks from the
+	 *        SAX element handler event. This gives you access to the element
+	 *        namespace, name, and attributes, but not to text contents.
+	 *        Filter should return 'true' to toggle on $this->filterMatch
 	 */
-	function __construct( $file, $softNamespaces=false ) {
-		$this->softNamespaces = $softNamespaces;
+	function __construct( $file, $filterCallback=null ) {
+		$this->filterCallback = $filterCallback;
 		$this->run( $file );
 	}
 
 	private function run( $fname ) {
-		if( $this->softNamespaces ) {
-			$parser = xml_parser_create( 'UTF-8' );
-		} else {
-			$parser = xml_parser_create_ns( 'UTF-8' );
-		}
+		$parser = xml_parser_create_ns( 'UTF-8' );
 
 		// case folding violates XML standard, turn it off
 		xml_parser_set_option( $parser, XML_OPTION_CASE_FOLDING, false );
 
-		xml_set_element_handler( $parser, array( $this, 'elementOpen' ), false );
+		xml_set_element_handler( $parser, array( $this, 'rootElementOpen' ), false );
 
 		$file = fopen( $fname, "rb" );
 		do {
@@ -59,35 +58,22 @@ class XmlTypeCheck {
 		xml_parser_free( $parser );
 	}
 
+	private function rootElementOpen( $parser, $name, $attribs ) {
+		$this->rootElement = $name;
+		
+		if( is_callable( $this->filterCallback ) ) {
+			xml_set_element_handler( $parser, array( $this, 'elementOpen' ), false );
+			$this->elementOpen( $parser, $name, $attribs );
+		} else {
+			// We only need the first open element
+			xml_set_element_handler( $parser, false, false );
+		}
+	}
+	
 	private function elementOpen( $parser, $name, $attribs ) {
-		if( $this->softNamespaces ) {
-			// Check namespaces manually, so expat doesn't throw
-			// errors on use of undeclared namespaces.
-			foreach( $attribs as $attrib => $val ) {
-				if( $attrib == 'xmlns' ) {
-					$this->namespaces[''] = $val;
-				} elseif( substr( $attrib, 0, strlen( 'xmlns:' ) ) == 'xmlns:' ) {
-					$this->namespaces[substr( $attrib, strlen( 'xmlns:' ) )] = $val;
-				}
-			}
-
-			if( strpos( $name, ':' ) === false ) {
-				$ns = '';
-				$subname = $name;
-			} else {
-				list( $ns, $subname ) = explode( ':', $name, 2 );
-			}
-
-			if( isset( $this->namespaces[$ns] ) ) {
-				$name = $this->namespaces[$ns] . ':' . $subname;
-			} else {
-				// Technically this is invalid for XML with Namespaces.
-				// But..... we'll just let it slide in soft mode.
-			}
+		if( call_user_func( $this->filterCallback, $name, $attribs ) ) {
+			// Filter hit!
+			$this->filterMatch = true;
 		}
-
-		// We only need the first open element
-		$this->rootElement = $name;
-		xml_set_element_handler( $parser, false, false );
 	}
 }
-- 
cgit v1.2.2