1 files changed, 55 insertions, 48 deletions
diff --git a/inc/3rdparty/libraries/feedwriter/FeedItem.php b/inc/3rdparty/libraries/feedwriter/FeedItem.php
index 3487423f..40786598 100644..100755
--- a/inc/3rdparty/libraries/feedwriter/FeedItem.php
+++ b/inc/3rdparty/libraries/feedwriter/FeedItem.php
@@ -1,7 +1,7 @@
 <?php
 /**
 * Univarsel Feed Writer
- * 
+ *
 * FeedItem class - Used as feed element in FeedWriter class
 *
 * @package         UnivarselFeedWriter
@@ -12,20 +12,20 @@
 {
    private $elements = array();    //Collection of feed elements
    private $version;
-    
    /**
-    * Constructor 
+    * Constructor
-    * 
+    *
-    * @param    contant     (RSS1/RSS2/ATOM) RSS2 is default. 
+    * @param    contant     (RSS1/RSS2/ATOM) RSS2 is default.
-    */ 
+    */
    function __construct($version = RSS2)
-    {    
+    {
        $this->version = $version;
    }
    /**
    * Set element (overwrites existing elements with $elementName)
-    * 
+    *
    * @access   public
    * @param    srting  The tag name of an element
    * @param    srting  The content of tag
@@ -38,11 +38,11 @@
            unset($this->elements[$elementName]);
        }
        $this->addElement($elementName, $content, $attributes);
-    }    
+    }
-    
    /**
    * Add an element to elements array
-    * 
+    *
    * @access   public
    * @param    srting  The tag name of an element
    * @param    srting  The content of tag
@@ -61,11 +61,11 @@
        $this->elements[$elementName][$i]['content']    = $content;
        $this->elements[$elementName][$i]['attributes'] = $attributes;
    }
-    
    /**
-    * Set multiple feed elements from an array. 
+    * Set multiple feed elements from an array.
    * Elements which have attributes cannot be added by this method
-    * 
+    *
    * @access   public
    * @param    array   array of elements in 'tagName' => 'tagContent' format.
    * @return   void
@@ -73,15 +73,15 @@
    public function addElementArray($elementArray)
    {
        if(! is_array($elementArray)) return;
-        foreach ($elementArray as $elementName => $content) 
+        foreach ($elementArray as $elementName => $content)
        {
            $this->addElement($elementName, $content);
        }
    }
-    
    /**
    * Return the collection of elements in this feed item
-    * 
+    *
    * @access   public
    * @return   array
    */
@@ -89,68 +89,74 @@
    {
        return $this->elements;
    }
-    
    // Wrapper functions ------------------------------------------------------
-    
    /**
    * Set the 'dscription' element of feed item
-    * 
+    *
    * @access   public
    * @param    string  The content of 'description' element
    * @return   void
    */
-    public function setDescription($description) 
+    public function setDescription($description)
    {
-        $this->setElement('description', $description);
+        $tag = ($this->version == ATOM)? 'summary' : 'description';
+        $this->setElement($tag, $description);
    }
-    
    /**
    * @desc     Set the 'title' element of feed item
    * @access   public
    * @param    string  The content of 'title' element
    * @return   void
    */
-    public function setTitle($title) 
+    public function setTitle($title)
    {
-        $this->setElement('title', $title);      
+        $this->setElement('title', $title);
    }
-    
    /**
    * Set the 'date' element of feed item
-    * 
+    *
    * @access   public
    * @param    string  The content of 'date' element
    * @return   void
    */
-    public function setDate($date) 
+    public function setDate($date)
    {
        if(! is_numeric($date))
        {
            $date = strtotime($date);
        }
-      
-        if($this->version == RSS2) 
+        if($this->version == ATOM)
+        {
+                $tag    = 'updated';
+                $value  = date(DATE_ATOM, $date);
+        }
+        elseif($this->version == RSS2)
        {
-            $tag    = 'pubDate';
+                $tag    = 'pubDate';
-            $value  = date(DATE_RSS, $date);
+                $value  = date(DATE_RSS, $date);
        }
-        else                                
+        else
        {
-            $tag    = 'dc:date';
+                $tag    = 'dc:date';
-            $value  = date("Y-m-d", $date);
+                $value  = date("Y-m-d", $date);
        }
-        
-        $this->setElement($tag, $value);    
+        $this->setElement($tag, $value);
    }
-    
    /**
    * Set the 'link' element of feed item
-    * 
+    *
    * @access   public
    * @param    string  The content of 'link' element
    * @return   void
    */
-    public function setLink($link) 
+    public function setLink($link)
    {
        if($this->version == RSS2 || $this->version == RSS1)
        {
@@ -161,26 +167,27 @@
        {
            $this->setElement('link','',array('href'=>$link));
            $this->setElement('id', FeedWriter::uuid($link,'urn:uuid:'));
-        } 
+        }
-        
    }
    /**
    * Set the 'source' element of feed item
-    * 
+    *
    * @access   public
    * @param    string  The content of 'source' element
    * @return   void
    */
-    public function setSource($link) 
+    public function setSource($link)
    {
-        $this->setElement('source', $link);
+        $attributes = array('url'=>$link);
+        $this->setElement('source', "wallabag",$attributes);
    }
-    
    /**
    * Set the 'encloser' element of feed item
    * For RSS 2.0 only
-    * 
+    *
    * @access   public
    * @param    string  The url attribute of encloser tag
    * @param    string  The length attribute of encloser tag
@@ -192,6 +199,6 @@
        $attributes = array('url'=>$url, 'length'=>$length, 'type'=>$type);
        $this->setElement('enclosure','',$attributes);
    }
-    
 } // end of class FeedItem
 ?>
 \ No newline at end of file