X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=application%2FFeedBuilder.php;h=ebae18b41c27ac011ff0cb12f8ad69fc6728d13e;hb=2a3fe990dd0730fce9465bbef6ad1a01054f775d;hp=ddefe6ce93a83ed8f6869d1eee57941264731e72;hpb=f66a1990e5d93a6f302ce594968e5e717b93da72;p=github%2Fshaarli%2FShaarli.git
diff --git a/application/FeedBuilder.php b/application/FeedBuilder.php
index ddefe6ce..ebae18b4 100644
--- a/application/FeedBuilder.php
+++ b/application/FeedBuilder.php
@@ -62,11 +62,6 @@ class FeedBuilder
*/
protected $hideDates;
- /**
- * @var string PubSub hub URL.
- */
- protected $pubsubhubUrl;
-
/**
* @var string server locale.
*/
@@ -102,6 +97,11 @@ class FeedBuilder
*/
public function buildData()
{
+ // Search for untagged links
+ if (isset($this->userInput['searchtags']) && empty($this->userInput['searchtags'])) {
+ $this->userInput['searchtags'] = false;
+ }
+
// Optionally filter the results:
$linksToDisplay = $this->linkDB->filterSearch($this->userInput);
@@ -120,11 +120,11 @@ class FeedBuilder
}
$data['language'] = $this->getTypeLanguage();
- $data['pubsubhub_url'] = $this->pubsubhubUrl;
$data['last_update'] = $this->getLatestDateFormatted();
$data['show_dates'] = !$this->hideDates || $this->isLoggedIn;
// Remove leading slash from REQUEST_URI.
- $data['self_link'] = $pageaddr . escape(ltrim($this->serverInfo['REQUEST_URI'], '/'));
+ $data['self_link'] = escape(server_url($this->serverInfo))
+ . escape($this->serverInfo['REQUEST_URI']);
$data['index_url'] = $pageaddr;
$data['usepermalinks'] = $this->usePermalinks === true;
$data['links'] = $linkDisplayed;
@@ -142,29 +142,36 @@ class FeedBuilder
*/
protected function buildItem($link, $pageaddr)
{
- $link['guid'] = $pageaddr .'?'. smallHash($link['linkdate']);
+ $link['guid'] = $pageaddr .'?'. $link['shorturl'];
// Check for both signs of a note: starting with ? and 7 chars long.
if ($link['url'][0] === '?' && strlen($link['url']) === 7) {
$link['url'] = $pageaddr . $link['url'];
}
if ($this->usePermalinks === true) {
- $permalink = 'Direct link';
+ $permalink = ''. t('Direct link') .'';
} else {
- $permalink = 'Permalink';
+ $permalink = ''. t('Permalink') .'';
}
- $link['description'] = format_description($link['description']) . PHP_EOL .'
— '. $permalink;
+ $link['description'] = format_description($link['description'], '', false, $pageaddr);
+ $link['description'] .= PHP_EOL .'
— '. $permalink;
- $date = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $link['linkdate']);
+ $pubDate = $link['created'];
+ $link['pub_iso_date'] = $this->getIsoDate($pubDate);
- if ($this->feedType == self::$FEED_RSS) {
- $link['iso_date'] = $date->format(DateTime::RSS);
+ // atom:entry elements MUST contain exactly one atom:updated element.
+ if (!empty($link['updated'])) {
+ $upDate = $link['updated'];
+ $link['up_iso_date'] = $this->getIsoDate($upDate, DateTime::ATOM);
} else {
- $link['iso_date'] = $date->format(DateTime::ATOM);
+ $link['up_iso_date'] = $this->getIsoDate($pubDate, DateTime::ATOM);;
}
// Save the more recent item.
- if (empty($this->latestDate) || $this->latestDate < $date) {
- $this->latestDate = $date;
+ if (empty($this->latestDate) || $this->latestDate < $pubDate) {
+ $this->latestDate = $pubDate;
+ }
+ if (!empty($upDate) && $this->latestDate < $upDate) {
+ $this->latestDate = $upDate;
}
$taglist = array_filter(explode(' ', $link['tags']), 'strlen');
@@ -174,16 +181,6 @@ class FeedBuilder
return $link;
}
- /**
- * Assign PubSub hub URL.
- *
- * @param string $pubsubhubUrl PubSub hub url.
- */
- public function setPubsubhubUrl($pubsubhubUrl)
- {
- $this->pubsubhubUrl = $pubsubhubUrl;
- }
-
/**
* Set this to true to use permalinks instead of direct links.
*
@@ -249,6 +246,26 @@ class FeedBuilder
return $this->latestDate->format($type);
}
+ /**
+ * Get ISO date from DateTime according to feed type.
+ *
+ * @param DateTime $date Date to format.
+ * @param string|bool $format Force format.
+ *
+ * @return string Formatted date.
+ */
+ protected function getIsoDate(DateTime $date, $format = false)
+ {
+ if ($format !== false) {
+ return $date->format($format);
+ }
+ if ($this->feedType == self::$FEED_RSS) {
+ return $date->format(DateTime::RSS);
+
+ }
+ return $date->format(DateTime::ATOM);
+ }
+
/**
* Returns the number of link to display according to 'nb' user input parameter.
*