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

diff --git a/php5/xml-template.php b/php5/xml-template.php
index 43b8b57..e6a4e19 100644
--- a/php5/xml-template.php
+++ b/php5/xml-template.php
@@ -11,7 +11,7 @@ function XML_Template_process_file($filename, $obj, $clean = 1)
 function XML_Template_process($node, $obj, $clean = 1)
 {
 	if (is_a($obj, 'DOMNode')) {                          # overwrite
-		while ($node->childeNodes->length > 0) {
+		while ($node->childNodes->length > 0) {
 			$child = $node->childNodes->item(0);
 			$node->removeChild($child);
 		}
@@ -25,15 +25,20 @@ function XML_Template_process($node, $obj, $clean = 1)
 		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);
-			$node->removeChild($child);
+		while ($node->childNodes->length > 0) {
+			$node->removeChild($node->firstChild);
 		}
 		$doc = $node->ownerDocument;
 		$node->appendChild($doc->createTextNode($obj));
 	} else if (is_associative_array($obj)) {              # substitute
-		for ($i = 0; $i < $node->childNodes->length; ++$i) {
-			$child = $node->childNodes->item($i);
+		$num_children = ($node->childNodes == null) ? 0 : $node->childNodes->length;
+		$children = array();
+		for ($i = 0; $i < $num_children; ++$i) {
+			$children[] = $node->childNodes->item($i);
+		}
+
+		for ($i = 0; $i < $num_children; ++$i) {
+			$child = $children[$i];
 			$processed = false;
 
 			if ($child->nodeType == XML_ELEMENT_NODE) {
@@ -44,14 +49,13 @@ function XML_Template_process($node, $obj, $clean = 1)
 
 				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;
-							}
-						}
+					$id_node = $child->getAttributeNodeNS('http://template.sesse.net/', 'id');
+					if (isset($id_node)) {
+						$id = $id_node->value;
+						if ($clean) {
+							$child->removeAttributeNode($id_node);
+							$replace_child = 1;
+						}       
 					}
 
 					# This seems to be the only way to reliably get rid of the excess
@@ -134,7 +138,7 @@ function XML_Template_clean($node)
 		while ($node->childNodes->length > 0) {
 			$child = $node->childNodes->item(0);
 			$node->removeChild($child);
-			$parent->insertBefore($child, $node);
+			$parent->insertBefore(own_clone_node($child, $doc), $node);
 		}
 		$parent->removeChild($node);
 	}
@@ -154,10 +158,10 @@ 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 both PHP4 and PHP5); it removes the prefix information
-# from all attributes during a clone. IOW, we'll have to clone evverything
-# ourselves.
+# Ideally, this would be "return $obj->clone_node(true)". But surprise,
+# surprise, PHP is buggy; it does not preserve the prefix information on
+# attributes properly during a clone. (PHP4 and PHP5 are broken in different
+# ways here...) IOW, we'll have to clone everything ourselves.
 function own_clone_node($node, $doc)
 {
 	// we only need these two
@@ -202,7 +206,9 @@ function own_clone_element($node, $doc)
 			} else {
 				$attr2 = $doc->createAttribute($attr->localName);
 			}
-			$attr2->value = $attr->value;
+
+			# You've got to be kidding me...
+			$attr2->value = preg_replace("/&/", "&amp;", $attr->value);
 			$newnode->appendChild($attr2);
 		}
 	}