Changeset 71

Timestamp:

06/19/07 19:30:19 (19 months ago)

Author:

verbosus

Message:

Cosmetic tweaks to feed.php: thanks, Federico Marzocchi!

Files:

• hacks/trunk/feedphp/feed.php (modified) (12 diffs)

hacks/trunk/feedphp/feed.php

@@ -6 +6 @@
    * 
    * author: Antonio Cavedoni <http://cavedoni.com/>
-   * version: 0.1
+   * version: 0.11
    * revision: $Id$
    * license: BSD
+   * 
+   * acknowledgements: Ludovico Magnocavallo, Simon Willison, Adrian
+   * Holovaty, Jacob Kaplan-Moss and the Django project, Federico
+   * Marzocchi
    * 
    * Feed::serve() outputs the feed with the proper MIME type and
@@ -21 +25 @@
    * require_once('feed.php');
    * 
-   * $feed = new AtomFeed(Array(
+   * $feed = new AtomFeed(array(
    *     'title' => 'My feed', 
    *     'link' => 'http://localhost/myfeed.php', 
@@ -27 +31 @@
    * ));
    * 
-   * $feed->addItem(Array(
+   * $feed->addItem(array(
    *    'title' => 'mytitle', 
    *    'link' => 'http://example.org/1', 
@@ -37 +41 @@
    * ));
    * 
-   * $feed->addItem(Array(
+   * $feed->addItem(array(
    *     'title' => 'another title', 
    *     'link' => 'http://example.org/2', 
@@ -63 +67 @@
 
 class Feed {
-    public $items = Array();
+    public $items = array();
     public $writer;
     public $charset = 'UTF-8';
@@ -73 +77 @@
     public function __construct($params)
     {
-        if (array_key_exists('charset', $params)) 
+        if (array_key_exists('charset', $params)) {
             $this->charset = $params['charset'];
-        if (array_key_exists('title', $params))
+        }
+        if (array_key_exists('title', $params)) {
             $this->title = $params['title'];
-        if (array_key_exists('link', $params))
+        }
+        if (array_key_exists('link', $params)) {
             $this->link = $params['link'];
-        if (array_key_exists('description', $params)) 
+        }
+        if (array_key_exists('description', $params)) {
             $this->description = $params['description'];
+        }
     }
 
@@ -92 +100 @@
     public function latestPostDate() 
     {
-        $updates = Array();
+        $updates = array();
         foreach ($this->items as $item) {
-            array_push($updates, $item['pubDate']);
+            $this->updates[] = $item['pubDate'];
         }
         rsort($updates);
@@ -102 +110 @@
     public function addItem($params) 
     {
-        $item = Array(
+        $item = array(
             'title' => $params['title'], 
             'link' => $params['link'], 
@@ -109 +117 @@
         );
 
-        if (array_key_exists('author', $params)) 
+        if (array_key_exists('author', $params)) {
             $item['author'] = $params['author'];
-        if (array_key_exists('authorEmail', $params))
+        }
+        if (array_key_exists('authorEmail', $params)) {
             $item['authorEmail'] = $params['authorEmail'];
-        if (array_key_exists('uniqueId', $params))
+        }
+        if (array_key_exists('uniqueId', $params)) {
             $item['uniqueId'] = $params['uniqueId'];
+        }
         array_push($this->items, $item);
     }
@@ -165 +176 @@
         // See if the client has provided the required headers
         $if_modified_since = $if_none_match = false;
-        if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']))
+        if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
             $if_modified_since = stripslashes($_SERVER['HTTP_IF_MODIFIED_SINCE']);
-        if(isset($_SERVER['HTTP_IF_NONE_MATCH']))
+        }
+        if (isset($_SERVER['HTTP_IF_NONE_MATCH'])) {
             $if_none_match = stripslashes($_SERVER['HTTP_IF_NONE_MATCH']);
+        }
         if (!$if_modified_since && !$if_none_match) {
             // both are missing
@@ -229 +242 @@
             $this->rfc3339Date($this->latestPostDate()));
         $this->writer->elementWithAttrs('link', 
-            Array('rel' => 'self', 'href' => $this->link));
+            array('rel' => 'self', 'href' => $this->link));
         $this->writeItems();
         $this->writer->endElement();
@@ -241 +254 @@
             $this->writer->writeElement('title', $item['title']);
             $this->writer->elementWithAttrs('link', 
-                Array('rel' => 'alternate', 'href' => $item['link']));
+                array('rel' => 'alternate', 'href' => $item['link']));
             $this->writer->elementWithAttrs('content', 
-                Array('type' => 'html'), $item['description']);
+                array('type' => 'html'), $item['description']);
             $this->writer->writeElement('id', $item['link']);
             $this->writer->writeElement('updated',