--- a/web/lib/Zend/Feed/Writer/Entry.php Thu Mar 21 17:31:31 2013 +0100
+++ b/web/lib/Zend/Feed/Writer/Entry.php Thu Mar 21 19:50:53 2013 +0100
@@ -14,9 +14,9 @@
*
* @category Zend
* @package Zend_Feed_Writer
- * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
- * @version $Id: Entry.php 22662 2010-07-24 17:37:36Z mabe $
+ * @version $Id: Entry.php 25160 2012-12-18 15:17:16Z matthew $
*/
/**
@@ -34,7 +34,7 @@
/**
* @category Zend
* @package Zend_Feed_Writer
- * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Feed_Writer_Entry
@@ -46,14 +46,14 @@
* @var array
*/
protected $_data = array();
-
+
/**
* Registered extensions
*
* @var array
*/
protected $_extensions = array();
-
+
/**
* Holds the value "atom" or "rss" depending on the feed type set when
* when last exported.
@@ -61,7 +61,7 @@
* @var string
*/
protected $_type = null;
-
+
/**
* Constructor: Primarily triggers the registration of core extensions and
* loads those appropriate to this data container.
@@ -84,8 +84,8 @@
{
$author = array();
if (is_array($name)) {
- if (!array_key_exists('name', $name)
- || empty($name['name'])
+ if (!array_key_exists('name', $name)
+ || empty($name['name'])
|| !is_string($name['name'])
) {
require_once 'Zend/Feed/Exception.php';
@@ -100,8 +100,8 @@
$author['email'] = $name['email'];
}
if (isset($name['uri'])) {
- if (empty($name['uri'])
- || !is_string($name['uri'])
+ if (empty($name['uri'])
+ || !is_string($name['uri'])
|| !Zend_Uri::check($name['uri'])
) {
require_once 'Zend/Feed/Exception.php';
@@ -114,7 +114,7 @@
* Array notation (above) is preferred and will be the sole supported input from ZF 2.0
*/
} else {
- if (empty($name['name']) || !is_string($name['name'])) {
+ if (empty($name) || !is_string($name)) {
require_once 'Zend/Feed/Exception.php';
throw new Zend_Feed_Exception('Invalid parameter: "name" must be a non-empty string value');
}
@@ -148,7 +148,7 @@
$this->addAuthor($author);
}
}
-
+
/**
* Set the feed character encoding
*
@@ -214,10 +214,10 @@
$zdate = null;
if ($date === null) {
$zdate = new Zend_Date;
- } elseif (ctype_digit($date) && strlen($date) == 10) {
- $zdate = new Zend_Date($date, Zend_Date::TIMESTAMP);
} elseif ($date instanceof Zend_Date) {
$zdate = $date;
+ } elseif (ctype_digit((string)$date)) {
+ $zdate = new Zend_Date($date, Zend_Date::TIMESTAMP);
} else {
require_once 'Zend/Feed/Exception.php';
throw new Zend_Feed_Exception('Invalid Zend_Date object or UNIX Timestamp passed as parameter');
@@ -235,10 +235,10 @@
$zdate = null;
if ($date === null) {
$zdate = new Zend_Date;
- } elseif (ctype_digit($date) && strlen($date) == 10) {
- $zdate = new Zend_Date($date, Zend_Date::TIMESTAMP);
} elseif ($date instanceof Zend_Date) {
$zdate = $date;
+ } elseif (ctype_digit((string)$date)) {
+ $zdate = new Zend_Date($date, Zend_Date::TIMESTAMP);
} else {
require_once 'Zend/Feed/Exception.php';
throw new Zend_Feed_Exception('Invalid Zend_Date object or UNIX Timestamp passed as parameter');
@@ -295,7 +295,7 @@
*/
public function setCommentCount($count)
{
- if (empty($count) || !is_numeric($count) || (int) $count < 0) {
+ if ( !is_numeric($count) || (int) $count < 0) {
require_once 'Zend/Feed/Exception.php';
throw new Zend_Feed_Exception('Invalid parameter: "count" must be a non-empty integer number');
}
@@ -337,7 +337,7 @@
}
$this->_data['commentFeedLinks'][] = $link;
}
-
+
/**
* Set a links to an XML feed for any comments associated with this entry.
* Each link is an array with keys "uri" and "type", where type is one of:
@@ -456,7 +456,7 @@
}
return $this->_data['id'];
}
-
+
/**
* Get a link to the HTML source
*
@@ -536,12 +536,12 @@
}
return $this->_data['commentFeedLinks'];
}
-
+
/**
* Add a entry category
*
* @param string $category
- */
+ */
public function addCategory(array $category)
{
if (!isset($category['term'])) {
@@ -551,7 +551,7 @@
. ' readable category name');
}
if (isset($category['scheme'])) {
- if (empty($category['scheme'])
+ if (empty($category['scheme'])
|| !is_string($category['scheme'])
|| !Zend_Uri::check($category['scheme'])
) {
@@ -565,7 +565,7 @@
}
$this->_data['categories'][] = $category;
}
-
+
/**
* Set an array of entry categories
*
@@ -577,7 +577,7 @@
$this->addCategory($category);
}
}
-
+
/**
* Get the entry categories
*
@@ -590,7 +590,7 @@
}
return $this->_data['categories'];
}
-
+
/**
* Adds an enclosure to the entry. The array parameter may contain the
* keys 'uri', 'type' and 'length'. Only 'uri' is required for Atom, though the
@@ -611,7 +611,7 @@
}
$this->_data['enclosure'] = $enclosure;
}
-
+
/**
* Retrieve an array of all enclosures to be added to entry.
*
@@ -624,7 +624,7 @@
}
return $this->_data['enclosure'];
}
-
+
/**
* Unset a specific data point
*
@@ -636,7 +636,7 @@
unset($this->_data[$name]);
}
}
-
+
/**
* Get registered extensions
*
@@ -660,7 +660,7 @@
}
return null;
}
-
+
/**
* Set the current feed type being exported to "rss" or "atom". This allows
* other objects to gracefully choose whether to execute or not, depending
@@ -672,7 +672,7 @@
{
$this->_type = $type;
}
-
+
/**
* Retrieve the current or last feed type exported.
*
@@ -703,7 +703,7 @@
throw new Zend_Feed_Exception('Method: ' . $method
. ' does not exist and could not be located on a registered Extension');
}
-
+
/**
* Creates a new Zend_Feed_Writer_Source data container for use. This is NOT
* added to the current feed automatically, but is necessary to create a
@@ -731,7 +731,7 @@
{
$this->_data['source'] = $source;
}
-
+
/**
* @return Zend_Feed_Writer_Source
*/