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 7d0ab1985102e734fa256deaa0111492b4bd5960..e68c2be45842a4c4da9bd389de21cee26ee1be7a 100644 (file)
--- a/php5/xml-template.php
+++ b/php5/xml-template.php
@@ -10,17 +10,17 @@ 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);
+               $newobj = $obj->cloneNode(true);
                $node->appendChild($newobj);
 
                XML_Template_process($newobj, array(), $clean);
@@ -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)) {