X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=php5%2Fxml-template.php;h=43b8b577c264513db1b70f5825fdc3b0f5d90338;hb=13fb5825f2cef59f70b8ad7518a460a3e43c4f41;hp=af055917757f63f7902294636b615c15231ab5fe;hpb=1740b1f59b984b42ea1609f64fd7c994b85e121f;p=xml-template

diff --git a/php5/xml-template.php b/php5/xml-template.php
index af05591..43b8b57 100644
--- a/php5/xml-template.php
+++ b/php5/xml-template.php
@@ -10,20 +10,20 @@ function XML_Template_process_file($filename, $obj, $clean = 1)
 
 function XML_Template_process($node, $obj, $clean = 1)
 {
-	if (is_a($obj, 'domnode')) {                          # overwrite
-		for ($i = 0; $i < $node->childNodes->length; ++$i) {
-			$child = $node->childNodes->item($i);
+	if (is_a($obj, 'DOMNode')) {                          # overwrite
+		while ($node->childeNodes->length > 0) {
+			$child = $node->childNodes->item(0);
 			$node->removeChild($child);
 		}
 
-		if (is_a($obj, 'domdocument')) {
-			$obj = $obj->document_element();
+		if (is_a($obj, 'DOMDocument')) {
+			$obj = $obj->documentElement;
 		}
 
-		$newobj = own_clone_node($obj, $node->ownerDocument);
-		$node->appendChild($newobj);
-
-		XML_Template_process($newobj, array(), $clean);
+		$frag = $node->ownerDocument->createDocumentFragment();
+		$frag->appendChild($node->ownerDocument->importNode($obj, true));
+		XML_Template_process($frag, array(), $clean);
+		$node->appendChild($frag);
 	} else if (!is_array($obj)) {                         # overwrite
 		for ($i = 0; $i < $node->childNodes->length; ++$i) {
 			$child = $node->childNodes->item($i);
@@ -39,17 +39,31 @@ function XML_Template_process($node, $obj, $clean = 1)
 			if ($child->nodeType == XML_ELEMENT_NODE) {
 				unset($id);
 
-				$tag = $child->nodeName;
+				$tag = $child->localName;
 				$attrs = $child->attributes;
+
 				if (isset($attrs)) {
+					$replace_child = 0;
 					foreach ($child->attributes as $attr) {
 						if ($attr->namespaceURI == 'http://template.sesse.net/' && $attr->name == 'id') {
 							$id = $attr->value;
 							if ($clean) {
 								$child->removeAttributeNode($attr);
+								$replace_child = 1;
 							}
 						}
 					}
+
+					# This seems to be the only way to reliably get rid of the excess
+					# XML namespace declarations.
+					if ($replace_child == 1) {
+						$newchild = own_clone_element($child, $child->ownerDocument);
+						while ($child->childNodes->length > 0) {
+							$newchild->appendChild($child->firstChild);
+						}
+						$node->replaceChild($newchild, $child);
+						$child = $newchild;
+					}
 				}
 			
 				# check all substitutions to see if we found anything
@@ -58,7 +72,7 @@ function XML_Template_process($node, $obj, $clean = 1)
 					# FIXME: we would want something like \Q and \E here...
 					if (preg_match('/^' . $tag . '\/(.*)$/', $key, $matches) ||
 					    (isset($id) && preg_match('/^#' . $id . '\/(.*)$/', $key, $matches))) {
-					    	$child->set_attribute($matches[1], $obj[$key]);
+					    	$child->setAttribute($matches[1], $obj[$key]);
 					}
 
 					if ($processed) {
@@ -77,10 +91,11 @@ function XML_Template_process($node, $obj, $clean = 1)
 		}
 	} else {						# repeat
 		$doc = $node->ownerDocument;
-		$frag = $doc->createElement("temporary-fragment");    # ugh
+		$frag = $doc->createDocumentFragment();
 
 		while ($node->childNodes->length > 0) {
 			$child = $node->childNodes->item(0);
+			$node->removeChild($child);
 			$frag->appendChild($child);
 		}
 
@@ -90,26 +105,13 @@ function XML_Template_process($node, $obj, $clean = 1)
 			}
 
 			$newnode = own_clone_node($frag, $frag->ownerDocument);
-			$node->appendChild($newnode);
 			XML_Template_process($newnode, $instance, $clean);
+
+			$node->appendChild($newnode);
 			if ($clean) {
 				XML_Template_clean($newnode);
 			}
 		}
-
-		# remove all the <fragment> tags
-
-		for ($i = 0; $i < $node->childNodes->length; ++$i) {
-			$child = $node->childNodes->item($i);
-			if ($child->name != 'temporary-fragment') {
-				continue;
-			}
-			for ($j = 0; $j < $child->childNodes->length; ++$j) {
-				$child2 = $child->childNodes->item($j);
-				$node->appendChild($child2);
-			}
-			$node->removeChild($child);
-		}	
 	}
 
 	if ($clean) {
@@ -128,10 +130,11 @@ function XML_Template_clean($node)
 		# after we've done any required replacements
 		$doc = $node->ownerDocument;
 		$parent = $node->parentNode;
-		for ($i = 0; $i < $node->childNodes->length; ++$i) {
-			$child = $node->childNodes->item($i);
+
+		while ($node->childNodes->length > 0) {
+			$child = $node->childNodes->item(0);
 			$node->removeChild($child);
-			$node->insert_before($child, $node);
+			$parent->insertBefore($child, $node);
 		}
 		$parent->removeChild($node);
 	}
@@ -158,28 +161,16 @@ function XML_Template_alternate($tag, $array, $elems)
 function own_clone_node($node, $doc)
 {
 	// we only need these two
-	if ($node->nodeType == XML_ELEMENT_NODE) {
-		$nsuri = $node->namespaceURI;
-		if (isset($nsuri)) {
-			$newnode = $doc->createElementNS($node->namespaceURI, $node->nodeName, $node->prefix);
-		} else {
-			$newnode = $doc->createElement($node->nodeName);
-		}
-		
-		$attrs = $node->attributes;
-		if (isset($attrs)) {
-			foreach ($node->attributes as $attr) {
-				$nsuri = $attr->namespaceURI;
-				if (isset($nsuri)) {
-					$attr2 = $doc->createAttribute($attr->name);
-				} else {
-					$attr2 = $doc->createAttributeNS($nsuri, $attr->name);
-					$attr2->prefix = $attr->prefix;
-				}
-				$attr2->value = $attr->value;
-				$newnode->appendChild($attr2);
-			}
+	if ($node->nodeType == XML_DOCUMENT_FRAG_NODE) {
+		$newnode = $doc->createDocumentFragment();
+
+		for ($i = 0; $i < $node->childNodes->length; ++$i) {
+			$child = $node->childNodes->item($i);
+			$newnode->appendChild(own_clone_node($child, $doc));
 		}
+		return $newnode;
+	} else if ($node->nodeType == XML_ELEMENT_NODE) {
+		$newnode = own_clone_element($node, $doc);
 		for ($i = 0; $i < $node->childNodes->length; ++$i) {
 			$child = $node->childNodes->item($i);
 			$newnode->appendChild(own_clone_node($child, $doc));
@@ -189,6 +180,34 @@ function own_clone_node($node, $doc)
 		return $node->cloneNode(true);
 	}
 }
+		
+function own_clone_element($node, $doc)
+{
+	$nsuri = $node->namespaceURI;
+	if (isset($nsuri) && $node->prefix != "default") {
+		$newnode = $doc->createElementNS($node->namespaceURI, $node->nodeName, $node->prefix);
+	
+		// remove useless empty text child
+		$newnode->removeChild($newnode->firstChild);
+	} else {
+		$newnode = $doc->createElement($node->localName);
+	}
+	
+	$attrs = $node->attributes;
+	if (isset($attrs)) {
+		foreach ($node->attributes as $attr) {
+			$nsuri = $attr->namespaceURI;
+			if (isset($nsuri) && $attr->prefix != "default") {
+				$attr2 = $doc->createAttributeNS($nsuri, $attr->prefix . ":" . $attr->name);
+			} else {
+				$attr2 = $doc->createAttribute($attr->localName);
+			}
+			$attr2->value = $attr->value;
+			$newnode->appendChild($attr2);
+		}
+	}
+	return $newnode;
+}
 
 function is_associative_array($arr)
 {