X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=php5%2Fxml-template.php;h=2a527d2184f513188fcdd694cafa1d027951b0c5;hb=68651e7904b17101ee5f8b0a873c093f781d4f7e;hp=7d0ab1985102e734fa256deaa0111492b4bd5960;hpb=3e6129a126eb0b5f7ea07855cb1e05e62923b007;p=xml-template

diff --git a/php5/xml-template.php b/php5/xml-template.php
index 7d0ab19..2a527d2 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->appendXML($obj->ownerDocument->saveXML($obj));
+		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,8 +39,9 @@ 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)) {
 					foreach ($child->attributes as $attr) {
 						if ($attr->namespaceURI == 'http://template.sesse.net/' && $attr->name == 'id') {
@@ -58,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) {
@@ -77,12 +78,12 @@ function XML_Template_process($node, $obj, $clean = 1)
 		}
 	} else {						# repeat
 		$doc = $node->ownerDocument;
-		$frag = $doc->createElement("temporary-fragment");    # ugh
+		$frag = $doc->createDocumentFragment();
 
-		for ($i = 0; $i < $node->childNodes->length; ++$i) {
-			$child = $node->childNodes->item($i);
-			$frag->appendChild($child);
+		while ($node->childNodes->length > 0) {
+			$child = $node->childNodes->item(0);
 			$node->removeChild($child);
+			$frag->appendChild($child);
 		}
 
 		foreach ($obj as $instance) {
@@ -90,27 +91,13 @@ function XML_Template_process($node, $obj, $clean = 1)
 				continue;
 			}
 
-			$newnode = own_clone_node($frag, $frag->ownerDocument);
-			$node->appendChild($newnode);
+			$newnode = $frag->cloneNode(true);
 			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) {
@@ -129,10 +116,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);
 	}
@@ -152,41 +140,6 @@ function XML_Template_alternate($tag, $array, $elems)
 	return $array;
 }
 		
-# 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.
-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) {
-				$attr2 = $doc->createAttribute($attr->name, $attr->value);
-				$nsuri = $attr->namespaceURI;
-				if (isset($nsuri)) {
-					$attr2->set_namespace($nsuri, $attr->prefix);
-				}
-				$newnode->appendChild($attr2);
-			}
-		}
-		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);
-	}
-}
-
 function is_associative_array($arr)
 {
 	if (!is_array($arr)) {