Add some hairy magic for removing excess namespaces.

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

diff --git a/php5/xml-template.php b/php5/xml-template.php
index b326e45914beafb84ecf3657317c125bec5e0c0a..43b8b577c264513db1b70f5825fdc3b0f5d90338 100644 (file)
--- a/php5/xml-template.php
+++ b/php5/xml-template.php
@@ -43,14 +43,27 @@ function XML_Template_process($node, $obj, $clean = 1)
                                $attrs = $child->attributes;
 
                                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;
                                                        }
                                                }
                                        }
+
+                                       # This seems to be the only way to reliably get rid of the excess
+                                       # XML namespace declarations.
+                                       if ($replace_child == 1) {
+                                               $newchild = own_clone_element($child, $child->ownerDocument);
+                                               while ($child->childNodes->length > 0) {
+                                                       $newchild->appendChild($child->firstChild);
+                                               }
+                                               $node->replaceChild($newchild, $child);
+                                               $child = $newchild;
+                                       }
                                }
                        
                                # check all substitutions to see if we found anything
@@ -157,26 +170,7 @@ function own_clone_node($node, $doc)
                }
                return $newnode;
        } else if ($node->nodeType == XML_ELEMENT_NODE) {
-               $nsuri = $node->namespaceURI;
-               if (isset($nsuri) && $node->prefix != "default") {
-                       $newnode = $doc->createElementNS($node->namespaceURI, $node->nodeName, $node->prefix);
-               } else {
-                       $newnode = $doc->createElement($node->localName);
-               }
-               
-               $attrs = $node->attributes;
-               if (isset($attrs)) {
-                       foreach ($node->attributes as $attr) {
-                               $nsuri = $attr->namespaceURI;
-                               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);
-                       }
-               }
+               $newnode = own_clone_element($node, $doc);
                for ($i = 0; $i < $node->childNodes->length; ++$i) {
                        $child = $node->childNodes->item($i);
                        $newnode->appendChild(own_clone_node($child, $doc));
@@ -186,6 +180,34 @@ function own_clone_node($node, $doc)
                return $node->cloneNode(true);
        }
 }
+               
+function own_clone_element($node, $doc)
+{
+       $nsuri = $node->namespaceURI;
+       if (isset($nsuri) && $node->prefix != "default") {
+               $newnode = $doc->createElementNS($node->namespaceURI, $node->nodeName, $node->prefix);
+       
+               // remove useless empty text child
+               $newnode->removeChild($newnode->firstChild);
+       } else {
+               $newnode = $doc->createElement($node->localName);
+       }
+       
+       $attrs = $node->attributes;
+       if (isset($attrs)) {
+               foreach ($node->attributes as $attr) {
+                       $nsuri = $attr->namespaceURI;
+                       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);
+               }
+       }
+       return $newnode;
+}
 
 function is_associative_array($arr)
 {