Changeset 2453

Timestamp:

09/06/08 22:57:09 (3 months ago)

Author:

dmondark

Message:

090508-dom: First pass of porting AtomHandler to DOM. create_atom_wrapper, add_posts and get_collection methods now uses DOM to generate the feed so the main entries feed now works, other feeds are broken so far, obviously.

Files:

• branches/090508-dom/system/classes/atomhandler.php (modified) (4 diffs)

branches/090508-dom/system/classes/atomhandler.php

@@ -81 +81 @@
         $namespaces= array( 'default' => 'http://www.w3.org/2005/Atom' );
         $namespaces= Plugins::filter( 'atom_get_collection_namespaces', $namespaces );
-        $namespaces= array_map( create_function( '$value,$key', 'return ( ( $key == "default" ) ? "xmlns" : "xmlns:" . $key ) . "=\"" . $value ."\"";' ), $namespaces, array_keys($namespaces) );
-        $namespaces= implode( ' ', $namespaces );
-
-        $xml= new SimpleXMLElement( '<feed ' . $namespaces . '></feed>' );
-
-        $feed_title= $xml->addChild( 'title', htmlspecialchars( Options::get( 'title' ) ) );
+        $namespaces=array_combine( array_map( create_function( '$key', 'return ( ( $key == "default" ) ? "xmlns" : "xmlns:" . $key ) ;' ), array_keys( $namespaces ) ) ,array_values($namespaces) );
+
+        $xml= new DOMDocument( '1.0' );
+        $feed = $xml->appendChild( $xml->createElement('feed') );
+        
+        foreach ( $namespaces as $namespace=>$uri ){
+            $feed->setAttribute( $namespace, $uri );
+        }
+
+        $feed_title= $feed->appendChild( $xml->createElement( 'title' ) );
+        $feed_title->appendChild( $xml->createTextNode( Options::get( 'title' ) ) );
 
         if ( $tagline= Options::get( 'tagline' ) ) {
-            $feed_subtitle= $xml->addChild( 'subtitle', htmlspecialchars( $tagline ) );
-        }
-
-        $feed_updated= $xml->addChild( 'updated', date( 'c', time() ) );
-
-        $feed_link= $xml->addChild( 'link' );
-        $feed_link->addAttribute( 'rel', 'alternate' );
-        $feed_link->addAttribute( 'href', $alternate );
-
-        $feed_link= $xml->addChild( 'link' );
-        $feed_link->addAttribute( 'rel', 'self' );
-        $feed_link->addAttribute( 'href', $self );
+            $feed_subtitle= $feed->appendChild( $xml->createElement( 'subtitle' ) );
+            $feed_subtitle->appendChild( $xml->createTextNode( $tagline ) );
+        }
+
+        $feed_updated= $feed->appendChild( $xml->createElement('updated', date( 'c', time() ) ) );
+
+        $feed_link= $feed->appendChild( $xml->createElement( 'link' ) );
+        $feed_link->setAttribute( 'rel', 'alternate' );
+        $feed_link->setAttribute( 'href', $alternate );
+
+        $feed_link= $feed->appendChild( $xml->createElement( 'link' ) );
+        $feed_link->setAttribute( 'rel', 'self' );
+        $feed_link->setAttribute( 'href', $self );
 
         $page= ( isset( $rr_args['page'] ) ) ? $rr_args['page'] : 1;
@@ -111 +117 @@
 
             $rr_args['page']= $firstpage;
-            $feed_link= $xml->addChild( 'link' );
-            $feed_link->addAttribute( 'rel', 'first' );
-            $feed_link->addAttribute( 'href', URL::get( $rr_name, $rr_args ) );
-            $feed_link->addAttribute( 'type', 'application/atom+xml' );
-            $feed_link->addAttribute( 'title', _t('First Page') );
+            $feed_link= $feed->appendChild( $xml->createElement( 'link' ) );
+            $feed_link->setAttribute( 'rel', 'first' );
+            $feed_link->setAttribute( 'href', URL::get( $rr_name, $rr_args ) );
+            $feed_link->setAttribute( 'type', 'application/atom+xml' );
+            $feed_link->setAttribute( 'title', _t('First Page') );
 
             if ( $prevpage > $firstpage ) {
                 $rr_args['page']= $prevpage;
-                $feed_link= $xml->addChild( 'link' );
-                $feed_link->addAttribute( 'rel', 'previous' );
-                $feed_link->addAttribute( 'href', URL::get( $rr_name, $rr_args ) );
-                $feed_link->addAttribute( 'type', 'application/atom+xml' );
-                $feed_link->addAttribute( 'title', _t('Previous Page') );
+                $feed_link= $feed->appendChild( $xml->createElement( 'link' ) );
+                $feed_link->setAttribute( 'rel', 'previous' );
+                $feed_link->setAttribute( 'href', URL::get( $rr_name, $rr_args ) );
+                $feed_link->setAttribute( 'type', 'application/atom+xml' );
+                $feed_link->setAttribute( 'title', _t('Previous Page') );
             }
 
             if ( $nextpage <= $lastpage ) {
                 $rr_args['page']= $nextpage;
-                $feed_link= $xml->addChild( 'link' );
-                $feed_link->addAttribute( 'rel', 'next' );
-                $feed_link->addAttribute( 'href', URL::get( $rr_name, $rr_args ) );
-                $feed_link->addAttribute( 'type', 'application/atom+xml' );
-                $feed_link->addAttribute( 'title', _t('Next Page') );
+                $feed_link= $feed->appendChild( $xml->createElement( 'link' ) );
+                $feed_link->setAttribute( 'rel', 'next' );
+                $feed_link->setAttribute( 'href', URL::get( $rr_name, $rr_args ) );
+                $feed_link->setAttribute( 'type', 'application/atom+xml' );
+                $feed_link->setAttribute( 'title', _t('Next Page') );
             }
 
             $rr_args['page']= $lastpage;
-            $feed_link= $xml->addChild( 'link' );
-            $feed_link->addAttribute( 'rel', 'last' );
-            $feed_link->addAttribute( 'href', URL::get( $rr_name, $rr_args ) );
-            $feed_link->addAttribute( 'type', 'application/atom+xml' );
-            $feed_link->addAttribute( 'title', _t('Last Page') );
+            $feed_link= $feed->appendChild( $xml->createElement( 'link' ) );
+            $feed_link->setAttribute( 'rel', 'last' );
+            $feed_link->setAttribute( 'href', URL::get( $rr_name, $rr_args ) );
+            $feed_link->setAttribute( 'type', 'application/atom+xml' );
+            $feed_link->setAttribute( 'title', _t('Last Page') );
         }
 
         $rr_args['page']= $page;
 
-        $feed_generator= $xml->addChild( 'generator', 'Habari' );
-        $feed_generator->addAttribute( 'uri', 'http://www.habariproject.org/' );
-        $feed_generator->addAttribute( 'version', Version::get_habariversion() );
-
-        $feed_id= $xml->addChild( 'id', 'tag:' . Site::get_url('hostname') . ',' . date("Y-m-d") . ':' . $id . '/' . Options::get( 'GUID' ) );
+        $feed_generator= $feed->appendChild( $xml->createElement( 'generator', 'Habari' ) );
+        $feed_generator->setAttribute( 'uri', 'http://www.habariproject.org/' );
+        $feed_generator->setAttribute( 'version', Version::get_habariversion() );
+
+        $feed_id= $feed->appendChild( $xml->createElement( 'id', 'tag:' . Site::get_url('hostname') . ',' . date("Y-m-d") . ':' . $id . '/' . Options::get( 'GUID' ) ) );
 
         Plugins::act( 'atom_create_wrapper', $xml );
@@ -163 +169 @@
     public function add_posts($xml, $posts)
     {
+        //TODO:Is this the best way to retreive the feed element? :
+        $elements= $xml->getElementsByTagName( 'feed' );
+        $feed= $elements->item(0);
+        
         foreach ( $posts as $post ) {
             $user= User::get_by_id( $post->user_id );
-            $title= ( $this->is_auth() ) ? htmlspecialchars( $post->title ) : htmlspecialchars( $post->title_atom );
-            $content= ( $this->is_auth() ) ? htmlspecialchars( $post->content ) : htmlspecialchars( $post->content_atom );
-
-            $feed_entry= $xml->addChild( 'entry' );
-            $entry_title= $feed_entry->addChild( 'title', $title );
-
-            $entry_link= $feed_entry->addChild( 'link' );
-            $entry_link->addAttribute( 'rel', 'alternate' );
-            $entry_link->addAttribute( 'href', $post->permalink );
-
-            $entry_link= $feed_entry->addChild( 'link' );
-            $entry_link->addAttribute( 'rel', 'edit' );
-            $entry_link->addAttribute( 'href', URL::get( 'atom_entry', "slug={$post->slug}" ) );
-
-            $entry_author= $feed_entry->addChild( 'author' );
-            $author_name= $entry_author->addChild( 'name', $user->displayname );
-
-            $entry_id= $feed_entry->addChild( 'id', $post->guid );
-
-            $entry_updated= $feed_entry->addChild( 'updated', date( 'c', strtotime( $post->updated ) ) );
-            $entry_edited= $feed_entry->addChild( 'app:edited', date( 'c', strtotime( $post->updated ) ), 'http://www.w3.org/2007/app' );
-
-                foreach ( $post->tags as $tag ) {
-                    $entry_category= $feed_entry->addChild( 'category' );
-                    $entry_category->addAttribute( 'term', $tag );
-                }
-
-            $entry_content= $feed_entry->addChild( 'content', $content );
-            $entry_content->addAttribute( 'type', 'html' );
+            $title= ( $this->is_auth() ) ? $post->title : $post->title_atom;
+            $content= ( $this->is_auth() ) ? $post->content : $post->content_atom;
+
+            $feed_entry= $feed->appendChild( $xml->createElement( 'entry' ) );
+            $entry_title= $feed_entry->appendChild( $xml->createElement( 'title' ) );
+            $entry_title->appendChild( $xml->createTextNode( $title ) );
+
+            $entry_link= $feed_entry->appendChild( $xml->createElement( 'link' ) );
+            $entry_link->setAttribute( 'rel', 'alternate' );
+            $entry_link->setAttribute( 'href', $post->permalink );
+
+            $entry_link= $feed_entry->appendChild( $xml->createElement( 'link' ) );
+            $entry_link->setAttribute( 'rel', 'edit' );
+            $entry_link->setAttribute( 'href', URL::get( 'atom_entry', "slug={$post->slug}" ) );
+
+            $entry_author= $feed_entry->appendChild( $xml->createElement( 'author' ) );
+            $author_name= $entry_author->appendChild( $xml->createElement( 'name' ) );
+            $author_name= $entry_author->appendChild( $xml->createTextNode( $user->displayname ) );
+
+            $entry_id= $feed_entry->appendChild( $xml->createElement( 'id', $post->guid ) );
+
+            $entry_updated= $feed_entry->appendChild( $xml->createElement( 'updated', date( 'c', strtotime( $post->updated ) ) ) );
+            $entry_edited= $feed_entry->appendChild( $xml->createElementNS( 'http://www.w3.org/2007/app', 'app:edited', date( 'c', strtotime( $post->updated ) ) ) );
+
+            foreach ( $post->tags as $tag ) {
+                $entry_category= $feed_entry->appendChild( $xml->createElement( 'category' ) );
+                $entry_category->setAttribute( 'term', $tag );
+            }
+
+            $entry_content= $feed_entry->appendChild( $xml->createElement( 'content' ) );
+            $entry_content->setAttribute( 'type', 'html' );
+            $entry_content->appendChild( $xml->createTextNode( $content ) );
             Plugins::act( 'atom_add_post', $feed_entry, $post );
         }
@@ -646 +659 @@
 
         Plugins::act( 'atom_get_collection', $xml, $params, $handler_vars );
-        $xml= $xml->asXML();
+        $xml= $xml->saveXML();
 
         ob_clean();