Use "real" document fragments instead of our own hacks.

[xml-template] / php5 / xml-template.php

diff --git a/php5/xml-template.php b/php5/xml-template.php
index 911a6417064b587945c609d0e62ecfd2f6706ebb..e68c2be45842a4c4da9bd389de21cee26ee1be7a 100644 (file)
--- 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
+               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);
+               $newobj = $obj->cloneNode(true);
+               $node->appendChild($newobj);
 
                XML_Template_process($newobj, array(), $clean);
        } 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) {
@@ -86,25 +91,13 @@ function XML_Template_process($node, $obj, $clean = 1)
                                continue;
                        }
 
-                       $newnode = own_clone_node($frag, $frag->ownerDocument);
-                       $node->append_child($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
-
-               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 +115,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);
        }
@@ -145,40 +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->append_child($attr2);
-                       }
-               }
-               foreach ($node->childNodes as $child) {
-                       $newnode->append_child(own_clone_node($child, $doc));
-               }
-               return $newnode;
-       } else {
-               return $node->clone_node(true);
-       }
-}
-
 function is_associative_array($arr)
 {
        if (!is_array($arr)) {