aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-08-12 21:01:51 -0700
committerFriendika <info@friendika.com>2011-08-12 21:01:51 -0700
commite15e18e0d1499a91f6e3d20553a09af534c471f7 (patch)
treeb871ba05ec4d741425961e0ce7023faef3cb800c
parente1db1369664cd4299dd5bdcb463e549c602213f0 (diff)
downloadvolse-hubzilla-e15e18e0d1499a91f6e3d20553a09af534c471f7.tar.gz
volse-hubzilla-e15e18e0d1499a91f6e3d20553a09af534c471f7.tar.bz2
volse-hubzilla-e15e18e0d1499a91f6e3d20553a09af534c471f7.zip
hopefully fix statusnet bug by altering our feed format slightly
-rw-r--r--boot.php2
-rw-r--r--include/items.php6
-rw-r--r--view/atom_feed.tpl4
-rw-r--r--view/atom_feed_dfrn.tpl28
4 files changed, 35 insertions, 5 deletions
diff --git a/boot.php b/boot.php
index 0a8a2fd84..76b80ce04 100644
--- a/boot.php
+++ b/boot.php
@@ -7,7 +7,7 @@ require_once('include/text.php');
require_once("include/pgettext.php");
-define ( 'FRIENDIKA_VERSION', '2.2.1069' );
+define ( 'FRIENDIKA_VERSION', '2.2.1070' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1079 );
diff --git a/include/items.php b/include/items.php
index be231f34d..ec519ad9b 100644
--- a/include/items.php
+++ b/include/items.php
@@ -112,7 +112,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
$items = $r;
- $feed_template = get_markup_template('atom_feed.tpl');
+ $feed_template = get_markup_template(($dfrn_id) ? 'atom_feed_dfrn.tpl' : 'atom_feed.tpl');
$atom = '';
@@ -1038,7 +1038,9 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_fee
if(count($hubs))
$hub = implode(',', $hubs);
- $rawtags = $feed->get_feed_tags( SIMPLEPIE_NAMESPACE_ATOM_10, 'author');
+ $rawtags = $feed->get_feed_tags( NAMESPACE_DFRN, 'owner');
+ if(! $rawtags)
+ $rawtags = $feed->get_feed_tags( SIMPLEPIE_NAMESPACE_ATOM_10, 'author');
if($rawtags) {
$elems = $rawtags[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10];
if($elems['name'][0]['attribs'][NAMESPACE_DFRN]['updated']) {
diff --git a/view/atom_feed.tpl b/view/atom_feed.tpl
index 3d6bcc5b5..c7cc08297 100644
--- a/view/atom_feed.tpl
+++ b/view/atom_feed.tpl
@@ -19,10 +19,10 @@
<updated>$feed_updated</updated>
- <author>
+ <dfrn:owner>
<name dfrn:updated="$namdate" >$name</name>
<uri dfrn:updated="$uridate" >$profile_page</uri>
<link rel="photo" type="image/jpeg" dfrn:updated="$picdate" media:width="175" media:height="175" href="$photo" />
<link rel="avatar" type="image/jpeg" dfrn:updated="$picdate" media:width="175" media:height="175" href="$photo" />
$birthday
- </author>
+ </dfrn:owner>
diff --git a/view/atom_feed_dfrn.tpl b/view/atom_feed_dfrn.tpl
new file mode 100644
index 000000000..3d6bcc5b5
--- /dev/null
+++ b/view/atom_feed_dfrn.tpl
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<feed xmlns="http://www.w3.org/2005/Atom"
+ xmlns:thr="http://purl.org/syndication/thread/1.0"
+ xmlns:at="http://purl.org/atompub/tombstones/1.0"
+ xmlns:media="http://purl.org/syndication/atommedia"
+ xmlns:dfrn="http://purl.org/macgirvin/dfrn/1.0"
+ xmlns:as="http://activitystrea.ms/spec/1.0/"
+ xmlns:georss="http://www.georss.org/georss"
+ xmlns:poco="http://portablecontacts.net/spec/1.0"
+ xmlns:ostatus="http://ostatus.org/schema/1.0"
+ xmlns:statusnet="http://status.net/schema/api/1/" >
+
+ <id>$feed_id</id>
+ <title>$feed_title</title>
+ <generator uri="http://friendika.com" version="$version">Friendika</generator>
+ <link rel="license" href="http://creativecommons.org/licenses/by/3.0/" />
+ $hub
+ $salmon
+
+ <updated>$feed_updated</updated>
+
+ <author>
+ <name dfrn:updated="$namdate" >$name</name>
+ <uri dfrn:updated="$uridate" >$profile_page</uri>
+ <link rel="photo" type="image/jpeg" dfrn:updated="$picdate" media:width="175" media:height="175" href="$photo" />
+ <link rel="avatar" type="image/jpeg" dfrn:updated="$picdate" media:width="175" media:height="175" href="$photo" />
+ $birthday
+ </author>