X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=php5%2Fxml-template.php;h=b326e45914beafb84ecf3657317c125bec5e0c0a;hb=7294f2eaa75313cac1aae6e95bb05ce57185bc01;hp=08c78ab57bcaf4998890628303b5790918c7eb99;hpb=b8100eaa3bfbad12dd8c758c1d28dd953b4e48fc;p=xml-template

diff --git a/php5/xml-template.php b/php5/xml-template.php
index 08c78ab..b326e45 100644
--- a/php5/xml-template.php
+++ b/php5/xml-template.php
@@ -11,19 +11,19 @@ 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);
+		while ($node->childeNodes->length > 0) {
+			$child = $node->childNodes->item(0);
 			$node->removeChild($child);
 		}
 
 		if (is_a($obj, 'DOMDocument')) {
-			$obj = $obj->document_element();
+			$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);
@@ -78,10 +78,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);
 		}
 
@@ -91,26 +92,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->localName != 'temporary-fragment') {
-				continue;
-			}
-			while ($child->childNodes->length > 0) {
-				$child2 = $child->childNodes->item(0);
-				$node->appendChild($child2);
-			}
-			--$i;
-			$node->removeChild($child);
-		}	
 	}
 
 	if ($clean) {
@@ -160,22 +148,30 @@ function XML_Template_alternate($tag, $array, $elems)
 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)) {
+		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) {
 				$nsuri = $attr->namespaceURI;
-				if (isset($nsuri)) {
-					$attr2 = $doc->createAttribute($attr->name);
-				} else {
+				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);