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

diff --git a/php5/xml-template.php b/php5/xml-template.php
index f98e674..08c78ab 100644
--- a/php5/xml-template.php
+++ b/php5/xml-template.php
@@ -10,18 +10,18 @@ function XML_Template_process_file($filename, $obj, $clean = 1)
 
 function XML_Template_process($node, $obj, $clean = 1)
 {
-	if (is_a($obj, 'domnode')) {                          # overwrite
+	if (is_a($obj, 'DOMNode')) {                          # overwrite
 		for ($i = 0; $i < $node->childNodes->length; ++$i) {
 			$child = $node->childNodes->item($i);
 			$node->removeChild($child);
 		}
 
-		if (is_a($obj, 'domdocument')) {
+		if (is_a($obj, 'DOMDocument')) {
 			$obj = $obj->document_element();
 		}
 
 		$newobj = own_clone_node($obj, $node->ownerDocument);
-		$node->append_child($newobj);
+		$node->appendChild($newobj);
 
 		XML_Template_process($newobj, array(), $clean);
 	} else if (!is_array($obj)) {                         # overwrite
@@ -39,14 +39,15 @@ 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') {
 							$id = $attr->value;
 							if ($clean) {
-								# $attr->unlinkNode();
+								$child->removeAttributeNode($attr);
 							}
 						}
 					}
@@ -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) {
@@ -79,10 +80,9 @@ function XML_Template_process($node, $obj, $clean = 1)
 		$doc = $node->ownerDocument;
 		$frag = $doc->createElement("temporary-fragment");    # ugh
 
-		for ($i = 0; $i < $node->childNodes->length; ++$i) {
-			$child = $node->childNodes->item($i);
-			$frag->append_child($child);
-			$node->removeChild($child);
+		while ($node->childNodes->length > 0) {
+			$child = $node->childNodes->item(0);
+			$frag->appendChild($child);
 		}
 
 		foreach ($obj as $instance) {
@@ -91,7 +91,7 @@ function XML_Template_process($node, $obj, $clean = 1)
 			}
 
 			$newnode = own_clone_node($frag, $frag->ownerDocument);
-			$node->append_child($newnode);
+			$node->appendChild($newnode);
 			XML_Template_process($newnode, $instance, $clean);
 			if ($clean) {
 				XML_Template_clean($newnode);
@@ -99,16 +99,16 @@ function XML_Template_process($node, $obj, $clean = 1)
 		}
 
 		# remove all the <fragment> tags
-
 		for ($i = 0; $i < $node->childNodes->length; ++$i) {
 			$child = $node->childNodes->item($i);
-			if ($child->name != 'temporary-fragment') {
+			if ($child->localName != 'temporary-fragment') {
 				continue;
 			}
-			for ($j = 0; $j < $child->childNodes->length; ++$j) {
-				$child2 = $child->childNodes->item($j);
-				$node->append_child($child2);
+			while ($child->childNodes->length > 0) {
+				$child2 = $child->childNodes->item(0);
+				$node->appendChild($child2);
 			}
+			--$i;
 			$node->removeChild($child);
 		}	
 	}
@@ -128,11 +128,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();
-		for ($i = 0; $i < $node->childNodes->length; ++$i) {
-			$child = $node->childNodes->item($i);
+		$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);
 	}
@@ -153,15 +154,16 @@ 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) {
 		$nsuri = $node->namespaceURI;
 		if (isset($nsuri)) {
-			$newnode = $doc->createElementNS($node->namespaceURI, $node->nodeName, $node->prefix());
+			$newnode = $doc->createElementNS($node->namespaceURI, $node->nodeName, $node->prefix);
 		} else {
 			$newnode = $doc->createElement($node->nodeName);
 		}
@@ -169,21 +171,23 @@ function own_clone_node($node, $doc)
 		$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);
+					$attr2 = $doc->createAttribute($attr->name);
+				} else {
+					$attr2 = $doc->createAttributeNS($nsuri, $attr->prefix . ":" . $attr->name);
 				}
-				$newnode->append_child($attr2);
+				$attr2->value = $attr->value;
+				$newnode->appendChild($attr2);
 			}
 		}
 		for ($i = 0; $i < $node->childNodes->length; ++$i) {
 			$child = $node->childNodes->item($i);
-			$newnode->append_child(own_clone_node($child, $doc));
+			$newnode->appendChild(own_clone_node($child, $doc));
 		}
 		return $newnode;
 	} else {
-		return $node->clone_node(true);
+		return $node->cloneNode(true);
 	}
 }