X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=php5%2Fxml-template.php;h=66937d24e4a9e59b8b4fc842daecc14151d95767;hb=c1d4dfa5fe43d3e229cd90a18975fbf4df120f50;hp=911a6417064b587945c609d0e62ecfd2f6706ebb;hpb=4f5e553cffa801a29b5aa4b3b2f367f221a148ff;p=xml-template

diff --git a/php5/xml-template.php b/php5/xml-template.php
index 911a641..66937d2 100644
--- a/php5/xml-template.php
+++ b/php5/xml-template.php
@@ -10,40 +10,44 @@ function XML_Template_process_file($filename, $obj, $clean = 1)
 
 function XML_Template_process($node, $obj, $clean = 1)
 {
-	if (is_a($obj, 'domnode')) {                          # overwrite
-		foreach ($node->childNodes as $child) {
+	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->append_child($newobj);
-
-		XML_Template_process($newobj, array(), $clean);
+		$frag = $node->ownerDocument->createDocumentFragment();
+		$frag->appendXML($obj->ownerDocument->saveXML($obj));
+		XML_Template_process($frag, array(), $clean);
+		$node->appendChild($frag);
 	} else if (!is_array($obj)) {                         # overwrite
-		foreach ($node->childNodes as $child) {
+		for ($i = 0; $i < $node->childNodes->length; ++$i) {
+			$child = $node->childNodes->item($i);
 			$node->removeChild($child);
 		}
 		$doc = $node->ownerDocument;
 		$node->appendChild($doc->createTextNode($obj));
 	} else if (is_associative_array($obj)) {              # substitute
-		foreach ($node->childNodes as $child) {
+		for ($i = 0; $i < $node->childNodes->length; ++$i) {
+			$child = $node->childNodes->item($i);
 			$processed = false;
 
 			if ($child->nodeType == XML_ELEMENT_NODE) {
 				unset($id);
 
-				$tag = $child->nodeName;
+				$tag = $child->localName;
 				$attrs = $child->attributes;
+
 				if (isset($attrs)) {
 					foreach ($child->attributes as $attr) {
 						if ($attr->namespaceURI == 'http://template.sesse.net/' && $attr->name == 'id') {
 							$id = $attr->value;
 							if ($clean) {
-								# $attr->unlinkNode();
+								$child->removeAttributeNode($attr);
 							}
 						}
 					}
@@ -55,7 +59,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) {
@@ -74,11 +78,12 @@ function XML_Template_process($node, $obj, $clean = 1)
 		}
 	} else {						# repeat
 		$doc = $node->ownerDocument;
-		$frag = $doc->createElement("temporary-fragment");    # ugh
+		$frag = $doc->createDocumentFragment();
 
-		foreach ($node->childNodes as $child) {
-			$frag->append_child($child);
+		while ($node->childNodes->length > 0) {
+			$child = $node->childNodes->item(0);
 			$node->removeChild($child);
+			$frag->appendChild($child);
 		}
 
 		foreach ($obj as $instance) {
@@ -87,24 +92,13 @@ function XML_Template_process($node, $obj, $clean = 1)
 			}
 
 			$newnode = own_clone_node($frag, $frag->ownerDocument);
-			$node->append_child($newnode);
 			XML_Template_process($newnode, $instance, $clean);
+
+			$node->appendChild($newnode);
 			if ($clean) {
 				XML_Template_clean($newnode);
 			}
 		}
-
-		# remove all the <fragment> tags
-
-		foreach ($node->childNodes as $child) {
-			if ($child->name != 'temporary-fragment') {
-				continue;
-			}
-			foreach ($child->childNodes as $child2) {
-				$node->append_child($child2);
-			}
-			$node->removeChild($child);
-		}	
 	}
 
 	if ($clean) {
@@ -122,10 +116,12 @@ function XML_Template_clean($node)
 		# as this is a dummy node, we want to remove it and move everything further up
 		# after we've done any required replacements
 		$doc = $node->ownerDocument;
-		$parent = $node->parent_node();
-		foreach ($node->childNodes as $child) {
+		$parent = $node->parentNode;
+
+		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);
 	}
@@ -146,36 +142,48 @@ function XML_Template_alternate($tag, $array, $elems)
 }
 		
 # Ideally, this would be "return $obj->clone_node(true)". But surprise, surprise,
-# PHP is buggy (at least PHP4); it removes the prefix information from all attributes
-# during a clone. IOW, we'll have to clone evverything ourselves.
+# PHP is buggy (at least both PHP4 and PHP5); it removes the prefix information
+# from all attributes during a clone. IOW, we'll have to clone evverything
+# ourselves.
 function own_clone_node($node, $doc)
 {
 	// we only need these two
-	if ($node->nodeType == XML_ELEMENT_NODE) {
+	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) {
 		$nsuri = $node->namespaceURI;
-		if (isset($nsuri)) {
-			$newnode = $doc->createElementNS($node->namespaceURI, $node->nodeName, $node->prefix());
+		if (isset($nsuri) && $node->prefix != "default") {
+			$newnode = $doc->createElementNS($node->namespaceURI, $node->nodeName, $node->prefix);
 		} else {
-			$newnode = $doc->createElement($node->nodeName);
+			$newnode = $doc->createElement($node->localName);
 		}
 		
 		$attrs = $node->attributes;
 		if (isset($attrs)) {
 			foreach ($node->attributes as $attr) {
-				$attr2 = $doc->createAttribute($attr->name, $attr->value);
 				$nsuri = $attr->namespaceURI;
-				if (isset($nsuri)) {
-					$attr2->set_namespace($nsuri, $attr->prefix);
+				if (isset($nsuri) && $attr->prefix != "default") {
+					$attr2 = $doc->createAttributeNS($nsuri, $attr->prefix . ":" . $attr->name);
+				} else {
+					$attr2 = $doc->createAttribute($attr->localName);
 				}
-				$newnode->append_child($attr2);
+				$attr2->value = $attr->value;
+				$newnode->appendChild($attr2);
 			}
 		}
-		foreach ($node->childNodes as $child) {
-			$newnode->append_child(own_clone_node($child, $doc));
+		for ($i = 0; $i < $node->childNodes->length; ++$i) {
+			$child = $node->childNodes->item($i);
+			$newnode->appendChild(own_clone_node($child, $doc));
 		}
 		return $newnode;
 	} else {
-		return $node->clone_node(true);
+		return $node->cloneNode(true);
 	}
 }